mcconnell 2003/12/17 17:11:08
Modified: merlin maven.xml platform.xml
merlin/activation/api project.xml
merlin/activation/impl project.xml
merlin/activation/impl/src/test/org/apache/avalon/activation/appliance
AbstractTestCase.java
merlin/activation/spi project.xml
merlin/composition/api project.xml
merlin/composition/impl project.xml
merlin/composition/impl/src/test/conf includes.xml
merlin/composition/spi project.xml
merlin/kernel/api project.xml
merlin/kernel/cli maven.xml project.properties project.xml
merlin/kernel/impl project.xml
merlin/kernel/plugin project.xml
merlin/kernel/unit project.xml
merlin/platform/tutorials/hello project.xml
merlin/platform/tutorials/parameterization project.xml
Log:
Version bump.
Revision Changes Path
1.23 +6 -6 avalon/merlin/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/maven.xml,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- maven.xml 17 Dec 2003 14:50:57 -0000 1.22
+++ maven.xml 18 Dec 2003 01:11:07 -0000 1.23
@@ -2,20 +2,20 @@
<maven:snapshot project="${pom}"/>
- <ant:property name="merlin.cli.jar" value="merlin-cli-3.2-dev.jar"/>
- <ant:property name="avalon.plugin.jar" value="avalon-plugin-1.0-dev.jar"/>
- <ant:property name="meta.plugin.jar" value="avalon-meta-plugin-1.2.jar"/>
- <ant:property name="merlin.plugin.jar" value="merlin-plugin-3.2.1-dev.jar"/>
+ <ant:property name="merlin.cli.jar" value="merlin-cli-3.2.jar"/>
+ <ant:property name="avalon.plugin.jar" value="avalon-plugin-1.0.jar"/>
+ <ant:property name="meta.plugin.jar" value="avalon-meta-plugin-1.3.jar"/>
+ <ant:property name="merlin.plugin.jar" value="merlin-plugin-3.2.1.jar"/>
<ant:property file="project.properties"/>
<ant:property name="maven.docs.src" value="${basedir}/platform/xdocs"/>
<ant:property name="merlin.build.inst" value="merlin"/>
<ant:property name="merlin.build.inst.dir"
value="${maven.build.dir}/${merlin.build.inst}"/>
- <ant:property name="maven.jar.manifest.extensions.add" value="true"/>
+ <ant:property name="maven.jar.manifest.extensions.add" value="false"/>
<ant:property name="maven.checkstyle.format" value="avalon"/>
<ant:property name="pom.organization.identifier" value="ASF"/>
- <ant:property name="pom.specificationVersion" value="1.0"/>
+ <ant:property name="pom.specificationVersion" value="3.0"/>
<ant:property name="maven.license.licenseFile" value="${basedir}/LICENSE.txt"/>
<ant:property name="maven.javadoc.stylesheet"
value="${basedir}/platform/src/etc/stylesheet.css"/>
1.17 +22 -27 avalon/merlin/platform.xml
Index: platform.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- platform.xml 15 Dec 2003 22:46:23 -0000 1.16
+++ platform.xml 18 Dec 2003 01:11:07 -0000 1.17
@@ -28,12 +28,12 @@
<dependency>
<groupId>merlin</groupId>
<artifactId>merlin-api</artifactId>
- <version>3.2-dev</version>
+ <version>3.2</version>
</dependency>
<dependency>
<groupId>merlin</groupId>
<artifactId>merlin-impl</artifactId>
- <version>3.2-dev</version>
+ <version>3.2</version>
</dependency>
<!-- avalon dependecies -->
@@ -41,48 +41,48 @@
<dependency>
<groupId>avalon-util</groupId>
<artifactId>avalon-util-env</artifactId>
- <version>1.0-dev</version>
+ <version>1.0</version>
</dependency>
<dependency>
<groupId>avalon-util</groupId>
<artifactId>avalon-util-defaults</artifactId>
- <version>1.1-dev</version>
+ <version>1.1</version>
</dependency>
<dependency>
<groupId>avalon-util</groupId>
<artifactId>avalon-util-exception</artifactId>
- <version>1.0-dev</version>
+ <version>1.0</version>
</dependency>
<dependency>
<groupId>avalon-util</groupId>
<artifactId>avalon-util-criteria</artifactId>
- <version>1.0-dev</version>
+ <version>1.0</version>
</dependency>
<dependency>
<groupId>avalon-repository</groupId>
<artifactId>avalon-repository-api</artifactId>
- <version>1.2-dev</version>
+ <version>1.2</version>
</dependency>
<dependency>
<groupId>avalon-repository</groupId>
<artifactId>avalon-repository-spi</artifactId>
- <version>1.2-dev</version>
+ <version>1.2</version>
</dependency>
<dependency>
<groupId>avalon-repository</groupId>
<artifactId>avalon-repository-impl</artifactId>
- <version>1.2-dev</version>
+ <version>1.2</version>
</dependency>
<dependency>
<groupId>avalon-repository</groupId>
<artifactId>avalon-repository-util</artifactId>
- <version>1.2-dev</version>
+ <version>1.2</version>
</dependency>
<dependency>
<groupId>avalon-repository</groupId>
<artifactId>avalon-repository-main</artifactId>
- <version>1.2-dev</version>
+ <version>1.2</version>
</dependency>
<dependency>
@@ -99,59 +99,59 @@
<dependency>
<groupId>avalon-meta</groupId>
<artifactId>avalon-meta-api</artifactId>
- <version>1.2.1-dev</version>
+ <version>1.3</version>
</dependency>
<dependency>
<groupId>avalon-meta</groupId>
<artifactId>avalon-meta-spi</artifactId>
- <version>1.2.1-dev</version>
+ <version>1.3</version>
</dependency>
<dependency>
<groupId>avalon-meta</groupId>
<artifactId>avalon-meta-impl</artifactId>
- <version>1.2.1-dev</version>
+ <version>1.3</version>
</dependency>
<dependency>
<groupId>avalon-meta</groupId>
<artifactId>avalon-meta-tools</artifactId>
- <version>1.2.1-dev</version>
+ <version>1.3</version>
</dependency>
<dependency>
<groupId>avalon-meta</groupId>
<artifactId>avalon-meta-plugin</artifactId>
- <version>1.2</version>
+ <version>1.3</version>
</dependency>
<dependency>
<groupId>avalon-activation</groupId>
<artifactId>avalon-activation-api</artifactId>
- <version>1.2.1-dev</version>
+ <version>1.2.1</version>
</dependency>
<dependency>
<groupId>avalon-activation</groupId>
<artifactId>avalon-activation-spi</artifactId>
- <version>1.2.2-dev</version>
+ <version>1.2.2</version>
</dependency>
<dependency>
<groupId>avalon-activation</groupId>
<artifactId>avalon-activation-impl</artifactId>
- <version>1.2.3-dev</version>
+ <version>1.2.3</version>
</dependency>
<dependency>
<groupId>avalon-composition</groupId>
<artifactId>avalon-composition-api</artifactId>
- <version>1.2.1-dev</version>
+ <version>1.2.1</version>
</dependency>
<dependency>
<groupId>avalon-composition</groupId>
<artifactId>avalon-composition-spi</artifactId>
- <version>1.2.1-dev</version>
+ <version>1.2.1</version>
</dependency>
<dependency>
<groupId>avalon-composition</groupId>
<artifactId>avalon-composition-impl</artifactId>
- <version>1.2.2-dev</version>
+ <version>1.2.2</version>
</dependency>
<dependency>
@@ -256,11 +256,6 @@
<packageGroup>
<title>Extension</title>
<packages>org.apache.avalon.extension,org.apache.avalon.extension.*</packages>
- </packageGroup>
-
- <packageGroup>
- <title>Repository</title>
-
<packages>org.apache.avalon.repository,org.apache.avalon.repository.*</packages>
</packageGroup>
</packageGroups>
1.5 +3 -3 avalon/merlin/activation/api/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/activation/api/project.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.xml 3 Dec 2003 19:04:53 -0000 1.4
+++ project.xml 18 Dec 2003 01:11:07 -0000 1.5
@@ -8,7 +8,7 @@
<id>avalon-activation-api</id>
<name>Avalon Activation API</name>
<package>org.apache.avalon.activation</package>
- <currentVersion>1.2.1-dev</currentVersion>
+ <currentVersion>1.2.1</currentVersion>
<inceptionYear>2002</inceptionYear>
<shortDescription>Activation API</shortDescription>
@@ -27,12 +27,12 @@
<dependency>
<groupId>avalon-meta</groupId>
<artifactId>avalon-meta-api</artifactId>
- <version>1.2.1-dev</version>
+ <version>1.3</version>
</dependency>
<dependency>
<groupId>avalon-composition</groupId>
<artifactId>avalon-composition-api</artifactId>
- <version>1.2.1-dev</version>
+ <version>1.2.1</version>
</dependency>
</dependencies>
1.11 +13 -13 avalon/merlin/activation/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/activation/impl/project.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- project.xml 15 Dec 2003 22:46:22 -0000 1.10
+++ project.xml 18 Dec 2003 01:11:07 -0000 1.11
@@ -8,7 +8,7 @@
<id>avalon-activation-impl</id>
<name>Avalon Activation Framework</name>
<package>org.apache.avalon.activation</package>
- <currentVersion>1.2.3-dev</currentVersion>
+ <currentVersion>1.2.3</currentVersion>
<inceptionYear>2002</inceptionYear>
<shortDescription>Runtime activation framework.</shortDescription>
@@ -33,65 +33,65 @@
<dependency>
<groupId>avalon-repository</groupId>
<artifactId>avalon-repository-api</artifactId>
- <version>1.2-dev</version>
+ <version>1.2</version>
</dependency>
<dependency>
<groupId>avalon-repository</groupId>
<artifactId>avalon-repository-spi</artifactId>
- <version>1.2-dev</version>
+ <version>1.2</version>
</dependency>
<dependency>
<groupId>avalon-repository</groupId>
<artifactId>avalon-repository-impl</artifactId>
- <version>1.2-dev</version>
+ <version>1.2</version>
</dependency>
<dependency>
<groupId>avalon-repository</groupId>
<artifactId>avalon-repository-util</artifactId>
- <version>1.2-dev</version>
+ <version>1.2</version>
</dependency>
<dependency>
<groupId>avalon-activation</groupId>
<artifactId>avalon-activation-api</artifactId>
- <version>1.2.1-dev</version>
+ <version>1.2.1</version>
</dependency>
<dependency>
<groupId>avalon-activation</groupId>
<artifactId>avalon-activation-spi</artifactId>
- <version>1.2.2-dev</version>
+ <version>1.2.2</version>
</dependency>
<dependency>
<groupId>avalon-composition</groupId>
<artifactId>avalon-composition-api</artifactId>
- <version>1.2.1-dev</version>
+ <version>1.2.1</version>
</dependency>
<dependency>
<groupId>avalon-composition</groupId>
<artifactId>avalon-composition-spi</artifactId>
- <version>1.2.1-dev</version>
+ <version>1.2.1</version>
</dependency>
<dependency>
<groupId>avalon-composition</groupId>
<artifactId>avalon-composition-impl</artifactId>
- <version>1.2.2-dev</version>
+ <version>1.2.2</version>
</dependency>
<dependency>
<groupId>avalon-meta</groupId>
<artifactId>avalon-meta-api</artifactId>
- <version>1.2.1-dev</version>
+ <version>1.3</version>
</dependency>
<dependency>
<groupId>avalon-meta</groupId>
<artifactId>avalon-meta-spi</artifactId>
- <version>1.2.1-dev</version>
+ <version>1.3</version>
</dependency>
<dependency>
<groupId>avalon-meta</groupId>
<artifactId>avalon-meta-impl</artifactId>
- <version>1.2.1-dev</version>
+ <version>1.3</version>
</dependency>
<dependency>
1.4 +1 -1
avalon/merlin/activation/impl/src/test/org/apache/avalon/activation/appliance/AbstractTestCase.java
Index: AbstractTestCase.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/activation/impl/src/test/org/apache/avalon/activation/appliance/AbstractTestCase.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractTestCase.java 18 Oct 2003 00:34:19 -0000 1.3
+++ AbstractTestCase.java 18 Dec 2003 01:11:07 -0000 1.4
@@ -82,7 +82,7 @@
File local = new File( base, "repository" );
SystemContext system =
DefaultSystemContext.createSystemContext(
- base, local, ConsoleLogger.LEVEL_DEBUG );
+ base, local, ConsoleLogger.LEVEL_INFO );
m_logger = system.getLogger();
//
1.9 +6 -6 avalon/merlin/activation/spi/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/activation/spi/project.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- project.xml 15 Dec 2003 22:46:22 -0000 1.8
+++ project.xml 18 Dec 2003 01:11:07 -0000 1.9
@@ -8,7 +8,7 @@
<id>avalon-activation-spi</id>
<name>Avalon Activation SPI</name>
<package>org.apache.avalon.activation</package>
- <currentVersion>1.2.2-dev</currentVersion>
+ <currentVersion>1.2.2</currentVersion>
<inceptionYear>2002</inceptionYear>
<shortDescription>Activation Service Provider Interface</shortDescription>
@@ -24,7 +24,7 @@
<dependency>
<groupId>avalon-repository</groupId>
<artifactId>avalon-repository-api</artifactId>
- <version>1.2-dev</version>
+ <version>1.2</version>
</dependency>
<dependency>
@@ -36,24 +36,24 @@
<dependency>
<groupId>avalon-meta</groupId>
<artifactId>avalon-meta-api</artifactId>
- <version>1.2.1-dev</version>
+ <version>1.3</version>
</dependency>
<dependency>
<groupId>avalon-meta</groupId>
<artifactId>avalon-meta-spi</artifactId>
- <version>1.2.1-dev</version>
+ <version>1.3</version>
</dependency>
<dependency>
<groupId>avalon-composition</groupId>
<artifactId>avalon-composition-api</artifactId>
- <version>1.2.1-dev</version>
+ <version>1.2.1</version>
</dependency>
<dependency>
<groupId>avalon-activation</groupId>
<artifactId>avalon-activation-api</artifactId>
- <version>1.2.1-dev</version>
+ <version>1.2.1</version>
</dependency>
<dependency>
1.8 +3 -3 avalon/merlin/composition/api/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/api/project.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- project.xml 15 Dec 2003 22:46:22 -0000 1.7
+++ project.xml 18 Dec 2003 01:11:07 -0000 1.8
@@ -8,7 +8,7 @@
<id>avalon-composition-api</id>
<name>Avalon Composition API</name>
<package>org.apache.avalon.assembly</package>
- <currentVersion>1.2.1-dev</currentVersion>
+ <currentVersion>1.2.1</currentVersion>
<inceptionYear>2002</inceptionYear>
<shortDescription>Avalon Composition SPI</shortDescription>
@@ -28,13 +28,13 @@
<dependency>
<groupId>avalon-repository</groupId>
<artifactId>avalon-repository-api</artifactId>
- <version>1.2-dev</version>
+ <version>1.2</version>
</dependency>
<dependency>
<groupId>avalon-meta</groupId>
<artifactId>avalon-meta-api</artifactId>
- <version>1.2.1-dev</version>
+ <version>1.3</version>
</dependency>
<dependency>
1.9 +10 -10 avalon/merlin/composition/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/project.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- project.xml 15 Dec 2003 22:46:22 -0000 1.8
+++ project.xml 18 Dec 2003 01:11:07 -0000 1.9
@@ -8,7 +8,7 @@
<id>avalon-composition-impl</id>
<name>Avalon Composition Framework</name>
<package>org.apache.avalon.composition</package>
- <currentVersion>1.2.2-dev</currentVersion>
+ <currentVersion>1.2.2</currentVersion>
<inceptionYear>2002</inceptionYear>
<shortDescription>Avalon Composition Framework.</shortDescription>
@@ -20,22 +20,22 @@
<dependency>
<groupId>avalon-repository</groupId>
<artifactId>avalon-repository-api</artifactId>
- <version>1.2-dev</version>
+ <version>1.2</version>
</dependency>
<dependency>
<groupId>avalon-repository</groupId>
<artifactId>avalon-repository-spi</artifactId>
- <version>1.2-dev</version>
+ <version>1.2</version>
</dependency>
<dependency>
<groupId>avalon-repository</groupId>
<artifactId>avalon-repository-impl</artifactId>
- <version>1.2-dev</version>
+ <version>1.2</version>
</dependency>
<dependency>
<groupId>avalon-repository</groupId>
<artifactId>avalon-repository-util</artifactId>
- <version>1.2-dev</version>
+ <version>1.2</version>
</dependency>
<dependency>
@@ -52,28 +52,28 @@
<dependency>
<groupId>avalon-meta</groupId>
<artifactId>avalon-meta-api</artifactId>
- <version>1.2.1-dev</version>
+ <version>1.3</version>
</dependency>
<dependency>
<groupId>avalon-meta</groupId>
<artifactId>avalon-meta-spi</artifactId>
- <version>1.2.1-dev</version>
+ <version>1.3</version>
</dependency>
<dependency>
<groupId>avalon-meta</groupId>
<artifactId>avalon-meta-impl</artifactId>
- <version>1.2.1-dev</version>
+ <version>1.3</version>
</dependency>
<dependency>
<groupId>avalon-composition</groupId>
<artifactId>avalon-composition-api</artifactId>
- <version>1.2.1-dev</version>
+ <version>1.2.1</version>
</dependency>
<dependency>
<groupId>avalon-composition</groupId>
<artifactId>avalon-composition-spi</artifactId>
- <version>1.2.1-dev</version>
+ <version>1.2.1</version>
</dependency>
<dependency>
1.2 +1 -1 avalon/merlin/composition/impl/src/test/conf/includes.xml
Index: includes.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/test/conf/includes.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- includes.xml 24 Sep 2003 09:32:20 -0000 1.1
+++ includes.xml 18 Dec 2003 01:11:07 -0000 1.2
@@ -3,7 +3,7 @@
<include name="test" id="test:includes">
<target path="primary/block/test">
- <categories priority="DEBUG"/>
+ <categories priority="INFO"/>
</target>
</include>
1.9 +2 -2 avalon/merlin/composition/spi/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/spi/project.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- project.xml 15 Dec 2003 22:46:23 -0000 1.8
+++ project.xml 18 Dec 2003 01:11:07 -0000 1.9
@@ -8,7 +8,7 @@
<id>avalon-composition-spi</id>
<name>Avalon Composition SPI</name>
<package>org.apache.avalon.assembly</package>
- <currentVersion>1.2.1-dev</currentVersion>
+ <currentVersion>1.2.1</currentVersion>
<inceptionYear>2002</inceptionYear>
<shortDescription>Avalon Composition SPI</shortDescription>
@@ -34,7 +34,7 @@
<dependency>
<groupId>avalon-composition</groupId>
<artifactId>avalon-composition-api</artifactId>
- <version>1.2.1-dev</version>
+ <version>1.2.1</version>
</dependency>
</dependencies>
1.2 +4 -4 avalon/merlin/kernel/api/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/api/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 8 Dec 2003 15:37:12 -0000 1.1
+++ project.xml 18 Dec 2003 01:11:07 -0000 1.2
@@ -9,7 +9,7 @@
<name>Merlin API</name>
<package>org.apache.avalon.merlin</package>
- <currentVersion>3.2-dev</currentVersion>
+ <currentVersion>3.2</currentVersion>
<inceptionYear>2002</inceptionYear>
<shortDescription>Merlin API</shortDescription>
@@ -26,17 +26,17 @@
<dependency>
<groupId>avalon-repository</groupId>
<artifactId>avalon-repository-api</artifactId>
- <version>1.2-dev</version>
+ <version>1.2</version>
</dependency>
<dependency>
<groupId>avalon-composition</groupId>
<artifactId>avalon-composition-api</artifactId>
- <version>1.2.1-dev</version>
+ <version>1.2.1</version>
</dependency>
<dependency>
<groupId>avalon-activation</groupId>
<artifactId>avalon-activation-api</artifactId>
- <version>1.2.1-dev</version>
+ <version>1.2.1</version>
</dependency>
</dependencies>
1.3 +0 -34 avalon/merlin/kernel/cli/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/cli/maven.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- maven.xml 14 Dec 2003 11:58:26 -0000 1.2
+++ maven.xml 18 Dec 2003 01:11:08 -0000 1.3
@@ -2,12 +2,6 @@
<project default="jar:install" xmlns:maven="jelly:maven" xmlns:j="jelly:core"
xmlns:util="jelly:util" xmlns:ant="jelly:ant">
<!--
- <postGoal name="java:prepare-filesystem">
- <attainGoal name="avalon:artifact"/>
- </postGoal>
- -->
-
- <!--
Add the merlin.properties file.
-->
<postGoal name="java:compile">
@@ -26,33 +20,5 @@
</unzip>
</j:forEach>
</preGoal>
-
- <!--
- ###################################################################
- # Create the merlin.implementation property file. #
- # This contains the information used to identify the #
- # the implementation artifact classpath, factory, etc. #
- ###################################################################
- -->
- <!--
- <postGoal name="java:compile">
- <ant:echo file="${maven.build.dir}/classes/merlin.implementation">
-#===================================================================#
-# Default merlin implementation artifact identifier. #
-#===================================================================#
-
-meta.domain = avalon
-meta.version = 1.0
-avalon.artifact.group = ${merlin.implementation.group}
-avalon.artifact.name = ${merlin.implementation.name}
-avalon.artifact.version = ${merlin.implementation.version}
-
-#
-# EOF
-#
-</ant:echo>
- </postGoal>
- -->
-
</project>
1.2 +0 -6 avalon/merlin/kernel/cli/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/cli/project.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.properties 8 Dec 2003 15:37:12 -0000 1.1
+++ project.properties 18 Dec 2003 01:11:08 -0000 1.2
@@ -1,9 +1,3 @@
-#
-# default implementation
-#
-merlin.implementation.group = merlin
-merlin.implementation.name = merlin-impl
-merlin.implementation.version = 3.2-dev
#
# main class
1.2 +2 -2 avalon/merlin/kernel/cli/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/cli/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 8 Dec 2003 15:37:12 -0000 1.1
+++ project.xml 18 Dec 2003 01:11:08 -0000 1.2
@@ -7,7 +7,7 @@
<groupId>merlin</groupId>
<id>merlin-cli</id>
<name>Merlin CLI</name>
- <currentVersion>3.2-dev</currentVersion>
+ <currentVersion>3.2</currentVersion>
<package>org.apache.avalon.merlin.cli</package>
@@ -18,7 +18,7 @@
<dependency>
<groupId>avalon-repository</groupId>
<artifactId>avalon-repository-main</artifactId>
- <version>1.2-dev</version>
+ <version>1.2</version>
</dependency>
<dependency>
<id>commons-cli</id>
1.14 +26 -22 avalon/merlin/kernel/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/impl/project.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- project.xml 15 Dec 2003 22:46:23 -0000 1.13
+++ project.xml 18 Dec 2003 01:11:08 -0000 1.14
@@ -9,9 +9,9 @@
<name>Merlin Implementation</name>
<package>org.apache.avalon.merlin</package>
- <currentVersion>3.2-dev</currentVersion>
+ <currentVersion>3.2</currentVersion>
<inceptionYear>2002</inceptionYear>
- <shortDescription>Merlin Implementation</shortDescription>
+ <shortDescription>Merlin Implementation.</shortDescription>
<description>
Merlin service management platform.
@@ -24,7 +24,7 @@
<dependency>
<groupId>merlin</groupId>
<artifactId>merlin-api</artifactId>
- <version>3.2-dev</version>
+ <version>3.2</version>
<properties>
<avalon.classloader>api</avalon.classloader>
</properties>
@@ -35,7 +35,7 @@
<dependency>
<groupId>avalon-activation</groupId>
<artifactId>avalon-activation-api</artifactId>
- <version>1.2.1-dev</version>
+ <version>1.2.1</version>
<properties>
<avalon.classloader>api</avalon.classloader>
</properties>
@@ -43,7 +43,7 @@
<dependency>
<groupId>avalon-activation</groupId>
<artifactId>avalon-activation-spi</artifactId>
- <version>1.2.2-dev</version>
+ <version>1.2.2</version>
<properties>
<avalon.classloader>spi</avalon.classloader>
</properties>
@@ -51,13 +51,13 @@
<dependency>
<groupId>avalon-activation</groupId>
<artifactId>avalon-activation-impl</artifactId>
- <version>1.2.3-dev</version>
+ <version>1.2.3</version>
</dependency>
<dependency>
<groupId>avalon-repository</groupId>
<artifactId>avalon-repository-api</artifactId>
- <version>1.2-dev</version>
+ <version>1.2</version>
<properties>
<avalon.classloader>api</avalon.classloader>
</properties>
@@ -65,7 +65,7 @@
<dependency>
<groupId>avalon-repository</groupId>
<artifactId>avalon-repository-spi</artifactId>
- <version>1.2-dev</version>
+ <version>1.2</version>
<properties>
<avalon.classloader>spi</avalon.classloader>
</properties>
@@ -74,7 +74,7 @@
<dependency>
<groupId>avalon-composition</groupId>
<artifactId>avalon-composition-api</artifactId>
- <version>1.2.1-dev</version>
+ <version>1.2.1</version>
<properties>
<avalon.classloader>api</avalon.classloader>
</properties>
@@ -82,7 +82,7 @@
<dependency>
<groupId>avalon-composition</groupId>
<artifactId>avalon-composition-spi</artifactId>
- <version>1.2.1-dev</version>
+ <version>1.2.1</version>
<properties>
<avalon.classloader>spi</avalon.classloader>
</properties>
@@ -90,13 +90,13 @@
<dependency>
<groupId>avalon-composition</groupId>
<artifactId>avalon-composition-impl</artifactId>
- <version>1.2.2-dev</version>
+ <version>1.2.2</version>
</dependency>
<dependency>
<groupId>avalon-meta</groupId>
<artifactId>avalon-meta-api</artifactId>
- <version>1.2.1-dev</version>
+ <version>1.3</version>
<properties>
<avalon.classloader>api</avalon.classloader>
</properties>
@@ -104,7 +104,7 @@
<dependency>
<groupId>avalon-meta</groupId>
<artifactId>avalon-meta-spi</artifactId>
- <version>1.2.1-dev</version>
+ <version>1.3</version>
<properties>
<avalon.classloader>spi</avalon.classloader>
</properties>
@@ -112,7 +112,7 @@
<dependency>
<groupId>avalon-meta</groupId>
<artifactId>avalon-meta-impl</artifactId>
- <version>1.2.1-dev</version>
+ <version>1.3</version>
</dependency>
<dependency>
@@ -145,28 +145,29 @@
<dependency>
<groupId>avalon-util</groupId>
<artifactId>avalon-util-defaults</artifactId>
- <version>1.1-dev</version>
+ <version>1.1</version>
</dependency>
<dependency>
<groupId>avalon-util</groupId>
<artifactId>avalon-util-env</artifactId>
- <version>1.0-dev</version>
+ <version>1.0</version>
</dependency>
<dependency>
<groupId>avalon-util</groupId>
<artifactId>avalon-util-exception</artifactId>
- <version>1.0-dev</version>
+ <version>1.0</version>
</dependency>
<dependency>
<groupId>avalon-util</groupId>
<artifactId>avalon-util-criteria</artifactId>
- <version>1.0-dev</version>
+ <version>1.0</version>
</dependency>
<!-- logkit dependecies -->
<dependency>
- <id>logkit</id>
+ <groupId>logkit</groupId>
+ <artifactId>logkit</artifactId>
<version>1.2</version>
</dependency>
@@ -214,14 +215,16 @@
<!-- commons dependencies -->
<dependency>
- <id>commons-collections</id>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
<version>2.1</version>
</dependency>
<!-- pre JDK 1.4 dependencies -->
<dependency>
- <id>xml-apis</id>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
<version>2.0.2</version>
<properties>
<avalon.classloader>api</avalon.classloader>
@@ -236,7 +239,8 @@
</properties>
</dependency>
<dependency>
- <id>xerces</id>
+ <groupId>xerces</groupId>
+ <artifactId>xerces</artifactId>
<version>2.4.0</version>
</dependency>
1.14 +2 -2 avalon/merlin/kernel/plugin/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/plugin/project.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- project.xml 11 Dec 2003 04:51:49 -0000 1.13
+++ project.xml 18 Dec 2003 01:11:08 -0000 1.14
@@ -10,13 +10,13 @@
<description>Merlin Plugin for Maven</description>
<shortDescription>Merlin Plugin for Maven</shortDescription>
<package>org.apache.avalon.merlin</package>
- <currentVersion>3.2.1-dev</currentVersion>
+ <currentVersion>3.2.1</currentVersion>
<dependencies>
<dependency>
<groupId>avalon-repository</groupId>
<artifactId>avalon-repository-main</artifactId>
- <version>1.2-dev</version>
+ <version>1.2</version>
<properties>
<classloader>root</classloader>
</properties>
1.19 +2 -2 avalon/merlin/kernel/unit/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/unit/project.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- project.xml 14 Dec 2003 09:56:08 -0000 1.18
+++ project.xml 18 Dec 2003 01:11:08 -0000 1.19
@@ -7,7 +7,7 @@
<groupId>merlin</groupId>
<id>merlin-unit</id>
<name>Merlin Unit Test</name>
- <currentVersion>3.2.6-dev</currentVersion>
+ <currentVersion>3.2.6</currentVersion>
<package>org.apache.avalon.merlin</package>
@@ -18,7 +18,7 @@
<dependency>
<groupId>avalon-repository</groupId>
<artifactId>avalon-repository-main</artifactId>
- <version>1.2-dev</version>
+ <version>1.2</version>
</dependency>
<dependency>
<groupId>junit</groupId>
1.10 +1 -1 avalon/merlin/platform/tutorials/hello/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/tutorials/hello/project.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- project.xml 11 Dec 2003 04:51:50 -0000 1.9
+++ project.xml 18 Dec 2003 01:11:08 -0000 1.10
@@ -27,7 +27,7 @@
<dependency>
<groupId>merlin</groupId>
<artifactId>merlin-unit</artifactId>
- <version>3.2.6-dev</version>
+ <version>3.2.6</version>
</dependency>
</dependencies>
1.4 +1 -1 avalon/merlin/platform/tutorials/parameterization/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/tutorials/parameterization/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 11 Dec 2003 04:51:50 -0000 1.3
+++ project.xml 18 Dec 2003 01:11:08 -0000 1.4
@@ -27,7 +27,7 @@
<dependency>
<groupId>merlin</groupId>
<artifactId>merlin-unit</artifactId>
- <version>3.2.6-dev</version>
+ <version>3.2.6</version>
</dependency>
</dependencies>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
