From fb665452c938c6a07c1873bb6b14ca85aea02351 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Mon, 9 May 2016 06:26:04 +0200
Subject: [PATCH] Update to upstream version 3.0.24

---
 .gitignore                   |  1 +
 plexus-utils-1.4.5-build.xml | 90 ------------------------------------
 plexus-utils.spec            |  7 ++-
 sources                      |  2 +-
 4 files changed, 7 insertions(+), 93 deletions(-)
 delete mode 100644 plexus-utils-1.4.5-build.xml

diff --git a/.gitignore b/.gitignore
index 2fb0d29..0b13813 100644
--- a/.gitignore
+++ b/.gitignore
@@ -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
diff --git a/plexus-utils-1.4.5-build.xml b/plexus-utils-1.4.5-build.xml
deleted file mode 100644
index 273644b..0000000
--- a/plexus-utils-1.4.5-build.xml
+++ /dev/null
@@ -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>
diff --git a/plexus-utils.spec b/plexus-utils.spec
index 3e98d61..d62d11f 100644
--- a/plexus-utils.spec
+++ b/plexus-utils.spec
@@ -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
 
diff --git a/sources b/sources
index f52bf29..6dc6356 100644
--- a/sources
+++ b/sources
@@ -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