mcconnell 2003/09/10 02:49:17
Modified: merlin maven.xml platform.xml
merlin/composition/api project.xml
merlin/composition/impl project.xml
merlin/composition/spi project.xml
Log:
Version syn in top-level build.
Revision Changes Path
1.55 +9 -16 avalon-sandbox/merlin/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/maven.xml,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- maven.xml 10 Sep 2003 00:35:40 -0000 1.54
+++ maven.xml 10 Sep 2003 09:49:17 -0000 1.55
@@ -26,7 +26,6 @@
<ant:property name="merlin.home" value="${user.home}/.merlin"/>
<goal name="merlin:update">
- <!--<attainGoal name="merlin:clean"/>-->
<attainGoal name="merlin:install"/>
<attainGoal name="merlin:site"/>
<attainGoal name="merlin:tutorials"/>
@@ -60,14 +59,8 @@
goals="jar:install-snapshot"
banner="Installing:"
ignoreFailures="false" />
- <attainGoal name="merlin:plugin"/>
- <!-- build the plugin -->
- <maven:reactor basedir="${basedir}"
- includes="kernel/bootstrap/project.xml"
- goals="jar:install"
- banner="Installing:"
- ignoreFailures="false" />
+ <attainGoal name="merlin:plugin"/>
</goal>
@@ -80,7 +73,7 @@
<!-- import bootstrap jar -->
<ant:copy
- file="${basedir}/kernel/bootstrap/target/merlin-bootstrap-1.0.jar"
+ file="${basedir}/kernel/bootstrap/target/merlin-bootstrap-3.0.jar"
toDir="${merlin.build.inst.dir}/bin/lib"/>
<!-- import subproject jar files -->
@@ -138,7 +131,7 @@
</goal>
<goal name="merlin:package">
- <maven:snapshot project="${pom}"/>
+ <maven:snapshot project="${pom}"/>
<j:set var="timestamp" value="${snapshotSignature.substring(7,15)}"/>
<j:set var="package.name" value="${maven.final.name}-dist-${timestamp}"/>
@@ -160,7 +153,7 @@
<fileset dir="${basedir}">
<include name="INSTALLATION.TXT"/>
</fileset>
- <fileset dir="${basedir}/merlin-plugin/target">
+ <fileset dir="${basedir}/kernel/plugin/target">
<include name="*.jar"/>
</fileset>
<fileset dir="${basedir}/../meta/plugin/target">
@@ -278,14 +271,14 @@
</j:forEach>
<sourcepath path="${basedir}/repository/spi/src/java"/>
<sourcepath path="${basedir}/repository/impl/src/java"/>
- <sourcepath path="${basedir}/extension-spi/src/java"/>
- <sourcepath path="${basedir}/extension/src/java"/>
+ <sourcepath path="${basedir}/extension/spi/src/java"/>
+ <sourcepath path="${basedir}/extension/impl/src/java"/>
<sourcepath path="${basedir}/composition/api/src/java"/>
<sourcepath path="${basedir}/composition/spi/src/java"/>
<sourcepath path="${basedir}/composition/impl/src/java"/>
- <sourcepath path="${basedir}/activation-api/src/java"/>
- <sourcepath path="${basedir}/activation-spi/src/java"/>
- <sourcepath path="${basedir}/activation/src/java"/>
+ <sourcepath path="${basedir}/activation/api/src/java"/>
+ <sourcepath path="${basedir}/activation/spi/src/java"/>
+ <sourcepath path="${basedir}/activation/impl/src/java"/>
<sourcepath path="${basedir}/kernel/spi/src/java"/>
<sourcepath path="${basedir}/kernel/impl/src/java"/>
<classpath>
1.4 +20 -20 avalon-sandbox/merlin/platform.xml
Index: platform.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/platform.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- platform.xml 5 Sep 2003 10:00:32 -0000 1.3
+++ platform.xml 10 Sep 2003 09:49:17 -0000 1.4
@@ -28,12 +28,12 @@
<dependency>
<groupId>merlin</groupId>
<artifactId>merlin-kernel-spi</artifactId>
- <version>SNAPSHOT</version>
+ <version>3.0-beta-1-RC1</version>
</dependency>
<dependency>
<groupId>merlin</groupId>
<artifactId>merlin-kernel-impl</artifactId>
- <version>SNAPSHOT</version>
+ <version>3.0-beta-1-RC1</version>
</dependency>
<!-- avalon dependecies -->
@@ -41,87 +41,87 @@
<dependency>
<groupId>avalon-repository</groupId>
<artifactId>avalon-repository-spi</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.0-beta-1-RC1</version>
</dependency>
<dependency>
<groupId>avalon-repository</groupId>
<artifactId>avalon-repository-impl</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.0-beta-1-RC1</version>
</dependency>
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-api</artifactId>
- <version>SNAPSHOT</version>
+ <version>4.1.5-RC3</version>
</dependency>
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-impl</artifactId>
- <version>SNAPSHOT</version>
+ <version>4.1.5-RC3</version>
</dependency>
<dependency>
<groupId>avalon-meta</groupId>
<artifactId>avalon-meta-api</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.1-RC1</version>
</dependency>
<dependency>
<groupId>avalon-meta</groupId>
<artifactId>avalon-meta-spi</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.1-RC1</version>
</dependency>
<dependency>
<groupId>avalon-meta</groupId>
<artifactId>avalon-meta-impl</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.1-RC1</version>
</dependency>
<dependency>
<groupId>avalon-meta</groupId>
<artifactId>avalon-meta-tools</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.1-RC1</version>
</dependency>
<dependency>
<groupId>avalon-activation</groupId>
<artifactId>avalon-activation-api</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.0-beta-1-RC1</version>
</dependency>
<dependency>
<groupId>avalon-activation</groupId>
<artifactId>avalon-activation-spi</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.0-beta-1-RC1</version>
</dependency>
<dependency>
<groupId>avalon-activation</groupId>
<artifactId>avalon-activation-impl</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.0-beta-1-RC1</version>
</dependency>
<dependency>
<groupId>avalon-composition</groupId>
<artifactId>avalon-composition-api</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.0-beta-1-RC1</version>
</dependency>
<dependency>
<groupId>avalon-composition</groupId>
<artifactId>avalon-composition-spi</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.0-beta-1-RC1</version>
</dependency>
<dependency>
<groupId>avalon-composition</groupId>
<artifactId>avalon-composition-impl</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.0-beta-1-RC1</version>
</dependency>
<dependency>
<groupId>avalon-extension</groupId>
<artifactId>avalon-extension-spi</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.0-RC1</version>
</dependency>
<dependency>
<groupId>avalon-extension</groupId>
<artifactId>avalon-extension-impl</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.0-RC1</version>
</dependency>
<dependency>
@@ -145,11 +145,11 @@
<dependency>
<id>excalibur-i18n</id>
- <version>1.0</version>
+ <version>1.1-RC1</version>
</dependency>
<dependency>
<id>excalibur-configuration</id>
- <version>1.1-dev</version>
+ <version>1.1-RC1</version>
</dependency>
<dependency>
<id>excalibur-pool</id>
1.2 +6 -6 avalon-sandbox/merlin/composition/api/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/composition/api/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 31 Aug 2003 14:26:44 -0000 1.1
+++ project.xml 10 Sep 2003 09:49:17 -0000 1.2
@@ -8,7 +8,7 @@
<id>avalon-composition-api</id>
<name>Avalon Composition API</name>
<package>org.apache.avalon.assembly</package>
- <currentVersion>1.0</currentVersion>
+ <currentVersion>1.0-beta-1-RC1</currentVersion>
<inceptionYear>2002</inceptionYear>
<shortDescription>Avalon Composition Service Provider Interface</shortDescription>
@@ -22,30 +22,30 @@
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-api</artifactId>
- <version>SNAPSHOT</version>
+ <version>4.1.5-RC3</version>
</dependency>
<dependency>
<groupId>avalon-repository</groupId>
<artifactId>avalon-repository-spi</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.0-beta-1-RC1</version>
</dependency>
<dependency>
<groupId>avalon-meta</groupId>
<artifactId>avalon-meta-api</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.1-RC1</version>
</dependency>
<dependency>
<groupId>avalon-meta</groupId>
<artifactId>avalon-meta-spi</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.1-RC1</version>
</dependency>
<dependency>
<groupId>avalon-extension</groupId>
<artifactId>avalon-extension-spi</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.0-RC1</version>
</dependency>
</dependencies>
1.3 +14 -14 avalon-sandbox/merlin/composition/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/composition/impl/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 1 Sep 2003 02:18:13 -0000 1.2
+++ project.xml 10 Sep 2003 09:49:17 -0000 1.3
@@ -8,7 +8,7 @@
<id>avalon-composition-impl</id>
<name>Avalon Composition Framework</name>
<package>org.apache.avalon.composition</package>
- <currentVersion>1.0</currentVersion>
+ <currentVersion>1.0-beta-1-RC1</currentVersion>
<inceptionYear>2002</inceptionYear>
<shortDescription>
@@ -22,61 +22,61 @@
<dependency>
<groupId>avalon-repository</groupId>
<artifactId>avalon-repository-spi</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.0-beta-1-RC1</version>
</dependency>
<dependency>
<groupId>avalon-repository</groupId>
<artifactId>avalon-repository-impl</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.0-beta-1-RC1</version>
</dependency>
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-api</artifactId>
- <version>SNAPSHOT</version>
+ <version>4.1.5-RC3</version>
</dependency>
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-impl</artifactId>
- <version>SNAPSHOT</version>
+ <version>4.1.5-RC3</version>
</dependency>
<dependency>
<groupId>avalon-meta</groupId>
<artifactId>avalon-meta-api</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.1-RC1</version>
</dependency>
<dependency>
<groupId>avalon-meta</groupId>
<artifactId>avalon-meta-spi</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.1-RC1</version>
</dependency>
<dependency>
<groupId>avalon-meta</groupId>
<artifactId>avalon-meta-impl</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.1-RC1</version>
</dependency>
<dependency>
<groupId>avalon-composition</groupId>
<artifactId>avalon-composition-api</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.0-beta-1-RC1</version>
</dependency>
<dependency>
<groupId>avalon-composition</groupId>
<artifactId>avalon-composition-spi</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.0-beta-1-RC1</version>
</dependency>
<dependency>
<groupId>avalon-extension</groupId>
<artifactId>avalon-extension-spi</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.0-RC1</version>
</dependency>
<dependency>
<groupId>avalon-extension</groupId>
<artifactId>avalon-extension-impl</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.0-RC1</version>
</dependency>
<!-- logkit -->
@@ -101,11 +101,11 @@
</dependency>
<dependency>
<id>excalibur-i18n</id>
- <version>1.0</version>
+ <version>1.1-RC1</version>
</dependency>
<dependency>
<id>excalibur-configuration</id>
- <version>1.1-dev</version>
+ <version>1.1-RC1</version>
</dependency>
<dependency>
<id>excalibur-pool</id>
1.2 +7 -7 avalon-sandbox/merlin/composition/spi/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/composition/spi/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 31 Aug 2003 14:28:11 -0000 1.1
+++ project.xml 10 Sep 2003 09:49:17 -0000 1.2
@@ -8,7 +8,7 @@
<id>avalon-composition-spi</id>
<name>Avalon Composition SPI</name>
<package>org.apache.avalon.assembly</package>
- <currentVersion>1.0</currentVersion>
+ <currentVersion>1.0-beta-1-RC1</currentVersion>
<inceptionYear>2002</inceptionYear>
<shortDescription>Avalon Composition Service Provider Interface</shortDescription>
@@ -22,36 +22,36 @@
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-api</artifactId>
- <version>SNAPSHOT</version>
+ <version>4.1.5-RC3</version>
</dependency>
<dependency>
<groupId>avalon-repository</groupId>
<artifactId>avalon-repository-spi</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.0-beta-1-RC1</version>
</dependency>
<dependency>
<groupId>avalon-meta</groupId>
<artifactId>avalon-meta-api</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.1-RC1</version>
</dependency>
<dependency>
<groupId>avalon-meta</groupId>
<artifactId>avalon-meta-spi</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.1-RC1</version>
</dependency>
<dependency>
<groupId>avalon-extension</groupId>
<artifactId>avalon-extension-spi</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.0-RC1</version>
</dependency>
<dependency>
<groupId>avalon-composition</groupId>
<artifactId>avalon-composition-api</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.0-beta-1-RC1</version>
</dependency>
</dependencies>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
