Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package json-lib for openSUSE:Factory 
checked in at 2022-03-22 21:36:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/json-lib (Old)
 and      /work/SRC/openSUSE:Factory/.json-lib.new.25692 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "json-lib"

Tue Mar 22 21:36:50 2022 rev:6 rq:964068 version:2.4

Changes:
--------
--- /work/SRC/openSUSE:Factory/json-lib/json-lib.changes        2022-03-21 
20:13:35.368533203 +0100
+++ /work/SRC/openSUSE:Factory/.json-lib.new.25692/json-lib.changes     
2022-03-22 21:36:50.988992275 +0100
@@ -1,0 +2,10 @@
+Tue Mar 22 18:21:05 UTC 2022 - Fridrich Strba <[email protected]>
+
+- Modified patch:
+  * json-lib-2.4-antrun-plugin.patch
+    + specify source and target levels 8 for maven-antrun-plugin
+      and for groovyc ant task
+- Add opens of java.lang from java.base module to all unnamed
+  * fixes build with jdk17
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ json-lib.spec ++++++
--- /var/tmp/diff_new_pack.qNjEGH/_old  2022-03-22 21:36:51.504992680 +0100
+++ /var/tmp/diff_new_pack.qNjEGH/_new  2022-03-22 21:36:51.508992683 +0100
@@ -30,7 +30,7 @@
 Patch0:         %{name}-%{version}-antrun-plugin.patch
 Patch100:       %{name}-%{version}-Use-Jenkins-default-values.patch
 BuildRequires:  fdupes
-BuildRequires:  java-devel
+BuildRequires:  java-devel >= 1.8
 BuildRequires:  maven-local
 BuildRequires:  mvn(antlr:antlr)
 BuildRequires:  mvn(commons-beanutils:commons-beanutils)
@@ -115,6 +115,9 @@
 
 %build
 %{mvn_file} : %{name}
+%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0}
+MAVEN_OPTS="--add-opens=java.base/java.lang=ALL-UNNAMED" \
+%endif
 %{mvn_build} -f -- \
 %if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0}
        -Dmaven.compiler.release=8 \

++++++ json-lib-2.4-antrun-plugin.patch ++++++
--- /var/tmp/diff_new_pack.qNjEGH/_old  2022-03-22 21:36:51.552992718 +0100
+++ /var/tmp/diff_new_pack.qNjEGH/_new  2022-03-22 21:36:51.556992721 +0100
@@ -48,8 +48,8 @@
 +                        <taskdef name="groovyc" 
classname="org.codehaus.groovy.ant.Groovyc">
 +                           <classpath refid="maven.plugin.classpath"/>
 +                        </taskdef>
-+                        <groovyc destdir="${project.build.outputDirectory}" 
srcdir="${basedir}/src/main" classpathref="maven.compile.classpath">
-+                           <javac source="1.6" target="1.6" debug="on"/>
++                        <groovyc destdir="${project.build.outputDirectory}" 
srcdir="${basedir}/src/main" classpathref="maven.compile.classpath" 
targetBytecode="1.8">
++                           <javac source="1.8" target="1.8" debug="on"/>
 +                        </groovyc>
 +                     </target>
 +                  </configuration>

Reply via email to