pool/plexus-languages
SHA256
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 690951 from Java:packages

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/690951
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plexus-languages?expand=0&rev=2
This commit is contained in:
Dominique Leuenberger 2019-04-05 10:04:15 +00:00 committed by Git OBS Bridge
commit 721b118856
3 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
plexus-java-build.xml
View File

@ -83,10 +83,25 @@
</target> </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}"/> <mkdir dir="${build.outputDir9}"/>
<javac destdir="${build.outputDir9}" <javac destdir="${build.outputDir9}"
nowarn="false" nowarn="false"

6
plexus-languages.changes
View File

@ -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> Tue Mar 12 16:06:18 UTC 2019 - Fridrich Strba <fstrba@suse.com>

2
plexus-languages.spec
View File

@ -32,7 +32,7 @@ Source100: plexus-java-build.xml
BuildRequires: ant BuildRequires: ant
BuildRequires: atinject BuildRequires: atinject
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: java-devel >= 9 BuildRequires: java-devel
BuildRequires: javapackages-local BuildRequires: javapackages-local
BuildRequires: objectweb-asm BuildRequires: objectweb-asm
BuildRequires: plexus-containers-component-annotations BuildRequires: plexus-containers-component-annotations