mcconnell 2003/09/10 02:40:33
Modified: merlin/kernel/bootstrap project.xml
merlin/kernel/bootstrap/src/etc merlin.properties
merlin/kernel/impl project.xml
merlin/kernel/plugin project.xml
merlin/kernel/spi project.xml
Log:
Sync. version references and bring plugin version up to 3.0 to match kernel version.
Revision Changes Path
1.4 +3 -4 avalon-sandbox/merlin/kernel/bootstrap/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/kernel/bootstrap/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 21 Aug 2003 00:52:47 -0000 1.3
+++ project.xml 10 Sep 2003 09:40:33 -0000 1.4
@@ -6,10 +6,9 @@
<groupId>merlin</groupId>
<id>merlin-bootstrap</id>
<name>Merlin Kernel CLI</name>
- <currentVersion>1.0</currentVersion>
+ <currentVersion>3.0</currentVersion>
<package>*</package>
- <currentVersion>1.0</currentVersion>
<inceptionYear>2003</inceptionYear>
<shortDescription>Merlin Command-Line Interface.</shortDescription>
@@ -22,12 +21,12 @@
<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>
</dependencies>
1.12 +19 -19 avalon-sandbox/merlin/kernel/bootstrap/src/etc/merlin.properties
Index: merlin.properties
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/kernel/bootstrap/src/etc/merlin.properties,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- merlin.properties 5 Sep 2003 09:59:26 -0000 1.11
+++ merlin.properties 10 Sep 2003 09:40:33 -0000 1.12
@@ -7,36 +7,36 @@
#
# the api classpath
#
-merlin.api.classpath.0=avalon-framework:avalon-framework-api;SNAPSHOT
-merlin.api.classpath.1=avalon-meta:avalon-meta-api;SNAPSHOT
-merlin.api.classpath.2=avalon-composition:avalon-composition-api;SNAPSHOT
-merlin.api.classpath.3=avalon-activation:avalon-activation-api;SNAPSHOT
+merlin.api.classpath.0=avalon-framework:avalon-framework-api;4.1.5-RC1
+merlin.api.classpath.1=avalon-meta:avalon-meta-api;1.1-RC1
+merlin.api.classpath.2=avalon-composition:avalon-composition-api;1.0-beta-1-RC1
+merlin.api.classpath.3=avalon-activation:avalon-activation-api;1.0-beta-1-RC1
merlin.api.classpath.4=excalibur-lifecycle:excalibur-lifecycle-api;1.0
#
# the spi classpath
#
-merlin.spi.classpath.0=avalon-meta:avalon-meta-spi;SNAPSHOT
-merlin.spi.classpath.1=avalon-extension:avalon-extension-spi;SNAPSHOT
-merlin.spi.classpath.2=avalon-composition:avalon-composition-spi;SNAPSHOT
-merlin.spi.classpath.3=avalon-activation:avalon-activation-spi;SNAPSHOT
-merlin.spi.classpath.4=avalon-repository:avalon-repository-spi;SNAPSHOT
-merlin.spi.classpath.5=merlin:merlin-kernel-spi;SNAPSHOT
+merlin.spi.classpath.0=avalon-meta:avalon-meta-spi;1.1-RC1
+merlin.spi.classpath.1=avalon-extension:avalon-extension-spi;1.0-RC1
+merlin.spi.classpath.2=avalon-composition:avalon-composition-spi;1.0-beta-1-RC1
+merlin.spi.classpath.3=avalon-activation:avalon-activation-spi;1.0-beta-1-RC1
+merlin.spi.classpath.4=avalon-repository:avalon-repository-spi;1.0-beta-1-RC1
+merlin.spi.classpath.5=merlin:merlin-kernel-spi;3.0-beta-1-RC1
#
# the bootstrap classpath
#
-merlin.impl.classpath.0=avalon-framework:avalon-framework-impl;SNAPSHOT
-merlin.impl.classpath.1=avalon-meta:avalon-meta-impl;SNAPSHOT
-merlin.impl.classpath.2=avalon-extension:avalon-extension-impl;SNAPSHOT
-merlin.impl.classpath.3=avalon-composition:avalon-composition-impl;SNAPSHOT
-merlin.impl.classpath.4=avalon-activation:avalon-activation-impl;SNAPSHOT
-merlin.impl.classpath.5=excalibur-i18n:excalibur-i18n;1.0
-merlin.impl.classpath.6=avalon-repository:avalon-repository-impl;SNAPSHOT
+merlin.impl.classpath.0=avalon-framework:avalon-framework-impl;4.1.5-RC3
+merlin.impl.classpath.1=avalon-meta:avalon-meta-impl;1.1-RC1
+merlin.impl.classpath.2=avalon-extension:avalon-extension-impl;1.0-RC1
+merlin.impl.classpath.3=avalon-composition:avalon-composition-impl;1.0-beta-1-RC1
+merlin.impl.classpath.4=avalon-activation:avalon-activation-impl;1.0-beta-1-RC1
+merlin.impl.classpath.5=excalibur-i18n:excalibur-i18n;1.1-RC1
+merlin.impl.classpath.6=avalon-repository:avalon-repository-impl;1.0-beta-1-RC1
merlin.impl.classpath.7=commons-cli:commons-cli;1.0
-merlin.impl.classpath.8=merlin:merlin-kernel-impl;SNAPSHOT
+merlin.impl.classpath.8=merlin:merlin-kernel-impl;1.3-beta-1-RC1
merlin.impl.classpath.9=logkit:logkit;1.2
merlin.impl.classpath.10=excalibur-event:excalibur-event;1.0.3
-merlin.impl.classpath.11=excalibur-configuration:excalibur-configuration;1.1-dev
+merlin.impl.classpath.11=excalibur-configuration:excalibur-configuration;1.1-RC1
merlin.impl.classpath.12=mx4j:mx4j-jmx;1.1.1
merlin.impl.classpath.13=mx4j:mx4j-tools;1.1.1
1.7 +19 -19 avalon-sandbox/merlin/kernel/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/kernel/impl/project.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- project.xml 5 Sep 2003 09:59:26 -0000 1.6
+++ project.xml 10 Sep 2003 09:40:33 -0000 1.7
@@ -9,7 +9,7 @@
<name>Merlin Kernel Implementation</name>
<package>org.apache.avalon.merlin</package>
- <currentVersion>3.0</currentVersion>
+ <currentVersion>3.0-beta-1-RC1</currentVersion>
<inceptionYear>2002</inceptionYear>
<shortDescription>Merlin Kernel Implementation</shortDescription>
@@ -37,7 +37,7 @@
<dependency>
<groupId>merlin</groupId>
<artifactId>merlin-kernel-spi</artifactId>
- <version>SNAPSHOT</version>
+ <version>3.0-beta-1-RC1</version>
</dependency>
<!-- avalon dependecies -->
@@ -45,82 +45,82 @@
<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-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-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-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-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>
<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>
@@ -146,11 +146,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-event</id>
1.2 +10 -10 avalon-sandbox/merlin/kernel/plugin/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/kernel/plugin/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 10 Sep 2003 00:32:27 -0000 1.1
+++ project.xml 10 Sep 2003 09:40:33 -0000 1.2
@@ -5,7 +5,7 @@
<pomVersion>3</pomVersion>
<id>merlin-plugin</id>
<name>Merlin Plugin</name>
- <currentVersion>1.0</currentVersion>
+ <currentVersion>3.0</currentVersion>
<description>Merlin Plugin for Maven</description>
<shortDescription>Merlin Plugin for Maven</shortDescription>
<package>org.apache.avalon.merlin</package>
@@ -30,13 +30,13 @@
<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 -->
@@ -44,33 +44,33 @@
<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>
@@ -137,7 +137,7 @@
<dependency>
<id>excalibur-i18n</id>
- <version>1.0</version>
+ <version>1.1-RC1</version>
</dependency>
<dependency>
1.6 +1 -1 avalon-sandbox/merlin/kernel/spi/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/kernel/spi/project.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.xml 10 Sep 2003 09:22:41 -0000 1.5
+++ project.xml 10 Sep 2003 09:40:33 -0000 1.6
@@ -9,7 +9,7 @@
<name>Merlin Kernel SPI</name>
<package>org.apache.avalon.merlin</package>
- <currentVersion>3.0</currentVersion>
+ <currentVersion>3.0-beta-1-RC1</currentVersion>
<inceptionYear>2002</inceptionYear>
<shortDescription>Merlin Kernel SPI</shortDescription>
<description>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
