You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by lt...@apache.org on 2005/12/01 01:36:18 UTC
svn commit: r350085 - in /maven/maven-1/plugins/trunk/artifact:
plugin.properties
src/main/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java
xdocs/changes.xml xdocs/properties.xml xdocs/tags.xml
Author: ltheussl
Date: Wed Nov 30 16:36:12 2005
New Revision: 350085
URL: http://svn.apache.org/viewcvs?rev=350085&view=rev
Log:
PR: MPARTIFACT-59
Make deploying a timestamped SNAPSHOT artifact configurable.
Modified:
maven/maven-1/plugins/trunk/artifact/plugin.properties
maven/maven-1/plugins/trunk/artifact/src/main/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java
maven/maven-1/plugins/trunk/artifact/xdocs/changes.xml
maven/maven-1/plugins/trunk/artifact/xdocs/properties.xml
maven/maven-1/plugins/trunk/artifact/xdocs/tags.xml
Modified: maven/maven-1/plugins/trunk/artifact/plugin.properties
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/artifact/plugin.properties?rev=350085&r1=350084&r2=350085&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/artifact/plugin.properties (original)
+++ maven/maven-1/plugins/trunk/artifact/plugin.properties Wed Nov 30 16:36:12 2005
@@ -21,3 +21,5 @@
maven.artifact.manifest.basedir=${plugin.dir}/plugin-resources/templates
maven.artifact.manifest.template=manifest.vm
+
+maven.deploy.timestamps=true
\ No newline at end of file
Modified: maven/maven-1/plugins/trunk/artifact/src/main/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/artifact/src/main/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java?rev=350085&r1=350084&r2=350085&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/artifact/src/main/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java (original)
+++ maven/maven-1/plugins/trunk/artifact/src/main/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java Wed Nov 30 16:36:12 2005
@@ -256,8 +256,13 @@
srcFiles.add( snapshotVersionFile );
destFiles.add( snapshotVersionsFilename );
- srcFiles.add( file );
- destFiles.add( handler.constructRepositoryFullPath( type, project, v ) );
+ String deployTimestamp =
+ (String) project.getContext().getVariable( "maven.deploy.timestamps" );
+ if ( deployTimestamp.equals("true") )
+ {
+ srcFiles.add( file );
+ destFiles.add( handler.constructRepositoryFullPath( type, project, v ) );
+ }
}
// trick add special values to context for default repository;
Modified: maven/maven-1/plugins/trunk/artifact/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/artifact/xdocs/changes.xml?rev=350085&r1=350084&r2=350085&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/artifact/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/artifact/xdocs/changes.xml Wed Nov 30 16:36:12 2005
@@ -25,6 +25,7 @@
</properties>
<body>
<release version="1.7-SNAPSHOT" date="in SVN">
+ <action dev="ltheussl" type="add" issue="MPARTIFACT-59">Make deploying a timestamped SNAPSHOT artifact configurable.</action>
<action dev="aheritier" type="update" issue="MAVEN-1712">Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated :
<ul>
<li>commons-collections v3.1 -> v3.0</li>
Modified: maven/maven-1/plugins/trunk/artifact/xdocs/properties.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/artifact/xdocs/properties.xml?rev=350085&r1=350084&r2=350085&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/artifact/xdocs/properties.xml (original)
+++ maven/maven-1/plugins/trunk/artifact/xdocs/properties.xml Wed Nov 30 16:36:12 2005
@@ -197,6 +197,16 @@
</subsection>
</section>
<section name="Other properties used">
+ <table>
+ <tr>
+ <td>maven.deploy.timestamps</td>
+ <td>
+ Specifies whether timestamped versions of artifacts should
+ be deployed as well when deploying SNAPSHOT versions.
+ Defaults to 'true'.
+ </td>
+ </tr>
+ </table>
<p>
If you are behind a firewall and need to use a proxy server, check the
<a href="http://maven.apache.org/maven-1.x/reference/properties.html#Proxy_Properties">proxy properties</a>.
Modified: maven/maven-1/plugins/trunk/artifact/xdocs/tags.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/artifact/xdocs/tags.xml?rev=350085&r1=350084&r2=350085&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/artifact/xdocs/tags.xml (original)
+++ maven/maven-1/plugins/trunk/artifact/xdocs/tags.xml Wed Nov 30 16:36:12 2005
@@ -138,13 +138,12 @@
File <i>foo-snapshot-version</i>
contains the version number (20030620.124616)
that the snapshot is linked to,
- so that
- <a href="http://maven.apache.org/reference/user-guide.html#Resolving SNAPSHOT Dependencies">'convert-snapshots'</a>
- can correctly update dependencies in projects that will use this artifact.
+ so that automated tools
+ can correctly update dependencies in projects that will use this artifact.
</p>
<p>
<b>artifact:deploy-snapshot</b> tag uses the same set of attributes
- as <a href="artifact:deloy">artifact:deploy</a> tag
+ as <a href="#artifact:deploy">artifact:deploy</a> tag
</p>
</subsection>
<subsection name="artifact:install">
Re: svn commit: r350085 - in /maven/maven-1/plugins/trunk/artifact: plugin.properties src/main/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java xdocs/changes.xml xdocs/properties.xml xdocs/tags.xml
Posted by Arnaud HERITIER <ah...@gmail.com>.
[SNIP]
>
>
> Modified: maven/maven-1/plugins/trunk/artifact/plugin.properties
> URL:
> http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/artifact/plugin.properties?rev=350085&r1=350084&r2=350085&view=diff
>
> ==============================================================================
> --- maven/maven-1/plugins/trunk/artifact/plugin.properties (original)
> +++ maven/maven-1/plugins/trunk/artifact/plugin.properties Wed Nov 30
> 16:36:12 2005
> @@ -21,3 +21,5 @@
>
> maven.artifact.manifest.basedir=${plugin.dir}/plugin-resources/templates
> maven.artifact.manifest.template=manifest.vm
> +
> +maven.deploy.timestamps=true
> \ No newline at end of file
> [SNIP]
Hi Lukas,
Why isn't it maven.artifact.deploy.timestamps ?
Arnaud