From 5cb8f26241c1b4bd3d5ebef7c946a1c57fbb2a42 Mon Sep 17 00:00:00 2001 From: Marek Goldmann Date: Apr 21 2012 07:55:30 +0000 Subject: Upstream release 1.3.13.GA --- diff --git a/.gitignore b/.gitignore index df6f06b..53973d0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /jboss-marshalling-1.3.0.GA.tar.xz /jboss-marshalling-1.3.4.GA.tar.xz /jboss-marshalling-1.3.9.GA.tar.xz +/jboss-marshalling-1.3.13.GA.tar.xz diff --git a/jboss-marshalling-1.3.13.GA-pom.patch b/jboss-marshalling-1.3.13.GA-pom.patch new file mode 100644 index 0000000..0e3c323 --- /dev/null +++ b/jboss-marshalling-1.3.13.GA-pom.patch @@ -0,0 +1,61 @@ +diff -Naur jboss-marshalling-1.3.13.GA/osgi/pom.xml jboss-marshalling-1.3.13.GA-work/osgi/pom.xml +--- jboss-marshalling-1.3.13.GA/osgi/pom.xml 2012-03-23 05:27:08.000000000 +0100 ++++ jboss-marshalling-1.3.13.GA-work/osgi/pom.xml 2012-04-21 09:36:13.440000800 +0200 +@@ -63,27 +63,6 @@ + + + +- maven-shade-plugin +- +- +- package +- +- shade +- +- +- true +- true +- +- +- META-INF/services/org.jboss.marshalling.ProviderDescriptor +- +- +- +- +- +- +- +- + org.apache.felix + maven-bundle-plugin + 2.1.0 +diff -Naur jboss-marshalling-1.3.13.GA/pom.xml jboss-marshalling-1.3.13.GA-work/pom.xml +--- jboss-marshalling-1.3.13.GA/pom.xml 2012-03-23 05:27:08.000000000 +0100 ++++ jboss-marshalling-1.3.13.GA-work/pom.xml 2012-04-21 09:35:50.340000039 +0200 +@@ -43,7 +43,6 @@ + api + river + serial +- tests + osgi + + +@@ -51,18 +50,6 @@ + + + +- maven-shade-plugin +- 1.4 +- +- +- package +- +- shade +- +- +- +- +- + org.jboss.maven.plugins + maven-injection-plugin + 1.0.2 diff --git a/jboss-marshalling-1.3.9.GA-pom.patch b/jboss-marshalling-1.3.9.GA-pom.patch deleted file mode 100644 index ecb02f6..0000000 --- a/jboss-marshalling-1.3.9.GA-pom.patch +++ /dev/null @@ -1,61 +0,0 @@ -diff -Naur jboss-marshalling-1.3.9.GA/osgi/pom.xml jboss-marshalling-1.3.9.GA-work/osgi/pom.xml ---- jboss-marshalling-1.3.9.GA/osgi/pom.xml 2012-02-15 17:48:28.000000000 +0100 -+++ jboss-marshalling-1.3.9.GA-work/osgi/pom.xml 2012-02-23 09:17:41.476999947 +0100 -@@ -63,27 +63,6 @@ - - - -- maven-shade-plugin -- -- -- package -- -- shade -- -- -- true -- true -- -- -- META-INF/services/org.jboss.marshalling.ProviderDescriptor -- -- -- -- -- -- -- -- - org.apache.felix - maven-bundle-plugin - 2.1.0 -diff -Naur jboss-marshalling-1.3.9.GA/pom.xml jboss-marshalling-1.3.9.GA-work/pom.xml ---- jboss-marshalling-1.3.9.GA/pom.xml 2012-02-15 17:48:28.000000000 +0100 -+++ jboss-marshalling-1.3.9.GA-work/pom.xml 2012-02-23 09:06:35.955000374 +0100 -@@ -43,7 +43,6 @@ - api - river - serial -- tests - osgi - - -@@ -51,18 +50,6 @@ - - - -- maven-shade-plugin -- 1.4 -- -- -- package -- -- shade -- -- -- -- -- - org.jboss.maven.plugins - maven-injection-plugin - 1.0.2 diff --git a/jboss-marshalling.spec b/jboss-marshalling.spec index 1b03b7a..fa5841f 100644 --- a/jboss-marshalling.spec +++ b/jboss-marshalling.spec @@ -2,15 +2,15 @@ %global namedversion %{version}%{?namedreltag} Name: jboss-marshalling -Version: 1.3.9 -Release: 2%{?dist} +Version: 1.3.13 +Release: 1%{?dist} Summary: JBoss Marshalling Group: Development/Libraries License: LGPLv2+ URL: http://www.jboss.org/jbossmarshalling # git clone git://github.com/jboss-remoting/jboss-marshalling.git -# cd jboss-marshalling/ && git archive --format=tar --prefix=jboss-marshalling-1.3.9.GA/ 1.3.9.GA | xz > jboss-marshalling-1.3.9.GA.tar.xz +# cd jboss-marshalling/ && git archive --format=tar --prefix=jboss-marshalling-1.3.13.GA/ 1.3.13.GA | xz > jboss-marshalling-1.3.13.GA.tar.xz Source0: %{name}-%{namedversion}.tar.xz Patch0: %{name}-%{namedversion}-pom.patch @@ -97,6 +97,9 @@ cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} %doc COPYING.txt %changelog +* Sat Apr 20 2012 Marek Goldmann 1.3.13-1 +- Upstream release 1.3.13.GA + * Thu Feb 23 2012 Marek Goldmann 1.3.9-2 - Relocated jars to _javadir diff --git a/sources b/sources index 058f886..c139e9f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7f2e3d45dd103bdde59dea6f252030e1 jboss-marshalling-1.3.9.GA.tar.xz +cd0fbc42d216524253c734de1e475624 jboss-marshalling-1.3.13.GA.tar.xz