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/10/03 16:12:10 UTC
cvs commit: avalon/merlin/kernel/plugin project.xml
mcconnell 2003/10/03 07:12:10
Modified: merlin maven.xml project.xml
merlin/kernel/plugin project.xml
Log:
Updates to the build to deal with a new maven release and new bugs.
Revision Changes Path
1.3 +8 -6 avalon/merlin/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/maven.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- maven.xml 26 Sep 2003 01:46:36 -0000 1.2
+++ maven.xml 3 Oct 2003 14:12:10 -0000 1.3
@@ -1,8 +1,8 @@
<project default="merlin:build" xmlns:maven="jelly:maven" xmlns:j="jelly:core" xmlns:util="jelly:util" xmlns:ant="jelly:ant">
<ant:property name="merlin.bootstrap.jar" value="merlin-bootstrap-1.0.jar"/>
- <ant:property name="merlin.plugin.jar" value="merlin-plugin-1.0.jar"/>
- <ant:property name="meta.plugin.jar" value="avalon-meta-plugin-1.1.jar"/>
+ <ant:property name="merlin.plugin.jar" value="merlin-plugin-1.1-SNAPSHOT.jar"/>
+ <ant:property name="meta.plugin.jar" value="avalon-meta-plugin-1.2-SNAPSHOT.jar"/>
<ant:property file="project.properties"/>
<ant:property name="maven.docs.src" value="${basedir}/platform/xdocs"/>
@@ -249,16 +249,19 @@
-->
<goal name="ximport">
<j:forEach var="dep" items="${pom.dependencies}">
- <mkdir dir="${maven.build.dir}/${merlin.build.inst}/system/${dep.artifactDirectory}/jars"/>
+ <mkdir dir="${maven.build.dir}/${merlin.build.inst}/system/${dep.artifactDirectory}/${dep.type}s"/>
<copy
- todir="${maven.build.dir}/${merlin.build.inst}/system/${dep.artifactDirectory}/jars/"
- file="${maven.repo.local}/${dep.artifactDirectory}/jars/${dep.artifact}"/>
+ todir="${maven.build.dir}/${merlin.build.inst}/system/${dep.artifactDirectory}/${dep.type}s/"
+ file="${maven.repo.local}/${dep.artifactDirectory}/${dep.type}s/${dep.artifact}"/>
</j:forEach>
</goal>
<!--
Generation of the documentation for the entire Merlin project including the
related subprojects.
+ NOTE: merlin site generation is broken due a bug in Maven RC1
+ Workaround is to download docs from
+ http://www.apache.org/dist/avalon/merlin/binaries/
-->
<goal name="merlin:site"
description="Build the Merlin site" prereqs="license">
@@ -268,7 +271,6 @@
banner="Building site:"
ignoreFailures="false"/>
</goal>
-
<!--
Build the tuturials distribution.
1.3 +0 -103 avalon/merlin/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 1 Oct 2003 10:47:54 -0000 1.2
+++ project.xml 3 Oct 2003 14:12:10 -0000 1.3
@@ -185,109 +185,6 @@
</contributor>
</contributors>
- <dependencies>
-
- <!-- avalon dependecies -->
-
- <dependency>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework-api</artifactId>
- <version>4.1.5</version>
- </dependency>
- <dependency>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework-impl</artifactId>
- <version>4.1.5</version>
- </dependency>
-
- <dependency>
- <groupId>avalon-meta</groupId>
- <artifactId>avalon-meta-api</artifactId>
- <version>1.1</version>
- </dependency>
- <dependency>
- <groupId>avalon-meta</groupId>
- <artifactId>avalon-meta-spi</artifactId>
- <version>1.1</version>
- </dependency>
- <dependency>
- <groupId>avalon-meta</groupId>
- <artifactId>avalon-meta-impl</artifactId>
- <version>1.1</version>
- </dependency>
- <dependency>
- <groupId>avalon-meta</groupId>
- <artifactId>avalon-meta-tools</artifactId>
- <version>1.1</version>
- </dependency>
- <dependency>
- <groupId>avalon-meta</groupId>
- <artifactId>avalon-meta-plugin</artifactId>
- <version>1.2-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <id>logkit</id>
- <version>1.2</version>
- </dependency>
-
- <!-- excalibur dependencies -->
-
- <dependency>
- <groupId>excalibur-lifecycle</groupId>
- <artifactId>excalibur-lifecycle-api</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>excalibur</groupId>
- <artifactId>excalibur-util-concurrent</artifactId>
- <version>1.3.1</version>
- </dependency>
- <dependency>
- <id>excalibur-i18n</id>
- <version>1.1</version>
- </dependency>
- <dependency>
- <id>excalibur-configuration</id>
- <version>1.1</version>
- </dependency>
- <dependency>
- <id>excalibur-pool</id>
- <version>1.2</version>
- </dependency>
- <dependency>
- <id>excalibur-event</id>
- <version>1.0.3</version>
- </dependency>
-
- <!-- mx4j dependecies -->
-
- <dependency>
- <groupId>mx4j</groupId>
- <artifactId>mx4j-jmx</artifactId>
- <version>1.1.1</version>
- </dependency>
- <dependency>
- <groupId>mx4j</groupId>
- <artifactId>mx4j-tools</artifactId>
- <version>1.1.1</version>
- </dependency>
-
- <!-- pre JDK 1.4 dependencies -->
-
- <dependency>
- <id>xml-apis</id>
- <version>2.0.2</version>
- </dependency>
- <dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xmlParserAPIs</artifactId>
- <version>2.0.2</version>
- </dependency>
-
- </dependencies>
-
-
<build>
<nagEmailAddress>dev@avalon.apache.org</nagEmailAddress>
1.2 +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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 24 Sep 2003 09:33:20 -0000 1.1
+++ project.xml 3 Oct 2003 14:12:10 -0000 1.2
@@ -8,7 +8,7 @@
<description>Merlin Plugin for Maven</description>
<shortDescription>Merlin Plugin for Maven</shortDescription>
<package>org.apache.avalon.merlin</package>
- <currentVersion>1.0</currentVersion>
+ <currentVersion>1.1-SNAPSHOT</currentVersion>
<dependencies>
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org