Hello community, here is the log from the commit of package json-lib for openSUSE:Factory checked in at 2019-11-26 17:00:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/json-lib (Old) and /work/SRC/openSUSE:Factory/.json-lib.new.26869 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "json-lib" Tue Nov 26 17:00:49 2019 rev:2 rq:750675 version:2.4 Changes: -------- --- /work/SRC/openSUSE:Factory/json-lib/json-lib.changes 2019-11-15 00:07:23.308222757 +0100 +++ /work/SRC/openSUSE:Factory/.json-lib.new.26869/json-lib.changes 2019-11-26 17:01:14.488070585 +0100 @@ -1,0 +2,10 @@ +Sun Nov 24 13:13:21 UTC 2019 - Fridrich Strba <[email protected]> + +- Specify maven.compiler.release to fix build with jdk9+ and newer + maven-javadoc-plugin +- Modified patch: + * json-lib-2.4-antrun-plugin.patch + + dependency on asm-all uberjar can be replaces by dependency + on the simple asm.jar + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ json-lib.spec ++++++ --- /var/tmp/diff_new_pack.r7xJt4/_old 2019-11-26 17:01:16.220070014 +0100 +++ /var/tmp/diff_new_pack.r7xJt4/_new 2019-11-26 17:01:16.224070012 +0100 @@ -1,7 +1,7 @@ # # spec file for package json-lib # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -32,10 +32,8 @@ BuildRequires: fdupes BuildRequires: java-devel BuildRequires: maven-local -BuildRequires: maven-shared -BuildRequires: maven-surefire-provider-junit BuildRequires: mvn(antlr:antlr) -BuildRequires: mvn(asm:asm-all) +BuildRequires: mvn(asm:asm) BuildRequires: mvn(commons-beanutils:commons-beanutils) BuildRequires: mvn(commons-cli:commons-cli) BuildRequires: mvn(commons-collections:commons-collections) @@ -45,6 +43,7 @@ BuildRequires: mvn(log4j:log4j:1.2.14) BuildRequires: mvn(net.sf.ezmorph:ezmorph) BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) +BuildRequires: mvn(org.apache:apache:pom:) BuildRequires: mvn(org.codehaus.groovy:groovy18-all:1.8) BuildRequires: mvn(org.codehaus.groovy:groovy18:1.8) BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) @@ -118,11 +117,18 @@ %build %{mvn_file} : %{name} -%{mvn_build} -f -- -Dproject.build.sourceEncoding=UTF-8 -Dsource=6 +%{mvn_build} -f -- -Dproject.build.sourceEncoding=UTF-8 \ +%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0} + -Dmaven.compiler.release=6 +%endif # build Jenkins JSON lib pushd jenkins-%{name}-%{version} -%{mvn_build} -f -- -Dsource=6 +%{mvn_build} -f \ +%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0} + -- -Dmaven.compiler.release=6 +%endif + popd %install ++++++ json-lib-2.4-antrun-plugin.patch ++++++ --- /var/tmp/diff_new_pack.r7xJt4/_old 2019-11-26 17:01:16.256070002 +0100 +++ /var/tmp/diff_new_pack.r7xJt4/_new 2019-11-26 17:01:16.260070000 +0100 @@ -29,7 +29,7 @@ + </dependency> + <dependency> + <groupId>asm</groupId> -+ <artifactId>asm-all</artifactId> ++ <artifactId>asm</artifactId> + <version>any</version> + </dependency> + <dependency>
