dion 2003/08/07 09:51:37
Modified: . Tag: MAVEN_RC1_STABLE project.xml
project.properties build-bootstrap-core.xml
maven.xml
Log:
Update from back ported fixes
Revision Changes Path
No revision
No revision
1.290.2.1 +7 -28 maven/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven/project.xml,v
retrieving revision 1.290
retrieving revision 1.290.2.1
diff -u -r1.290 -r1.290.2.1
--- project.xml 26 Jul 2003 22:35:34 -0000 1.290
+++ project.xml 7 Aug 2003 16:51:37 -0000 1.290.2.1
@@ -377,11 +377,12 @@
<!-- Need to mark these as compile-time/run-time -->
<dependencies>
+
<!-- leave dom4j as the first entry or the tests fail -->
<dependency>
<id>dom4j</id>
- <version>1.4-dev-8</version>
+ <version>1.4</version>
<url>http://www.dom4j.org/</url>
<properties>
<description>ouch</description>
@@ -408,6 +409,7 @@
<version>1.4.1</version>
<url>http://jakarta.apache.org/commons/digester.html</url>
</dependency>
+
<dependency>
<id>commons-jelly</id>
<version>20030724.033229</version>
@@ -449,8 +451,9 @@
<dependency>
<id>werkz</id>
<version>1.0-beta-10</version>
- <url>http://werkz.sourceforge.net/</url>
+ <url>http://werkz.codehaus.org/</url>
</dependency>
+
<!-- Runtime dependencies -->
<dependency>
@@ -487,16 +490,9 @@
<id>forehead</id>
<version>1.0-beta-4</version>
</dependency>
- <!--
- <dependency>
- <id>classworlds</id>
- <version>1.0-beta-3</version>
- </dependency>
- -->
-
<dependency>
<id>log4j</id>
- <version>1.1.3</version>
+ <version>1.2.8</version>
<url>http://jakarta.apache.org/log4j/</url>
</dependency>
<dependency>
@@ -516,7 +512,7 @@
</dependency>
<dependency>
<id>xerces</id>
- <version>2.2.1</version>
+ <version>2.4.0</version>
<url>http://xml.apache.org/xerces2-j/</url>
</dependency>
@@ -526,22 +522,6 @@
<version>1.1.2a</version>
</dependency>
- <!--
-
- <dependency>
- <groupId>aspectj</groupId>
- <artifactId>aspectjrt</artifactId>
- <version>1.1.0</version>
- </dependency>
-
- <dependency>
- <groupId>aspectj</groupId>
- <artifactId>aspectjtools</artifactId>
- <version>1.1.0</version>
- </dependency>
-
- -->
-
<dependency>
<groupId>plexus</groupId>
<artifactId>plexus</artifactId>
@@ -553,7 +533,6 @@
<nagEmailAddress>[EMAIL PROTECTED]</nagEmailAddress>
<sourceDirectory>${basedir}/src/java</sourceDirectory>
<unitTestSourceDirectory>${basedir}/src/test/java</unitTestSourceDirectory>
- <aspectSourceDirectory>${basedir}/src/aspect</aspectSourceDirectory>
<unitTest>
<includes>
<include>**/*Test.java</include>
1.39.2.1 +15 -1 maven/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/maven/project.properties,v
retrieving revision 1.39
retrieving revision 1.39.2.1
diff -u -r1.39 -r1.39.2.1
--- project.properties 26 Jul 2003 22:34:39 -0000 1.39
+++ project.properties 7 Aug 2003 16:51:37 -0000 1.39.2.1
@@ -24,6 +24,7 @@
# Display the date on the Maven web site
maven.xdoc.date = left
+maven.xdoc.date.format = dd MMMM yyyy HH:mm Z
# Display the maven version the web site is documenting
maven.xdoc.version = ${pom.currentVersion}
@@ -37,7 +38,7 @@
# This is to test a feature where a value is defined in a properties file
# and is available for use inside the POM.
-pomProperty = value
+pomProperty = value
maven.build.dir = ${basedir}/target
maven.gen.docs = ${maven.build.dir}/generated-xdocs
@@ -47,4 +48,17 @@
# M U L T I P R O J E C T - A L L P L U G I N G S
#------------------------------------------------------------------
maven.multiproject.basedir=${basedir}/src/plugins-build
+
+#do not go down to nested subproject
+maven.multiproject.includes=*/project.xml
+
+maven.multiproject.navigation=independent
+
+maven.multiproject.overviewPage.title=Maven Plugins
+
+maven.multiproject.overviewPage.link=reference/plugins
+
+#maven.multiproject.overviewPage.linkTitle=Plugins
+
+maven.multiproject.overviewPage.text=The following plugins are provided along with
Maven
1.3.2.1 +1 -1 maven/build-bootstrap-core.xml
Index: build-bootstrap-core.xml
===================================================================
RCS file: /home/cvs/maven/build-bootstrap-core.xml,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- build-bootstrap-core.xml 4 Jul 2003 22:43:13 -0000 1.3
+++ build-bootstrap-core.xml 7 Aug 2003 16:51:37 -0000 1.3.2.1
@@ -100,7 +100,7 @@
<path location="src/java"/>
</src>
</javac>
-
+
<copy todir="${maven.bootstrap.phase1.classes}">
<fileset dir="src/conf">
<include name="*.properties"/>
1.84.2.1 +5 -3 maven/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/maven/maven.xml,v
retrieving revision 1.84
retrieving revision 1.84.2.1
diff -u -r1.84 -r1.84.2.1
--- maven.xml 10 Jun 2003 03:15:39 -0000 1.84
+++ maven.xml 7 Aug 2003 16:51:37 -0000 1.84.2.1
@@ -3,7 +3,6 @@
xmlns:u="jelly:util"
xmlns:ant="jelly:ant"
xmlns:maven="jelly:maven"
- xmlns:m="maven"
xmlns:deploy="deploy">
<goal name="maven:init">
@@ -26,7 +25,10 @@
<!-- ================================================================== -->
<postGoal name="test:test">
- <j:if test="${context.getVariable('maven.mode.online')}">
+
+ <echo>maven.mode.online = ${maven.mode.online}</echo>
+
+ <j:if test="${maven.mode.online}">
<echo>
We are online so the touchstone will be run ...
@@ -224,7 +226,7 @@
<goal name="maven:installer-deploy"
description="Deploy an installable Maven jar to the remote repo??">
- <m:user-check user="${maven.username}"/>
+ <maven:user-check user="${maven.username}"/>
<attainGoal name="maven:installer"/>
<tar longfile="gnu" tarfile="installers.tar">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
