set javac source and target to 1.8 to fix Java 11 builds
This commit is contained in:
Fabio Valentini
parent
4850f85fd8
commit
8afa88484c
@ -1,127 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<!--build.xml generated by maven from project.xml version 1.0-beta-6
|
||||
on date November 7 2005, time 1319-->
|
||||
<project default="jar" name="plexus-i18n" basedir=".">
|
||||
<property name="defaulttargetdir" value="target"></property>
|
||||
<property name="libdir" value="target/lib"></property>
|
||||
<property name="classesdir" value="target/classes"></property>
|
||||
<property name="testclassesdir" value="target/test-classes"></property>
|
||||
<property name="testclassesdir" value="target/test-classes"></property>
|
||||
<property name="testreportdir" value="target/test-reports"></property>
|
||||
<property name="distdir" value="dist"></property>
|
||||
<property name="javadocdir" value="target/docs/apidocs"></property>
|
||||
<property name="final.name" value="plexus-i18n-1.0-beta-6"></property>
|
||||
<path id="build.classpath">
|
||||
<fileset dir="${libdir}">
|
||||
<include name="**/*.jar"></include>
|
||||
</fileset>
|
||||
</path>
|
||||
<target name="init" description="o Initializes some properties">
|
||||
<mkdir dir="${libdir}"></mkdir>
|
||||
<condition property="noget">
|
||||
<equals arg2="only" arg1="${build.sysclasspath}"></equals>
|
||||
</condition>
|
||||
<!--Test if JUNIT is present in ANT classpath-->
|
||||
<available property="Junit.present" classname="junit.framework.Test"></available>
|
||||
</target>
|
||||
<target name="compile" description="o Compile the code" depends="get-deps">
|
||||
<mkdir dir="${classesdir}"></mkdir>
|
||||
<javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
|
||||
<src>
|
||||
<pathelement location="src/main/java"></pathelement>
|
||||
</src>
|
||||
<classpath refid="build.classpath"></classpath>
|
||||
</javac>
|
||||
<copy todir="${classesdir}">
|
||||
<fileset dir="src/main/resources">
|
||||
<include name="**/*"></include>
|
||||
</fileset>
|
||||
</copy>
|
||||
</target>
|
||||
<target name="jar" description="o Create the jar" depends="compile,test">
|
||||
<jar jarfile="${defaulttargetdir}/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}"></jar>
|
||||
</target>
|
||||
<target name="clean" description="o Clean up the generated directories">
|
||||
<delete dir="${defaulttargetdir}"></delete>
|
||||
<delete dir="${distdir}"></delete>
|
||||
</target>
|
||||
<target name="dist" description="o Create a distribution" depends="jar, javadoc">
|
||||
<mkdir dir="dist"></mkdir>
|
||||
<copy todir="dist">
|
||||
<fileset dir="${defaulttargetdir}" includes="*.jar"></fileset>
|
||||
<fileset dir="${basedir}" includes="LICENSE*, README*"></fileset>
|
||||
</copy>
|
||||
</target>
|
||||
<target name="test" description="o Run the test cases" if="test.failure" depends="internal-test">
|
||||
<fail message="There were test failures."></fail>
|
||||
</target>
|
||||
<target name="internal-test" if="Junit.present" depends="junit-present,compile-tests">
|
||||
<mkdir dir="${testreportdir}"></mkdir>
|
||||
<junit dir="./" failureproperty="test.failure" printSummary="yes" fork="true" haltonerror="true">
|
||||
<sysproperty key="basedir" value="."></sysproperty>
|
||||
<formatter type="xml"></formatter>
|
||||
<formatter usefile="false" type="plain"></formatter>
|
||||
<classpath>
|
||||
<path refid="build.classpath"></path>
|
||||
<pathelement path="${testclassesdir}"></pathelement>
|
||||
<pathelement path="${classesdir}"></pathelement>
|
||||
</classpath>
|
||||
<batchtest todir="${testreportdir}">
|
||||
<fileset dir="src/test/java">
|
||||
<include name="**/*Test.java"></include>
|
||||
<exclude name="**/Abstract*.java"></exclude>
|
||||
</fileset>
|
||||
</batchtest>
|
||||
</junit>
|
||||
</target>
|
||||
<target name="junit-present" unless="Junit.present" depends="init">
|
||||
<echo>================================= WARNING ================================</echo>
|
||||
<echo>Junit isn't present in your ${ANT_HOME}/lib directory. Tests not executed.</echo>
|
||||
<echo>==========================================================================</echo>
|
||||
</target>
|
||||
<target name="compile-tests" if="Junit.present" depends="junit-present,compile">
|
||||
<mkdir dir="${testclassesdir}"></mkdir>
|
||||
<javac destdir="${testclassesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
|
||||
<src>
|
||||
<pathelement location="src/test/java"></pathelement>
|
||||
</src>
|
||||
<classpath>
|
||||
<path refid="build.classpath"></path>
|
||||
<pathelement path="${classesdir}"></pathelement>
|
||||
</classpath>
|
||||
</javac>
|
||||
<copy todir="${testclassesdir}">
|
||||
<fileset dir="src/test/resources">
|
||||
<include name="**/*"></include>
|
||||
</fileset>
|
||||
</copy>
|
||||
</target>
|
||||
<target name="javadoc" description="o Generate javadoc" depends="get-deps">
|
||||
<mkdir dir="${javadocdir}"></mkdir>
|
||||
<tstamp>
|
||||
<format pattern="-yyyy" property="year"></format>
|
||||
</tstamp>
|
||||
<property name="copyright" value="Copyright &copy; . All Rights Reserved."></property>
|
||||
<property name="title" value="Plexus I18N Component 1.0-beta-6 API"></property>
|
||||
<javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/main/java" packagenames="org.codehaus.plexus.i18n.*">
|
||||
<classpath>
|
||||
<path refid="build.classpath"></path>
|
||||
</classpath>
|
||||
</javadoc>
|
||||
</target>
|
||||
<target name="get-deps" unless="noget" depends="init">
|
||||
<!--Proxy settings works only with a JDK 1.2 and higher.-->
|
||||
<!--
|
||||
<setproxy></setproxy>
|
||||
<get dest="${libdir}/plexus_container-default.jar" usetimestamp="true" ignoreerrors="true" src="file:/usr/share/maven-1.0/repository/JPP/jars/plexus_container-default.jar"></get>
|
||||
<get dest="${libdir}/plexus_utils.jar" usetimestamp="true" ignoreerrors="true" src="file:/usr/share/maven-1.0/repository/JPP/jars/plexus_utils.jar"></get>
|
||||
<get dest="${libdir}/classworlds.jar" usetimestamp="true" ignoreerrors="true" src="file:/usr/share/maven-1.0/repository/JPP/jars/classworlds.jar"></get>
|
||||
<get dest="${libdir}/[junit].jar" usetimestamp="true" ignoreerrors="true" src="file:/usr/share/maven-1.0/repository/JPP/jars/[junit].jar"></get>
|
||||
-->
|
||||
</target>
|
||||
<target name="install-maven">
|
||||
<get dest="${user.home}/maven-install-latest.jar" usetimestamp="true" src="${repo}/maven/maven-install-latest.jar"></get>
|
||||
<unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar"></unjar>
|
||||
</target>
|
||||
</project>
|
||||
@ -1,10 +0,0 @@
|
||||
<component-set>
|
||||
|
||||
<components>
|
||||
<component>
|
||||
<role>org.codehaus.plexus.i18n.I18N</role>
|
||||
<implementation>org.codehaus.plexus.i18n.DefaultI18N</implementation>
|
||||
</component>
|
||||
</components>
|
||||
|
||||
</component-set>
|
||||
@ -3,7 +3,7 @@
|
||||
|
||||
Name: plexus-i18n
|
||||
Version: 1.0
|
||||
Release: 0.16.b10.4%{?dist}
|
||||
Release: 0.17.b10.4%{?dist}
|
||||
Summary: Plexus I18N Component
|
||||
License: ASL 2.0
|
||||
URL: https://github.com/codehaus-plexus/plexus-i18n
|
||||
@ -41,8 +41,11 @@ Javadoc for %{name}.
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
|
||||
# remove maven-compiler-plugin configuration that is broken with Java 11
|
||||
%pom_xpath_remove 'pom:plugin[pom:artifactId="maven-compiler-plugin"]/pom:configuration'
|
||||
|
||||
%build
|
||||
%mvn_build
|
||||
%mvn_build -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8
|
||||
|
||||
%install
|
||||
%mvn_install
|
||||
@ -52,6 +55,9 @@ Javadoc for %{name}.
|
||||
%files javadoc -f .mfiles-javadoc
|
||||
|
||||
%changelog
|
||||
* Sat Jul 18 2020 Fabio Valentini <decathorpe@gmail.com> - 1.0-0.17.b10.4
|
||||
- Set javac source and target to 1.8 to fix Java 11 builds.
|
||||
|
||||
* Sat Jul 11 2020 Jiri Vanek <jvanek@redhat.com> - 1.0-0.16.b10.4
|
||||
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user