You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by mc...@apache.org on 2004/01/02 00:34:45 UTC
cvs commit: avalon/merlin/platform/xdocs/starting/installation/3.2 binary.xml
mcconnell 2004/01/01 15:34:45
Modified: merlin INSTALL.TXT maven.xml platform.xml project.xml
merlin/activation/impl project.xml
merlin/composition/impl project.xml
merlin/composition/impl/src/java/org/apache/avalon/composition/data/builder
XMLDeploymentProfileCreator.java
merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl
DefaultContextModel.java
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/xdocs/starting/installation/3.2 binary.xml
Removed: merlin/composition/impl/src/test/org/apache/avalon/composition/data
DataTestCase.java
Log:
Correct a bug in the composition implementation in the case of a component type that contains only optional context entries and no context directive is declared in a block. Previously this generated a NPE. The update ensures that a non-null directive is generated and checks for optionality of the entry when processing the meta-model. Version bump on composition-impl and dependent packages.
Revision Changes Path
1.5 +4 -4 avalon/merlin/INSTALL.TXT
Index: INSTALL.TXT
===================================================================
RCS file: /home/cvs/avalon/merlin/INSTALL.TXT,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- INSTALL.TXT 29 Dec 2003 22:56:18 -0000 1.4
+++ INSTALL.TXT 1 Jan 2004 23:34:45 -0000 1.5
@@ -16,8 +16,8 @@
LICENSE.TXT
INSTALL.TXT
/plugins
- avalon-meta-plugin-1.2.jar
- merlin-plugin-3.2.2-dev.jar
+ avalon-meta-plugin-1.3.1.jar
+ merlin-plugin-3.2.3-dev.jar
Installing Merlin.
@@ -68,8 +68,8 @@
Maven platform. These plugins should be placed in the Maven plugin
directory (${maven.home.local}\plugins).
- [YOUR-MAVEN-HOME]\plugins\avalon-meta-plugin-1.2.jar
- [YOUR-MAVEN-HOME]\plugins\merlin-plugin-3.2.2-dev.jar
+ [YOUR-MAVEN-HOME]\plugins\avalon-meta-plugin-1.3.1.jar
+ [YOUR-MAVEN-HOME]\plugins\merlin-plugin-3.2.3-dev.jar
Please note that if you are upgrading an existing installation you must
delete the following two directories:
1.31 +4 -4 avalon/merlin/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/maven.xml,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- maven.xml 29 Dec 2003 22:56:18 -0000 1.30
+++ maven.xml 1 Jan 2004 23:34:45 -0000 1.31
@@ -2,10 +2,10 @@
<maven:snapshot project="${pom}"/>
- <ant:property name="merlin.cli.jar" value="merlin-cli-3.2.1.jar"/>
+ <ant:property name="merlin.cli.jar" value="merlin-cli-3.2.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.2.jar"/>
+ <ant:property name="meta.plugin.jar" value="avalon-meta-plugin-1.3.1.jar"/>
+ <ant:property name="merlin.plugin.jar" value="merlin-plugin-3.2.3.jar"/>
<ant:property file="project.properties"/>
<ant:property name="maven.docs.src" value="${basedir}/platform/xdocs"/>
@@ -370,7 +370,7 @@
<maven:reactor
basedir="${basedir}"
includes="**/project.xml"
- excludes="project.xml,merlin-extensions/**"
+ excludes="project.xml,merlin-extensions/**,**/target/project.xml,platform/**"
goals="clean:clean"
banner="Cleaning subproject:"
ignoreFailures="true"/>
1.19 +3 -3 avalon/merlin/platform.xml
Index: platform.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- platform.xml 29 Dec 2003 22:56:18 -0000 1.18
+++ platform.xml 1 Jan 2004 23:34:45 -0000 1.19
@@ -109,7 +109,7 @@
<dependency>
<groupId>avalon-meta</groupId>
<artifactId>avalon-meta-impl</artifactId>
- <version>1.3</version>
+ <version>1.3.1</version>
</dependency>
<dependency>
<groupId>avalon-meta</groupId>
@@ -119,7 +119,7 @@
<dependency>
<groupId>avalon-meta</groupId>
<artifactId>avalon-meta-plugin</artifactId>
- <version>1.3</version>
+ <version>1.3.1</version>
</dependency>
<dependency>
@@ -151,7 +151,7 @@
<dependency>
<groupId>avalon-composition</groupId>
<artifactId>avalon-composition-impl</artifactId>
- <version>1.2.3</version>
+ <version>1.2.4</version>
</dependency>
<dependency>
1.18 +1 -1 avalon/merlin/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/project.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- project.xml 29 Dec 2003 22:56:18 -0000 1.17
+++ project.xml 1 Jan 2004 23:34:45 -0000 1.18
@@ -6,7 +6,7 @@
<groupId>merlin</groupId>
<id>merlin</id>
<name>Avalon Merlin</name>
- <currentVersion>3.2.2</currentVersion>
+ <currentVersion>3.2.3</currentVersion>
<organization>
<name>Apache Software Foundation</name>
1.13 +2 -2 avalon/merlin/activation/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/activation/impl/project.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- project.xml 29 Dec 2003 22:56:18 -0000 1.12
+++ project.xml 1 Jan 2004 23:34:45 -0000 1.13
@@ -75,7 +75,7 @@
<dependency>
<groupId>avalon-composition</groupId>
<artifactId>avalon-composition-impl</artifactId>
- <version>1.2.3</version>
+ <version>1.2.4</version>
</dependency>
<dependency>
@@ -91,7 +91,7 @@
<dependency>
<groupId>avalon-meta</groupId>
<artifactId>avalon-meta-impl</artifactId>
- <version>1.3</version>
+ <version>1.3.1</version>
</dependency>
<dependency>
1.12 +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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- project.xml 29 Dec 2003 22:56:18 -0000 1.11
+++ project.xml 1 Jan 2004 23:34:45 -0000 1.12
@@ -8,7 +8,7 @@
<id>avalon-composition-impl</id>
<name>Avalon Composition Framework</name>
<package>org.apache.avalon.composition</package>
- <currentVersion>1.2.3</currentVersion>
+ <currentVersion>1.2.4</currentVersion>
<inceptionYear>2002</inceptionYear>
<shortDescription>Avalon Composition Framework.</shortDescription>
@@ -62,7 +62,7 @@
<dependency>
<groupId>avalon-meta</groupId>
<artifactId>avalon-meta-impl</artifactId>
- <version>1.3</version>
+ <version>1.3.1</version>
</dependency>
<dependency>
1.7 +2 -2 avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/data/builder/XMLDeploymentProfileCreator.java
Index: XMLDeploymentProfileCreator.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/data/builder/XMLDeploymentProfileCreator.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XMLDeploymentProfileCreator.java 1 Jan 2004 13:07:37 -0000 1.6
+++ XMLDeploymentProfileCreator.java 1 Jan 2004 23:34:45 -0000 1.7
@@ -260,7 +260,7 @@
{
if( config == null )
{
- return null;
+ return new ContextDirective( null );
}
if( config.getChildren( "import" ).length > 0 )
1.3 +62 -37 avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContextModel.java
Index: DefaultContextModel.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContextModel.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultContextModel.java 28 Oct 2003 20:21:00 -0000 1.2
+++ DefaultContextModel.java 1 Jan 2004 23:34:45 -0000 1.3
@@ -129,6 +129,15 @@
ContextDirective directive, DeploymentContext context )
throws ModelException
{
+ if( null == logger )
+ throw new NullPointerException( "logger" );
+
+ if( null == descriptor )
+ throw new NullPointerException( "descriptor" );
+
+ if( null == context )
+ throw new NullPointerException( "context" );
+
enableLogging( logger );
m_descriptor = descriptor;
@@ -174,45 +183,61 @@
EntryDirective entryDirective =
directive.getEntryDirective( key );
- if( entryDirective == null )
- {
- final String error =
- REZ.getString(
- "context.missing-directive.error", key );
- throw new ModelException( error );
- }
-
- //
- // there are only two context entry models - import
- // and constructor - identify the model to use then add
- // the resolved model to the map
- //
-
- if( entryDirective instanceof ImportDirective )
- {
- ImportDirective importDirective =
- (ImportDirective) entryDirective;
- DefaultImportModel model =
- new DefaultImportModel( entry, importDirective, context, m_map );
- m_context.register( model );
- m_map.put( key, model.getValue() );
- }
- else if( entryDirective instanceof ConstructorDirective )
+ if( null == entryDirective )
{
- ConstructorDirective constructor =
- (ConstructorDirective) entryDirective;
- DefaultConstructorModel model =
- new DefaultConstructorModel( entry, constructor, context, m_map );
- m_context.register( model );
- m_map.put( key, model.getValue() );
+ if( entry.isRequired() )
+ {
+ final String error =
+ REZ.getString(
+ "context.missing-directive.error", key );
+ throw new ModelException( error );
+ }
}
else
{
- String modelClass = entryDirective.getClass().getName();
- final String error =
- REZ.getString(
- "context.unsupported-directive.error", key, modelClass );
- throw new ModelException( error );
+
+ //
+ // there are only two context entry models - import
+ // and constructor - identify the model to use then add
+ // the resolved model to the map
+ //
+
+ if( entryDirective instanceof ImportDirective )
+ {
+ ImportDirective importDirective =
+ (ImportDirective) entryDirective;
+ DefaultImportModel model =
+ new DefaultImportModel(
+ entry,
+ importDirective,
+ context,
+ m_map );
+ m_context.register( model );
+ m_map.put( key, model.getValue() );
+ }
+ else if( entryDirective instanceof ConstructorDirective )
+ {
+ ConstructorDirective constructor =
+ (ConstructorDirective) entryDirective;
+ DefaultConstructorModel model =
+ new DefaultConstructorModel(
+ entry,
+ constructor,
+ context,
+ m_map );
+ m_context.register( model );
+ m_map.put( key, model.getValue() );
+ }
+ else
+ {
+ String modelClass =
+ entryDirective.getClass().getName();
+ final String error =
+ REZ.getString(
+ "context.unsupported-directive.error",
+ key, modelClass );
+ throw new ModelException( error );
+ }
}
}
}
@@ -387,7 +412,7 @@
return DEFAULT_CONTEXT_CLASS;
}
- final String classname = m_directive.getClassname();
+ final String classname = directive.getClassname();
if( classname == null )
{
return DEFAULT_CONTEXT_CLASS;
1.4 +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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 29 Dec 2003 22:56:18 -0000 1.3
+++ project.xml 1 Jan 2004 23:34:45 -0000 1.4
@@ -7,7 +7,7 @@
<groupId>merlin</groupId>
<id>merlin-cli</id>
<name>Merlin CLI</name>
- <currentVersion>3.2.1</currentVersion>
+ <currentVersion>3.2.2</currentVersion>
<package>org.apache.avalon.merlin.cli</package>
1.16 +3 -3 avalon/merlin/kernel/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/impl/project.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- project.xml 29 Dec 2003 22:56:18 -0000 1.15
+++ project.xml 1 Jan 2004 23:34:45 -0000 1.16
@@ -9,7 +9,7 @@
<name>Merlin Implementation</name>
<package>org.apache.avalon.merlin</package>
- <currentVersion>3.2.1</currentVersion>
+ <currentVersion>3.2.2</currentVersion>
<inceptionYear>2002</inceptionYear>
<shortDescription>Merlin Implementation.</shortDescription>
@@ -90,7 +90,7 @@
<dependency>
<groupId>avalon-composition</groupId>
<artifactId>avalon-composition-impl</artifactId>
- <version>1.2.3</version>
+ <version>1.2.4</version>
</dependency>
<dependency>
@@ -112,7 +112,7 @@
<dependency>
<groupId>avalon-meta</groupId>
<artifactId>avalon-meta-impl</artifactId>
- <version>1.3</version>
+ <version>1.3.1</version>
</dependency>
<dependency>
1.16 +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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- project.xml 29 Dec 2003 22:56:18 -0000 1.15
+++ project.xml 1 Jan 2004 23:34:45 -0000 1.16
@@ -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.2</currentVersion>
+ <currentVersion>3.2.3</currentVersion>
<dependencies>
<dependency>
1.3 +1 -1 avalon/merlin/kernel/servlet/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/servlet/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 29 Dec 2003 22:56:18 -0000 1.2
+++ project.xml 1 Jan 2004 23:34:45 -0000 1.3
@@ -9,7 +9,7 @@
<name>Merlin Servlet</name>
<package>org.apache.avalon.merlin.servlet</package>
- <currentVersion>3.2.1</currentVersion>
+ <currentVersion>3.2.2</currentVersion>
<inceptionYear>2002</inceptionYear>
<shortDescription>Merlin Servlet</shortDescription>
1.21 +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.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- project.xml 29 Dec 2003 22:56:18 -0000 1.20
+++ project.xml 1 Jan 2004 23:34:45 -0000 1.21
@@ -7,7 +7,7 @@
<groupId>merlin</groupId>
<id>merlin-unit</id>
<name>Merlin Unit Test</name>
- <currentVersion>3.2.7</currentVersion>
+ <currentVersion>3.2.8</currentVersion>
<package>org.apache.avalon.merlin</package>
1.6 +1 -1 avalon/merlin/platform/src/bin/merlin
Index: merlin
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/src/bin/merlin,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- merlin 29 Dec 2003 22:56:19 -0000 1.5
+++ merlin 1 Jan 2004 23:34:45 -0000 1.6
@@ -1,7 +1,7 @@
#!/bin/sh
#
-export MERLIN_VERSION="3.2.1"
+export MERLIN_VERSION="3.2.2"
# Checking for JAVA_HOME is required on *nix due
# to some distributions stupidly including kaffe in /usr/bin
1.9 +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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- merlin-server.sh 29 Dec 2003 22:56:19 -0000 1.8
+++ merlin-server.sh 1 Jan 2004 23:34:45 -0000 1.9
@@ -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.1.jar
+MERLIN_BOOTSTRAP_JAR=$MERLIN_HOME/bin/lib/merlin-cli-3.2.2.jar
# Get the run cmd
RUN_CMD="$JAVA_HOME/bin/java $JVM_OPTS $DEBUG $MERLIN_JVM_OPTS -jar $MERLIN_BOOTSTRAP_JAR $ARGS"
1.10 +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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- merlin.bat 29 Dec 2003 22:56:19 -0000 1.9
+++ merlin.bat 1 Jan 2004 23:34:45 -0000 1.10
@@ -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.1.jar
+set MERLIN_BOOTSTRAP_JAR=%MERLIN_HOME%\bin\lib\merlin-cli-3.2.2.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.13 +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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- merlin.sh 29 Dec 2003 22:56:19 -0000 1.12
+++ merlin.sh 1 Jan 2004 23:34:45 -0000 1.13
@@ -42,7 +42,7 @@
[ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
fi
-MERLIN_BOOTSTRAP_JAR=$MERLIN_HOME/bin/lib/merlin-cli-3.2.1.jar
+MERLIN_BOOTSTRAP_JAR=$MERLIN_HOME/bin/lib/merlin-cli-3.2.2.jar
echo "Starting Merlin."
echo "================"
1.12 +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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- merlinx.bat 29 Dec 2003 22:56:19 -0000 1.11
+++ merlinx.bat 1 Jan 2004 23:34:45 -0000 1.12
@@ -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.1.jar
+set MERLIN_BOOTSTRAP_JAR=%MERLIN_HOME%\bin\lib\merlin-cli-3.2.2.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.12 +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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- merlinx.sh 29 Dec 2003 22:56:19 -0000 1.11
+++ merlinx.sh 1 Jan 2004 23:34:45 -0000 1.12
@@ -53,7 +53,7 @@
[ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
fi
-MERLIN_BOOTSTRAP_JAR=$MERLIN_HOME/bin/lib/merlin-cli-3.2.1.jar
+MERLIN_BOOTSTRAP_JAR=$MERLIN_HOME/bin/lib/merlin-cli-3.2.2.jar
echo "Starting Merlin."
echo "================"
1.9 +1 -1 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- wrapper.conf 29 Dec 2003 22:56:19 -0000 1.8
+++ wrapper.conf 1 Jan 2004 23:34:45 -0000 1.9
@@ -10,7 +10,7 @@
# 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.1.jar
+wrapper.java.classpath.2=../lib/merlin-cli-3.2.2.jar
# Java Library Path (location of Wrapper.DLL or libwrapper.so)
wrapper.java.library.path.1=.
1.4 +6 -6 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- binary.xml 29 Dec 2003 22:56:19 -0000 1.3
+++ binary.xml 1 Jan 2004 23:34:45 -0000 1.4
@@ -74,8 +74,8 @@
README.TXT
LICENSE.TXT
/plugins
- avalon-meta-plugin-1.2.jar
- merlin-plugin-3.2.2-dev.jar
+ avalon-meta-plugin-1.3.1.jar
+ merlin-plugin-3.2.3.jar
]]></source>
<p>
@@ -136,8 +136,8 @@
directory (%MAVEN_HOME%\plugins).
</p>
<source><![CDATA[
- %MAVEN_HOME%\plugins\avalon-meta-plugin-1.2.jar
- %MAVEN_HOME%\plugins\merlin-plugin-3.2.2-dev.jar
+ %MAVEN_HOME%\plugins\avalon-meta-plugin-1.3.1.jar
+ %MAVEN_HOME%\plugins\merlin-plugin-3.2.3.jar
]]></source>
<p>
@@ -147,8 +147,8 @@
directory (%MAVEN_HOME%\plugins).
</p>
<source><![CDATA[
- %MAVEN_HOME%\plugins\avalon-meta-plugin-1.2.jar
- %MAVEN_HOME%\plugins\merlin-plugin-3.2.2-dev.jar
+ %MAVEN_HOME%\plugins\avalon-meta-plugin-1.3.1.jar
+ %MAVEN_HOME%\plugins\merlin-plugin-3.2.3.jar
]]></source>
<p>
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org