You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by di...@apache.org on 2003/03/02 15:22:46 UTC
cvs commit: jakarta-turbine-maven/src/plugins-build/ant project.xml plugin.jelly
dion 2003/03/02 06:22:46
Modified: src/plugins-build/ant/xdocs changes.xml
src/plugins-build/ant project.xml plugin.jelly
Log:
Make ant plugin only use one remote repository for gets
Revision Changes Path
1.2 +7 -1 jakarta-turbine-maven/src/plugins-build/ant/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/ant/xdocs/changes.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- changes.xml 24 Jan 2003 03:44:35 -0000 1.1
+++ changes.xml 2 Mar 2003 14:22:46 -0000 1.2
@@ -6,7 +6,13 @@
</properties>
<body>
- <release version="1.2" date="in CVS">
+ <release version="1.3" date="in cvs">
+ <action dev="dion" type="fix">
+ Use first remote repo the user has specified for gets
+ </action>
+ </release>
+
+ <release version="1.2" date="2003-02-12">
<action dev="dion" type="add">
Added the new maven.ant.excludedTests property
</action>
1.5 +1 -1 jakarta-turbine-maven/src/plugins-build/ant/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/ant/project.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.xml 11 Feb 2003 22:33:47 -0000 1.4
+++ project.xml 2 Mar 2003 14:22:46 -0000 1.5
@@ -5,7 +5,7 @@
<pomVersion>3</pomVersion>
<id>maven-ant-plugin</id>
<name>Maven Ant Plug-in</name>
- <currentVersion>1.2</currentVersion>
+ <currentVersion>1.3-SNAPSHOT</currentVersion>
<description>Generates ant build files from a maven project, so that plain ant users can build your project</description>
<shortDescription>Java Project Management Tools</shortDescription>
<url>http://jakarta.apache.org/turbine/maven/reference/plugins/ant/</url>
1.3 +9 -5 jakarta-turbine-maven/src/plugins-build/ant/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/ant/plugin.jelly,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- plugin.jelly 8 Feb 2003 13:14:17 -0000 1.2
+++ plugin.jelly 2 Mar 2003 14:22:46 -0000 1.3
@@ -24,6 +24,10 @@
description="Generate an Ant build file">
<tstamp />
+ <!-- get first repo in the list -->
+ <u:tokenize var="repos" delim=",">${maven.repo.remote}</u:tokenize>
+ <j:set var="repo">${repos[0]}</j:set>
+
<j:file name="${maven.ant.generatebuild.file}" prettyPrint="true">
<j:whitespace xmlns="dummy">
<x:comment>
@@ -308,24 +312,24 @@
<j:forEach var="dep" items="${pom.dependencies}">
<get
- src="${maven.repo.remote}/${dep.artifactDirectory}/jars/${dep.artifact}"
+ src="${repo}/${dep.artifactDirectory}/jars/${dep.artifact}"
dest="$${libdir}/${dep.artifact}"
usetimestamp="true"
ignoreerrors="true"
/></j:forEach>
<!-- force junit for tests -->
<get
- src="${maven.repo.remote}/junit/jars/junit-3.8.1.jar"
+ src="${repo}/junit/jars/junit-3.8.1.jar"
dest="$${libdir}/junit-3.8.1.jar"
usetimestamp="true"
ignoreerrors="true"/>
<get
- src="${maven.repo.remote}/ant/jars/ant-1.5.jar"
+ src="${repo}/ant/jars/ant-1.5.jar"
dest="$${libdir}/ant-1.5.jar"
usetimestamp="true"
ignoreerrors="true"/>
<get
- src="${maven.repo.remote}/ant/jars/ant-optional-1.5.jar"
+ src="${repo}/ant/jars/ant-optional-1.5.jar"
dest="$${libdir}/ant-optional-1.5.jar"
usetimestamp="true"
ignoreerrors="true"/>
@@ -353,7 +357,7 @@
-->
<get
- src="$${maven.repo.remote}/maven/maven-install-latest.jar"
+ src="$${repo}/maven/maven-install-latest.jar"
dest="$${user.home}/maven-install-latest.jar"
usetimestamp="true"
/>