[Jpackage-commits] rpms/free/plexus-utils plexus-utils-1.4.5-build.xml, 1.2, NONE plexus-utils-1.5.8-build.xml, NONE, 1.1 plexus-utils-1.5.8-jpp-depmap.xml, NONE, 1.1 plexus-utils.spec, 1.5, 1.6

jpackage jpackage at ryu.zarb.org
Fri Dec 3 11:43:43 CET 2010


Update of /home/projects/jpackage/cvs/rpms/free/plexus-utils
In directory ryu.zarb.org:/tmp/i7TbMmN8zC/rpms/free/plexus-utils

Modified Files:
	plexus-utils.spec 
Added Files:
	plexus-utils-1.5.8-build.xml plexus-utils-1.5.8-jpp-depmap.xml 
Removed Files:
	plexus-utils-1.4.5-build.xml 
Log Message:
1.5.8-1.jpp6

--- NEW FILE: plexus-utils-1.5.8-jpp-depmap.xml ---
<dependencies>
	<dependency>
		<maven>
			<groupId>servletapi</groupId>
			<artifactId>servletapi</artifactId>
			<version>2.3</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>servletapi5</artifactId>
			<version>2.4</version>
		</jpp>
	</dependency>

	<dependency>
		<maven>
			<groupId>jetty</groupId>
			<artifactId>jetty</artifactId>
			<version>4.2.10</version>
		</maven>
		<jpp>
			<groupId>JPP/jetty5</groupId>
			<artifactId>jetty5</artifactId>
			<version>5.1.12</version>
		</jpp>
	</dependency>

	<dependency>
		<maven>
			<groupId>joda-time</groupId>
			<artifactId>joda-time</artifactId>
			<version>1.2.1</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>joda-time</artifactId>
			<version>1.2.1</version>
		</jpp>
	</dependency>

	<dependency>
		<maven>
			<groupId>xom</groupId>
			<artifactId>xom</artifactId>
			<version>1.1</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>xom</artifactId>
			<version>1.0</version>
		</jpp>
	</dependency>

	<dependency>
		<maven>
			<groupId>xpp3</groupId>
			<artifactId>xpp3</artifactId>
			<version>1.1.3.4.O</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>xpp3</artifactId>
			<version>1.1.3.8</version>
		</jpp>
	</dependency>
	<dependency>
		<maven>
			<groupId>xpp3</groupId>
			<artifactId>xpp3_min</artifactId>
			<version>1.1.3.4.O</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>xpp3</artifactId>
			<version>1.1.3.8</version>
		</jpp>
	</dependency>

	<dependency>
		<maven>
			<groupId>cglib</groupId>
			<artifactId>cglib-nodep</artifactId>
			<version>2.1_3</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>cglib-nodep</artifactId>
			<version>2.1.3</version>
		</jpp>
	</dependency>

	<dependency>
		<maven>
			<groupId>com.megginson.sax</groupId>
			<artifactId>xml-writer</artifactId>
			<version>0.2</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>xom</artifactId>
			<version>1.0</version>
		</jpp>
	</dependency>

	<dependency>
		<maven>
			<groupId>stax</groupId>
			<artifactId>stax</artifactId>
			<version>1.2.0</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>bea-stax-ri</artifactId>
			<version>1.2.0</version>
		</jpp>
	</dependency>
	<dependency>
		<maven>
			<groupId>stax</groupId>
			<artifactId>stax-api</artifactId>
			<version>1.0.1</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>bea-stax-api</artifactId>
			<version>1.0.1</version>
		</jpp>
	</dependency>

	<dependency>
		<maven>
			<groupId>plexus</groupId>
			<artifactId>plexus-utils</artifactId>
			<version>1.2</version>
		</maven>
		<jpp>
			<groupId>JPP/plexus</groupId>
			<artifactId>utils</artifactId>
			<version>1.2</version>
		</jpp>
	</dependency>

	<dependency>
		<maven>
			<groupId>org.codehaus.xsite</groupId>
			<artifactId>xsite-maven-plugin</artifactId>
			<version>1.0-beta-5</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>xsite-maven-plugin</artifactId>
			<version>1.0</version>
		</jpp>
	</dependency>

	<dependency>
		<maven>
			<groupId>org.nanocontainer</groupId>
			<artifactId>nanocontainer</artifactId>
			<version>1.1</version>
		</maven>
		<jpp>
			<groupId>JPP/nanocontainer</groupId>
			<artifactId>container</artifactId>
			<version>1.1</version>
		</jpp>
	</dependency>

	<dependency>
		<maven>
			<groupId>opensymphony</groupId>
			<artifactId>sitemesh</artifactId>
			<version>2.3</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>sitemesh</artifactId>
			<version>2.3</version>
		</jpp>
	</dependency>

	<dependency>
		<maven>
			<groupId>freemarker</groupId>
			<artifactId>freemarker</artifactId>
			<version>2.3.9</version>
		</maven>
		<jpp>
			<groupId>JPP</groupId>
			<artifactId>freemarker</artifactId>
			<version>2.3.6</version>
		</jpp>
	</dependency>

        <dependency>
                <maven>
                        <groupId>asm</groupId>
                        <artifactId>asm</artifactId>
                        <version>2.2.3</version>
                </maven>
                <jpp>
                        <groupId>JPP/objectweb-asm</groupId>
                        <artifactId>asm</artifactId>
                        <version>3.2</version>
                </jpp>
        </dependency>
        <dependency>
                <maven>
                        <groupId>asm</groupId>
                        <artifactId>asm-common</artifactId>
                        <version>2.2.3</version>
                </maven>
                <jpp>
                        <groupId>JPP/objectweb-asm</groupId>
                        <artifactId>asm-common</artifactId>
                        <version>3.2</version>
                </jpp>
        </dependency>
        <dependency>
                <maven>
                        <groupId>asm</groupId>
                        <artifactId>asm-tree</artifactId>
                        <version>2.2.3</version>
                </maven>
                <jpp>
                        <groupId>JPP/objectweb-asm</groupId>
                        <artifactId>asm-tree</artifactId>
                        <version>3.2</version>
                </jpp>
        </dependency>
        <dependency>
                <maven>
                        <groupId>asm</groupId>
                        <artifactId>asm-util</artifactId>
                        <version>2.2.3</version>
                </maven>
                <jpp>
                        <groupId>JPP/objectweb-asm</groupId>
                        <artifactId>asm-util</artifactId>
                        <version>3.2</version>
                </jpp>
        </dependency>
        <dependency>
                <maven>
                        <groupId>xalan</groupId>
                        <artifactId>xalan-serializer</artifactId>
                        <version>2.7.0</version>
                </maven>
                <jpp>
                        <groupId>JPP</groupId>
                        <artifactId>xalan-j2-serializer</artifactId>
                        <version>2.7.0</version>
                </jpp>
        </dependency>
        <dependency>
                <maven>
                        <groupId>slide</groupId>
                        <artifactId>slide-webdavlib</artifactId>
                        <version>2.1</version>
                </maven>
                <jpp>
                        <groupId>JPP/slide</groupId>
                        <artifactId>slide-webdavclient-webdavlib</artifactId>
                        <version>2.1</version>
                </jpp>
        </dependency>

</dependencies>

--- plexus-utils-1.4.5-build.xml DELETED ---

--- NEW FILE: plexus-utils-1.5.8-build.xml ---
<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: /home/projects/jpackage/cvs/rpms/free/plexus-utils/plexus-utils.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -C 2 -d -r1.5 -r1.6
*** plexus-utils.spec	28 Apr 2009 09:23:18 -0000	1.5
--- plexus-utils.spec	3 Dec 2010 10:43:41 -0000	1.6
***************
*** 1,3 ****
! # Copyright (c) 2000-2007, JPackage Project
  # All rights reserved.
  #
--- 1,3 ----
! # Copyright (c) 2000-2010, JPackage Project
  # All rights reserved.
  #
***************
*** 37,59 ****
  %define without_maven %{?_without_maven:1}%{!?_without_maven:0}
  
! %define section     free
  %define parent plexus
  %define subname utils
  
  Name:           plexus-utils
! Version:        1.4.5
! Release:        5%{?dist}
  Epoch:          0
  Summary:        Plexus Common Utilities
  License:        Apache Software License 2.0
  Group:          Development/Java
- #Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:%{_vendor}}
- #Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
  URL:            http://plexus.codehaus.org/
! Source0:        plexus-utils-1.4.5.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
  
- # build it with maven2-generated ant build.xml
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
--- 37,57 ----
  %define without_maven %{?_without_maven:1}%{!?_without_maven:0}
  
! %define section free
  %define parent plexus
  %define subname utils
  
  Name:           plexus-utils
! Version:        1.5.8
! Release:        1%{?dist}
  Epoch:          0
  Summary:        Plexus Common Utilities
  License:        Apache Software License 2.0
  Group:          Development/Java
  URL:            http://plexus.codehaus.org/
! Source0:        plexus-utils-1.5.8.tar.gz
! # svn export http://svn.codehaus.org/plexus/plexus-utils/tags/plexus-utils-1.5.8/
! Source1:        plexus-utils-1.5.8-build.xml
! Source2:        plexus-utils-1.5.8-jpp-depmap.xml
  
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
***************
*** 69,92 ****
  %endif
  
  BuildRequires:  ant
- BuildRequires:  jpackage-utils >= 0:1.7.2
  
  %if %{with_maven}
! BuildRequires:  maven2 >= 2.0.4-10jpp
! BuildRequires:	maven2-plugin-compiler
! BuildRequires:	maven2-plugin-install
! BuildRequires:	maven2-plugin-jar
! BuildRequires:	maven2-plugin-javadoc
! BuildRequires:	maven2-plugin-resources
! BuildRequires:  maven2-plugin-surefire = 2.3
! BuildRequires:  maven-surefire-provider-junit = 2.3
! BuildRequires:	maven-doxia
  BuildRequires:  maven-doxia-sitetools
! BuildRequires:	maven2-common-poms >= 1.0
! BuildRequires:	maven-release
  %endif
  
! Requires(post):    jpackage-utils >= 0:1.7.2
! Requires(postun):  jpackage-utils >= 0:1.7.2
  
  %description
--- 67,97 ----
  %endif
  
+ BuildRequires:  jpackage-utils >= 0:1.7.5
+ BuildRequires:  java-devel >= 0:1.6.0
  BuildRequires:  ant
  
  %if %{with_maven}
! BuildRequires:  maven2 >= 2.0.8
! BuildRequires:  maven2-plugin-compiler
! BuildRequires:  maven2-plugin-install
! BuildRequires:  maven2-plugin-jar
! BuildRequires:  maven2-plugin-javadoc
! BuildRequires:  maven2-plugin-resources
! BuildRequires:  maven2-plugin-shade
! BuildRequires:  maven-release
! BuildRequires:  maven-surefire-maven-plugin
! BuildRequires:  maven-surefire-provider-junit
! BuildRequires:  maven-doxia
  BuildRequires:  maven-doxia-sitetools
! BuildRequires:  maven2-common-poms >= 1.0
! BuildRequires:  mojo-maven2-plugin-shade
! BuildRequires:  apache-commons-parent
  %endif
+ BuildRequires:  plexus-interpolation
  
! Requires:       java >= 0:1.6.0
! Requires:       plexus-interpolation
! Requires(post):    jpackage-utils >= 0:1.7.5
! Requires(postun):  jpackage-utils >= 0:1.7.5
  
  %description
***************
*** 101,111 ****
  Summary:        Javadoc for %{name}
  Group:          Development/Documentation
- Requires(post):   /bin/rm,/bin/ln
- Requires(postun): /bin/rm
  
  %description javadoc
  Javadoc for %{name}.
  
- 
  %prep
  %setup -q -n %{name}-%{version}
--- 106,113 ----
***************
*** 118,125 ****
  mvn-jpp -e \
      -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
      install javadoc:javadoc
  
  %else
! export CLASSPATH=target/classes:target/test-classes
  ant -Dbuild.sysclasspath=only jar javadoc
  %endif
--- 120,130 ----
  mvn-jpp -e \
      -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+     -Dmaven2.jpp.depmap.file=%{SOURCE2} \
+     -Dmaven.test.failure.ignore=true \
      install javadoc:javadoc
  
+ 
  %else
! export CLASSPATH=$(build-classpath plexus/interpolation):target/classes:target/test-classes
  ant -Dbuild.sysclasspath=only jar javadoc
  %endif
***************
*** 130,135 ****
  # jars
  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)
--- 135,140 ----
  # jars
  install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus
! install -m 644 target/%{name}-%{version}.jar \
!   $RPM_BUILD_ROOT%{_javadir}/plexus/%{subname}-%{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)
***************
*** 137,145 ****
  # 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/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
  ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
  
--- 142,150 ----
  # pom
  install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
! install -m 644 target/dependency-reduced-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/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
  ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
  
***************
*** 152,164 ****
  rm -rf $RPM_BUILD_ROOT
  
- %post javadoc
- rm -f %{_javadocdir}/%{name}
- ln -s %{name}-%{version} %{_javadocdir}/%{name}
- 
- %postun javadoc
- if [ "$1" = "0" ]; then
-   rm -f %{_javadocdir}/%{name}
- fi
- 
  %post
  %update_maven_depmap
--- 157,160 ----
***************
*** 181,187 ****
  %files
  %defattr(-,root,root,-)
! %{_javadir}/*
! %{_datadir}/maven2
! %{_mavendepmapfragdir}
  %if %{gcj_support}
  %dir %attr(-,root,root) %{_libdir}/gcj/%{name}
--- 177,184 ----
  %files
  %defattr(-,root,root,-)
! %dir %{_javadir}/%{parent}
! %{_javadir}/%{parent}/*.jar
! %{_datadir}/maven2/poms/*
! %{_mavendepmapfragdir}/*
  %if %{gcj_support}
  %dir %attr(-,root,root) %{_libdir}/gcj/%{name}
***************
*** 192,198 ****
  %defattr(-,root,root,-)
  %doc %{_javadocdir}/%{name}-%{version}
! %ghost %doc %{_javadocdir}/%{name}
  
  %changelog
  * Tue Apr 28 2009 Yong Yang <yyang at redhat.com> 0:1.4.5-5
  - Add BRs maven2-plugin-surfire*, maven-doxia*
--- 189,198 ----
  %defattr(-,root,root,-)
  %doc %{_javadocdir}/%{name}-%{version}
! %doc %{_javadocdir}/%{name}
  
  %changelog
+ * Fri Dec 03 2010 Ralph Apel <r.apel at r-apel.de> 0:1.5.8-1
+ - 1.5.8
+ 
  * Tue Apr 28 2009 Yong Yang <yyang at redhat.com> 0:1.4.5-5
  - Add BRs maven2-plugin-surfire*, maven-doxia*




More information about the JPackage-commits mailing list