Author: jdcasey
Date: Thu Sep 15 12:21:28 2005
New Revision: 289294
URL: http://svn.apache.org/viewcvs?rev=289294&view=rev
Log:
Resolving: MNG-886
o Added complex test case for the release plugin, called it2002.
o Added copying of reportArtifacts and extensionArtifacts sets when one
MavenProject is constructed with another.
o Added some logging statements to PrepareReleaseMojo, which I will remove
later when I'm done with this rash of bugfixes.
Added:
maven/components/trunk/maven-core-it/it2002/
maven/components/trunk/maven-core-it/it2002/project/
maven/components/trunk/maven-core-it/it2002/project/pom.xml (with props)
maven/components/trunk/maven-core-it/it2002/project/src/
maven/components/trunk/maven-core-it/it2002/project/src/main/
maven/components/trunk/maven-core-it/it2002/project/src/main/java/
maven/components/trunk/maven-core-it/it2002/project/src/main/java/org/
maven/components/trunk/maven-core-it/it2002/project/src/main/java/org/apache/
maven/components/trunk/maven-core-it/it2002/project/src/main/java/org/apache/maven/
maven/components/trunk/maven-core-it/it2002/project/src/main/java/org/apache/maven/it2002/
maven/components/trunk/maven-core-it/it2002/project/src/main/java/org/apache/maven/it2002/Thing.java
(with props)
maven/components/trunk/maven-core-it/it2002/test.sh (with props)
Modified:
maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
maven/components/trunk/maven-settings/settings.mdo
Added: maven/components/trunk/maven-core-it/it2002/project/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it2002/project/pom.xml?rev=289294&view=auto
==============================================================================
--- maven/components/trunk/maven-core-it/it2002/project/pom.xml (added)
+++ maven/components/trunk/maven-core-it/it2002/project/pom.xml Thu Sep 15
12:21:28 2005
@@ -0,0 +1,64 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.it2002</groupId>
+ <artifactId>project</artifactId>
+ <version>1.0-SNAPSHOT</version>
+
+ <dependencies>
+ <dependency>
+ <groupId>plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>1.0.2-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+
+ <repositories>
+ <repository>
+ <id>snapshots</id>
+ <url>http://snapshots.maven.codehaus.org/maven2</url>
+ <releases><enabled>false</enabled></releases>
+ <snapshots><enabled>true</enabled></snapshots>
+ </repository>
+ </repositories>
+
+ <distributionManagement>
+ <repository>
+ <id>test</id>
+ <url>file:../target/test-repo</url>
+ </repository>
+ <snapshotRepository>
+ <id>test-snaps</id>
+ <url>file:../target/test-repo</url>
+ </snapshotRepository>
+ </distributionManagement>
+
+ <scm>
+
<connection>scm:svn:file://${project.file.parentFile.parentFile}/target/svnroot/project/trunk</connection>
+
<developerConnection>scm:svn:file://${project.file.parentFile.parentFile}/target/svnroot/project/trunk</developerConnection>
+
<url>file://${project.file.parentFile.parentFile}/target/svnroot/project/trunk</url>
+ <tag>p1</tag>
+ </scm>
+
+ <properties>
+
<tagBase>file://${project.file.parentFile.parentFile}/target/svnroot/project/tags</tagBase>
+ </properties>
+
+ <!-- build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.0-beta-1-SNAPSHOT</version>
+ </plugin>
+ </plugins>
+ </build -->
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </reporting>
+
+</project>
Propchange: maven/components/trunk/maven-core-it/it2002/project/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-core-it/it2002/project/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/components/trunk/maven-core-it/it2002/project/src/main/java/org/apache/maven/it2002/Thing.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it2002/project/src/main/java/org/apache/maven/it2002/Thing.java?rev=289294&view=auto
==============================================================================
---
maven/components/trunk/maven-core-it/it2002/project/src/main/java/org/apache/maven/it2002/Thing.java
(added)
+++
maven/components/trunk/maven-core-it/it2002/project/src/main/java/org/apache/maven/it2002/Thing.java
Thu Sep 15 12:21:28 2005
@@ -0,0 +1,7 @@
+package org.apache.maven.it2002;
+
+public class Thing
+{
+ private String type;
+}
+
Propchange:
maven/components/trunk/maven-core-it/it2002/project/src/main/java/org/apache/maven/it2002/Thing.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/components/trunk/maven-core-it/it2002/project/src/main/java/org/apache/maven/it2002/Thing.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-core-it/it2002/test.sh
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it2002/test.sh?rev=289294&view=auto
==============================================================================
--- maven/components/trunk/maven-core-it/it2002/test.sh (added)
+++ maven/components/trunk/maven-core-it/it2002/test.sh Thu Sep 15 12:21:28 2005
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+rm -Rf target
+rm -Rf project.checkout
+
+mkdir target
+
+svnadmin create --fs-type fsfs target/svnroot
+
+rm -Rf `find project -type d -name .svn`
+
+dir=`readlink -f ${PWD}`
+
+svn import project file://${dir}/target/svnroot/project/trunk -m "import."
+svn mkdir file://${dir}/target/svnroot/project/tags -m "Creating tags dir."
+
+svn co file://${dir}/target/svnroot/project/trunk project.checkout
+
+cd project.checkout
+
+rm -Rf target
+
+#. ~/shell-switches/m2-debug-on
+#echo "Enabling debugging options. Please attach the debugger."
+m2 -e release:prepare
+
+
Propchange: maven/components/trunk/maven-core-it/it2002/test.sh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-core-it/it2002/test.sh
------------------------------------------------------------------------------
svn:executable = *
Propchange: maven/components/trunk/maven-core-it/it2002/test.sh
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Modified:
maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java?rev=289294&r1=289293&r2=289294&view=diff
==============================================================================
---
maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java
(original)
+++
maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java
Thu Sep 15 12:21:28 2005
@@ -86,6 +86,7 @@
/**
* @parameter expression="${settings.interactiveMode}"
+ * @required
* @readonly
*/
private boolean interactive;
@@ -240,7 +241,7 @@
}
}
- removeReleasePoms();
+// removeReleasePoms();
checkInNextSnapshot();
@@ -890,12 +891,18 @@
{
//Rewrite report version
Map reportArtifacts =
releaseProject.getReportArtifactMap();
+
+ getLog().info( "Using report-artifact map with " +
reportArtifacts.size() + " entries." );
for ( Iterator i = reports.iterator(); i.hasNext(); )
{
ReportPlugin plugin = (ReportPlugin) i.next();
- Artifact artifact = (Artifact) reportArtifacts.get(
plugin.getKey() );
+ String pluginKey = plugin.getKey();
+
+ getLog().info( "Looking up report artifact for: \'" +
pluginKey + "\'" );
+
+ Artifact artifact = (Artifact) reportArtifacts.get(
pluginKey );
String version = resolveVersion( artifact, "report",
releaseProject );
@@ -1054,6 +1061,7 @@
private String resolveVersion( Artifact artifact, String artifactUsage,
MavenProject project )
throws MojoExecutionException
{
+ getLog().info( "Resolving version for: " + artifact );
String resolvedVersion = getVersionResolver().getResolvedVersion(
artifact.getGroupId(),
artifact.getArtifactId() );
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java?rev=289294&r1=289293&r2=289294&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
Thu Sep 15 12:21:28 2005
@@ -156,6 +156,9 @@
this.artifacts = Collections.unmodifiableSet( project.artifacts );
}
this.pluginArtifacts = Collections.unmodifiableSet(
project.pluginArtifacts );
+ this.reportArtifacts = Collections.unmodifiableSet(
project.reportArtifacts );
+ this.extensionArtifacts = Collections.unmodifiableSet(
project.extensionArtifacts );
+
this.remoteArtifactRepositories = Collections.unmodifiableList(
project.remoteArtifactRepositories );
this.pluginArtifactRepositories = Collections.unmodifiableList(
project.pluginArtifactRepositories );
this.collectedProjects = Collections.unmodifiableList(
project.collectedProjects );
@@ -972,7 +975,7 @@
this.artifacts = artifacts;
// flush the calculated artifactMap
- artifactMap = null;
+ this.artifactMap = null;
}
public Set getArtifacts()
@@ -993,6 +996,8 @@
public void setPluginArtifacts( Set pluginArtifacts )
{
this.pluginArtifacts = pluginArtifacts;
+
+ this.pluginArtifactMap = null;
}
public Set getPluginArtifacts()
@@ -1013,6 +1018,8 @@
public void setReportArtifacts( Set reportArtifacts )
{
this.reportArtifacts = reportArtifacts;
+
+ this.reportArtifactMap = null;
}
public Set getReportArtifacts()
@@ -1033,6 +1040,8 @@
public void setExtensionArtifacts( Set extensionArtifacts )
{
this.extensionArtifacts = extensionArtifacts;
+
+ this.extensionArtifactMap = null;
}
public Set getExtensionArtifacts()
Modified: maven/components/trunk/maven-settings/settings.mdo
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-settings/settings.mdo?rev=289294&r1=289293&r2=289294&view=diff
==============================================================================
--- maven/components/trunk/maven-settings/settings.mdo (original)
+++ maven/components/trunk/maven-settings/settings.mdo Thu Sep 15 12:21:28 2005
@@ -203,6 +203,11 @@
<codeSegment>
<version>1.0.0</version>
<code><![CDATA[
+ public Boolean getInteractiveMode()
+ {
+ return Boolean.valueOf( isInteractiveMode() );
+ }
+
private Proxy activeProxy;
public void flushActiveProxy()
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
