Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package groovy18 for openSUSE:Factory checked in at 2022-03-22 21:36:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/groovy18 (Old) and /work/SRC/openSUSE:Factory/.groovy18.new.25692 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "groovy18" Tue Mar 22 21:36:51 2022 rev:6 rq:964087 version:1.8.9 Changes: -------- --- /work/SRC/openSUSE:Factory/groovy18/groovy18.changes 2022-03-21 20:13:34.080531960 +0100 +++ /work/SRC/openSUSE:Factory/.groovy18.new.25692/groovy18.changes 2022-03-22 21:36:51.748992872 +0100 @@ -1,0 +2,10 @@ +Tue Mar 22 19:41:23 UTC 2022 - Fridrich Strba <[email protected]> + +- Added patch: + * groovy18-nofork.patch + + do not fork the groovyc and java tasks in the ant build.xml + file, so that the ANT_OPTS are propagated to the tasks +- Add opens of java.lang from java.base module to all unnamed + * fixes build with jdk17 + +------------------------------------------------------------------- New: ---- groovy18-nofork.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ groovy18.spec ++++++ --- /var/tmp/diff_new_pack.eVa0b3/_old 2022-03-22 21:36:52.528993484 +0100 +++ /var/tmp/diff_new_pack.eVa0b3/_new 2022-03-22 21:36:52.536993490 +0100 @@ -42,6 +42,7 @@ Patch8: groovy18-notarget.patch Patch9: groovy18-amgiguous-function-calls.patch Patch10: groovy18-asm7.patch +Patch11: groovy18-nofork.patch BuildRequires: ant BuildRequires: ant-antlr BuildRequires: antlr @@ -135,6 +136,7 @@ %patch8 -p1 %patch9 -p1 %patch10 -p1 +%patch11 -p1 # build.xml is not compatible with Ant 1.10+ sed -i "s| depends=\"-excludeLegacyAntVersion\"||" build.xml @@ -179,6 +181,9 @@ # Build # TODO: Build at least tests, maybe examples export CLASSPATH=$(build-classpath ant/ant-antlr) +%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0} +export ANT_OPTS="--add-opens=java.base/java.lang=ALL-UNNAMED" +%endif %ant -DskipTests=on -DskipExamples=on -DskipFetch=on -DskipEmbeddable=on \ createJars javadoc ++++++ groovy18-nofork.patch ++++++ diff -urEbwB groovy-core-GROOVY_1_8_9.orig/build.xml groovy-core-GROOVY_1_8_9/build.xml --- groovy-core-GROOVY_1_8_9.orig/build.xml 2013-02-15 09:42:29.000000000 +0100 +++ groovy-core-GROOVY_1_8_9/build.xml 2022-03-22 20:27:42.099395524 +0100 @@ -180,7 +180,7 @@ <exclude name="groovy/ui/**/*.java"/> </javac> <java classname="org.codehaus.groovy.tools.DgmConverter" - fork="yes" + fork="no" failonerror="true"> <classpath> <pathelement path="${mainClassesDirectory}"/> @@ -194,7 +194,7 @@ <target name="-stagedcompile-groovy" depends="-initGroovyc"> <groovyc srcdir="${mainSourcePath}" destdir="${mainClassesDirectory}" - fork="true" stacktrace="true" + fork="false" stacktrace="true" memorymaximumsize="${groovycMain_mx}"> <classpath> <pathelement path="${mainClassesDirectory}"/>
