Hello community,
here is the log from the commit of package groovy18 for openSUSE:Factory
checked in at 2019-12-02 11:35:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/groovy18 (Old)
and /work/SRC/openSUSE:Factory/.groovy18.new.4691 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "groovy18"
Mon Dec 2 11:35:25 2019 rev:3 rq:752790 version:1.8.9
Changes:
--------
--- /work/SRC/openSUSE:Factory/groovy18/groovy18.changes 2019-10-11
15:22:18.539280242 +0200
+++ /work/SRC/openSUSE:Factory/.groovy18.new.4691/groovy18.changes
2019-12-02 11:38:26.326461912 +0100
@@ -1,0 +2,9 @@
+Mon Dec 2 06:38:42 UTC 2019 - Fridrich Strba <fst...@suse.com>
+
+- Added patch:
+ * groovy18-notarget.patch
+ + Do not except on a classfile with MODULE information, just
+ ignore it
+ + Fixes build with jdk9+
+
+-------------------------------------------------------------------
New:
----
groovy18-notarget.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ groovy18.spec ++++++
--- /var/tmp/diff_new_pack.tBFSkQ/_old 2019-12-02 11:38:27.022462058 +0100
+++ /var/tmp/diff_new_pack.tBFSkQ/_new 2019-12-02 11:38:27.026462059 +0100
@@ -1,7 +1,7 @@
#
# spec file for package groovy18
#
-# 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
@@ -39,6 +39,7 @@
Patch5: groovy18-sourcetarget.patch
Patch6: groovy18-iterator.patch
Patch7: groovy18-securitymanager.patch
+Patch8: groovy18-notarget.patch
BuildRequires: ant
BuildRequires: ant-antlr
BuildRequires: antlr
@@ -64,7 +65,6 @@
BuildRequires: mvn(javax.servlet:servlet-api)
BuildRequires: mvn(org.apache.ant:ant-junit)
BuildRequires: mvn(org.apache.ant:ant-launcher)
-BuildConflicts: java-devel >= 9
Requires: %{name}-lib = %{version}-%{release}
# Used for servlet / gsp:
Requires: glassfish-jsp-api
@@ -130,6 +130,7 @@
%patch5 -p1
%patch6 -p1
%patch7 -p1
+%patch8 -p1
# build.xml is not compatible with Ant 1.10+
sed -i "s| depends=\"-excludeLegacyAntVersion\"||" build.xml
@@ -172,7 +173,7 @@
# Build
# TODO: Build at least tests, maybe examples
export CLASSPATH=$(build-classpath ant/ant-antlr)
-ant -DskipTests=on -DskipExamples=on -DskipFetch=on -DskipEmbeddable=on \
+%ant -DskipTests=on -DskipExamples=on -DskipFetch=on -DskipEmbeddable=on \
createJars javadoc
%install
++++++ groovy18-notarget.patch ++++++
---
groovy-core-GROOVY_1_8_9/src/main/org/codehaus/groovy/vmplugin/v5/Java5.java
2019-11-29 07:24:28.272641368 +0100
+++
groovy-core-GROOVY_1_8_9/src/main/org/codehaus/groovy/vmplugin/v5/Java5.java
2019-11-29 07:34:42.096191072 +0100
@@ -313,7 +313,7 @@
case PACKAGE:
return AnnotationNode.PACKAGE_TARGET;
default:
- throw new GroovyBugError("unsupported Target " + value);
+ return 0;
}
}
