mcconnell 2003/07/04 02:02:02
Modified: merlin maven.xml
merlin/merlin-extensions/merlin-jndi project.xml
merlin/merlin-extensions/merlin-jndi-new project.xml
merlin/merlin-extensions/merlin-servlet project.xml
merlin/meta project.xml
merlin/meta-spi project.xml
Log:
Updating the top-level build to include merlin-extensions.
Revision Changes Path
1.20 +2 -44 avalon-sandbox/merlin/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/maven.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- maven.xml 4 Jul 2003 07:33:48 -0000 1.19
+++ maven.xml 4 Jul 2003 09:02:01 -0000 1.20
@@ -8,7 +8,6 @@
<property name="maven.jar.manifest.extensions.add" value="true"/>
<property name="maven.checkstyle.format" value="avalon"/>
- <!--<property name="maven.jar.manifest" value="${basedir}/src/etc/project.mf"/>-->
<property name="pom.organization.identifier" value="ASF"/>
<property name="pom.specificationVersion" value="1.0"/>
@@ -31,7 +30,7 @@
<maven:reactor
basedir="${basedir}"
- includes="*/project.xml"
+
includes="*/project.xml,merlin-extensions/merlin-jmx/project.xml,merlin-extensions/merlin-jndi/project.xml,merlin-extensions/merlin-servlet/project.xml"
excludes="merlin-platform/*,merlin-plugin/*"
goals="merlin-propergate"
banner="Installing:"
@@ -262,7 +261,6 @@
</javadoc>
</goal>
-
<!--
Install the merlin plugin into the Maven plugin suite.
-->
@@ -290,49 +288,9 @@
<goal name="merlin-clean" prereqs="clean">
<maven:reactor
basedir="${basedir}"
- includes="*/project.xml"
+ includes="*/project.xml,merlin-extensions/*/project.xml"
goals="clean"
banner="Cleaning subproject:"
- ignoreFailures="false"/>
- </goal>
-
- <goal name="merlin-jar" >
- <maven:reactor
- basedir="${basedir}"
- includes="*/project.xml"
- excludes="merlin-platform/*"
- goals="jar"
- banner="Building jar:"
- ignoreFailures="false"/>
- </goal>
-
- <goal name="merlin-snapshot" >
- <maven:reactor
- basedir="${basedir}"
- includes="*/project.xml"
- excludes="merlin-platform/*"
- goals="jar:snapshot"
- banner="Building shapshot:"
- ignoreFailures="false"/>
- </goal>
-
- <goal name="merlin-install-snapshot" >
- <maven:reactor
- basedir="${basedir}"
- includes="*/project.xml"
- excludes="merlin-platform/*"
- goals="jar:install-snapshot"
- banner="Installing snapshot:"
- ignoreFailures="false"/>
- </goal>
-
- <goal name="merlin-jar-install" >
- <maven:reactor
- basedir="${basedir}"
- includes="*/project.xml"
- excludes="merlin-platform/*"
- goals="clean,jar:install"
- banner="Installing jar:"
ignoreFailures="false"/>
</goal>
1.3 +1 -1 avalon-sandbox/merlin/merlin-extensions/merlin-jndi/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-extensions/merlin-jndi/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 25 Jun 2003 04:11:15 -0000 1.2
+++ project.xml 4 Jul 2003 09:02:01 -0000 1.3
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project>
- <extend>${basedir}/../project.xml</extend>
+ <extend>${basedir}/../../project.xml</extend>
<groupId>merlin</groupId>
<id>merlin-jndi</id>
<name>Merlin JNDI Gateway</name>
1.4 +1 -1
avalon-sandbox/merlin/merlin-extensions/merlin-jndi-new/project.xml
Index: project.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-extensions/merlin-jndi-new/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 25 Jun 2003 04:11:15 -0000 1.3
+++ project.xml 4 Jul 2003 09:02:01 -0000 1.4
@@ -2,7 +2,7 @@
<project>
- <extend>${basedir}/../project.xml</extend>
+ <extend>${basedir}/../../project.xml</extend>
<id>merlin-jndi-new</id>
<name>Merlin JNDI Provider</name>
1.7 +36 -21
avalon-sandbox/merlin/merlin-extensions/merlin-servlet/project.xml
Index: project.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-extensions/merlin-servlet/project.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- project.xml 1 Jul 2003 14:12:45 -0000 1.6
+++ project.xml 4 Jul 2003 09:02:01 -0000 1.7
@@ -2,7 +2,7 @@
<project>
- <extend>${basedir}/../project.xml</extend>
+ <extend>${basedir}/../../project.xml</extend>
<groupId>merlin</groupId>
<id>merlin-servlet</id>
<name>Merlin Kernel Servlet</name>
@@ -68,13 +68,22 @@
</dependency>
<dependency>
- <id>excalibur-lifecycle</id>
+ <groupId>avalon</groupId>
+ <artifactId>avalon-composition-spi</artifactId>
<version>1.0</version>
<properties>
<war.bundle.jar>true</war.bundle.jar>
</properties>
</dependency>
-
+ <dependency>
+ <groupId>avalon</groupId>
+ <artifactId>avalon-composition</artifactId>
+ <version>1.0</version>
+ <properties>
+ <war.bundle.jar>true</war.bundle.jar>
+ </properties>
+ </dependency>
+
<dependency>
<groupId>avalon</groupId>
<artifactId>avalon-meta</artifactId>
@@ -83,7 +92,6 @@
<war.bundle.jar>true</war.bundle.jar>
</properties>
</dependency>
-
<dependency>
<groupId>avalon</groupId>
<artifactId>avalon-meta-spi</artifactId>
@@ -101,7 +109,6 @@
<war.bundle.jar>true</war.bundle.jar>
</properties>
</dependency>
-
<dependency>
<groupId>avalon</groupId>
<artifactId>avalon-assembly</artifactId>
@@ -112,55 +119,63 @@
</dependency>
<dependency>
- <id>excalibur-i18n</id>
+ <groupId>avalon-extension</groupId>
+ <artifactId>avalon-extension-spi</artifactId>
<version>1.0</version>
<properties>
<war.bundle.jar>true</war.bundle.jar>
</properties>
</dependency>
-
<dependency>
- <id>excalibur-event</id>
- <version>1.0.3</version>
+ <groupId>avalon-extension</groupId>
+ <artifactId>avalon-extension-impl</artifactId>
+ <version>1.0</version>
<properties>
<war.bundle.jar>true</war.bundle.jar>
</properties>
</dependency>
-
+
<dependency>
- <groupId>excalibur</groupId>
- <artifactId>excalibur-util-concurrent</artifactId>
- <version>1.3.1</version>
+ <id>excalibur-lifecycle</id>
+ <version>1.0</version>
<properties>
<war.bundle.jar>true</war.bundle.jar>
</properties>
</dependency>
<dependency>
- <id>excalibur-configuration</id>
- <version>1.1-dev</version>
+ <id>excalibur-i18n</id>
+ <version>1.0</version>
<properties>
<war.bundle.jar>true</war.bundle.jar>
</properties>
</dependency>
<dependency>
- <groupId>avalon-extension</groupId>
- <artifactId>avalon-extension-spi</artifactId>
- <version>1.0</version>
+ <id>excalibur-event</id>
+ <version>1.0.3</version>
<properties>
<war.bundle.jar>true</war.bundle.jar>
</properties>
</dependency>
+
<dependency>
- <groupId>avalon-extension</groupId>
- <artifactId>avalon-extension-impl</artifactId>
- <version>1.0</version>
+ <groupId>excalibur</groupId>
+ <artifactId>excalibur-util-concurrent</artifactId>
+ <version>1.3.1</version>
<properties>
<war.bundle.jar>true</war.bundle.jar>
</properties>
</dependency>
+ <dependency>
+ <id>excalibur-configuration</id>
+ <version>1.1-dev</version>
+ <properties>
+ <war.bundle.jar>true</war.bundle.jar>
+ </properties>
+ </dependency>
+
<dependency>
<groupId>merlin</groupId>
<artifactId>merlin-spi</artifactId>
1.7 +1 -1 avalon-sandbox/merlin/meta/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/meta/project.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- project.xml 1 Jul 2003 14:12:45 -0000 1.6
+++ project.xml 4 Jul 2003 09:02:01 -0000 1.7
@@ -4,7 +4,7 @@
<extend>${basedir}/../project.xml</extend>
<groupId>avalon</groupId>
<id>avalon-meta</id>
- <name>Meta Model</name>
+ <name>Avalon Meta Model</name>
<package>org.apache.avalon.meta</package>
<currentVersion>1.0</currentVersion>
1.5 +1 -1 avalon-sandbox/merlin/meta-spi/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/meta-spi/project.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.xml 20 Jun 2003 05:25:27 -0000 1.4
+++ project.xml 4 Jul 2003 09:02:01 -0000 1.5
@@ -4,7 +4,7 @@
<extend>${basedir}/../project.xml</extend>
<groupId>avalon</groupId>
<id>avalon-meta-spi</id>
- <name>Meta Model SPI</name>
+ <name>Avalon Meta Model SPI</name>
<package>org.apache.avalon.meta</package>
<currentVersion>1.0</currentVersion>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
