Update to upstream version 3.0.24

This commit is contained in:
Mikolaj Izdebski 2016-05-09 06:26:04 +02:00
parent 675411a1ea
commit fb665452c9
4 changed files with 7 additions and 93 deletions

1
.gitignore vendored
View File

@ -9,3 +9,4 @@ plexus-utils-3.0.tar.xz
/plexus-utils-3.0.18.tar.gz
/plexus-utils-3.0.21.tar.gz
/plexus-utils-3.0.22.tar.gz
/plexus-utils-3.0.24.tar.gz

View File

@ -1,90 +0,0 @@
<project name="plexus-utils" default="jar" basedir=".">
<property file="${user.home}/.m2/maven.properties"/>
<property name="maven.build.output" value="target/classes"/>
<property name="maven.build.directory" value="target"/>
<property name="maven.build.final.name" value="plexus-utils-1.4.5"/>
<property name="maven.test.reports" value="${maven.build.directory}/test-reports"/>
<property name="maven.test.output" value="target/test-classes"/>
<property name="maven.repo.local" value="${basedir}/.m2/repository"/>
<property name="javadocdir" value="target/site/apidocs"></property>
<path id="build.classpath">
<fileset dir="${maven.repo.local}"/>
</path>
<target name="clean" description="Clean the output directory">
<delete dir="${maven.build.directory}"/>
</target>
<target name="compile" depends="get-deps" description="Compile the code">
<mkdir dir="${maven.build.output}"/>
<javac destdir="${maven.build.output}" excludes="**/package.html" debug="true" deprecation="true" optimize="false">
<src>
<pathelement location="src/main/java"/>
</src>
<classpath refid="build.classpath"/>
</javac>
</target>
<target name="jar" depends="compile,test" description="Clean the JAR">
<jar jarfile="${maven.build.directory}/${maven.build.final.name}.jar" basedir="${maven.build.output}" excludes="**/package.html"/>
</target>
<target name="compile-tests" depends="junit-present, compile" description="Compile the test code" if="junit.present">
<mkdir dir="${maven.test.output}"/>
<javac destdir="${maven.test.output}" excludes="**/package.html" debug="true" deprecation="true" optimize="false">
<src>
<pathelement location="src/test/java"/>
</src>
<classpath>
<path refid="build.classpath"/>
<pathelement location="${maven.build.output}"/>
</classpath>
</javac>
<copy todir="${maven.test.output}">
<fileset dir="src/test/resources"/>
</copy>
</target>
<target name="test" depends="junit-present, compile-tests" if="junit.present" description="Run the test cases">
<mkdir dir="${maven.test.reports}"/>
<junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
<sysproperty key="basedir" value="."/>
<formatter type="xml"/>
<formatter type="plain" usefile="false"/>
<classpath>
<path refid="build.classpath"/>
<pathelement location="${maven.build.output}"/>
<pathelement location="${maven.test.output}"/>
</classpath>
<batchtest todir="${maven.test.reports}">
<fileset dir="src/test/java">
<include name="**/*Test.java"/>
<exclude name="**/*Abstract*Test.java"/>
</fileset>
</batchtest>
</junit>
</target>
<target name="test-junit-present">
<available classname="junit.framework.Test" property="junit.present"/>
</target>
<target name="junit-present" depends="test-junit-present" unless="junit.present">
<echo>================================= WARNING ================================</echo>
<echo> Junit isn&apos;t present in your $ANT_HOME/lib directory. Tests not executed. </echo>
<echo>==========================================================================</echo>
</target>
<target name="test-offline">
<condition property="maven.mode.offline">
<equals arg1="${build.sysclasspath}" arg2="only"/>
</condition>
</target>
<target name="get-deps" depends="test-offline" description="Download all dependencies" unless="maven.mode.offline">
<mkdir dir="${maven.repo.local}"/>
</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 &amp;copy; . All Rights Reserved."></property>
<property name="title" value="Plexus Common Utilities 1.4.5 API"></property> <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/main/java" packagenames="org.codehaus.plexus.util.*">
<classpath>
<path refid="build.classpath"></path>
</classpath>
</javadoc>
</target>
</project>

View File

@ -1,6 +1,6 @@
Name: plexus-utils
Version: 3.0.22
Release: 3%{?dist}
Version: 3.0.24
Release: 1%{?dist}
Summary: Plexus Common Utilities
# ASL 1.1: several files in src/main/java/org/codehaus/plexus/util/
# xpp: src/main/java/org/codehaus/plexus/util/xml/pull directory
@ -70,6 +70,9 @@ cp %{SOURCE1} .
%doc NOTICE.txt LICENSE-2.0.txt
%changelog
* Mon May 9 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.24-1
- Update to upstream version 3.0.24
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.22-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild

View File

@ -1,2 +1,2 @@
d5fd539c6f489efb9111f4960e1ecefb plexus-utils-3.0.22.tar.gz
52f4ebac1675278864f9b39056511afd plexus-utils-3.0.24.tar.gz
3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt