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 2003/07/04 09:33:13 UTC
cvs commit: avalon-sandbox/merlin/merlin-plugin plugin.jelly project.xml
mcconnell 2003/07/04 00:33:13
Modified: merlin/merlin-plugin plugin.jelly project.xml
Log:
Synchronization with the introduction of the composition package.
Revision Changes Path
1.15 +0 -9 avalon-sandbox/merlin/merlin-plugin/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-plugin/plugin.jelly,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- plugin.jelly 25 Jun 2003 03:10:03 -0000 1.14
+++ plugin.jelly 4 Jul 2003 07:33:13 -0000 1.15
@@ -40,11 +40,6 @@
format="${merlin.meta.format}"
force="${merlin.meta.force}"
postfix="${merlin.meta.type.postfix}">
- <!--
- <ant:src>
- <ant:path refid="maven.compile.src.set"/>
- </ant:src>
- -->
<j:if test="${javaSourcesPresent == 'true'}">
<ant:fileset dir="${maven.src.dir}/java">
@@ -245,10 +240,6 @@
<include name="**/*.*"/>
</fileset>
<mbeaninterface/>
- <!--
- <mlet/>
- <mx4jdescription/>
- -->
</jmx>
</goal>
1.8 +22 -13 avalon-sandbox/merlin/merlin-plugin/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-plugin/project.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- project.xml 1 Jul 2003 14:12:45 -0000 1.7
+++ project.xml 4 Jul 2003 07:33:13 -0000 1.8
@@ -39,7 +39,6 @@
<artifactId>avalon-meta</artifactId>
<version>1.0</version>
</dependency>
-
<dependency>
<groupId>avalon</groupId>
<artifactId>avalon-meta-spi</artifactId>
@@ -48,12 +47,33 @@
<dependency>
<groupId>avalon</groupId>
- <artifactId>avalon-assembly</artifactId>
+ <artifactId>avalon-composition-spi</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>avalon</groupId>
+ <artifactId>avalon-composition</artifactId>
+ <version>1.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>avalon-extension</groupId>
+ <artifactId>avalon-extension-spi</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>avalon-extension</groupId>
+ <artifactId>avalon-extension-impl</artifactId>
<version>1.0</version>
</dependency>
<dependency>
<groupId>avalon</groupId>
+ <artifactId>avalon-assembly</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>avalon</groupId>
<artifactId>avalon-assembly-spi</artifactId>
<version>1.0</version>
</dependency>
@@ -92,17 +112,6 @@
<version>1.1-dev</version>
</dependency>
- <dependency>
- <groupId>avalon-extension</groupId>
- <artifactId>avalon-extension-spi</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>avalon-extension</groupId>
- <artifactId>avalon-extension-impl</artifactId>
- <version>1.0</version>
- </dependency>
-
<!-- merlin -->
<dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org