Update to 1.1.

This commit is contained in:
Alexander Kurtakov 2010-10-06 15:13:28 +03:00
parent 270629b5d6
commit e339563eea
5 changed files with 21 additions and 217 deletions

1
.gitignore vendored
View File

@ -1,2 +1,3 @@
plexus-archiver-src.tar.gz
plexus-archiver-1.0-alpha-12-src.tar.bz2
plexus-archiver-1.1-src.tar.xz

View File

@ -1,127 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--build.xml generated by maven from project.xml version 1.0-alpha-3
on date November 7 2005, time 1151-->
<project default="jar" name="plexus-archiver" 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-archiver-1.0-alpha-3"></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 &amp;copy; . All Rights Reserved."></property>
<property name="title" value="Plexus Archiver Component 1.0-alpha-3 API"></property>
<javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/main/java" packagenames="org.codehaus.plexus.archiver.*">
<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>

View File

@ -1,67 +0,0 @@
<project>
<parent>
<artifactId>plexus-components</artifactId>
<groupId>org.codehaus.plexus</groupId>
<version>1.1.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-archiver</artifactId>
<name>Plexus Archiver Component</name>
<currentVersion>1.0-alpha-3</currentVersion>
<package>org.codehaus.plexus.archiver</package>
<build>
<sourceDirectory>src/main/java</sourceDirectory>
<unitTestSourceDirectory>src/test/java</unitTestSourceDirectory>
<resources>
<resource>
<directory>src/main/resources</directory>
<includes>
<include>**/*</include>
</includes>
</resource>
</resources>
<unitTest>
<resources>
<resource>
<directory>src/test/resources</directory>
<includes>
<include>**/*</include>
</includes>
</resource>
</resources>
<includes>
<include>**/*Test.java</include>
</includes>
<excludes>
<exclude>**/Abstract*.java</exclude>
</excludes>
</unitTest>
</build>
<dependencies>
<dependency>
<groupId>JPP</groupId>
<artifactId>plexus-container-default</artifactId>
<jar>plexus_container-default.jar</jar>
<version>1.0</version>
</dependency>
<dependency>
<groupId>JPP</groupId>
<artifactId>plexus-utils</artifactId>
<jar>plexus_utils.jar</jar>
<version>1.0</version>
</dependency>
<dependency>
<groupId>JPP</groupId>
<artifactId>classworlds</artifactId>
<jar>classworlds.jar</jar>
<version>1.1</version>
</dependency>
<dependency>
<groupId>JPP</groupId>
<artifactId>junit</artifactId>
<jar>[junit].jar</jar>
<version>3.8.1</version>
</dependency>
</dependencies>
</project>

View File

@ -28,21 +28,15 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
%define namedversion 1.0-alpha-12
Name: plexus-archiver
Version: 1.0
Release: 0.4.a12.4%{?dist}
Version: 1.1
Release: 1%{?dist}
Epoch: 0
Summary: Plexus Archiver Component
License: MIT and ASL 2.0
Group: Development/Java
Group: Development/Libraries
URL: http://plexus.codehaus.org/plexus-components/plexus-archiver/
Source0: plexus-archiver-%{namedversion}-src.tar.bz2
# svn export http://svn.codehaus.org/plexus/plexus-components/tags/plexus-archiver-1.0-alpha-12/
# tar cjvf plexus-archiver-1.0-alpha-12-src.tar.bz2 plexus-archiver-1.0-alpha-12/
Source1: plexus-archiver-1.0-build.xml
Source2: plexus-archiver-1.0-project.xml
Source0: plexus-archiver-%{version}-src.tar.xz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -54,12 +48,12 @@ BuildRequires: plexus-container-default
BuildRequires: plexus-utils
BuildRequires: plexus-io
BuildRequires: maven2
BuildRequires: maven2-plugin-resources
BuildRequires: maven2-plugin-compiler
BuildRequires: maven2-plugin-jar
BuildRequires: maven2-plugin-install
BuildRequires: maven2-plugin-javadoc
BuildRequires: maven-surefire-maven-plugin
BuildRequires: maven-resources-plugin
BuildRequires: maven-compiler-plugin
BuildRequires: maven-jar-plugin
BuildRequires: maven-install-plugin
BuildRequires: maven-javadoc-plugin
BuildRequires: maven-surefire-plugin
BuildRequires: maven-surefire-provider-junit
BuildRequires: maven-shared-reporting-impl
BuildRequires: maven-doxia-sitetools
@ -88,10 +82,10 @@ Javadoc for %{name}.
%prep
%setup -q -n plexus-archiver-%{namedversion}
%setup -q
mkdir external_repo
ln -s %{_javadir} external_repo/JPP
#remove not compilint tests
rm -fr src/test/java/org/codehaus/plexus/archiver/DuplicateFilesTest.java
%build
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
@ -107,7 +101,7 @@ mvn-jpp \
rm -rf $RPM_BUILD_ROOT
# jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus
install -pm 644 target/%{name}-%{namedversion}.jar \
install -pm 644 target/%{name}-%{version}.jar \
$RPM_BUILD_ROOT%{_javadir}/plexus/archiver-%{version}.jar
(cd $RPM_BUILD_ROOT%{_javadir}/plexus && for jar in *-%{version}*; \
do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
@ -135,8 +129,8 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%{_javadir}/*
%{_datadir}/maven2
%{_mavendepmapfragdir}
%{_mavenpomdir}/*
%{_mavendepmapfragdir}/*
%files javadoc
%defattr(-,root,root,-)
@ -144,6 +138,9 @@ rm -rf $RPM_BUILD_ROOT
%doc %{_javadocdir}/%{name}
%changelog
* Wed Oct 6 2010 Alexander Kurtakov <akurtako@redhat.com> 0:1.1-1
- Update to 1.1.
* Mon Dec 28 2009 Alexander Kurtakov <akurtako@redhat.com> 0:1.0-0.4.a12.4
- Install depmap and pom to override common poms.

View File

@ -1 +1 @@
3f756befd4d0d9fa12a4f10e510de563 plexus-archiver-1.0-alpha-12-src.tar.bz2
475d5e7bff4a58bff88c74eb2ab2003a plexus-archiver-1.1-src.tar.xz