From 533278f98538db9f0bd8b839c1883af5cd99ae29d7893c9e6e0f036b97a5edba Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Sat, 12 Mar 2022 07:26:55 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/plexus-languages?expand=0&rev=16

---
 plexus-java-build.xml    | 47 +++++++++++++++++++++++++++++++++++++++-
 plexus-languages.changes |  5 +++++
 plexus-languages.spec    |  2 +-
 3 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/plexus-java-build.xml b/plexus-java-build.xml
index 97a9173..ca0f80d 100644
--- a/plexus-java-build.xml
+++ b/plexus-java-build.xml
@@ -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>
diff --git a/plexus-languages.changes b/plexus-languages.changes
index 6056852..b8ffa0e 100644
--- a/plexus-languages.changes
+++ b/plexus-languages.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat Mar 12 07:26:31 UTC 2022 - Fridrich Strba <fstrba@suse.com>
+
+- Build as multirelease modular jar
+
 -------------------------------------------------------------------
 Thu Mar 10 11:28:51 UTC 2022 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/plexus-languages.spec b/plexus-languages.spec
index 8176d64..0975afa 100644
--- a/plexus-languages.spec
+++ b/plexus-languages.spec
@@ -29,7 +29,7 @@ Source100:      plexus-java-build.xml
 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