From 9815a904bfa31ba939f9e29c7fc1ef9874ad5edb86bd323c2072f33fb2986bd0 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Tue, 2 Apr 2019 13:23:33 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/plexus-languages?expand=0&rev=3

---
 plexus-java-build.xml    | 19 +++++++++++++++++--
 plexus-languages.changes |  6 ++++++
 plexus-languages.spec    |  2 +-
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/plexus-java-build.xml b/plexus-java-build.xml
index d19e890..4f15905 100644
--- a/plexus-java-build.xml
+++ b/plexus-java-build.xml
@@ -83,10 +83,25 @@
   </target>
 
   <!-- ====================================================================== -->
-  <!-- Compilation target                                                     -->
+  <!-- Java 9 compilation target                                              -->
   <!-- ====================================================================== -->
 
-  <target name="compile9" depends="compile" description="Compile the java9 code">
+  <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"
diff --git a/plexus-languages.changes b/plexus-languages.changes
index 84facc3..10213f7 100644
--- a/plexus-languages.changes
+++ b/plexus-languages.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Apr  2 13:22:51 UTC 2019 - Fridrich Strba <fstrba@suse.com>
+
+- Put a condition to the compile9 target in order to allow building
+  for distributions that do not have Java >= 9
+
 -------------------------------------------------------------------
 Tue Mar 12 16:06:18 UTC 2019 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/plexus-languages.spec b/plexus-languages.spec
index a81aaf3..4fd80d3 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 >= 9
+BuildRequires:  java-devel
 BuildRequires:  javapackages-local
 BuildRequires:  objectweb-asm
 BuildRequires:  plexus-containers-component-annotations