mcconnell 2003/11/13 06:24:42
Modified: kernel/bootstrap maven.xml project.xml snapshot.properties
kernel/bootstrap/src/etc merlin.properties
kernel/impl project.xml
kernel/loader project.xml
kernel maven.xml project.xml
kernel/plugin project.xml
kernel/spi project.xml
kernel/unit project.xml snapshot.properties
kernel/unit/src/etc merlin.properties
repository/api project.xml
repository/impl project.xml
repository/spi project.xml
Log:
Rackup the version of the sdandbox repository and kernel so we don;t create too many
conflicts.
Revision Changes Path
1.2 +2 -0 avalon-sandbox/kernel/bootstrap/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/kernel/bootstrap/maven.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven.xml 12 Nov 2003 07:38:35 -0000 1.1
+++ maven.xml 13 Nov 2003 14:24:41 -0000 1.2
@@ -9,6 +9,8 @@
<ant:echo file="${basedir}/snapshot.properties">
build.signature = ${snapshotSignature}
</ant:echo>
+ <unzip
src="${pom.getDependencyPath('avalon-repository:avalon-repository-api')}"
+ dest="${maven.build.dir}/classes"/>
<unzip
src="${pom.getDependencyPath('avalon-repository:avalon-repository-spi')}"
dest="${maven.build.dir}/classes"/>
<unzip
src="${pom.getDependencyPath('avalon-repository:avalon-repository-impl')}"
1.3 +8 -3 avalon-sandbox/kernel/bootstrap/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/kernel/bootstrap/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 12 Nov 2003 19:41:29 -0000 1.2
+++ project.xml 13 Nov 2003 14:24:41 -0000 1.3
@@ -6,7 +6,7 @@
<groupId>merlin</groupId>
<id>merlin-bootstrap</id>
<name>Merlin Kernel CLI</name>
- <currentVersion>1.0</currentVersion>
+ <currentVersion>SNAPSHOT</currentVersion>
<package>*</package>
<inceptionYear>2003</inceptionYear>
@@ -20,13 +20,18 @@
<dependency>
<groupId>avalon-repository</groupId>
+ <artifactId>avalon-repository-api</artifactId>
+ <version>1.2-dev</version>
+ </dependency>
+ <dependency>
+ <groupId>avalon-repository</groupId>
<artifactId>avalon-repository-spi</artifactId>
- <version>1.1-dev</version>
+ <version>1.2-dev</version>
</dependency>
<dependency>
<groupId>avalon-repository</groupId>
<artifactId>avalon-repository-impl</artifactId>
- <version>1.1-dev</version>
+ <version>1.2-dev</version>
</dependency>
</dependencies>
1.2 +1 -1 avalon-sandbox/kernel/bootstrap/snapshot.properties
Index: snapshot.properties
===================================================================
RCS file: /home/cvs/avalon-sandbox/kernel/bootstrap/snapshot.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- snapshot.properties 12 Nov 2003 07:38:35 -0000 1.1
+++ snapshot.properties 13 Nov 2003 14:24:41 -0000 1.2
@@ -1,2 +1,2 @@
-build.signature = merlin-bootstrap-20031105.083922
+build.signature = merlin-bootstrap-20031113.141220
1.2 +5 -4 avalon-sandbox/kernel/bootstrap/src/etc/merlin.properties
Index: merlin.properties
===================================================================
RCS file: /home/cvs/avalon-sandbox/kernel/bootstrap/src/etc/merlin.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- merlin.properties 12 Nov 2003 07:38:35 -0000 1.1
+++ merlin.properties 13 Nov 2003 14:24:41 -0000 1.2
@@ -13,7 +13,8 @@
merlin.api.classpath.3=avalon-activation:avalon-activation-api;1.2-dev
merlin.api.classpath.4=excalibur-lifecycle:excalibur-lifecycle-api;1.0
merlin.api.classpath.5=avalon-extension:avalon-extension-spi;1.0
-merlin.api.classpath.6=merlin:merlin-kernel-spi;3.2-dev
+merlin.api.classpath.6=merlin:merlin-kernel-spi;3.3-dev
+merlin.api.classpath.3=avalon-repository:avalon-repository-spi;1.2-dev
#
# the spi classpath
@@ -21,7 +22,7 @@
merlin.spi.classpath.0=avalon-meta:avalon-meta-spi;1.2.1-dev
merlin.spi.classpath.1=avalon-composition:avalon-composition-spi;1.2-dev
merlin.spi.classpath.2=avalon-activation:avalon-activation-spi;1.2.1-dev
-merlin.spi.classpath.3=avalon-repository:avalon-repository-spi;1.1-dev
+merlin.spi.classpath.3=avalon-repository:avalon-repository-spi;1.2-dev
#
# the bootstrap classpath
@@ -32,9 +33,9 @@
merlin.impl.classpath.3=avalon-composition:avalon-composition-impl;1.2-dev
merlin.impl.classpath.4=avalon-activation:avalon-activation-impl;1.2.2-dev
merlin.impl.classpath.5=excalibur-i18n:excalibur-i18n;1.1
-merlin.impl.classpath.6=avalon-repository:avalon-repository-impl;1.1-dev
+merlin.impl.classpath.6=avalon-repository:avalon-repository-impl;1.2-dev
merlin.impl.classpath.7=commons-cli:commons-cli;1.0
-merlin.impl.classpath.8=merlin:merlin-kernel-impl;3.2-dev
+merlin.impl.classpath.8=merlin:merlin-kernel-impl;3.3-dev
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
1.3 +9 -4 avalon-sandbox/kernel/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/kernel/impl/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 12 Nov 2003 19:38:58 -0000 1.2
+++ project.xml 13 Nov 2003 14:24:41 -0000 1.3
@@ -9,7 +9,7 @@
<name>Merlin Kernel Implementation</name>
<package>org.apache.avalon.merlin</package>
- <currentVersion>3.2.1-dev</currentVersion>
+ <currentVersion>3.3-dev</currentVersion>
<inceptionYear>2002</inceptionYear>
<shortDescription>Merlin Kernel Implementation</shortDescription>
@@ -37,7 +37,7 @@
<dependency>
<groupId>merlin</groupId>
<artifactId>merlin-kernel-spi</artifactId>
- <version>3.2-dev</version>
+ <version>3.3-dev</version>
</dependency>
<!-- avalon dependecies -->
@@ -60,13 +60,18 @@
<dependency>
<groupId>avalon-repository</groupId>
+ <artifactId>avalon-repository-api</artifactId>
+ <version>1.2-dev</version>
+ </dependency>
+ <dependency>
+ <groupId>avalon-repository</groupId>
<artifactId>avalon-repository-spi</artifactId>
- <version>1.1-dev</version>
+ <version>1.2-dev</version>
</dependency>
<dependency>
<groupId>avalon-repository</groupId>
<artifactId>avalon-repository-impl</artifactId>
- <version>1.1-dev</version>
+ <version>1.2-dev</version>
</dependency>
<dependency>
1.3 +8 -3 avalon-sandbox/kernel/loader/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/kernel/loader/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 12 Nov 2003 19:31:56 -0000 1.2
+++ project.xml 13 Nov 2003 14:24:41 -0000 1.3
@@ -6,7 +6,7 @@
<groupId>merlin</groupId>
<id>merlin-loader</id>
<name>Merlin Loader</name>
- <currentVersion>3.2-dev</currentVersion>
+ <currentVersion>3.3-dev</currentVersion>
<package>*</package>
<inceptionYear>2003</inceptionYear>
@@ -30,13 +30,18 @@
</dependency>
<dependency>
<groupId>avalon-repository</groupId>
+ <artifactId>avalon-repository-api</artifactId>
+ <version>1.2-dev</version>
+ </dependency>
+ <dependency>
+ <groupId>avalon-repository</groupId>
<artifactId>avalon-repository-spi</artifactId>
- <version>1.1-dev</version>
+ <version>1.2-dev</version>
</dependency>
<dependency>
<groupId>avalon-repository</groupId>
<artifactId>avalon-repository-impl</artifactId>
- <version>1.1-dev</version>
+ <version>1.2-dev</version>
</dependency>
</dependencies>
1.2 +1 -1 avalon-sandbox/kernel/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/kernel/maven.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven.xml 12 Nov 2003 07:43:46 -0000 1.1
+++ maven.xml 13 Nov 2003 14:24:41 -0000 1.2
@@ -70,7 +70,7 @@
<goal name="merlin:build" description="Build Merlin.">
<maven:reactor basedir="${basedir}"
includes="**/project.xml"
-
excludes="target/**,platform/**,kernel/plugin/**,project.xml,merlin-extensions/**"
+
excludes="**/target/**,platform/**,kernel/plugin/**,project.xml,merlin-extensions/**"
goals="jar:install"
banner="Installing:"
ignoreFailures="false" />
1.2 +1 -1 avalon-sandbox/kernel/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/kernel/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 12 Nov 2003 07:43:46 -0000 1.1
+++ project.xml 13 Nov 2003 14:24:41 -0000 1.2
@@ -6,7 +6,7 @@
<groupId>merlin</groupId>
<id>merlin</id>
<name>Merlin POM</name>
- <currentVersion>3.2</currentVersion>
+ <currentVersion>3.3</currentVersion>
<organization>
<name>Apache Software Foundation</name>
1.3 +9 -4 avalon-sandbox/kernel/plugin/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/kernel/plugin/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 12 Nov 2003 20:32:47 -0000 1.2
+++ project.xml 13 Nov 2003 14:24:41 -0000 1.3
@@ -30,12 +30,12 @@
<dependency>
<groupId>merlin</groupId>
<artifactId>merlin-kernel-spi</artifactId>
- <version>3.2-dev</version>
+ <version>3.3-dev</version>
</dependency>
<dependency>
<groupId>merlin</groupId>
<artifactId>merlin-kernel-impl</artifactId>
- <version>3.2.1-dev</version>
+ <version>3.3-dev</version>
</dependency>
<dependency>
@@ -100,12 +100,17 @@
<dependency>
<groupId>avalon-repository</groupId>
<artifactId>avalon-repository-api</artifactId>
- <version>1.1-dev</version>
+ <version>1.2-dev</version>
+ </dependency>
+ <dependency>
+ <groupId>avalon-repository</groupId>
+ <artifactId>avalon-repository-spi</artifactId>
+ <version>1.2-dev</version>
</dependency>
<dependency>
<groupId>avalon-repository</groupId>
<artifactId>avalon-repository-impl</artifactId>
- <version>1.1-dev</version>
+ <version>1.2-dev</version>
</dependency>
<dependency>
1.4 +2 -2 avalon-sandbox/kernel/spi/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/kernel/spi/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 13 Nov 2003 05:13:08 -0000 1.3
+++ project.xml 13 Nov 2003 14:24:41 -0000 1.4
@@ -9,7 +9,7 @@
<name>Merlin Kernel SPI</name>
<package>org.apache.avalon.merlin</package>
- <currentVersion>3.2-dev</currentVersion>
+ <currentVersion>3.3-dev</currentVersion>
<inceptionYear>2002</inceptionYear>
<shortDescription>Merlin Kernel SPI</shortDescription>
<description>
@@ -39,7 +39,7 @@
<dependency>
<groupId>avalon-repository</groupId>
<artifactId>avalon-repository-api</artifactId>
- <version>1.1-dev</version>
+ <version>1.2-dev</version>
</dependency>
</dependencies>
1.3 +15 -4 avalon-sandbox/kernel/unit/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/kernel/unit/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 12 Nov 2003 20:38:27 -0000 1.2
+++ project.xml 13 Nov 2003 14:24:42 -0000 1.3
@@ -6,7 +6,7 @@
<groupId>merlin</groupId>
<id>merlin-unit</id>
<name>Merlin Unit</name>
- <currentVersion>3.2.3-dev</currentVersion>
+ <currentVersion>3.3-dev</currentVersion>
<package>org.apache.avalon.merlin.unit</package>
<inceptionYear>2003</inceptionYear>
@@ -20,14 +20,25 @@
<dependencies>
<dependency>
+ <groupId>avalon-util</groupId>
+ <artifactId>avalon-util-defaults</artifactId>
+ <version>1.0-dev</version>
+ </dependency>
+
+ <dependency>
<groupId>avalon-repository</groupId>
<artifactId>avalon-repository-api</artifactId>
- <version>1.1-dev</version>
+ <version>1.2-dev</version>
+ </dependency>
+ <dependency>
+ <groupId>avalon-repository</groupId>
+ <artifactId>avalon-repository-spi</artifactId>
+ <version>1.2-dev</version>
</dependency>
<dependency>
<groupId>avalon-repository</groupId>
<artifactId>avalon-repository-impl</artifactId>
- <version>1.1-dev</version>
+ <version>1.2-dev</version>
</dependency>
<dependency>
@@ -63,7 +74,7 @@
<dependency>
<groupId>merlin</groupId>
<artifactId>merlin-kernel-spi</artifactId>
- <version>3.2-dev</version>
+ <version>3.3-dev</version>
</dependency>
<dependency>
1.2 +1 -1 avalon-sandbox/kernel/unit/snapshot.properties
Index: snapshot.properties
===================================================================
RCS file: /home/cvs/avalon-sandbox/kernel/unit/snapshot.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- snapshot.properties 12 Nov 2003 07:55:11 -0000 1.1
+++ snapshot.properties 13 Nov 2003 14:24:42 -0000 1.2
@@ -1,3 +1,3 @@
-build.signature = merlin-unit-20031105.083935
+build.signature = merlin-unit-20031113.141248
1.2 +6 -4 avalon-sandbox/kernel/unit/src/etc/merlin.properties
Index: merlin.properties
===================================================================
RCS file: /home/cvs/avalon-sandbox/kernel/unit/src/etc/merlin.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- merlin.properties 12 Nov 2003 07:55:11 -0000 1.1
+++ merlin.properties 13 Nov 2003 14:24:42 -0000 1.2
@@ -13,7 +13,8 @@
merlin.api.classpath.3=avalon-activation:avalon-activation-api;1.2-dev
merlin.api.classpath.4=excalibur-lifecycle:excalibur-lifecycle-api;1.0
merlin.api.classpath.5=avalon-extension:avalon-extension-spi;1.0
-merlin.api.classpath.6=merlin:merlin-kernel-spi;3.2-dev
+merlin.api.classpath.6=merlin:merlin-kernel-spi;3.3-dev
+merlin.api.classpath.3=avalon-repository:avalon-repository-api;1.2-dev
#
# the spi classpath
@@ -21,7 +22,7 @@
merlin.spi.classpath.0=avalon-meta:avalon-meta-spi;1.2.1-dev
merlin.spi.classpath.1=avalon-composition:avalon-composition-spi;1.2-dev
merlin.spi.classpath.2=avalon-activation:avalon-activation-spi;1.2.1-dev
-merlin.spi.classpath.3=avalon-repository:avalon-repository-spi;1.1-dev
+merlin.spi.classpath.3=avalon-repository:avalon-repository-spi;1.2-dev
#
# the bootstrap classpath
@@ -32,12 +33,13 @@
merlin.impl.classpath.3=avalon-composition:avalon-composition-impl;1.2-dev
merlin.impl.classpath.4=avalon-activation:avalon-activation-impl;1.2.2-dev
merlin.impl.classpath.5=excalibur-i18n:excalibur-i18n;1.1
-merlin.impl.classpath.6=avalon-repository:avalon-repository-impl;1.1-dev
+merlin.impl.classpath.6=avalon-repository:avalon-repository-impl;1.2-dev
merlin.impl.classpath.7=commons-cli:commons-cli;1.0
-merlin.impl.classpath.8=merlin:merlin-kernel-impl;3.2.1-dev
+merlin.impl.classpath.8=merlin:merlin-kernel-impl;3.3-dev
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
merlin.impl.classpath.12=mx4j:mx4j-jmx;1.1.1
merlin.impl.classpath.13=mx4j:mx4j-tools;1.1.1
+merlin.impl.classpath.14=avalon-util:avalon-util-defaults;1.0
1.2 +1 -1 avalon-sandbox/repository/api/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/repository/api/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 7 Nov 2003 12:50:54 -0000 1.1
+++ project.xml 13 Nov 2003 14:24:42 -0000 1.2
@@ -7,7 +7,7 @@
<groupId>avalon-repository</groupId>
<id>avalon-repository-api</id>
<name>Avalon Repository API</name>
- <currentVersion>1.1-dev</currentVersion>
+ <currentVersion>1.2-dev</currentVersion>
<package>org.apache.avalon.repository</package>
1.4 +3 -3 avalon-sandbox/repository/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/repository/impl/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 7 Nov 2003 12:50:54 -0000 1.3
+++ project.xml 13 Nov 2003 14:24:42 -0000 1.4
@@ -8,7 +8,7 @@
<id>avalon-repository-impl</id>
<name>Avalon Repository Implementation</name>
<package>org.apache.avalon.repository</package>
- <currentVersion>1.1-dev</currentVersion>
+ <currentVersion>1.2-dev</currentVersion>
<inceptionYear>2002</inceptionYear>
<shortDescription>Jar file repository implementation.</shortDescription>
@@ -17,12 +17,12 @@
<dependency>
<groupId>avalon-repository</groupId>
<artifactId>avalon-repository-api</artifactId>
- <version>1.1-dev</version>
+ <version>1.2-dev</version>
</dependency>
<dependency>
<groupId>avalon-repository</groupId>
<artifactId>avalon-repository-spi</artifactId>
- <version>1.1-dev</version>
+ <version>1.2-dev</version>
</dependency>
<dependency>
<groupId>avalon-util</groupId>
1.4 +2 -2 avalon-sandbox/repository/spi/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/repository/spi/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 7 Nov 2003 12:50:55 -0000 1.3
+++ project.xml 13 Nov 2003 14:24:42 -0000 1.4
@@ -7,7 +7,7 @@
<groupId>avalon-repository</groupId>
<id>avalon-repository-spi</id>
<name>Avalon Repository SPI</name>
- <currentVersion>1.1-dev</currentVersion>
+ <currentVersion>1.2-dev</currentVersion>
<package>org.apache.avalon.repository</package>
@@ -18,7 +18,7 @@
<dependency>
<groupId>avalon-repository</groupId>
<artifactId>avalon-repository-api</artifactId>
- <version>1.1-dev</version>
+ <version>1.2-dev</version>
</dependency>
</dependencies>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
