Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package jackson for openSUSE:Factory checked in at 2022-03-24 22:58:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jackson (Old) and /work/SRC/openSUSE:Factory/.jackson.new.1900 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jackson" Thu Mar 24 22:58:27 2022 rev:3 rq:964653 version:1.9.13 Changes: -------- --- /work/SRC/openSUSE:Factory/jackson/jackson.changes 2019-12-16 15:21:19.387115313 +0100 +++ /work/SRC/openSUSE:Factory/.jackson.new.1900/jackson.changes 2022-03-24 23:00:39.164404159 +0100 @@ -1,0 +2,13 @@ +Thu Mar 24 12:26:55 UTC 2022 - Fridrich Strba <[email protected]> + +- Build with java source and target levels 1.8 +- Modified patch: + * jackson-sourcetarget.patch + + Do not hardcode source and target levels, so that they + can be overriden on command-line +- Added patch: + * jackson-javaee.patch + + Set classpath correctly so that the project builds with + standalone JavaEE modules too + +------------------------------------------------------------------- New: ---- jackson-javaee.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jackson.spec ++++++ --- /var/tmp/diff_new_pack.o8DLT6/_old 2022-03-24 23:00:39.824404796 +0100 +++ /var/tmp/diff_new_pack.o8DLT6/_new 2022-03-24 23:00:39.832404804 +0100 @@ -1,7 +1,7 @@ # # spec file for package jackson # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -37,14 +37,17 @@ Patch4: %{name}-1.9.11-javadoc.patch Patch5: jackson-sourcetarget.patch Patch6: jackson-module.patch +Patch7: jackson-javaee.patch BuildRequires: ant >= 1.8.2 -BuildRequires: asm3 >= 3.3 BuildRequires: cglib >= 2.2 BuildRequires: fdupes +BuildRequires: glassfish-activation-api +BuildRequires: glassfish-jaxb-api BuildRequires: groovy18 >= 1.8.5 BuildRequires: javapackages-local BuildRequires: joda-time >= 1.6.2 BuildRequires: jsr-311 >= 1.1.1 +BuildRequires: objectweb-asm BuildRequires: stax2-api >= 3.1.1 BuildRequires: xmvn-install BuildRequires: xmvn-resolve @@ -74,6 +77,7 @@ %patch4 %patch5 -p1 %patch6 -p1 +%patch7 -p1 # Remove all the binary jar files, as the packaging policies # forbids using them: @@ -90,11 +94,13 @@ mkdir -p lib/xml ln -s $(build-classpath stax2-api) lib/xml/sta2-api.jar ln -s $(build-classpath jsr-311) lib/jaxrs/jsr-311.jar -ln -s $(build-classpath asm3/asm) lib/ext/asm/asm.jar -ln -s $(build-classpath asm3/asm) lib/repackaged/jackson-asm.jar +ln -s $(build-classpath objectweb-asm/asm) lib/ext/asm/asm.jar +ln -s $(build-classpath objectweb-asm/asm) lib/repackaged/jackson-asm.jar ln -s $(build-classpath cglib/cglib) lib/ext/cglib/cglib-nodep.jar ln -s $(build-classpath groovy-1.8) lib/ext/groovy/groovy.jar ln -s $(build-classpath junit) lib/junit/junit.jar +ln -s $(build-classpath glassfish-activation-api) lib/jaxb/activation.jar +ln -s $(build-classpath glassfish-jaxb-api) lib/jaxb/jaxb-api-2.0.jar sed -i "s,59 Temple Place,51 Franklin Street,;s,Suite 330,Fifth Floor,;s,02111-1307,02110-1301," \ release-notes/lgpl/LGPL2.1 @@ -104,7 +110,7 @@ %build -ant -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 dist +%{ant} -Dant.build.javac.source=1.8 -Dant.build.javac.target=1.8 dist %install ++++++ jackson-javaee.patch ++++++ --- jackson-1.9.13/ant/build-test.xml 2022-03-21 10:31:11.630838063 +0100 +++ jackson-1.9.13/ant/build-test.xml 2022-03-21 10:29:27.494205481 +0100 @@ -18,6 +18,8 @@ <fileset dir="${dir.lib}"> <!-- for actual unit testing, junit --> <include name="junit/*.jar" /> + <!-- For 1.5 and 9+, need JAXB API jar too (and related) --> + <include name="jaxb/*.jar" /> </fileset> </path> <!-- Libs only needed for tests that check optional interoperability @@ -25,9 +27,7 @@ --> <path id="test-libs-ext"> <fileset dir="${dir.lib}"> - <!-- For 1.5, need JAXB API jar too (and related) --> - <include name="jaxb/*.jar" /> - <!-- and some other misc libs for interoperability tests --> + <!-- Some misc libs for interoperability tests --> <include name="ext/**/*.jar" /> </fileset> </path> --- jackson-1.9.13/build.xml 2022-03-21 10:31:11.662838258 +0100 +++ jackson-1.9.13/build.xml 2022-03-21 10:34:56.140201919 +0100 @@ -323,6 +323,9 @@ <fileset dir="${dir.lib}/ext/asm"> <include name="*.jar" /> </fileset> + <fileset dir="${dir.lib}/jaxb"> + <include name="*.jar" /> + </fileset> </classpath> <packageset dir="${dir.src.java.core}" defaultexcludes="yes"> ++++++ jackson-sourcetarget.patch ++++++ --- /var/tmp/diff_new_pack.o8DLT6/_old 2022-03-24 23:00:39.924404893 +0100 +++ /var/tmp/diff_new_pack.o8DLT6/_new 2022-03-24 23:00:39.928404897 +0100 @@ -1,96 +1,86 @@ --- jackson-src-1.9.11/ant/build-mini.xml 2012-11-06 17:24:49.000000000 +0100 +++ jackson-src-1.9.11/ant/build-mini.xml 2018-12-18 13:22:53.406616086 +0100 -@@ -8,7 +8,7 @@ +@@ -8,7 +8,6 @@ <target name="compile.mini" depends="prepare"> <mkdir dir="${dir.build.classes.mini}" /> <javac srcdir="${dir.src.java.core}" destdir="${dir.build.classes.mini}" - source="1.5" target="1.5" -+ source="1.6" target="1.6" debug="false" includeantruntime="false" > <compilerarg value="-Xlint:unchecked" /> --- jackson-src-1.9.11/ant/build-test.xml 2012-11-06 17:24:49.000000000 +0100 +++ jackson-src-1.9.11/ant/build-test.xml 2018-12-18 13:22:41.566554979 +0100 -@@ -51,7 +51,7 @@ +@@ -51,7 +51,6 @@ <target name="test.compile" depends="test.prepare, compile.mapper, compile.xc, compile.jaxrs, compile.smile, compile.mrbean"> <javac srcdir="${dir.src.test}" destdir="${dir.test.classes}" - source="1.5" target="1.5" -+ source="1.6" target="1.6" debug="true" includeantruntime="false" > <exclude name="org/codehaus/jackson/map/ext/*.java" /> -@@ -71,7 +71,7 @@ +@@ -71,7 +70,6 @@ </classpath> </javac> <javac srcdir="${dir.src.test}" destdir="${dir.test.classes}" - source="1.5" target="1.5" -+ source="1.6" target="1.6" debug="true" includeantruntime="false" > <include name="org/codehaus/jackson/map/ext/*.java" /> --- jackson-src-1.9.11/build.xml 2012-11-06 17:24:49.000000000 +0100 +++ jackson-src-1.9.11/build.xml 2018-12-18 13:22:06.686374987 +0100 -@@ -158,7 +158,7 @@ +@@ -158,7 +158,6 @@ <target name="compile.core" depends="prepare"> <javac srcdir="${dir.src.java.core}" destdir="${dir.build.classes.core}" - source="1.5" target="1.5" -+ source="1.6" target="1.6" debug="true" includeantruntime="false" > <compilerarg value="-Xlint:unchecked" /> -@@ -171,7 +171,7 @@ +@@ -171,7 +170,6 @@ <target name="compile.mapper" depends="compile.core"> <javac srcdir="${dir.src.java.mapper}" destdir="${dir.build.classes.mapper}" - source="1.5" target="1.5" -+ source="1.6" target="1.6" debug="true" includeantruntime="false" > <compilerarg value="-Xlint:unchecked" /> -@@ -192,7 +192,7 @@ +@@ -192,7 +190,6 @@ <target name="compile.xc" depends="compile.mapper"> <javac srcdir="${dir.src.java.xc}" destdir="${dir.build.classes.xc}" - source="1.5" target="1.5" -+ source="1.6" target="1.6" debug="true" includeantruntime="false" > <compilerarg value="-Xlint:unchecked" /> -@@ -215,7 +215,7 @@ +@@ -215,7 +212,6 @@ <target name="compile.jaxrs" depends="compile.mapper,compile.xc"> <javac srcdir="${dir.src.java.jaxrs}" destdir="${dir.build.classes.jaxrs}" - source="1.5" target="1.5" -+ source="1.6" target="1.6" debug="true" includeantruntime="false" > <compilerarg value="-Xlint:unchecked" /> -@@ -238,7 +238,7 @@ +@@ -238,7 +234,6 @@ <target name="compile.smile" depends="compile.core"> <javac srcdir="${dir.src.java.smile}" destdir="${dir.build.classes.smile}" - source="1.5" target="1.5" -+ source="1.6" target="1.6" debug="true" includeantruntime="false" > <compilerarg value="-Xlint:unchecked" /> -@@ -255,7 +255,7 @@ +@@ -255,7 +250,6 @@ <target name="compile.mrbean" depends="compile.core"> <javac srcdir="${dir.src.java.mrbean}" destdir="${dir.build.classes.mrbean}" - source="1.5" target="1.5" -+ source="1.6" target="1.6" debug="true" includeantruntime="false" > <compilerarg value="-Xlint:unchecked" /> -@@ -282,7 +282,7 @@ +@@ -282,7 +276,6 @@ <target name="compile.extra" depends="compile.main"> <javac destdir="${dir.build.classes.extra}" - source="1.5" target="1.5" -+ source="1.6" target="1.6" debug="true" includeantruntime="false" > <compilerarg value="-Xlint:unchecked" />
