brett 2004/11/10 02:18:50
Modified: dist Tag: MAVEN_DIST_1_6-branch plugin.jelly project.xml
dist/xdocs Tag: MAVEN_DIST_1_6-branch changes.xml
Log:
remove deploy warning
Revision Changes Path
No revision
No revision
1.17.2.1 +0 -10 maven-plugins/dist/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/dist/plugin.jelly,v
retrieving revision 1.17
retrieving revision 1.17.2.1
diff -u -r1.17 -r1.17.2.1
--- plugin.jelly 25 Jun 2004 13:48:53 -0000 1.17
+++ plugin.jelly 10 Nov 2004 10:18:50 -0000 1.17.2.1
@@ -23,7 +23,6 @@
xmlns:ant="jelly:ant"
xmlns:maven="jelly:maven"
xmlns:artifact="artifact"
- xmlns:deploy="deploy"
xmlns:util="jelly:util">
<!-- Poor mans version check - plugin dependencies still suck for multiple
versions -->
@@ -32,15 +31,6 @@
<ant:fail>
Must have artifact plugin v1.3 installed to use this version of the
dist plugin.
Try: maven plugin:download -DgroupId=maven
-DartifactId=maven-artifact-plugin -Dversion=1.3
- </ant:fail>
- </j:if>
- <!-- Can remove deploy dependency above when this is gone -->
- <maven:get plugin="maven-deploy-plugin" property="plugin"
var="deployPlugin" />
- <j:if test="${deployPlugin != null}">
- <ant:fail>
- Must remove the deploy plugin to use this version of the dist plugin.
- Please delete
${deployPlugin.artifactId}-${deployPlugin.currentVersion}.jar from
- ${maven.plugin.dir} and ${maven.plugin.unpacked.dir} (if it exists)
</ant:fail>
</j:if>
1.34.2.1 +6 -1 maven-plugins/dist/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/dist/project.xml,v
retrieving revision 1.34
retrieving revision 1.34.2.1
diff -u -r1.34 -r1.34.2.1
--- project.xml 25 Jun 2004 19:01:59 -0000 1.34
+++ project.xml 10 Nov 2004 10:18:50 -0000 1.34.2.1
@@ -23,7 +23,7 @@
<pomVersion>3</pomVersion>
<id>maven-dist-plugin</id>
<name>Maven Distribution Plugin</name>
- <currentVersion>1.6</currentVersion>
+ <currentVersion>1.6.1</currentVersion>
<shortDescription>Create source and binary distributions</shortDescription>
<url>http://maven.apache.org/reference/plugins/dist/</url>
<issueTrackingUrl>http://jira.codehaus.org/browse/MPDIST</issueTrackingUrl>
@@ -48,6 +48,11 @@
<id>1.6</id>
<name>1.6</name>
<tag>MAVEN_DIST_1_6</tag>
+ </version>
+ <version>
+ <id>1.6.1</id>
+ <name>1.6.1</name>
+ <tag>MAVEN_DIST_1_6_1</tag>
</version>
</versions>
<developers>
No revision
No revision
1.16.2.1 +3 -0 maven-plugins/dist/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/dist/xdocs/changes.xml,v
retrieving revision 1.16
retrieving revision 1.16.2.1
diff -u -r1.16 -r1.16.2.1
--- changes.xml 25 Jun 2004 19:02:38 -0000 1.16
+++ changes.xml 10 Nov 2004 10:18:50 -0000 1.16.2.1
@@ -24,6 +24,9 @@
<author email="[EMAIL PROTECTED]">Vincent Massol</author>
</properties>
<body>
+ <release version="1.6.1" date="2004-11-10">
+ <action dev="brett" type="fix">Remove deploy warning</action>
+ </release>
<release version="1.6" date="2004-06-25">
<action dev="brett" type="update">Use artifact plugin for
deployments</action>
</release>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
