Author: niallp
Date: Tue May 20 15:40:07 2008
New Revision: 658471
URL: http://svn.apache.org/viewvc?rev=658471&view=rev
Log:
Update m1 build and re-generate ant build
Modified:
commons/proper/chain/trunk/build.xml
commons/proper/chain/trunk/maven.xml
commons/proper/chain/trunk/project.properties
Modified: commons/proper/chain/trunk/build.xml
URL:
http://svn.apache.org/viewvc/commons/proper/chain/trunk/build.xml?rev=658471&r1=658470&r2=658471&view=diff
==============================================================================
--- commons/proper/chain/trunk/build.xml (original)
+++ commons/proper/chain/trunk/build.xml Tue May 20 15:40:07 2008
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--build.xml generated by maven from project.xml version 1.0
- on date December 7 2004, time 2226-->
+<!--build.xml generated by maven from project.xml version 1.2-SNAPSHOT
+ on date May 20 2008, time 2337-->
<project default="jar" name="commons-chain" basedir=".">
<property name="defaulttargetdir" value="target">
@@ -57,6 +57,14 @@
</include>
</fileset>
</copy>
+ <mkdir dir="${classesdir}/META-INF">
+ </mkdir>
+ <copy todir="${classesdir}/META-INF">
+ <fileset dir=".">
+ <include name="NOTICE.txt">
+ </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}">
@@ -138,7 +146,7 @@
</tstamp>
<property name="copyright" value="Copyright &copy; The Apache
Software Foundation. All Rights Reserved.">
</property>
- <property name="title" value="Commons Chain 1.0 API">
+ <property name="title" value="Commons Chain 1.2-SNAPSHOT API">
</property>
<javadoc use="true" private="true" destdir="${javadocdir}" author="true"
version="true" sourcepath="src/java" packagenames="org.apache.commons.chain.*">
<classpath>
@@ -152,19 +160,25 @@
<setproxy>
</setproxy>
- <get dest="${libdir}/servletapi-2.3.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/servletapi/jars/servletapi-2.3.jar";>
+ <get dest="${libdir}/servlet-api-2.3.jar" usetimestamp="true"
ignoreerrors="true"
src="http://repo1.maven.org/maven/javax.servlet/jars/servlet-api-2.3.jar";>
+ </get>
+ <get dest="${libdir}/portlet-api-1.0.jar" usetimestamp="true"
ignoreerrors="true"
src="http://repo1.maven.org/maven/javax.portlet/jars/portlet-api-1.0.jar";>
+ </get>
+ <get dest="${libdir}/myfaces-api-1.1.0.jar" usetimestamp="true"
ignoreerrors="true"
src="http://repo1.maven.org/maven/myfaces/jars/myfaces-api-1.1.0.jar";>
+ </get>
+ <get dest="${libdir}/junit-3.8.1.jar" usetimestamp="true"
ignoreerrors="true"
src="http://repo1.maven.org/maven/junit/jars/junit-3.8.1.jar";>
</get>
- <get dest="${libdir}/portlet-api-1.0.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/portlet-api/jars/portlet-api-1.0.jar";>
+ <get dest="${libdir}/commons-beanutils-1.7.0.jar" usetimestamp="true"
ignoreerrors="true"
src="http://repo1.maven.org/maven/commons-beanutils/jars/commons-beanutils-1.7.0.jar";>
</get>
- <get dest="${libdir}/myfaces-api-1.1.0.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/myfaces/jars/myfaces-api-1.1.0.jar";>
+ <get dest="${libdir}/commons-digester-1.8.jar" usetimestamp="true"
ignoreerrors="true"
src="http://repo1.maven.org/maven/commons-digester/jars/commons-digester-1.8.jar";>
</get>
- <get dest="${libdir}/junit-3.8.1.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/junit/jars/junit-3.8.1.jar";>
+ <get dest="${libdir}/commons-logging-1.0.4.jar" usetimestamp="true"
ignoreerrors="true"
src="http://repo1.maven.org/maven/commons-logging/jars/commons-logging-1.0.4.jar";>
</get>
- <get dest="${libdir}/commons-beanutils-1.7.0.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-beanutils/jars/commons-beanutils-1.7.0.jar";>
+ <get dest="${libdir}/maven-xdoc-plugin-1.9.2.jar" usetimestamp="true"
ignoreerrors="true"
src="http://repo1.maven.org/maven/maven/plugins/maven-xdoc-plugin-1.9.2.jar";>
</get>
- <get dest="${libdir}/commons-digester-1.8.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-digester/jars/commons-digester-1.8.jar";>
+ <get dest="${libdir}/maven-changelog-plugin-1.8.2.jar" usetimestamp="true"
ignoreerrors="true"
src="http://repo1.maven.org/maven/maven/plugins/maven-changelog-plugin-1.8.2.jar";>
</get>
- <get dest="${libdir}/commons-logging-1.0.4.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-logging/jars/commons-logging-1.0.4.jar";>
+ <get dest="${libdir}/maven-changes-plugin-1.6.jar" usetimestamp="true"
ignoreerrors="true"
src="http://repo1.maven.org/maven/maven/plugins/maven-changes-plugin-1.6.jar";>
</get>
</target>
<target name="install-maven">
@@ -173,4 +187,4 @@
<unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
</unjar>
</target>
-</project>
+</project>
\ No newline at end of file
Modified: commons/proper/chain/trunk/maven.xml
URL:
http://svn.apache.org/viewvc/commons/proper/chain/trunk/maven.xml?rev=658471&r1=658470&r2=658471&view=diff
==============================================================================
--- commons/proper/chain/trunk/maven.xml (original)
+++ commons/proper/chain/trunk/maven.xml Tue May 20 15:40:07 2008
@@ -42,6 +42,12 @@
<fileset file="${basedir}/build.properties.sample"/>
<fileset file="${basedir}/checkstyle.xml"/>
<fileset file="${basedir}/license-header.txt"/>
+ <fileset file="${basedir}/pom.xml"/>
+ </copy>
+
+ <!-- Copy apps files -->
+ <copy todir="${maven.dist.src.assembly.dir}/apps">
+ <fileset dir="./apps"/>
</copy>
<!-- Copy xdoc files -->
Modified: commons/proper/chain/trunk/project.properties
URL:
http://svn.apache.org/viewvc/commons/proper/chain/trunk/project.properties?rev=658471&r1=658470&r2=658471&view=diff
==============================================================================
--- commons/proper/chain/trunk/project.properties (original)
+++ commons/proper/chain/trunk/project.properties Tue May 20 15:40:07 2008
@@ -61,7 +61,7 @@
maven.xdoc.poweredby.image=maven-feather.png
maven.xdoc.version=${pom.currentVersion}
maven.xdoc.developmentProcessUrl=http://commons.apache.org/charter.html
-maven.xdoc.includeProjectDocumentation=no
+#maven.xdoc.includeProjectDocumentation=no
# once we create a theme url it should go here.
