dion 2003/08/18 21:46:31
Modified: . project.xml maven.xml
Log:
Switch stable branch back to HEAD
Revision Changes Path
1.296 +35 -9 maven/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven/project.xml,v
retrieving revision 1.295
retrieving revision 1.296
diff -u -r1.295 -r1.296
--- project.xml 5 Aug 2003 16:56:09 -0000 1.295
+++ project.xml 19 Aug 2003 04:46:31 -0000 1.296
@@ -308,6 +308,16 @@
<url>http://www.walding.com</url>
<timezone>+10</timezone>
</developer>
+ <developer>
+ <name>Brett Porter</name>
+ <id>brett</id>
+ <email>[EMAIL PROTECTED]</email>
+ <organization>f2 network</organization>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ <timezone>+10</timezone>
+ </developer>
</developers>
<contributors>
<contributor>
@@ -351,10 +361,6 @@
<email>[EMAIL PROTECTED]</email>
</contributor>
<contributor>
- <name>Brett Porter</name>
- <email>[EMAIL PROTECTED]</email>
- </contributor>
- <contributor>
<name>Martin Skopp</name>
<email>[EMAIL PROTECTED]</email>
<organization>Riege Software International</organization>
@@ -400,6 +406,11 @@
<url>http://jakarta.apache.org/ant/</url>
</dependency>
<dependency>
+ <id>commons-betwixt</id>
+ <version>1.0-beta-1.20030111.103454</version>
+ <url>http://jakarta.apache.org/commons/betwixt/</url>
+ </dependency>
+ <dependency>
<id>commons-digester</id>
<version>1.4.1</version>
<url>http://jakarta.apache.org/commons/digester.html</url>
@@ -445,7 +456,7 @@
</dependency>
<dependency>
<id>werkz</id>
- <version>1.0-beta-11</version>
+ <version>1.0-beta-10</version>
<url>http://werkz.codehaus.org/</url>
</dependency>
@@ -472,6 +483,16 @@
<url>http://jakarta.apache.org/commons/sandbox/grant/</url>
</dependency>
<dependency>
+ <id>commons-io</id>
+ <version>20030203.000550</version>
+ <url>http://jakarta.apache.org/commons/</url>
+ </dependency>
+ <dependency>
+ <id>commons-lang</id>
+ <version>1.0-b1.1</version>
+ <url>http://jakarta.apache.org/commons/</url>
+ </dependency>
+ <dependency>
<id>forehead</id>
<version>1.0-beta-4</version>
</dependency>
@@ -480,6 +501,11 @@
<version>1.2.8</version>
<url>http://jakarta.apache.org/log4j/</url>
</dependency>
+ <dependency>
+ <id>which</id>
+ <version>1.0</version>
+
<url>http://cvs.apache.org/viewcvs.cgi/xml-commons/java/src/org/apache/env/</url>
+ </dependency>
<!-- this is a dependency, but as the classes ship with ant, bootstrap will
fail with linkage errors if it's included and the junit tests are not
forked
@@ -511,8 +537,8 @@
</dependencies>
<build>
<nagEmailAddress>[EMAIL PROTECTED]</nagEmailAddress>
- <sourceDirectory>src/java</sourceDirectory>
- <unitTestSourceDirectory>src/test/java</unitTestSourceDirectory>
+ <sourceDirectory>${basedir}/src/java</sourceDirectory>
+ <unitTestSourceDirectory>${basedir}/src/test/java</unitTestSourceDirectory>
<unitTest>
<includes>
<include>**/*Test.java</include>
@@ -524,7 +550,7 @@
</unitTest>
<resources>
<resource>
- <directory>src/conf</directory>
+ <directory>${basedir}/src/conf</directory>
<includes>
<include>*.xsd</include>
<include>*.dtd</include>
@@ -534,7 +560,7 @@
</includes>
</resource>
<resource>
- <directory>src/messages</directory>
+ <directory>${basedir}/src/messages</directory>
<targetPath>org/apache/maven/messages</targetPath>
<includes>
<include>messages*.properties</include>
1.88 +8 -13 maven/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/maven/maven.xml,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- maven.xml 31 Jul 2003 05:39:57 -0000 1.87
+++ maven.xml 19 Aug 2003 04:46:31 -0000 1.88
@@ -5,11 +5,6 @@
xmlns:maven="jelly:maven"
xmlns:deploy="deploy">
- <goal name="build">
- <attainGoal name="aspectj:compile"/>
- <attainGoal name="jar:jar"/>
- </goal>
-
<goal name="maven:init">
<j:choose>
<j:when test="${systemScope['os.name'].startsWith('Windows')}">
@@ -58,12 +53,12 @@
description="Build each Maven plugin into an installable jar">
<maven:reactor
- basedir="${basedir}/src/plugins-build"
+ basedir="${maven.src.dir}/plugins-build"
includes="*/project.xml"
excludes="examples/*"
goals="clean,plugin"
banner="Building"
- ignoreFailures="true"
+ ignoreFailures="false"
/>
</goal>
@@ -72,7 +67,7 @@
description="Build each Maven plugin into an installable jar">
<maven:reactor
- basedir="${basedir}/src/plugins-build"
+ basedir="${maven.src.dir}/plugins-build"
includes="clean/project.xml,jar/project.xml,java/project.xml,license/project.xml,plugin/project.xml,test/project.xml,touchstone/project.xml,touchstone-partner/project.xml"
excludes="examples/*"
goals="clean,plugin"
@@ -85,7 +80,7 @@
description="Cleans all plugin projects">
<maven:reactor
- basedir="${basedir}/src/plugins-build"
+ basedir="${maven.src.dir}/plugins-build"
includes="*/project.xml"
goals="clean"
banner="Building"
@@ -97,7 +92,7 @@
description="Convert snapshot versions into resolved timestamped versions.">
<maven:reactor
- basedir="${basedir}/src/plugins-build"
+ basedir="${maven.src.dir}/plugins-build"
includes="*/project.xml"
goals="convert-snapshots-auto"
banner="Resolving snapshot versions"
@@ -109,7 +104,7 @@
description="Validate the Plugin POMs for release.">
<maven:reactor
- basedir="${basedir}/src/plugins-build"
+ basedir="${maven.src.dir}/plugins-build"
includes="*/project.xml"
goals="validate-pom-for-release"
banner="Resolving snapshot versions"
@@ -121,7 +116,7 @@
description="Graduate Plugin currentVersion element.">
<maven:reactor
- basedir="${basedir}/src/plugins-build"
+ basedir="${maven.src.dir}/plugins-build"
includes="*/project.xml"
goals="increment-snapshot-version"
banner="Graduating snapshot version"
@@ -137,7 +132,7 @@
description="Build each Maven plugin's documentation">
<maven:reactor
- basedir="${basedir}/src/plugins-build"
+ basedir="${maven.src.dir}/plugins-build"
includes="*/project.xml"
goals="xdoc"
banner="Generating Docs For"
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
