You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2004/06/25 15:52:23 UTC
cvs commit: maven-plugins/jar/xdocs changes.xml
brett 2004/06/25 06:52:23
Modified: jar plugin.jelly
jar/xdocs changes.xml
Log:
use artifact for deployment
Revision Changes Path
1.38 +40 -64 maven-plugins/jar/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/jar/plugin.jelly,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- plugin.jelly 11 Jun 2004 09:36:41 -0000 1.37
+++ plugin.jelly 25 Jun 2004 13:52:23 -0000 1.38
@@ -23,10 +23,29 @@
xmlns:ant="jelly:ant"
xmlns:license="license"
xmlns:maven="jelly:maven"
+ xmlns:artifact="artifact"
xmlns:deploy="deploy"
xmlns:util="jelly:util"
xmlns:doc="doc">
+ <!-- Poor mans version check - plugin dependencies still suck for multiple versions -->
+ <maven:get plugin="maven-artifact-plugin" property="plugin" var="artifactPlugin" />
+ <j:if test="${artifactPlugin.currentVersion.compareTo('1.3') lt 0}">
+ <ant:fail>
+ Must have artifact plugin v1.3 installed to use this version of the jar 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 jar plugin.
+ Please delete ${deployPlugin.artifactId}-${deployPlugin.currentVersion}.jar from
+ ${maven.plugin.dir} and ${maven.plugin.unpacked.dir} (if it exists)
+ </ant:fail>
+ </j:if>
+
<!-- ================================================================== -->
<!-- J A R -->
<!-- ================================================================== -->
@@ -176,6 +195,7 @@
<goal
name="jar:snapshot"
description="Create a snapshot jar, ie 'id-YYYYMMDD.hhmmss.jar'">
+ <ant:echo>DEPRECATED: jar:snapshot is deprecated</ant:echo>
<maven:snapshot project="${pom}"/>
@@ -193,29 +213,14 @@
<goal
name="jar:deploy-snapshot"
+ prereqs="jar:jar"
description="Deploy a snapshot jar to the remote repository">
- <maven:user-check user="${maven.username}"/>
- <attainGoal name="jar:snapshot"/>
- <ant:property name="maven.jar.to.deploy" value="${maven.final.name}.jar"/>
- <ant:property name="dir"
- value="${maven.repo.central.directory}/${pom.artifactDirectory}/jars"/>
-
- <util:replace var="jarToDeploy" oldChar="\" newChar="/">${maven.build.dir}/${maven.jar.to.deploy}</util:replace>
- <util:replace var="forwardSlashBaseDir" oldChar="\" newChar="/" value="${basedir}"/>
- <j:if test="${!forwardSlashBaseDir.endsWith('/')}">
- <j:set var="base" value="${forwardSlashBaseDir}/" />
- </j:if>
- <j:set var="relativePath">${jarToDeploy.substring(base.length())}</j:set>
-
- <deploy:artifact
- artifact="${relativePath}"
- type="jars"
- assureDirectoryCommand="mkdir -p"
- siteCommand="cd @deployDirectory@; chmod g+w ${maven.jar.to.deploy}; chgrp ${maven.remote.group} ${maven.jar.to.deploy}; rm -f ${pom.artifactId}-SNAPSHOT.jar; ln -s ${maven.jar.to.deploy} ${pom.artifactId}-SNAPSHOT.jar; echo ${snapshotVersion} > ${pom.artifactId}-snapshot-version"
+ <artifact:deploy-snapshot
+ artifact="${maven.build.dir}/${maven.final.name}.jar"
+ type="jar"
+ project="${pom}"
/>
- <j:set var="maven.final.name" value="${oldMavenFinalName}" />
-
</goal>
<!-- ================================================================== -->
@@ -224,27 +229,14 @@
<goal
name="jar:deploy"
+ prereqs="jar:jar"
description="Deploy a jar to the remote repository">
- <maven:user-check user="${maven.username}"/>
- <attainGoal name="jar:jar"/>
- <ant:property name="maven.jar.to.deploy" value="${maven.final.name}.jar"/>
-
- <j:set var="sl" value="/"/>
- <util:replace var="jarToDeploy" oldChar="\" newChar="/">${maven.build.dir}/${maven.jar.to.deploy}</util:replace>
- <util:replace var="forwardSlashBaseDir" oldChar="\" newChar="/" value="${basedir}"/>
- <j:if test="${!forwardSlashBaseDir.endsWith('/')}">
- <j:set var="base" value="${forwardSlashBaseDir}/" />
- </j:if>
- <j:set var="relativePath">${jarToDeploy.substring(base.length())}</j:set>
-
- <deploy:artifact
- artifact="${relativePath}"
- type="jars"
- assureDirectoryCommand="mkdir -p"
- siteCommand="cd @deployDirectory@; chmod g+w ${maven.jar.to.deploy}; chgrp ${maven.remote.group} ${maven.jar.to.deploy}"
+ <artifact:deploy
+ artifact="${maven.build.dir}/${maven.final.name}.jar"
+ type="jar"
+ project="${pom}"
/>
-
</goal>
<!-- ================================================================== -->
@@ -254,41 +246,25 @@
<goal name="jar:install" prereqs="jar:jar"
description="Install the jar in the local repository">
- <ant:echo>
- id = '${pom.artifactId}'
- groupId = '${pom.groupId}'
- artifactDirectory = '${pom.artifactDirectory}'
- </ant:echo>
-
- <ant:property name="jardir__" value="${maven.repo.local}/${pom.artifactDirectory}/jars"/>
- <ant:mkdir dir="${jardir__}"/>
- <ant:copy
- file="${maven.build.dir}/${maven.final.name}.jar"
- todir="${jardir__}"
- overwrite="true"
+ <artifact:install
+ artifact="${maven.build.dir}/${maven.final.name}.jar"
+ type="jar"
+ project="${pom}"
/>
</goal>
<!-- ================================================================== -->
- <!-- I N S T A L L S N A P S H O T -->
+ <!-- I N S T A L L S N A P S H O T -->
<!-- ================================================================== -->
<goal
- name="jar:install-snapshot" prereqs="jar:snapshot"
+ name="jar:install-snapshot" prereqs="jar:jar"
description="Install a snapshot jar in the local repository">
- <ant:property name="jardir__" value="${maven.repo.local}/${pom.artifactDirectory}/jars"/>
- <ant:mkdir dir="${jardir__}"/>
- <ant:copy
- file="${maven.build.dir}/${maven.final.name}.jar"
- tofile="${jardir__}/${pom.artifactId}-SNAPSHOT.jar"
- overwrite="true"
- />
- <ant:copy
- file="${maven.build.dir}/${maven.final.name}.jar"
- tofile="${jardir__}/${maven.final.name}.jar"
+ <artifact:install-snapshot
+ artifact="${maven.build.dir}/${maven.final.name}.jar"
+ type="jar"
+ project="${pom}"
/>
-
- <j:set var="maven.final.name" value="${oldMavenFinalName}" />
</goal>
</project>
1.20 +1 -0 maven-plugins/jar/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/jar/xdocs/changes.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- changes.xml 11 Jun 2004 09:36:41 -0000 1.19
+++ changes.xml 25 Jun 2004 13:52:23 -0000 1.20
@@ -26,6 +26,7 @@
</properties>
<body>
<release version="1.6" date="In CVS">
+ <action dev="brett" type="update">Use the artifact plugin for installation</action>
<action dev="evenisse" type="fix" due-to="Martin van den Bemt" issue="MPJAR-29">Replace Apache Jakarta Maven by Apache Maven in Manifest</action>
</release>
<release version="1.5" date="2004-05-13">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org