This commit is contained in:
parent
9815a904bf
commit
2b36a7b650
@ -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"
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:4ef14d4b61618dd0a4a7bb5c8a325c73ff43bebadb190060ff3695a7e1404394
|
||||
size 19628
|
3
plexus-languages-1.0.3.tar.xz
Normal file
3
plexus-languages-1.0.3.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:300bd9b38fdc7ac44ef0c2e4d2ffb75a80878486736785967610e74def6eebba
|
||||
size 23440
|
@ -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>
|
||||
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user