From 2b36a7b6501bd6c7a39587d9e32aaa59cd97da1fd55835d05a9b38ddebbe9702 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Thu, 21 Nov 2019 19:37:57 +0000
Subject: [PATCH 1/3] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/plexus-languages?expand=0&rev=6

---
 plexus-java-build.xml          | 45 ++--------------------------------
 plexus-languages-0.9.10.tar.xz |  3 ---
 plexus-languages-1.0.3.tar.xz  |  3 +++
 plexus-languages.changes       |  7 ++++++
 plexus-languages.spec          |  5 ++--
 5 files changed, 15 insertions(+), 48 deletions(-)
 delete mode 100644 plexus-languages-0.9.10.tar.xz
 create mode 100644 plexus-languages-1.0.3.tar.xz

diff --git a/plexus-java-build.xml b/plexus-java-build.xml
index 4f15905..b38387a 100644
--- a/plexus-java-build.xml
+++ b/plexus-java-build.xml
@@ -10,7 +10,7 @@
 
   <property name="project.groupId" value="org.codehaus.plexus"/>
   <property name="project.artifactId" value="plexus-java"/>
-  <property name="project.version" value="0.9.10"/>
+  <property name="project.version" value="1.0.3"/>
 
   <property name="compiler.source" value="1.7"/>
   <property name="compiler.target" value="${compiler.source}"/>
@@ -82,47 +82,6 @@
     </copy>
   </target>
 
-  <!-- ====================================================================== -->
-  <!-- Java 9 compilation target                                              -->
-  <!-- ====================================================================== -->
-
-  <condition property="isJava9">
-    <not>
-      <or>
-        <equals arg1="${ant.java.version}" arg2="1.1"/>
-        <equals arg1="${ant.java.version}" arg2="1.2"/>
-        <equals arg1="${ant.java.version}" arg2="1.3"/>
-        <equals arg1="${ant.java.version}" arg2="1.4"/>
-        <equals arg1="${ant.java.version}" arg2="1.5"/>
-        <equals arg1="${ant.java.version}" arg2="1.6"/>
-        <equals arg1="${ant.java.version}" arg2="1.7"/>
-        <equals arg1="${ant.java.version}" arg2="1.8"/>
-      </or>
-    </not>
-  </condition>
-
-  <target name="compile9" depends="compile" description="Compile the java9 code" if="isJava9">
-    <mkdir dir="${build.outputDir9}"/>
-    <javac destdir="${build.outputDir9}"
-           nowarn="false"
-           debug="true"
-           encoding="utf-8"
-           optimize="false"
-           deprecation="true"
-           target="9"
-           verbose="false"
-           fork="false"
-           source="9">
-      <src>
-        <pathelement location="${build.srcDir9}"/>
-      </src>
-      <classpath>
-        <path refid="build.classpath"/>
-        <pathelement location="${build.outputDir}"/>
-      </classpath>
-    </javac>
-  </target>
-
   <!-- ====================================================================== -->
   <!-- Test-compilation target                                                -->
   <!-- ====================================================================== -->
@@ -251,7 +210,7 @@
   <!-- Package target                                                         -->
   <!-- ====================================================================== -->
 
-  <target name="package" depends="compile9,test" description="Package the application">
+  <target name="package" depends="compile,test" description="Package the application">
     <jar jarfile="${build.dir}/${build.finalName}.jar"
          compress="true"
          index="false"
diff --git a/plexus-languages-0.9.10.tar.xz b/plexus-languages-0.9.10.tar.xz
deleted file mode 100644
index 8548f05..0000000
--- a/plexus-languages-0.9.10.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4ef14d4b61618dd0a4a7bb5c8a325c73ff43bebadb190060ff3695a7e1404394
-size 19628
diff --git a/plexus-languages-1.0.3.tar.xz b/plexus-languages-1.0.3.tar.xz
new file mode 100644
index 0000000..c159fde
--- /dev/null
+++ b/plexus-languages-1.0.3.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:300bd9b38fdc7ac44ef0c2e4d2ffb75a80878486736785967610e74def6eebba
+size 23440
diff --git a/plexus-languages.changes b/plexus-languages.changes
index 10213f7..484eecd 100644
--- a/plexus-languages.changes
+++ b/plexus-languages.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Nov 21 19:33:41 UTC 2019 - Fridrich Strba <fstrba@suse.com>
+
+- Upgrade to upstream version 1.0.3
+- Do not build the compile9 target even when building with modular
+  java.
+
 -------------------------------------------------------------------
 Tue Apr  2 13:22:51 UTC 2019 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/plexus-languages.spec b/plexus-languages.spec
index 4fd80d3..ba70827 100644
--- a/plexus-languages.spec
+++ b/plexus-languages.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package plexus-languages
 #
-# 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
@@ -17,7 +17,7 @@
 
 
 Name:           plexus-languages
-Version:        0.9.10
+Version:        1.0.3
 Release:        0
 Summary:        Plexus Languages
 License:        Apache-2.0
@@ -61,6 +61,7 @@ cp %{SOURCE100} plexus-java/build.xml
 
 %pom_xpath_inject "pom:project" "<groupId>org.codehaus.plexus</groupId>" .
 %pom_remove_parent .
+%pom_xpath_remove pom:project/pom:profiles plexus-java
 
 %build
 mkdir -p lib

From 0a6efd0bd567ce4a24f3953b25a3d2422b50c3587cce511ef2cf6abfb3ae76ab Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Thu, 21 Nov 2019 20:39:19 +0000
Subject: [PATCH 2/3] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/plexus-languages?expand=0&rev=7

---
 plexus-java-build.xml | 26 +++++++++++++++++++++++---
 plexus-languages.spec |  3 ++-
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/plexus-java-build.xml b/plexus-java-build.xml
index b38387a..3e178ae 100644
--- a/plexus-java-build.xml
+++ b/plexus-java-build.xml
@@ -19,8 +19,6 @@
   <property name="build.dir" value="target"/>
   <property name="build.outputDir" value="${build.dir}/classes"/>
   <property name="build.srcDir" value="src/main/java"/>
-  <property name="build.outputDir9" value="${build.outputDir}/META-INF/versions/9"/>
-  <property name="build.srcDir9" 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"/>
@@ -82,6 +80,28 @@
     </copy>
   </target>
 
+  <!-- ====================================================================== -->
+  <!-- Sisu javax.inject.Named generation target                              -->
+  <!-- ====================================================================== -->
+
+  <target name="sisu"
+          depends="compile"
+          description="Generate javax.inject.Name index">
+    <sequential>
+	  <java classname="org.eclipse.sisu.space.SisuIndex"
+	        failonerror="true"
+			fork="true">
+        <classpath>
+          <path refid="build.classpath"/>
+        </classpath>
+        <arg value="${build.outputDir}"/>
+      </java>
+      <move todir="${build.outputDir}/META-INF">
+        <fileset dir="META-INF"/>
+      </move>
+	</sequential>
+  </target>
+
   <!-- ====================================================================== -->
   <!-- Test-compilation target                                                -->
   <!-- ====================================================================== -->
@@ -210,7 +230,7 @@
   <!-- Package target                                                         -->
   <!-- ====================================================================== -->
 
-  <target name="package" depends="compile,test" description="Package the application">
+  <target name="package" depends="sisu,test" description="Package the application">
     <jar jarfile="${build.dir}/${build.finalName}.jar"
          compress="true"
          index="false"
diff --git a/plexus-languages.spec b/plexus-languages.spec
index ba70827..2a04b12 100644
--- a/plexus-languages.spec
+++ b/plexus-languages.spec
@@ -37,6 +37,7 @@ BuildRequires:  javapackages-local
 BuildRequires:  objectweb-asm
 BuildRequires:  plexus-containers-component-annotations
 BuildRequires:  qdox >= 2
+BuildRequires:  sisu-inject
 Requires:       java >= 1.7
 Requires:       mvn(com.thoughtworks.qdox:qdox)
 Requires:       mvn(org.ow2.asm:asm)
@@ -65,7 +66,7 @@ cp %{SOURCE100} plexus-java/build.xml
 
 %build
 mkdir -p lib
-build-jar-repository -s lib qdox javax.inject plexus-containers/plexus-component-annotations objectweb-asm/asm
+build-jar-repository -s lib qdox javax.inject plexus-containers/plexus-component-annotations objectweb-asm/asm atinject org.eclipse.sisu.inject
 pushd plexus-java
 %{ant} -Dtest.skip=true package javadoc
 popd

From d958679f1bf88a0541055cc3628250b1f8e10031cd4bd085d8c5b4323cfbb2bf Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Sun, 24 Nov 2019 11:45:53 +0000
Subject: [PATCH 3/3] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/plexus-languages?expand=0&rev=8

---
 plexus-languages.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plexus-languages.spec b/plexus-languages.spec
index 2a04b12..833dbcd 100644
--- a/plexus-languages.spec
+++ b/plexus-languages.spec
@@ -32,7 +32,7 @@ Source100:      plexus-java-build.xml
 BuildRequires:  ant
 BuildRequires:  atinject
 BuildRequires:  fdupes
-BuildRequires:  java-devel
+BuildRequires:  java-devel >= 1.7
 BuildRequires:  javapackages-local
 BuildRequires:  objectweb-asm
 BuildRequires:  plexus-containers-component-annotations
@@ -66,7 +66,7 @@ cp %{SOURCE100} plexus-java/build.xml
 
 %build
 mkdir -p lib
-build-jar-repository -s lib qdox javax.inject plexus-containers/plexus-component-annotations objectweb-asm/asm atinject org.eclipse.sisu.inject
+build-jar-repository -s lib qdox javax.inject plexus-containers/plexus-component-annotations objectweb-asm/asm org.eclipse.sisu.inject
 pushd plexus-java
 %{ant} -Dtest.skip=true package javadoc
 popd