svn commit: r754740 - /maven/scm/branches/scm-1.1.x/
Author: olamy Date: Sun Mar 15 20:11:19 2009 New Revision: 754740 URL: http://svn.apache.org/viewvc?rev=754740view=rev Log: create a 1.1.x branch before bumping trunk to 1.2 Added: maven/scm/branches/scm-1.1.x/ - copied from r754739, maven/scm/trunk/
svn commit: r754800 - in /maven/scm/trunk: maven-scm-api/src/main/java/org/apache/maven/scm/provider/ maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/mav
Author: olamy
Date: Mon Mar 16 00:23:48 2009
New Revision: 754800
URL: http://svn.apache.org/viewvc?rev=754800view=rev
Log:
[SCM-262] really use revision from svn info for remote tagging
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/provider/AbstractScmProvider.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnTagCommand.java
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/provider/AbstractScmProvider.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/provider/AbstractScmProvider.java?rev=754800r1=754799r2=754800view=diff
==
---
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/provider/AbstractScmProvider.java
(original)
+++
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/provider/AbstractScmProvider.java
Mon Mar 16 00:23:48 2009
@@ -690,7 +690,7 @@
parameters.setString( CommandParameter.TAG_NAME, tagName );
parameters.setScmTagParameters( CommandParameter.SCM_TAG_PARAMETERS,
scmTagParameters );
-
+
return tag( repository.getProviderRepository(), fileSet, parameters );
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnTagCommand.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnTagCommand.java?rev=754800r1=754799r2=754800view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnTagCommand.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnTagCommand.java
Mon Mar 16 00:23:48 2009
@@ -76,10 +76,17 @@
// NPE free
if (scmTagParameters == null)
{
+getLogger().debug( SvnTagCommand :: scmTagParameters is null
create an empty one );
scmTagParameters = new ScmTagParameters();
scmTagParameters.setRemoteTagging( false );
}
+else
+{
+getLogger().debug(
+ SvnTagCommand ::
scmTagParameters.remoteTagging :
+ + scmTagParameters.isRemoteTagging() );
+}
if ( tag == null || StringUtils.isEmpty( tag.trim() ) )
{
throw new ScmException( tag must be specified );
@@ -109,6 +116,7 @@
if (scmTagParameters.isRemoteTagging()
scmTagParameters.getScmRevision() == null)
{
String currentSvnRev = getCurrentSvnRev( fileSet );
+getLogger().info( tag with the current svn rev + currentSvnRev
);
scmTagParameters.setScmRevision( currentSvnRev );
}
@@ -233,11 +241,9 @@
cl.createArg().setValue( messageFile.getAbsolutePath() );
-String svnRev = null;
-
if ( scmTagParameters != null scmTagParameters.getScmRevision() !=
null )
{
-cl.createArg().setValue( --revision + svnRev );
+cl.createArg().setValue( --revision +
scmTagParameters.getScmRevision() );
}
if ( scmTagParameters != null scmTagParameters.isRemoteTagging() )
svn commit: r754652 - /maven/plugins/trunk/maven-shade-plugin/src/site/apt/examples.apt.vm
Author: hboutemy Date: Sun Mar 15 10:53:03 2009 New Revision: 754652 URL: http://svn.apache.org/viewvc?rev=754652view=rev Log: fixed a typo: was ServiceResourceTransformer instead of ServicesResourceTransformer Modified: maven/plugins/trunk/maven-shade-plugin/src/site/apt/examples.apt.vm Modified: maven/plugins/trunk/maven-shade-plugin/src/site/apt/examples.apt.vm URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/site/apt/examples.apt.vm?rev=754652r1=754651r2=754652view=diff == --- maven/plugins/trunk/maven-shade-plugin/src/site/apt/examples.apt.vm (original) +++ maven/plugins/trunk/maven-shade-plugin/src/site/apt/examples.apt.vm Sun Mar 15 10:53:03 2009 @@ -355,7 +355,7 @@ mainClassorg.sonatype.haven.HavenCli/mainClass /transformer /transformers -/configuration +/configuration /execution /executions /plugin @@ -364,7 +364,7 @@ ... /project +- - + * Shade Plugin where a set of manifest entries are added to the MANIFEST.MF +- @@ -422,7 +422,7 @@ configuration finalNamehaven-1.0/finalName transformers -transformer implementation=org.apache.maven.plugins.shade.resource.ServiceResourceTransformer/ +transformer implementation=org.apache.maven.plugins.shade.resource.ServicesResourceTransformer/ /transformers /configuration /execution
svn commit: r754650 - /maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml
Author: hboutemy
Date: Sun Mar 15 10:43:29 2009
New Revision: 754650
URL: http://svn.apache.org/viewvc?rev=754650view=rev
Log:
put Maven core dependency version in a property
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml?rev=754650r1=754649r2=754650view=diff
==
--- maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml Sun Mar 15
10:43:29 2009
@@ -54,7 +54,7 @@
/contributors
prerequisites
-maven2.0.6/maven
+maven${mavenVersion}/maven
/prerequisites
scm
@@ -70,6 +70,7 @@
properties
doxiaVersion1.0/doxiaVersion
doxia-sitetoolsVersion1.0/doxia-sitetoolsVersion
+mavenVersion2.0.6/mavenVersion
wagonVersion1.0-beta-3/wagonVersion
scmVersion1.1/scmVersion
/properties
@@ -79,42 +80,42 @@
dependency
groupIdorg.apache.maven/groupId
artifactIdmaven-artifact/artifactId
- version2.0.6/version
+ version${mavenVersion}/version
/dependency
dependency
groupIdorg.apache.maven/groupId
artifactIdmaven-artifact-manager/artifactId
- version2.0.6/version
+ version${mavenVersion}/version
/dependency
dependency
groupIdorg.apache.maven/groupId
artifactIdmaven-model/artifactId
- version2.0.6/version
+ version${mavenVersion}/version
/dependency
dependency
groupIdorg.apache.maven/groupId
artifactIdmaven-plugin-api/artifactId
- version2.0.6/version
+ version${mavenVersion}/version
/dependency
dependency
groupIdorg.apache.maven/groupId
artifactIdmaven-project/artifactId
- version2.0.6/version
+ version${mavenVersion}/version
/dependency
dependency
groupIdorg.apache.maven/groupId
artifactIdmaven-repository-metadata/artifactId
- version2.0.6/version
+ version${mavenVersion}/version
/dependency
dependency
groupIdorg.apache.maven/groupId
artifactIdmaven-settings/artifactId
- version2.0.6/version
+ version${mavenVersion}/version
/dependency
dependency
groupIdorg.apache.maven.reporting/groupId
artifactIdmaven-reporting-api/artifactId
- version2.0.6/version
+ version${mavenVersion}/version
/dependency
dependency
groupIdorg.apache.maven.reporting/groupId
svn commit: r754665 - in /maven/core-integration-testing/trunk/core-it-suite/src/test: java/org/apache/maven/it/ resources/mng-4086/ resources/mng-4086/repo/ resources/mng-4086/repo/org/ resources/mng
Author: bentmann Date: Sun Mar 15 13:42:09 2009 New Revision: 754665 URL: http://svn.apache.org/viewvc?rev=754665view=rev Log: [MNG-4086] [regression] Explicitly using plugin metaversions crashes plugin manager o Added IT Added: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4086ExplicitPluginMetaversionTest.java (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4086/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4086/pom.xml (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4086/repo/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4086/repo/org/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4086/repo/org/apache/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4086/repo/org/apache/maven/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4086/repo/org/apache/maven/its/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4086/repo/org/apache/maven/its/mng4086/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4086/repo/org/apache/maven/its/mng4086/maven-it-plugin-a/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4086/repo/org/apache/maven/its/mng4086/maven-it-plugin-a/0.1/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4086/repo/org/apache/maven/its/mng4086/maven-it-plugin-a/0.1/maven-it-plugin-a-0.1.jar (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4086/repo/org/apache/maven/its/mng4086/maven-it-plugin-a/0.1/maven-it-plugin-a-0.1.pom maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4086/repo/org/apache/maven/its/mng4086/maven-it-plugin-a/0.2-SNAPSHOT/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4086/repo/org/apache/maven/its/mng4086/maven-it-plugin-a/0.2-SNAPSHOT/maven-it-plugin-a-0.2-20090315.124508-1.jar (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4086/repo/org/apache/maven/its/mng4086/maven-it-plugin-a/0.2-SNAPSHOT/maven-it-plugin-a-0.2-20090315.124508-1.pom maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4086/repo/org/apache/maven/its/mng4086/maven-it-plugin-a/0.2-SNAPSHOT/maven-metadata.xml (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4086/repo/org/apache/maven/its/mng4086/maven-it-plugin-a/maven-metadata.xml (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4086/repo/org/apache/maven/its/mng4086/maven-metadata.xml (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4086/settings-template.xml (with props) Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java?rev=754665r1=754664r2=754665view=diff == --- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java (original) +++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java Sun Mar 15 13:42:09 2009 @@ -92,6 +92,7 @@ // suite.addTestSuite( MavenIT0109ReleaseUpdateTest.class ); // suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- MNG-3137 +suite.addTestSuite( MavenITmng4086ExplicitPluginMetaversionTest.class ); suite.addTestSuite( MavenITmng4072InactiveProfileReposTest.class ); suite.addTestSuite( MavenITmng4070WhitespaceTrimmingTest.class ); suite.addTestSuite( MavenITmng4068AuthenticatedMirrorTest.class ); Added: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4086ExplicitPluginMetaversionTest.java URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4086ExplicitPluginMetaversionTest.java?rev=754665view=auto == --- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4086ExplicitPluginMetaversionTest.java (added) +++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4086ExplicitPluginMetaversionTest.java Sun Mar 15 13:42:09
svn commit: r754668 - /maven/components/branches/maven-2.1.0-RC/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
Author: bentmann Date: Sun Mar 15 14:26:29 2009 New Revision: 754668 URL: http://svn.apache.org/viewvc?rev=754668view=rev Log: [MNG-4086] [regression] Explicitly using plugin metaversions crashes plugin manager o Merged from r754667 Modified: maven/components/branches/maven-2.1.0-RC/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java Modified: maven/components/branches/maven-2.1.0-RC/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.0-RC/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java?rev=754668r1=754667r2=754668view=diff == --- maven/components/branches/maven-2.1.0-RC/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java (original) +++ maven/components/branches/maven-2.1.0-RC/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java Sun Mar 15 14:26:29 2009 @@ -202,6 +202,8 @@ artifactResolver.resolve( pluginArtifact, project.getPluginArtifactRepositories(), localRepository ); +plugin.setVersion( pluginArtifact.getBaseVersion() ); + String pluginKey = PluginUtils.constructVersionedKey( plugin ); PlexusContainer pluginContainer = container.getChildContainer( pluginKey );
svn commit: r754670 - /maven/plugins/tags/maven-war-plugin-2.1-beta-1/
Author: dennisl Date: Sun Mar 15 14:35:13 2009 New Revision: 754670 URL: http://svn.apache.org/viewvc?rev=754670view=rev Log: Remove tag, because the vote was canceled. Removed: maven/plugins/tags/maven-war-plugin-2.1-beta-1/
svn commit: r754671 - /maven/plugins/trunk/maven-war-plugin/pom.xml
Author: dennisl Date: Sun Mar 15 14:39:58 2009 New Revision: 754671 URL: http://svn.apache.org/viewvc?rev=754671view=rev Log: o Revert the release. Modified: maven/plugins/trunk/maven-war-plugin/pom.xml Modified: maven/plugins/trunk/maven-war-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/pom.xml?rev=754671r1=754670r2=754671view=diff == --- maven/plugins/trunk/maven-war-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-war-plugin/pom.xml Sun Mar 15 14:39:58 2009 @@ -29,7 +29,7 @@ /parent artifactIdmaven-war-plugin/artifactId - version2.1-beta-2-SNAPSHOT/version + version2.1-beta-1-SNAPSHOT/version packagingmaven-plugin/packaging nameMaven WAR Plugin/name
svn commit: r754672 - /maven/plugins/trunk/maven-war-plugin/pom.xml
Author: dennisl Date: Sun Mar 15 14:42:03 2009 New Revision: 754672 URL: http://svn.apache.org/viewvc?rev=754672view=rev Log: [MWAR-184] FATAL ERROR - XPP3 pull parser library not present. Specify another driver. o Upgrade XStream to version 1.3.1 as recommended by Jörn Schaible. Hopefully it solves this issue. Modified: maven/plugins/trunk/maven-war-plugin/pom.xml Modified: maven/plugins/trunk/maven-war-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/pom.xml?rev=754672r1=754671r2=754672view=diff == --- maven/plugins/trunk/maven-war-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-war-plugin/pom.xml Sun Mar 15 14:42:03 2009 @@ -103,7 +103,7 @@ dependency groupIdcom.thoughtworks.xstream/groupId artifactIdxstream/artifactId - version1.2.2/version + version1.3.1/version /dependency dependency
svn commit: r754679 - /maven/plugins/trunk/maven-install-plugin/
Author: dennisl Date: Sun Mar 15 15:38:48 2009 New Revision: 754679 URL: http://svn.apache.org/viewvc?rev=754679view=rev Log: o Add SVN properties for bugtraq. Modified: maven/plugins/trunk/maven-install-plugin/ (props changed) Propchange: maven/plugins/trunk/maven-install-plugin/ -- bugtraq:logregex = MINSTALL-\d+ Propchange: maven/plugins/trunk/maven-install-plugin/ -- bugtraq:url = http://jira.codehaus.org/browse/%BUGID% Propchange: maven/plugins/trunk/maven-install-plugin/ -- bugtraq:warnifnoissue = false
svn commit: r754680 - in /maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install: AbstractInstallMojo.java InstallFileMojo.java
Author: dennisl
Date: Sun Mar 15 15:52:53 2009
New Revision: 754680
URL: http://svn.apache.org/viewvc?rev=754680view=rev
Log:
o Add @since tags to parameters.
Modified:
maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/AbstractInstallMojo.java
maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java
Modified:
maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/AbstractInstallMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/AbstractInstallMojo.java?rev=754680r1=754679r2=754680view=diff
==
---
maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/AbstractInstallMojo.java
(original)
+++
maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/AbstractInstallMojo.java
Sun Mar 15 15:52:53 2009
@@ -66,19 +66,20 @@
* Flag whether to create checksums (MD5, SHA-1) or not.
*
* @parameter expression=${createChecksum} default-value=false
+ * @since 2.2
*/
protected boolean createChecksum;
/**
* Digester for MD5.
- *
+ *
* @component role-hint=md5
*/
protected Digester md5Digester;
/**
* Digester for SHA-1.
- *
+ *
* @component role-hint=sha1
*/
protected Digester sha1Digester;
@@ -86,7 +87,7 @@
/**
* Gets the path of the specified artifact within the local repository.
Note that the returned path need not exist
* (yet).
- *
+ *
* @param artifact The artifact whose local repo path should be
determined, must not be codenull/code.
* @return The absolute path to the artifact when installed, never
codenull/code.
*/
@@ -99,7 +100,7 @@
/**
* Gets the path of the specified artifact metadata within the local
repository. Note that the returned path need
* not exist (yet).
- *
+ *
* @param metadata The artifact metadata whose local repo path should be
determined, must not be codenull/code.
* @return The absolute path to the artifact metadata when installed,
never codenull/code.
*/
@@ -116,7 +117,7 @@
* codeProjectArtifactMetadata/code did not install the original POM
file (cf. MNG-2820). While the plugin
* currently requires Maven 2.0.6, we continue to hash the installed POM
for robustness with regard to future
* changes like re-introducing some kind of POM filtering.
- *
+ *
* @param artifact The artifact for which to create checksums, must not be
codenull/code.
* @throws MojoExecutionException If the checksums could not be installed.
*/
@@ -145,7 +146,7 @@
/**
* Installs the checksums for the specified file (if it exists).
- *
+ *
* @param installedFile The path to the already installed file in the
local repo for which to generate checksums,
*must not be codenull/code.
* @throws MojoExecutionException If the checksums could not be installed.
@@ -163,7 +164,7 @@
/**
* Installs a checksum for the specified file.
- *
+ *
* @param originalFile The path to the file from which the checksum is
generated, must not be codenull/code.
* @param installedFile The base path from which the path to the checksum
files is derived by appending the given
*file extension, must not be codenull/code.
Modified:
maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java?rev=754680r1=754679r2=754680view=diff
==
---
maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java
(original)
+++
maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java
Sun Mar 15 15:52:53 2009
@@ -91,6 +91,7 @@
* means this is the project's main artifact.
*
* @parameter expression=${classifier}
+ * @since 2.2
*/
protected String classifier;
@@ -123,6 +124,7 @@
* parameter.
*
* @parameter expression=${pomFile}
+ * @since 2.1
*/
private File pomFile;
@@ -131,6 +133,7 @@
* codetrue/code if there is no existing POM in the local repository
yet.
*
* @parameter expression=${generatePom}
+ * @since 2.1
*/
private Boolean generatePom;
@@ -140,6 +143,7 @@
*
* @parameter expression=${repositoryLayout} default-value=default
* @required
+ * @since 2.2
*/
private String
svn commit: r754687 - /maven/plugins/trunk/maven-install-plugin/pom.xml
Author: dennisl
Date: Sun Mar 15 16:35:31 2009
New Revision: 754687
URL: http://svn.apache.org/viewvc?rev=754687view=rev
Log:
o Use a property to define the Maven core version.
Modified:
maven/plugins/trunk/maven-install-plugin/pom.xml
Modified: maven/plugins/trunk/maven-install-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-install-plugin/pom.xml?rev=754687r1=754686r2=754687view=diff
==
--- maven/plugins/trunk/maven-install-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-install-plugin/pom.xml Sun Mar 15 16:35:31 2009
@@ -37,7 +37,7 @@
inceptionYear2004/inceptionYear
prerequisites
-maven2.0.6/maven
+maven${mavenVersion}/maven
/prerequisites
scm
@@ -50,31 +50,35 @@
urlhttp://jira.codehaus.org/browse/MINSTALL/url
/issueManagement
+ properties
+mavenVersion2.0.6/mavenVersion
+ /properties
+
dependencies
dependency
groupIdorg.apache.maven/groupId
artifactIdmaven-plugin-api/artifactId
- version2.0.6/version
+ version${mavenVersion}/version
/dependency
dependency
groupIdorg.apache.maven/groupId
artifactIdmaven-project/artifactId
- version2.0.6/version
+ version${mavenVersion}/version
/dependency
dependency
groupIdorg.apache.maven/groupId
artifactIdmaven-model/artifactId
- version2.0.6/version
+ version${mavenVersion}/version
/dependency
dependency
groupIdorg.apache.maven/groupId
artifactIdmaven-artifact-manager/artifactId
- version2.0.6/version
+ version${mavenVersion}/version
/dependency
dependency
groupIdorg.apache.maven/groupId
artifactIdmaven-artifact/artifactId
- version2.0.6/version
+ version${mavenVersion}/version
/dependency
dependency
groupIdorg.apache.maven.plugin-testing/groupId
svn commit: r754690 - in /maven/plugins/trunk/maven-install-plugin/src/site/apt: examples/installing-checksums.apt usage.apt
Author: dennisl Date: Sun Mar 15 16:45:52 2009 New Revision: 754690 URL: http://svn.apache.org/viewvc?rev=754690view=rev Log: o Improve documentation. Use goal instead of mojo. Modified: maven/plugins/trunk/maven-install-plugin/src/site/apt/examples/installing-checksums.apt maven/plugins/trunk/maven-install-plugin/src/site/apt/usage.apt Modified: maven/plugins/trunk/maven-install-plugin/src/site/apt/examples/installing-checksums.apt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-install-plugin/src/site/apt/examples/installing-checksums.apt?rev=754690r1=754689r2=754690view=diff == --- maven/plugins/trunk/maven-install-plugin/src/site/apt/examples/installing-checksums.apt (original) +++ maven/plugins/trunk/maven-install-plugin/src/site/apt/examples/installing-checksums.apt Sun Mar 15 16:45:52 2009 @@ -33,7 +33,7 @@ functions and are used to check the integrity of the associated file. This can be activated by setting the createChecksum parameter to true. - In the install:install mojo. + In the install:install goal. +---+ mvn install -DcreateChecksum=true Modified: maven/plugins/trunk/maven-install-plugin/src/site/apt/usage.apt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-install-plugin/src/site/apt/usage.apt?rev=754690r1=754689r2=754690view=diff == --- maven/plugins/trunk/maven-install-plugin/src/site/apt/usage.apt (original) +++ maven/plugins/trunk/maven-install-plugin/src/site/apt/usage.apt Sun Mar 15 16:45:52 2009 @@ -28,7 +28,7 @@ Usage -* The install:install Mojo +* The install:install goal In most cases, install:install goal doesn't need any configuration, it needs the project's POM and the artifact file to be installed during the @@ -38,12 +38,12 @@ mvn install +---+ -* The install:install-file Mojo +* The install:install-file goal - The install:install-file mojo is used primarily for installing artifacts to + The install:install-file goal is used primarily for installing artifacts to the local repository which were not built by Maven. The project's development team - may or may not provide a POM for the artifact. Here's a complete example of the - install-file mojo: + may or may not provide a POM for the artifact. Here's a list of some of the available parameters for the + install-file goal: +---+ mvn install:install-file -Dfile=your-artifact-1.0.jar \ @@ -65,7 +65,7 @@ groupId can be considered if the groupId is not specified further for the current project or on the command line. - * the classifier parameter can be used to install secondary artifacts for a project, + * the optional classifier parameter can be used to install secondary artifacts for a project, like a javadoc or sources JAR. If a classifier is not given, Maven assumes the file is the main artifact for the project.
svn commit: r754731 - /maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
Author: bentmann
Date: Sun Mar 15 19:28:37 2009
New Revision: 754731
URL: http://svn.apache.org/viewvc?rev=754731view=rev
Log:
o Fixed resolution of plugin metaversions
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java?rev=754731r1=754730r2=754731view=diff
==
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
Sun Mar 15 19:28:37 2009
@@ -182,7 +182,7 @@
// TODO: this should be possibly outside
// All version-resolution logic has been moved to
DefaultPluginVersionManager.
logger.debug( Resolving plugin: + plugin.getKey() + with version:
+ pluginVersion );
-if ( ( pluginVersion == null ) || Artifact.LATEST_VERSION.equals(
pluginVersion ) || Artifact.RELEASE_VERSION.equals( pluginVersion ) )
+if ( pluginVersion == null )
{
logger.debug( Resolving version for plugin: + plugin.getKey() );
pluginVersion = resolvePluginVersion( plugin.getGroupId(),
plugin.getArtifactId(), project, session );
@@ -212,6 +212,8 @@
{
Artifact pluginArtifact = resolvePluginArtifact( plugin,
project, session );
+plugin.setVersion( pluginArtifact.getBaseVersion() );
+
addPlugin( plugin, pluginArtifact, project, session );
}
else
svn commit: r754735 - in /maven/plugins/trunk/maven-deploy-plugin/src: main/java/org/apache/maven/plugin/deploy/ test/java/org/apache/maven/plugin/deploy/ test/java/org/apache/maven/plugin/deploy/stub
Author: bentmann
Date: Sun Mar 15 19:59:58 2009
New Revision: 754735
URL: http://svn.apache.org/viewvc?rev=754735view=rev
Log:
o Polished code
Modified:
maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployFileMojo.java
maven/plugins/trunk/maven-deploy-plugin/src/test/java/org/apache/maven/plugin/deploy/DeployFileMojoTest.java
maven/plugins/trunk/maven-deploy-plugin/src/test/java/org/apache/maven/plugin/deploy/DeployMojoTest.java
maven/plugins/trunk/maven-deploy-plugin/src/test/java/org/apache/maven/plugin/deploy/stubs/ArtifactDeployerStub.java
Modified:
maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployFileMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployFileMojo.java?rev=754735r1=754734r2=754735view=diff
==
---
maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployFileMojo.java
(original)
+++
maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployFileMojo.java
Sun Mar 15 19:59:58 2009
@@ -248,7 +248,7 @@
/**
* Process the supplied pomFile to get groupId, artifactId, version, and
packaging
*
- * @throws NullPointerException if model is codenull/code
+ * @param model The POM to extract missing artifact coordinates from, must
not be codenull/code.
*/
private void processModel( Model model )
{
@@ -256,16 +256,13 @@
if ( this.groupId == null )
{
-if ( parent != null parent.getGroupId() != null )
+this.groupId = model.getGroupId();
+if ( this.groupId == null parent != null )
{
this.groupId = parent.getGroupId();
}
-if ( model.getGroupId() != null )
-{
-this.groupId = model.getGroupId();
-}
}
-if ( this.artifactId == null model.getArtifactId() != null )
+if ( this.artifactId == null )
{
this.artifactId = model.getArtifactId();
}
@@ -277,46 +274,39 @@
this.version = parent.getVersion();
}
}
-if ( this.packaging == null model.getPackaging() != null )
+if ( this.packaging == null )
{
this.packaging = model.getPackaging();
}
}
/**
- * Extract the Model from the specified file.
- *
- * @param pomFile
- * @return
- * @throws MojoExecutionException if the file doesn't exist of cannot be
read.
+ * Extract the model from the specified POM file.
+ *
+ * @param pomFile The path of the POM file to parse, must not be
codenull/code.
+ * @return The model from the POM file, never codenull/code.
+ * @throws MojoExecutionException If the file doesn't exist of cannot be
read.
*/
protected Model readModel( File pomFile )
throws MojoExecutionException
{
-
-if ( !pomFile.exists() )
-{
-throw new MojoExecutionException( Specified pomFile does not
exist );
-}
-
Reader reader = null;
try
{
reader = ReaderFactory.newXmlReader( pomFile );
-MavenXpp3Reader modelReader = new MavenXpp3Reader();
-return modelReader.read( reader );
+return new MavenXpp3Reader().read( reader );
}
catch ( FileNotFoundException e )
{
-throw new MojoExecutionException( Error reading specified POM
file: + e.getMessage(), e );
+throw new MojoExecutionException( POM not found + pomFile, e );
}
catch ( IOException e )
{
-throw new MojoExecutionException( Error reading specified POM
file: + e.getMessage(), e );
+throw new MojoExecutionException( Error reading POM + pomFile,
e );
}
catch ( XmlPullParserException e )
{
-throw new MojoExecutionException( Error reading specified POM
file: + e.getMessage(), e );
+throw new MojoExecutionException( Error parsing POM + pomFile,
e );
}
finally
{
Modified:
maven/plugins/trunk/maven-deploy-plugin/src/test/java/org/apache/maven/plugin/deploy/DeployFileMojoTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/test/java/org/apache/maven/plugin/deploy/DeployFileMojoTest.java?rev=754735r1=754734r2=754735view=diff
==
---
maven/plugins/trunk/maven-deploy-plugin/src/test/java/org/apache/maven/plugin/deploy/DeployFileMojoTest.java
(original)
+++
maven/plugins/trunk/maven-deploy-plugin/src/test/java/org/apache/maven/plugin/deploy/DeployFileMojoTest.java
Sun Mar 15 19:59:58
svn commit: r754746 - in /maven/core-integration-testing/trunk/core-it-suite/src/test: java/org/apache/maven/it/ resources/mng-4087/
Author: bentmann
Date: Sun Mar 15 20:34:57 2009
New Revision: 754746
URL: http://svn.apache.org/viewvc?rev=754746view=rev
Log:
[MNG-4087] Percent encoded characters in file URLs are not decoded upon
deployment
o Added IT
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4087PercentEncodedFileUrlTest.java
(with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4087/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4087/pom-template.xml
(with props)
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java?rev=754746r1=754745r2=754746view=diff
==
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
Sun Mar 15 20:34:57 2009
@@ -92,6 +92,7 @@
// suite.addTestSuite( MavenIT0109ReleaseUpdateTest.class );
// suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); --
MNG-3137
+suite.addTestSuite( MavenITmng4087PercentEncodedFileUrlTest.class );
suite.addTestSuite( MavenITmng4086ExplicitPluginMetaversionTest.class
);
suite.addTestSuite( MavenITmng4072InactiveProfileReposTest.class );
suite.addTestSuite( MavenITmng4070WhitespaceTrimmingTest.class );
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4087PercentEncodedFileUrlTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4087PercentEncodedFileUrlTest.java?rev=754746view=auto
==
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4087PercentEncodedFileUrlTest.java
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4087PercentEncodedFileUrlTest.java
Sun Mar 15 20:34:57 2009
@@ -0,0 +1,64 @@
+package org.apache.maven.it;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+
+import java.io.File;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * This is a test set for a
href=http://jira.codehaus.org/browse/MNG-4087;MNG-4087/a.
+ *
+ * @author Benjamin Bentmann
+ */
+public class MavenITmng4087PercentEncodedFileUrlTest
+extends AbstractMavenIntegrationTestCase
+{
+
+public MavenITmng4087PercentEncodedFileUrlTest()
+{
+super( [2.1.0,) );
+}
+
+/**
+ * Test that deployment to a file:// repository decodes percent-encoded
characters.
+ */
+public void testit()
+throws Exception
+{
+File testDir = ResourceExtractor.simpleExtractResources( getClass(),
/mng-4087 );
+
+Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+verifier.setAutoclean( false );
+verifier.deleteDirectory( target );
+verifier.deleteArtifacts( org.apache.maven.its.mng4087 );
+verifier.filterFile( pom-template.xml, pom.xml, UTF-8,
verifier.newDefaultFilterProperties() );
+verifier.executeGoal( validate );
+verifier.verifyErrorFreeLog();
+verifier.resetStreams();
+
+verifier.assertFileNotPresent( target/%72%65%70%6F );
+verifier.assertFilePresent( target/repo );
+}
+
+}
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4087PercentEncodedFileUrlTest.java
svn commit: r754753 - /maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployFileMojo.java
Author: bentmann
Date: Sun Mar 15 21:08:38 2009
New Revision: 754753
URL: http://svn.apache.org/viewvc?rev=754753view=rev
Log:
o Polished error checking
Modified:
maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployFileMojo.java
Modified:
maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployFileMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployFileMojo.java?rev=754753r1=754752r2=754753view=diff
==
---
maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployFileMojo.java
(original)
+++
maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployFileMojo.java
Sun Mar 15 21:08:38 2009
@@ -34,6 +34,7 @@
import org.apache.maven.project.artifact.ProjectArtifactMetadata;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.ReaderFactory;
+import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.WriterFactory;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
@@ -189,9 +190,21 @@
}
// Verify arguments
-if ( groupId == null || artifactId == null || version == null ||
packaging == null )
+if ( StringUtils.isEmpty( groupId ) )
{
-throw new MojoExecutionException( Missing group, artifact,
version, or packaging information );
+throw new MojoExecutionException( Missing group identifier,
please specify -DgroupId=... );
+}
+if ( StringUtils.isEmpty( artifactId ) )
+{
+throw new MojoExecutionException( Missing artifact identifier,
please specify -DartifactId=... );
+}
+if ( StringUtils.isEmpty( version ) )
+{
+throw new MojoExecutionException( Missing version, please specify
-Dversion=... );
+}
+if ( StringUtils.isEmpty( packaging ) )
+{
+throw new MojoExecutionException( Missing packaging type, please
specify -Dpackaging=... );
}
}
@@ -214,7 +227,7 @@
String protocol = deploymentRepository.getProtocol();
-if ( .equals( protocol ) || protocol == null )
+if ( StringUtils.isEmpty( protocol ) )
{
throw new MojoExecutionException( No transfer protocol found. );
}
svn commit: r754768 - in /maven/plugins/trunk/maven-deploy-plugin: ./ src/it/no-main-artifact-1/ src/it/no-main-artifact-2/ src/main/java/org/apache/maven/plugin/deploy/
Author: bentmann
Date: Sun Mar 15 21:43:33 2009
New Revision: 754768
URL: http://svn.apache.org/viewvc?rev=754768view=rev
Log:
[MDEPLOY-78] Deploy with classifier does not deploy pom
Added:
maven/plugins/trunk/maven-deploy-plugin/src/it/no-main-artifact-1/
maven/plugins/trunk/maven-deploy-plugin/src/it/no-main-artifact-1/pom.xml
(with props)
maven/plugins/trunk/maven-deploy-plugin/src/it/no-main-artifact-1/setup.bsh
(with props)
maven/plugins/trunk/maven-deploy-plugin/src/it/no-main-artifact-1/verify.bsh
(with props)
maven/plugins/trunk/maven-deploy-plugin/src/it/no-main-artifact-2/
maven/plugins/trunk/maven-deploy-plugin/src/it/no-main-artifact-2/pom.xml
(with props)
maven/plugins/trunk/maven-deploy-plugin/src/it/no-main-artifact-2/setup.bsh
(with props)
maven/plugins/trunk/maven-deploy-plugin/src/it/no-main-artifact-2/verify.bsh
(with props)
Modified:
maven/plugins/trunk/maven-deploy-plugin/pom.xml
maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/AbstractDeployMojo.java
maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployFileMojo.java
maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployMojo.java
Modified: maven/plugins/trunk/maven-deploy-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/pom.xml?rev=754768r1=754767r2=754768view=diff
==
--- maven/plugins/trunk/maven-deploy-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-deploy-plugin/pom.xml Sun Mar 15 21:43:33 2009
@@ -116,6 +116,10 @@
pomInclude*/pom.xml/pomInclude
pomInclude*/non-default-pom.xml/pomInclude
/pomIncludes
+ pomExcludes
+!-- TODO: Enabled this test once maven-install-plugin:2.3 is
released and can be used --
+pomExcludeno-main-artifact-1/*/pomExclude
+ /pomExcludes
preBuildHookScriptsetup/preBuildHookScript
postBuildHookScriptverify/postBuildHookScript
localRepositoryPath${project.build.directory}/local-repo/localRepositoryPath
Added: maven/plugins/trunk/maven-deploy-plugin/src/it/no-main-artifact-1/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/it/no-main-artifact-1/pom.xml?rev=754768view=auto
==
--- maven/plugins/trunk/maven-deploy-plugin/src/it/no-main-artifact-1/pom.xml
(added)
+++ maven/plugins/trunk/maven-deploy-plugin/src/it/no-main-artifact-1/pom.xml
Sun Mar 15 21:43:33 2009
@@ -0,0 +1,106 @@
+?xml version=1.0 encoding=UTF-8?
+
+!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+License); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+--
+
+project xmlns=http://maven.apache.org/POM/4.0.0;
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation=http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;
+ modelVersion4.0.0/modelVersion
+
+ groupIdorg.apache.maven.its.deploy.nma1/groupId
+ artifactIdtest/artifactId
+ version1.0/version
+ packagingjar/packaging
+
+ description
+Tests the installation of a non-POM project that has no main artifact file
but only attached artifacts (see
+MDEPLOY-78). This variant of the test checks the build when target/classes
is non-existent.
+ /description
+
+ properties
+maven.test.skiptrue/maven.test.skip
+ /properties
+
+ distributionManagement
+repository
+ idit/id
+ urlfile:///${basedir}/target/repo/url
+/repository
+ /distributionManagement
+
+ build
+plugins
+ plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-antrun-plugin/artifactId
+version1.1/version
+configuration
+ tasks
+!--
+NOTE: The Compiler Plugin sets this as the main artifact file,
should be non-existent for this test.
+--
+delete dir=target/classes/
+ /tasks
+/configuration
+executions
+ execution
+iddelete-output-dir/id
+phaseverify/phase
+goals
svn commit: r754777 - /maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployFileMojo.java
Author: bentmann
Date: Sun Mar 15 22:22:46 2009
New Revision: 754777
URL: http://svn.apache.org/viewvc?rev=754777view=rev
Log:
[MDEPLOY-59] deploy:deploy-file deletes the original file on error
o Added sanity check similiar to install:install-file and aborted deployment in
case user specified files from the local repo
Modified:
maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployFileMojo.java
Modified:
maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployFileMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployFileMojo.java?rev=754777r1=754776r2=754777view=diff
==
---
maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployFileMojo.java
(original)
+++
maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployFileMojo.java
Sun Mar 15 22:22:46 2009
@@ -30,6 +30,7 @@
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.project.artifact.ProjectArtifactMetadata;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.ReaderFactory;
@@ -201,7 +202,7 @@
}
public void execute()
-throws MojoExecutionException
+throws MojoExecutionException, MojoFailureException
{
initProperties();
@@ -228,6 +229,11 @@
Artifact artifact =
artifactFactory.createArtifactWithClassifier( groupId, artifactId,
version, packaging, classifier );
+if ( file.equals( getLocalRepoFile( artifact ) ) )
+{
+throw new MojoFailureException( Cannot deploy artifact from the
local repository: + file );
+}
+
// Upload the POM if requested, generating one if need be
if ( generatePom )
{
@@ -251,6 +257,19 @@
}
/**
+ * Gets the path of the specified artifact within the local repository.
Note that the returned path need not exist
+ * (yet).
+ *
+ * @param artifact The artifact whose local repo path should be
determined, must not be codenull/code.
+ * @return The absolute path to the artifact when installed, never
codenull/code.
+ */
+private File getLocalRepoFile( Artifact artifact )
+{
+String path = getLocalRepository().pathOf( artifact );
+return new File( getLocalRepository().getBasedir(), path );
+}
+
+/**
* Process the supplied pomFile to get groupId, artifactId, version, and
packaging
*
* @param model The POM to extract missing artifact coordinates from, must
not be codenull/code.
svn commit: r754778 - in /maven/scm/trunk: maven-scm-api/src/main/java/org/apache/maven/scm/ maven-scm-api/src/main/java/org/apache/maven/scm/command/tag/ maven-scm-api/src/main/java/org/apache/maven/
Author: olamy Date: Sun Mar 15 22:26:37 2009 New Revision: 754778 URL: http://svn.apache.org/viewvc?rev=754778view=rev Log: [SCM-262] scm:tag for subversion tagging from local version of code, not directly from repository add some options with ScmTagParameters to acivate a remote remota svn tagging Added: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmTagParameters.java (with props) Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/CommandParameter.java maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/CommandParameters.java maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmTag.java (props changed) maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmVersion.java (props changed) maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/tag/AbstractTagCommand.java maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/manager/AbstractScmManager.java (props changed) maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/manager/BasicScmManager.java (props changed) maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/manager/NoSuchScmProviderException.java (props changed) maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/manager/ScmManager.java (props changed) maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/provider/AbstractScmProvider.java maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/provider/ScmProvider.java maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/provider/ScmProviderRepositoryWithHost.java (props changed) maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/tag/ClearCaseTagCommand.java maven/scm/trunk/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/tag/HgTagCommand.java maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/tag/PerforceTagCommand.java maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/tag/StarteamTagCommand.java maven/scm/trunk/maven-scm-providers/maven-scm-provider-synergy/src/main/java/org/apache/maven/scm/provider/synergy/command/tag/SynergyTagCommand.java maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/AbstractCvsScmProvider.java maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/tag/AbstractCvsTagCommand.java maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/tag/GitTagCommand.java maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/command/SvnCommand.java maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnTagCommand.java maven/scm/trunk/maven-scm-test/src/main/java/org/apache/maven/scm/provider/ScmProviderStub.java Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/CommandParameter.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/CommandParameter.java?rev=754778r1=754777r2=754778view=diff == --- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/CommandParameter.java (original) +++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/CommandParameter.java Sun Mar 15 22:26:37 2009 @@ -61,6 +61,9 @@ public static final CommandParameter RUN_CHANGELOG_WITH_UPDATE = new CommandParameter( run_changelog_with_update ); + +public static final CommandParameter SCM_TAG_PARAMETERS = new CommandParameter( ScmTagParameters ); + /** * Parameter name Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/CommandParameters.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/CommandParameters.java?rev=754778r1=754777r2=754778view=diff == --- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/CommandParameters.java (original) +++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/CommandParameters.java Sun Mar 15 22:26:37 2009 @@ -274,6 +274,19 @@ return (File[]) getObject( File[].class,
svn commit: r754784 - /maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployFileMojo.java
Author: bentmann
Date: Sun Mar 15 22:37:29 2009
New Revision: 754784
URL: http://svn.apache.org/viewvc?rev=754784view=rev
Log:
[MDEPLOY-84] NPE when deploy-file with generatePom=false
Modified:
maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployFileMojo.java
Modified:
maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployFileMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployFileMojo.java?rev=754784r1=754783r2=754784view=diff
==
---
maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployFileMojo.java
(original)
+++
maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/deploy/DeployFileMojo.java
Sun Mar 15 22:37:29 2009
@@ -235,15 +235,18 @@
}
// Upload the POM if requested, generating one if need be
-if ( generatePom )
+if ( !pom.equals( packaging ) )
{
-ArtifactMetadata metadata = new ProjectArtifactMetadata( artifact,
generatePomFile() );
-artifact.addMetadata( metadata );
-}
-else
-{
-ArtifactMetadata metadata = new ProjectArtifactMetadata( artifact,
pomFile );
-artifact.addMetadata( metadata );
+if ( pomFile != null )
+{
+ArtifactMetadata metadata = new ProjectArtifactMetadata(
artifact, pomFile );
+artifact.addMetadata( metadata );
+}
+else if ( generatePom )
+{
+ArtifactMetadata metadata = new ProjectArtifactMetadata(
artifact, generatePomFile() );
+artifact.addMetadata( metadata );
+}
}
try
svn commit: r754785 - /maven/release/trunk/pom.xml
Author: olamy Date: Sun Mar 15 22:50:51 2009 New Revision: 754785 URL: http://svn.apache.org/viewvc?rev=754785view=rev Log: [MRELEASE-385] use last scm version 1.2-SNAPSHOT Modified: maven/release/trunk/pom.xml Modified: maven/release/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/release/trunk/pom.xml?rev=754785r1=754784r2=754785view=diff == --- maven/release/trunk/pom.xml (original) +++ maven/release/trunk/pom.xml Sun Mar 15 22:50:51 2009 @@ -124,7 +124,7 @@ /issueManagement properties -scmVersion1.1.1-SNAPSHOT/scmVersion +scmVersion1.2-SNAPSHOT/scmVersion mavenPluginPluginVersion2.5/mavenPluginPluginVersion /properties
