switch to the artifact plugin for deployments
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@115529 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
brett committed
1 parent
07d5c4aabd
commit
0bcb6bce06
4 files changed
+79
-57
No files matched your search
Vendored
+60
-56
@@ -22,9 +22,11 @@
|
||||
xmlns:j="jelly:core"
|
||||
xmlns:ant="jelly:ant"
|
||||
xmlns:maven="jelly:maven"
|
||||
xmlns:deploy="deploy"
|
||||
xmlns:artifact="artifact"
|
||||
xmlns:util="jelly:util">
|
||||
|
||||
<j:new var="distTypeHandler" className="org.apache.maven.dist.DistributionArtifactTypeHandler" />
|
||||
|
||||
<!-- ================================================================== -->
|
||||
<!-- D I S T R I B U T I O N S -->
|
||||
<!-- ================================================================== -->
|
||||
@@ -192,60 +194,39 @@
|
||||
<!-- D E P L O Y D I S T R I B U T I O N -->
|
||||
<!-- ================================================================== -->
|
||||
|
||||
<goal name="dist:deploy" description="Deploy a distribution">
|
||||
<goal name="dist:deploy" description="Deploy a distribution"
|
||||
prereqs="dist:deploy-bin,dist:deploy-src" />
|
||||
|
||||
<maven:user-check user="${maven.username}"/>
|
||||
<goal name="dist:deploy-bin" description="Deploy a binary distribution" prereqs="dist:build-bin">
|
||||
|
||||
<!--
|
||||
|
||||
Generate the site documentation if it has not already been generated.
|
||||
We need some markers or timestamps for this so we don't repeat work
|
||||
if it's not necessary.
|
||||
|
||||
-->
|
||||
|
||||
<attainGoal name="dist:build"/>
|
||||
|
||||
<ant:tar tarfile="distributions.tar" basedir="${maven.dist.dir}"/>
|
||||
<ant:gzip zipfile="distributions.tar.gz" src="distributions.tar"/>
|
||||
<ant:delete file="distributions.tar"/>
|
||||
|
||||
<deploy:artifact
|
||||
artifact="distributions.tar.gz"
|
||||
type="distributions"
|
||||
assureDirectoryCommand="mkdir -p"
|
||||
siteCommand="cd @deployDirectory@;${maven.dist.gunzip.executable} distributions.tar.gz;${maven.dist.tar.executable} xUvf distributions.tar;chmod -R g+u *;rm distributions.tar"
|
||||
/>
|
||||
|
||||
</goal>
|
||||
|
||||
|
||||
<goal name="dist:deploy-bin" description="Deploy a binary distribution">
|
||||
|
||||
<maven:user-check user="${maven.username}"/>
|
||||
|
||||
<attainGoal name="dist:build-bin"/>
|
||||
|
||||
<deploy:artifact
|
||||
<artifact:deploy
|
||||
artifact="${maven.dist.dir}/${maven.final.name}.tar.gz"
|
||||
type="distributions"
|
||||
assureDirectoryCommand="mkdir -p"
|
||||
siteCommand="cd @deployDirectory@;chmod -R g+u *;"
|
||||
type="distribution-targz"
|
||||
project="${pom}"
|
||||
typeHandler="${distTypeHandler}"
|
||||
/>
|
||||
<artifact:deploy
|
||||
artifact="${maven.dist.dir}/${maven.final.name}.zip"
|
||||
type="distribution-zip"
|
||||
project="${pom}"
|
||||
typeHandler="${distTypeHandler}"
|
||||
/>
|
||||
|
||||
</goal>
|
||||
|
||||
<goal name="dist:deploy-src" description="Deploy a source distribution">
|
||||
<goal name="dist:deploy-src" description="Deploy a source distribution" prereqs="dist:build-src">
|
||||
|
||||
<maven:user-check user="${maven.username}"/>
|
||||
|
||||
<attainGoal name="dist:build-src"/>
|
||||
|
||||
<deploy:artifact
|
||||
<artifact:deploy
|
||||
artifact="${maven.dist.dir}/${maven.final.name}-src.tar.gz"
|
||||
type="distributions"
|
||||
assureDirectoryCommand="mkdir -p"
|
||||
siteCommand="cd @deployDirectory@;chmod -R g+u *;"
|
||||
type="distribution-src-targz"
|
||||
project="${pom}"
|
||||
typeHandler="${distTypeHandler}"
|
||||
/>
|
||||
<artifact:deploy
|
||||
artifact="${maven.dist.dir}/${maven.final.name}-src.zip"
|
||||
type="distribution-src-zip"
|
||||
project="${pom}"
|
||||
typeHandler="${distTypeHandler}"
|
||||
/>
|
||||
|
||||
</goal>
|
||||
@@ -254,17 +235,40 @@
|
||||
<!-- D E P L O Y S N A P S H O T D I S T R I B U T I O N -->
|
||||
<!-- ================================================================== -->
|
||||
|
||||
<maven:snapshot project="${pom}"/>
|
||||
<goal name="dist:deploy-snapshot" description="Deploy a snapshot distribution"
|
||||
prereqs="dist:deploy-bin-snapshot,dist:deploy-src-snapshot" />
|
||||
|
||||
<goal name="dist:deploy-bin-snapshot" description="Deploy a binary distribution" prereqs="dist:build-bin">
|
||||
|
||||
<artifact:deploy-snapshot
|
||||
artifact="${maven.dist.dir}/${maven.final.name}.tar.gz"
|
||||
type="distribution-targz"
|
||||
pom="${pom}"
|
||||
typeHandler="${distTypeHandler}"
|
||||
/>
|
||||
<artifact:deploy-snapshot
|
||||
artifact="${maven.dist.dir}/${maven.final.name}.zip"
|
||||
type="distribution-zip"
|
||||
pom="${pom}"
|
||||
typeHandler="${distTypeHandler}"
|
||||
/>
|
||||
|
||||
<goal name="dist:deploy-snapshot" description="Deploy a snapshot distribution">
|
||||
|
||||
<maven:user-check user="${maven.username}"/>
|
||||
|
||||
<j:set var="maven.final.name" value="${snapshotSignature}"/>
|
||||
<ant:echo>Building snapshot distribution: ${maven.final.name}</ant:echo>
|
||||
|
||||
<attainGoal name="dist:deploy"/>
|
||||
|
||||
</goal>
|
||||
|
||||
<goal name="dist:deploy-src-snapshot" description="Deploy a source distribution" prereqs="dist:build-src">
|
||||
|
||||
<artifact:deploy-snapshot
|
||||
artifact="${maven.dist.dir}/${maven.final.name}-src.tar.gz"
|
||||
type="distribution-src-targz"
|
||||
pom="${pom}"
|
||||
typeHandler="${distTypeHandler}"
|
||||
/>
|
||||
<artifact:deploy-snapshot
|
||||
artifact="${maven.dist.dir}/${maven.final.name}-src.zip"
|
||||
type="distribution-src-zip"
|
||||
pom="${pom}"
|
||||
typeHandler="${distTypeHandler}"
|
||||
/>
|
||||
|
||||
</goal>
|
||||
</project>
|
||||
Vendored
+2
@@ -17,3 +17,5 @@
|
||||
# -------------------------------------------------------------------
|
||||
# P R O J E C T P R O P E R T I E S
|
||||
# -------------------------------------------------------------------
|
||||
maven.jar.override=on
|
||||
maven.jar.maven=${maven.home}/lib/maven.jar
|
||||
Vendored
+14
-1
@@ -23,7 +23,7 @@
|
||||
<pomVersion>3</pomVersion>
|
||||
<id>maven-dist-plugin</id>
|
||||
<name>Maven Distribution Plugin</name>
|
||||
<currentVersion>1.5</currentVersion>
|
||||
<currentVersion>1.6-SNAPSHOT</currentVersion>
|
||||
<shortDescription>Create source and binary distributions</shortDescription>
|
||||
<url>http://maven.apache.org/reference/plugins/dist/</url>
|
||||
<issueTrackingUrl>http://jira.codehaus.org/BrowseProject.jspa?id=10343</issueTrackingUrl>
|
||||
@@ -66,4 +66,17 @@
|
||||
</roles>
|
||||
</developer>
|
||||
</developers>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>commons-lang</groupId>
|
||||
<artifactId>commons-lang</artifactId>
|
||||
<version>2.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>maven</groupId>
|
||||
<artifactId>maven</artifactId>
|
||||
<version>1.0</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
||||
|
||||
Vendored
+3
@@ -24,6 +24,9 @@
|
||||
<author email="vmassol@octo.com">Vincent Massol</author>
|
||||
</properties>
|
||||
<body>
|
||||
<release version="1.6-SNAPSHOT" date="in CVS">
|
||||
<action dev="brett" type="update">Use artifact plugin for deployments</action>
|
||||
</release>
|
||||
<release version="1.5" date="2004-05-15">
|
||||
<action dev="brett" type="update" issue="MPDIST-8">Switch from javadoc:generate to site:generate so that entire project site is included in the binary distribution.</action>
|
||||
<action dev="brett" type="update" issue="MPDIST-2">Add properties
|
||||
|
||||
Reference in new issue
Block a user