rpms/plexus-utils/devel plexus-utils-1.4.5-build.xml, 1.1, 1.2 plexus-utils.spec, 1.4, 1.5 sources, 1.1, 1.2
Andrew Overholt
overholt at fedoraproject.org
Wed Aug 19 20:26:37 UTC 2009
Author: overholt
Update of /cvs/pkgs/rpms/plexus-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15746
Modified Files:
plexus-utils.spec sources
Added Files:
plexus-utils-1.4.5-build.xml
Log Message:
* Wed Aug 19 2009 Andrew Overholt <overholt at redhat.com> 1.4.5-1.2
- Update to 1.4.5 from JPackage and Deepak Bhole
- Remove gcj bits
Index: plexus-utils-1.4.5-build.xml
===================================================================
RCS file: plexus-utils-1.4.5-build.xml
diff -N plexus-utils-1.4.5-build.xml
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ plexus-utils-1.4.5-build.xml 19 Aug 2009 20:26:37 -0000 1.2
@@ -0,0 +1,90 @@
+<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'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 &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>
Index: plexus-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-utils/devel/plexus-utils.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- plexus-utils.spec 26 Jul 2009 18:56:42 -0000 1.4
+++ plexus-utils.spec 19 Aug 2009 20:26:37 -0000 1.5
@@ -1,4 +1,4 @@
-# Copyright (c) 2000-2005, JPackage Project
+# Copyright (c) 2000-2007, JPackage Project
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -28,25 +28,21 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-# If you want to build with maven,
-# give rpmbuild option '--with maven'
+%define with_maven 0
-%define with_maven %{!?_with_maven:0}%{?_with_maven:1}
-%define without_maven %{?_with_maven:0}%{!?_with_maven:1}
+%define parent plexus
+%define subname utils
Name: plexus-utils
-Version: 1.2
-Release: 4.2%{?dist}
-Epoch: 0
+Version: 1.4.5
+Release: 1.2%{?dist}
Summary: Plexus Common Utilities
License: ASL 1.1 and ASL 2.0 and MIT
-Group: Development/Java
+Group: Development/Libraries
URL: http://plexus.codehaus.org/
-# svn export svn://svn.plexus.codehaus.org/plexus/tags/plexus-utils-1.2/
-# tar xzf plexus-utils-1.2.tar.gz plexus-utils-1.2
-Source0: plexus-utils-1.2.tar.gz
-Source1: plexus-utils-1.2-build.xml
-# build it with maven2-generated ant build.xml
+Source0: plexus-utils-%{version}.tar.gz
+# svn export http://svn.codehaus.org/plexus/plexus-utils/tags/plexus-utils-1.4.5/
+Source1: plexus-utils-1.4.5-build.xml
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -56,15 +52,19 @@ BuildRequires: jpackage-utils >= 0:1.6
Requires: jpackage-utils
Requires(postun): jpackage-utils
%if %{with_maven}
-BuildRequires: maven2
+BuildRequires: maven2 >= 0:2.0.4
+BuildRequires: maven2-plugin-surefire
%endif
+Requires(post): jpackage-utils >= 0:1.7.2
+Requires(postun): jpackage-utils >= 0:1.7.2
+
%description
-The Plexus project seeks to create end-to-end developer tools for
-writing applications. At the core is the container, which can be
-embedded or for a full scale application server. There are many
-reusable components for hibernate, form processing, jndi, i18n,
-velocity, etc. Plexus also includes an application server which
+The Plexus project seeks to create end-to-end developer tools for
+writing applications. At the core is the container, which can be
+embedded or for a full scale application server. There are many
+reusable components for hibernate, form processing, jndi, i18n,
+velocity, etc. Plexus also includes an application server which
is like a J2EE application server, without all the baggage.
%package javadoc
@@ -76,9 +76,8 @@ Requires(postun): jpackage-utils
%description javadoc
Javadoc for %{name}.
-
%prep
-%setup -q -n plexus-utils-1.2
+%setup -q -n %{name}-%{version}
cp %{SOURCE1} build.xml
# Disable file utils test cases. See:
@@ -90,18 +89,15 @@ rm -f src/test/java/org/codehaus/plexus/
%build
%if %{with_maven}
-mkdir -p .maven/repository/maven/jars
-build-jar-repository .maven/repository/maven/jars \
-maven-jelly-tags
-
-export MAVEN_HOME_LOCAL=$(pwd)/.maven
-maven \
- -Dmaven.repo.remote=file:/usr/share/maven/repository \
- -Dmaven.home.local=$MAVEN_HOME_LOCAL \
- jar:install javadoc
+export MAVEN_REPO_LOCAL=`pwd`/.m2/repository
+
+mvn-jpp -e \
+ -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+ install javadoc:javadoc
%else
-ant jar javadoc
+export CLASSPATH=target/classes:target/test-classes
+ant -Dbuild.sysclasspath=only jar javadoc
%endif
%install
@@ -110,18 +106,32 @@ rm -rf $RPM_BUILD_ROOT
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus
install -pm 644 target/%{name}-%{version}.jar \
$RPM_BUILD_ROOT%{_javadir}/plexus/utils-%{version}.jar
+%add_to_maven_depmap org.codehaus.plexus %{name} %{version} JPP/%{parent} %{subname}
(cd $RPM_BUILD_ROOT%{_javadir}/plexus && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+
+# pom
+install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
+install -pm 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{parent}-%{subname}.pom
+
# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr target/docs/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%clean
rm -rf $RPM_BUILD_ROOT
+%post
+%update_maven_depmap
+
+%postun
+%update_maven_depmap
+
%files
%defattr(-,root,root,-)
%{_javadir}/*
+%{_datadir}/maven2
+%{_mavendepmapfragdir}
%files javadoc
%defattr(-,root,root,-)
@@ -129,6 +139,10 @@ rm -rf $RPM_BUILD_ROOT
%doc %{_javadocdir}/%{name}
%changelog
+* Wed Aug 19 2009 Andrew Overholt <overholt at redhat.com> 1.4.5-1.2
+- Update to 1.4.5 from JPackage and Deepak Bhole
+- Remove gcj bits
+
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.2-4.2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
@@ -139,6 +153,15 @@ rm -rf $RPM_BUILD_ROOT
- fix license tag
- drop repotag
+* Thu Aug 23 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.4.5-1jpp
+- Upgrade to 1.4.5
+- Now build with maven2 by default
+
+* Wed Mar 21 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.2-2jpp
+- Fix build classpath
+- Optionally build with maven2
+- Add gcj_support option
+
* Mon Feb 20 2007 Deepak Bhole <dbhole at redhat.com> - 0:1.2-2jpp.1.fc7
- Fix spec per Fedora guidelines
@@ -150,4 +173,3 @@ rm -rf $RPM_BUILD_ROOT
* Mon Nov 07 2005 Ralph Apel <r.apel at r-apel.de> - 0:1.0.4-1jpp
- First JPackage build
-
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-utils/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources 12 Mar 2007 15:03:37 -0000 1.1
+++ sources 19 Aug 2009 20:26:37 -0000 1.2
@@ -1 +1 @@
-fe3685edd13bf01d7b7013eb8c031389 plexus-utils-1.2.tar.gz
+89ed0f643168016776809507f94a16b3 plexus-utils-1.4.5.tar.gz
More information about the scm-commits
mailing list