Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package plexus-languages for
openSUSE:Factory checked in at 2022-03-13 22:01:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/plexus-languages (Old)
and /work/SRC/openSUSE:Factory/.plexus-languages.new.25692 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plexus-languages"
Sun Mar 13 22:01:56 2022 rev:6 rq:961198 version:1.1.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/plexus-languages/plexus-languages.changes
2022-03-11 11:51:14.466976983 +0100
+++
/work/SRC/openSUSE:Factory/.plexus-languages.new.25692/plexus-languages.changes
2022-03-13 22:01:57.412472094 +0100
@@ -1,0 +2,5 @@
+Sat Mar 12 07:26:31 UTC 2022 - Fridrich Strba <[email protected]>
+
+- Build as multirelease modular jar
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ plexus-languages.spec ++++++
--- /var/tmp/diff_new_pack.UJbUtl/_old 2022-03-13 22:01:58.740472749 +0100
+++ /var/tmp/diff_new_pack.UJbUtl/_new 2022-03-13 22:01:58.744472751 +0100
@@ -29,7 +29,7 @@
BuildRequires: ant
BuildRequires: atinject
BuildRequires: fdupes
-BuildRequires: java-devel >= 1.7
+BuildRequires: java-devel >= 9
BuildRequires: javapackages-local
BuildRequires: objectweb-asm
BuildRequires: plexus-containers-component-annotations
++++++ plexus-java-build.xml ++++++
--- /var/tmp/diff_new_pack.UJbUtl/_old 2022-03-13 22:01:58.840472798 +0100
+++ /var/tmp/diff_new_pack.UJbUtl/_new 2022-03-13 22:01:58.844472800 +0100
@@ -12,13 +12,15 @@
<property name="project.artifactId" value="plexus-java"/>
<property name="project.version" value="1.1.1"/>
- <property name="compiler.source" value="1.7"/>
+ <property name="compiler.source" value="1.8"/>
<property name="compiler.target" value="${compiler.source}"/>
<property name="build.finalName"
value="${project.artifactId}-${project.version}"/>
<property name="build.dir" value="target"/>
<property name="build.outputDir" value="${build.dir}/classes"/>
+ <property name="build.outputDirJava9"
value="${build.outputDir}/META-INF/versions/9"/>
<property name="build.srcDir" value="src/main/java"/>
+ <property name="build.srcDirJava9" value="src/main/java9"/>
<property name="build.resourceDir" value="src/main/resources"/>
<property name="build.testOutputDir" value="${build.dir}/test-classes"/>
<property name="build.testDir" value="src/test/java"/>
@@ -75,6 +77,49 @@
</src>
<classpath refid="build.classpath"/>
</javac>
+ <mkdir dir="${build.outputDirJava9}"/>
+ <!-- All java9 files without the module-info.java -->
+ <javac destdir="${build.outputDirJava9}"
+ nowarn="false"
+ debug="true"
+ encoding="utf-8"
+ optimize="false"
+ deprecation="true"
+ target="${compiler.target}"
+ verbose="false"
+ fork="false"
+ source="${compiler.source}">
+ <src>
+ <pathelement location="${build.srcDirJava9}"/>
+ </src>
+ <exclude name="**/module-info.java"/>
+ <classpath>
+ <path refid="build.classpath"/>
+ <pathelement location="${build.outputDir}"/>
+ </classpath>
+ </javac>
+ <!-- Special compilation of module-info.java that needs modulepath -->
+ <javac destdir="${build.outputDirJava9}"
+ nowarn="false"
+ debug="true"
+ encoding="utf-8"
+ optimize="false"
+ deprecation="true"
+ target="9"
+ verbose="false"
+ fork="false"
+ source="9">
+ <src>
+ <pathelement location="${build.srcDirJava9}"/>
+ <pathelement location="${build.srcDir}"/>
+ </src>
+ <include name="**/module-info.java"/>
+ <modulepath>
+ <path refid="build.classpath"/>
+ <pathelement location="${build.outputDirJava9}"/>
+ <pathelement location="${build.outputDir}"/>
+ </modulepath>
+ </javac>
<copy todir="${build.outputDir}">
<fileset dir="${build.resourceDir}"/>
</copy>
