mcconnell 2003/12/29 14:56:19
Modified: merlin INSTALL.TXT maven.xml platform.xml project.xml
merlin/activation/api project.xml
merlin/activation/impl project.xml
merlin/activation/spi project.xml
merlin/composition/api project.xml
merlin/composition/impl project.xml
merlin/composition/spi project.xml
merlin/kernel/api project.xml
merlin/kernel/cli project.xml
merlin/kernel/impl project.xml
merlin/kernel/plugin project.xml
merlin/kernel/servlet project.xml
merlin/kernel/unit project.xml
merlin/platform/src/bin merlin merlin-server.sh merlin.bat
merlin.sh merlinx.bat merlinx.sh
merlin/platform/src/bin/nt wrapper.conf
merlin/platform/tutorials/context/strategy project.xml
merlin/platform/tutorials/hello project.xml
merlin/platform/tutorials/lifecycle/activation project.xml
merlin/platform/tutorials/parameterization project.xml
merlin/platform/xdocs/starting/installation/3.2 binary.xml
Log:
Bump minor versions to reflect block add/remove resolution.
Revision Changes Path
1.4 +2 -2 avalon/merlin/INSTALL.TXT
Index: INSTALL.TXT
===================================================================
RCS file: /home/cvs/avalon/merlin/INSTALL.TXT,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- INSTALL.TXT 25 Dec 2003 01:12:20 -0000 1.3
+++ INSTALL.TXT 29 Dec 2003 22:56:18 -0000 1.4
@@ -17,7 +17,7 @@
INSTALL.TXT
/plugins
avalon-meta-plugin-1.2.jar
- merlin-plugin-3.2.1-dev.jar
+ merlin-plugin-3.2.2-dev.jar
Installing Merlin.
@@ -69,7 +69,7 @@
directory (${maven.home.local}\plugins).
[YOUR-MAVEN-HOME]\plugins\avalon-meta-plugin-1.2.jar
- [YOUR-MAVEN-HOME]\plugins\merlin-plugin-3.2.1-dev.jar
+ [YOUR-MAVEN-HOME]\plugins\merlin-plugin-3.2.2-dev.jar
Please note that if you are upgrading an existing installation you must
delete the following two directories:
1.30 +2 -2 avalon/merlin/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/maven.xml,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- maven.xml 26 Dec 2003 09:24:25 -0000 1.29
+++ maven.xml 29 Dec 2003 22:56:18 -0000 1.30
@@ -2,10 +2,10 @@
<maven:snapshot project="${pom}"/>
- <ant:property name="merlin.cli.jar" value="merlin-cli-3.2.jar"/>
+ <ant:property name="merlin.cli.jar" value="merlin-cli-3.2.1.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 name="merlin.plugin.jar" value="merlin-plugin-3.2.2.jar"/>
<ant:property file="project.properties"/>
<ant:property name="maven.docs.src" value="${basedir}/platform/xdocs"/>
1.18 +5 -5 avalon/merlin/platform.xml
Index: platform.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- platform.xml 18 Dec 2003 01:11:07 -0000 1.17
+++ platform.xml 29 Dec 2003 22:56:18 -0000 1.18
@@ -33,7 +33,7 @@
<dependency>
<groupId>merlin</groupId>
<artifactId>merlin-impl</artifactId>
- <version>3.2</version>
+ <version>3.2.1</version>
</dependency>
<!-- avalon dependecies -->
@@ -125,7 +125,7 @@
<dependency>
<groupId>avalon-activation</groupId>
<artifactId>avalon-activation-api</artifactId>
- <version>1.2.1</version>
+ <version>1.2.2</version>
</dependency>
<dependency>
<groupId>avalon-activation</groupId>
@@ -135,13 +135,13 @@
<dependency>
<groupId>avalon-activation</groupId>
<artifactId>avalon-activation-impl</artifactId>
- <version>1.2.3</version>
+ <version>1.2.4</version>
</dependency>
<dependency>
<groupId>avalon-composition</groupId>
<artifactId>avalon-composition-api</artifactId>
- <version>1.2.1</version>
+ <version>1.2.2</version>
</dependency>
<dependency>
<groupId>avalon-composition</groupId>
@@ -151,7 +151,7 @@
<dependency>
<groupId>avalon-composition</groupId>
<artifactId>avalon-composition-impl</artifactId>
- <version>1.2.2</version>
+ <version>1.2.3</version>
</dependency>
<dependency>
1.17 +1 -1 avalon/merlin/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/project.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- project.xml 29 Dec 2003 14:31:21 -0000 1.16
+++ project.xml 29 Dec 2003 22:56:18 -0000 1.17
@@ -6,7 +6,7 @@
<groupId>merlin</groupId>
<id>merlin</id>
<name>Avalon Merlin</name>
- <currentVersion>3.2.1</currentVersion>
+ <currentVersion>3.2.2</currentVersion>
<organization>
<name>Apache Software Foundation</name>
1.6 +2 -2 avalon/merlin/activation/api/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/activation/api/project.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.xml 18 Dec 2003 01:11:07 -0000 1.5
+++ project.xml 29 Dec 2003 22:56:18 -0000 1.6
@@ -8,7 +8,7 @@
<id>avalon-activation-api</id>
<name>Avalon Activation API</name>
<package>org.apache.avalon.activation</package>
- <currentVersion>1.2.1</currentVersion>
+ <currentVersion>1.2.2</currentVersion>
<inceptionYear>2002</inceptionYear>
<shortDescription>Activation API</shortDescription>
@@ -32,7 +32,7 @@
<dependency>
<groupId>avalon-composition</groupId>
<artifactId>avalon-composition-api</artifactId>
- <version>1.2.1</version>
+ <version>1.2.2</version>
</dependency>
</dependencies>
1.12 +4 -4 avalon/merlin/activation/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/activation/impl/project.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- project.xml 18 Dec 2003 01:11:07 -0000 1.11
+++ project.xml 29 Dec 2003 22:56:18 -0000 1.12
@@ -8,7 +8,7 @@
<id>avalon-activation-impl</id>
<name>Avalon Activation Framework</name>
<package>org.apache.avalon.activation</package>
- <currentVersion>1.2.3</currentVersion>
+ <currentVersion>1.2.4</currentVersion>
<inceptionYear>2002</inceptionYear>
<shortDescription>Runtime activation framework.</shortDescription>
@@ -54,7 +54,7 @@
<dependency>
<groupId>avalon-activation</groupId>
<artifactId>avalon-activation-api</artifactId>
- <version>1.2.1</version>
+ <version>1.2.2</version>
</dependency>
<dependency>
<groupId>avalon-activation</groupId>
@@ -65,7 +65,7 @@
<dependency>
<groupId>avalon-composition</groupId>
<artifactId>avalon-composition-api</artifactId>
- <version>1.2.1</version>
+ <version>1.2.2</version>
</dependency>
<dependency>
<groupId>avalon-composition</groupId>
@@ -75,7 +75,7 @@
<dependency>
<groupId>avalon-composition</groupId>
<artifactId>avalon-composition-impl</artifactId>
- <version>1.2.2</version>
+ <version>1.2.3</version>
</dependency>
<dependency>
1.10 +2 -2 avalon/merlin/activation/spi/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/activation/spi/project.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- project.xml 18 Dec 2003 01:11:07 -0000 1.9
+++ project.xml 29 Dec 2003 22:56:18 -0000 1.10
@@ -47,13 +47,13 @@
<dependency>
<groupId>avalon-composition</groupId>
<artifactId>avalon-composition-api</artifactId>
- <version>1.2.1</version>
+ <version>1.2.2</version>
</dependency>
<dependency>
<groupId>avalon-activation</groupId>
<artifactId>avalon-activation-api</artifactId>
- <version>1.2.1</version>
+ <version>1.2.2</version>
</dependency>
<dependency>
1.9 +1 -1 avalon/merlin/composition/api/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/api/project.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- project.xml 18 Dec 2003 01:11:07 -0000 1.8
+++ project.xml 29 Dec 2003 22:56:18 -0000 1.9
@@ -8,7 +8,7 @@
<id>avalon-composition-api</id>
<name>Avalon Composition API</name>
<package>org.apache.avalon.assembly</package>
- <currentVersion>1.2.1</currentVersion>
+ <currentVersion>1.2.2</currentVersion>
<inceptionYear>2002</inceptionYear>
<shortDescription>Avalon Composition SPI</shortDescription>
1.11 +2 -2 avalon/merlin/composition/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/project.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- project.xml 29 Dec 2003 14:31:21 -0000 1.10
+++ project.xml 29 Dec 2003 22:56:18 -0000 1.11
@@ -8,7 +8,7 @@
<id>avalon-composition-impl</id>
<name>Avalon Composition Framework</name>
<package>org.apache.avalon.composition</package>
- <currentVersion>1.2.2</currentVersion>
+ <currentVersion>1.2.3</currentVersion>
<inceptionYear>2002</inceptionYear>
<shortDescription>Avalon Composition Framework.</shortDescription>
@@ -68,7 +68,7 @@
<dependency>
<groupId>avalon-composition</groupId>
<artifactId>avalon-composition-api</artifactId>
- <version>1.2.1</version>
+ <version>1.2.2</version>
</dependency>
<dependency>
<groupId>avalon-composition</groupId>
1.10 +1 -1 avalon/merlin/composition/spi/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/spi/project.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- project.xml 18 Dec 2003 01:11:07 -0000 1.9
+++ project.xml 29 Dec 2003 22:56:18 -0000 1.10
@@ -34,7 +34,7 @@
<dependency>
<groupId>avalon-composition</groupId>
<artifactId>avalon-composition-api</artifactId>
- <version>1.2.1</version>
+ <version>1.2.2</version>
</dependency>
</dependencies>
1.3 +2 -2 avalon/merlin/kernel/api/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/api/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 18 Dec 2003 01:11:07 -0000 1.2
+++ project.xml 29 Dec 2003 22:56:18 -0000 1.3
@@ -31,12 +31,12 @@
<dependency>
<groupId>avalon-composition</groupId>
<artifactId>avalon-composition-api</artifactId>
- <version>1.2.1</version>
+ <version>1.2.2</version>
</dependency>
<dependency>
<groupId>avalon-activation</groupId>
<artifactId>avalon-activation-api</artifactId>
- <version>1.2.1</version>
+ <version>1.2.2</version>
</dependency>
</dependencies>
1.3 +1 -1 avalon/merlin/kernel/cli/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/cli/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 18 Dec 2003 01:11:08 -0000 1.2
+++ project.xml 29 Dec 2003 22:56:18 -0000 1.3
@@ -7,7 +7,7 @@
<groupId>merlin</groupId>
<id>merlin-cli</id>
<name>Merlin CLI</name>
- <currentVersion>3.2</currentVersion>
+ <currentVersion>3.2.1</currentVersion>
<package>org.apache.avalon.merlin.cli</package>
1.15 +5 -5 avalon/merlin/kernel/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/impl/project.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- project.xml 18 Dec 2003 01:11:08 -0000 1.14
+++ project.xml 29 Dec 2003 22:56:18 -0000 1.15
@@ -9,7 +9,7 @@
<name>Merlin Implementation</name>
<package>org.apache.avalon.merlin</package>
- <currentVersion>3.2</currentVersion>
+ <currentVersion>3.2.1</currentVersion>
<inceptionYear>2002</inceptionYear>
<shortDescription>Merlin Implementation.</shortDescription>
@@ -35,7 +35,7 @@
<dependency>
<groupId>avalon-activation</groupId>
<artifactId>avalon-activation-api</artifactId>
- <version>1.2.1</version>
+ <version>1.2.2</version>
<properties>
<avalon.classloader>api</avalon.classloader>
</properties>
@@ -51,7 +51,7 @@
<dependency>
<groupId>avalon-activation</groupId>
<artifactId>avalon-activation-impl</artifactId>
- <version>1.2.3</version>
+ <version>1.2.4</version>
</dependency>
<dependency>
@@ -74,7 +74,7 @@
<dependency>
<groupId>avalon-composition</groupId>
<artifactId>avalon-composition-api</artifactId>
- <version>1.2.1</version>
+ <version>1.2.2</version>
<properties>
<avalon.classloader>api</avalon.classloader>
</properties>
@@ -90,7 +90,7 @@
<dependency>
<groupId>avalon-composition</groupId>
<artifactId>avalon-composition-impl</artifactId>
- <version>1.2.2</version>
+ <version>1.2.3</version>
</dependency>
<dependency>
1.15 +1 -1 avalon/merlin/kernel/plugin/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/plugin/project.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- project.xml 18 Dec 2003 01:11:08 -0000 1.14
+++ project.xml 29 Dec 2003 22:56:18 -0000 1.15
@@ -10,7 +10,7 @@
<description>Merlin Plugin for Maven</description>
<shortDescription>Merlin Plugin for Maven</shortDescription>
<package>org.apache.avalon.merlin</package>
- <currentVersion>3.2.1</currentVersion>
+ <currentVersion>3.2.2</currentVersion>
<dependencies>
<dependency>
1.2 +3 -3 avalon/merlin/kernel/servlet/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/servlet/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 21 Dec 2003 01:43:47 -0000 1.1
+++ project.xml 29 Dec 2003 22:56:18 -0000 1.2
@@ -9,7 +9,7 @@
<name>Merlin Servlet</name>
<package>org.apache.avalon.merlin.servlet</package>
- <currentVersion>3.2</currentVersion>
+ <currentVersion>3.2.1</currentVersion>
<inceptionYear>2002</inceptionYear>
<shortDescription>Merlin Servlet</shortDescription>
@@ -48,7 +48,7 @@
<dependency>
<groupId>avalon-composition</groupId>
<artifactId>avalon-composition-api</artifactId>
- <version>1.2.1</version>
+ <version>1.2.2</version>
<type>jar</type>
<properties>
<war.bundle>true</war.bundle>
@@ -57,7 +57,7 @@
<dependency>
<groupId>avalon-activation</groupId>
<artifactId>avalon-activation-api</artifactId>
- <version>1.2.1</version>
+ <version>1.2.2</version>
<type>jar</type>
<properties>
<war.bundle>true</war.bundle>
1.20 +1 -1 avalon/merlin/kernel/unit/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/unit/project.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- project.xml 18 Dec 2003 01:11:08 -0000 1.19
+++ project.xml 29 Dec 2003 22:56:18 -0000 1.20
@@ -7,7 +7,7 @@
<groupId>merlin</groupId>
<id>merlin-unit</id>
<name>Merlin Unit Test</name>
- <currentVersion>3.2.6</currentVersion>
+ <currentVersion>3.2.7</currentVersion>
<package>org.apache.avalon.merlin</package>
1.5 +1 -1 avalon/merlin/platform/src/bin/merlin
Index: merlin
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/src/bin/merlin,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- merlin 29 Dec 2003 02:24:44 -0000 1.4
+++ merlin 29 Dec 2003 22:56:19 -0000 1.5
@@ -1,7 +1,7 @@
#!/bin/sh
#
-export MERLIN_VERSION="3.2"
+export MERLIN_VERSION="3.2.1"
# Checking for JAVA_HOME is required on *nix due
# to some distributions stupidly including kaffe in /usr/bin
1.8 +1 -1 avalon/merlin/platform/src/bin/merlin-server.sh
Index: merlin-server.sh
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/src/bin/merlin-server.sh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- merlin-server.sh 22 Dec 2003 13:57:53 -0000 1.7
+++ merlin-server.sh 29 Dec 2003 22:56:19 -0000 1.8
@@ -107,7 +107,7 @@
JVM_EXT_DIRS="$MERLIN_HOME/ext"
JVM_OPTS="-Djava.security.policy=$MERLIN_HOME/bin/security.policy
-Djava.ext.dirs=$JVM_EXT_DIRS"
-MERLIN_BOOTSTRAP_JAR=$MERLIN_HOME/bin/lib/merlin-cli-3.2.jar
+MERLIN_BOOTSTRAP_JAR=$MERLIN_HOME/bin/lib/merlin-cli-3.2.1.jar
# Get the run cmd
RUN_CMD="$JAVA_HOME/bin/java $JVM_OPTS $DEBUG $MERLIN_JVM_OPTS -jar
$MERLIN_BOOTSTRAP_JAR $ARGS"
1.9 +1 -1 avalon/merlin/platform/src/bin/merlin.bat
Index: merlin.bat
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/src/bin/merlin.bat,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- merlin.bat 22 Dec 2003 13:57:53 -0000 1.8
+++ merlin.bat 29 Dec 2003 22:56:19 -0000 1.9
@@ -1,7 +1,7 @@
@echo off
if "%MERLIN_HOME%" == "" set MERLIN_HOME=%USERPROFILE%\.merlin
set MERLIN_CMD_LINE_ARGS=%*
-set MERLIN_BOOTSTRAP_JAR=%MERLIN_HOME%\bin\lib\merlin-cli-3.2.jar
+set MERLIN_BOOTSTRAP_JAR=%MERLIN_HOME%\bin\lib\merlin-cli-3.2.1.jar
set MERLIN_SECURITY_POLICY=-Djava.security.policy=%MERLIN_HOME%\bin\security.policy
java %MERLIN_SECURITY_POLICY% %MERLIN_JVM_OPTS% -jar %MERLIN_BOOTSTRAP_JAR%
%MERLIN_CMD_LINE_ARGS%
goto EndOfScript
1.12 +1 -1 avalon/merlin/platform/src/bin/merlin.sh
Index: merlin.sh
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/src/bin/merlin.sh,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- merlin.sh 23 Dec 2003 15:07:01 -0000 1.11
+++ merlin.sh 29 Dec 2003 22:56:19 -0000 1.12
@@ -42,7 +42,7 @@
[ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
fi
-MERLIN_BOOTSTRAP_JAR=$MERLIN_HOME/bin/lib/merlin-cli-3.2.jar
+MERLIN_BOOTSTRAP_JAR=$MERLIN_HOME/bin/lib/merlin-cli-3.2.1.jar
echo "Starting Merlin."
echo "================"
1.11 +1 -1 avalon/merlin/platform/src/bin/merlinx.bat
Index: merlinx.bat
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/src/bin/merlinx.bat,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- merlinx.bat 22 Dec 2003 13:57:53 -0000 1.10
+++ merlinx.bat 29 Dec 2003 22:56:19 -0000 1.11
@@ -5,7 +5,7 @@
set WORKING_REPOSITORY=%MAVEN_HOME_LOCAL%\repository
:DoneMerlinSystem
set MERLIN_CMD_LINE_ARGS=%*
-set MERLIN_BOOTSTRAP_JAR=%MERLIN_HOME%\bin\lib\merlin-cli-3.2.jar
+set MERLIN_BOOTSTRAP_JAR=%MERLIN_HOME%\bin\lib\merlin-cli-3.2.1.jar
set MERLIN_SECURITY_POLICY=-Djava.security.policy=%MERLIN_HOME%\bin\security.policy
java %MERLIN_SECURITY_POLICY% %MERLIN_JVM_OPTS% -jar %MERLIN_BOOTSTRAP_JAR% -system
%WORKING_REPOSITORY% -repository %WORKING_REPOSITORY% %MERLIN_CMD_LINE_ARGS%
goto :EndOfScript
1.11 +1 -1 avalon/merlin/platform/src/bin/merlinx.sh
Index: merlinx.sh
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/src/bin/merlinx.sh,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- merlinx.sh 23 Dec 2003 15:07:01 -0000 1.10
+++ merlinx.sh 29 Dec 2003 22:56:19 -0000 1.11
@@ -53,7 +53,7 @@
[ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
fi
-MERLIN_BOOTSTRAP_JAR=$MERLIN_HOME/bin/lib/merlin-cli-3.2.jar
+MERLIN_BOOTSTRAP_JAR=$MERLIN_HOME/bin/lib/merlin-cli-3.2.1.jar
echo "Starting Merlin."
echo "================"
1.8 +2 -2 avalon/merlin/platform/src/bin/nt/wrapper.conf
Index: wrapper.conf
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/src/bin/nt/wrapper.conf,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- wrapper.conf 18 Dec 2003 01:33:53 -0000 1.7
+++ wrapper.conf 29 Dec 2003 22:56:19 -0000 1.8
@@ -10,13 +10,13 @@
# Java Classpath (include wrapper.jar) Add class path elements as
# needed starting from 1
wrapper.java.classpath.1=wrapper.jar
-wrapper.java.classpath.2=../lib/merlin-cli-3.2.jar
+wrapper.java.classpath.2=../lib/merlin-cli-3.2.1.jar
# Java Library Path (location of Wrapper.DLL or libwrapper.so)
wrapper.java.library.path.1=.
# Java Additional Parameters
-#wrapper.java.additional.1=-Dmerlin.home=%MERLIN_HOME%
+#wrapper.java.additional.1=
# Initial Java Heap Size (in MB)
wrapper.java.initmemory=3
1.5 +1 -1 avalon/merlin/platform/tutorials/context/strategy/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/tutorials/context/strategy/project.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.xml 12 Dec 2003 15:16:58 -0000 1.4
+++ project.xml 29 Dec 2003 22:56:19 -0000 1.5
@@ -26,7 +26,7 @@
<dependency>
<groupId>avalon-activation</groupId>
<artifactId>avalon-activation-api</artifactId>
- <version>1.2.1-dev</version>
+ <version>1.2.2/version>
</dependency>
</dependencies>
1.11 +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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- project.xml 18 Dec 2003 01:11:08 -0000 1.10
+++ project.xml 29 Dec 2003 22:56:19 -0000 1.11
@@ -27,7 +27,7 @@
<dependency>
<groupId>merlin</groupId>
<artifactId>merlin-unit</artifactId>
- <version>3.2.6</version>
+ <version>3.2.7</version>
</dependency>
</dependencies>
1.5 +3 -3
avalon/merlin/platform/tutorials/lifecycle/activation/project.xml
Index: project.xml
===================================================================
RCS file:
/home/cvs/avalon/merlin/platform/tutorials/lifecycle/activation/project.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.xml 12 Dec 2003 15:11:23 -0000 1.4
+++ project.xml 29 Dec 2003 22:56:19 -0000 1.5
@@ -26,17 +26,17 @@
<dependency>
<groupId>avalon-composition</groupId>
<artifactId>avalon-composition-api</artifactId>
- <version>1.2.1-dev</version>
+ <version>1.2.2</version>
</dependency>
<dependency>
<groupId>avalon-activation</groupId>
<artifactId>avalon-activation-api</artifactId>
- <version>1.2.1-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>
</dependencies>
1.5 +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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.xml 18 Dec 2003 01:11:08 -0000 1.4
+++ project.xml 29 Dec 2003 22:56:19 -0000 1.5
@@ -27,7 +27,7 @@
<dependency>
<groupId>merlin</groupId>
<artifactId>merlin-unit</artifactId>
- <version>3.2.6</version>
+ <version>3.2.7</version>
</dependency>
</dependencies>
1.3 +3 -3
avalon/merlin/platform/xdocs/starting/installation/3.2/binary.xml
Index: binary.xml
===================================================================
RCS file:
/home/cvs/avalon/merlin/platform/xdocs/starting/installation/3.2/binary.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- binary.xml 11 Dec 2003 04:51:50 -0000 1.2
+++ binary.xml 29 Dec 2003 22:56:19 -0000 1.3
@@ -75,7 +75,7 @@
LICENSE.TXT
/plugins
avalon-meta-plugin-1.2.jar
- merlin-plugin-3.2.1-dev.jar
+ merlin-plugin-3.2.2-dev.jar
]]></source>
<p>
@@ -137,7 +137,7 @@
</p>
<source><![CDATA[
%MAVEN_HOME%\plugins\avalon-meta-plugin-1.2.jar
- %MAVEN_HOME%\plugins\merlin-plugin-3.2.1-dev.jar
+ %MAVEN_HOME%\plugins\merlin-plugin-3.2.2-dev.jar
]]></source>
<p>
@@ -148,7 +148,7 @@
</p>
<source><![CDATA[
%MAVEN_HOME%\plugins\avalon-meta-plugin-1.2.jar
- %MAVEN_HOME%\plugins\merlin-plugin-3.2.1-dev.jar
+ %MAVEN_HOME%\plugins\merlin-plugin-3.2.2-dev.jar
]]></source>
<p>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
