svn commit: r532344 - in /maven/release/trunk/maven-release-manager/src: main/java/org/apache/maven/shared/release/phase/ main/mdo/ test/java/org/apache/maven/shared/release/phase/ test/resources/proj
Author: evenisse Date: Wed Apr 25 05:56:44 2007 New Revision: 532344 URL: http://svn.apache.org/viewvc?view=rev&rev=532344 Log: [MRELEASE-220] Allow to keep released versions for dependencies instead of next development version Added: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/internal-snapshot-dependencies-without-dependencies-version-update/ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/internal-snapshot-dependencies-without-dependencies-version-update/expected-pom.xml (with props) maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/internal-snapshot-dependencies-without-dependencies-version-update/pom.xml (with props) maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/internal-snapshot-dependencies-without-dependencies-version-update/subproject1/ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/internal-snapshot-dependencies-without-dependencies-version-update/subproject1/expected-pom.xml (with props) maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/internal-snapshot-dependencies-without-dependencies-version-update/subproject1/pom.xml (with props) maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/internal-snapshot-dependencies-without-dependencies-version-update/subproject2/ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/internal-snapshot-dependencies-without-dependencies-version-update/subproject2/expected-pom.xml (with props) maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/internal-snapshot-dependencies-without-dependencies-version-update/subproject2/pom.xml (with props) maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/internal-snapshot-dependencies-without-dependencies-version-update/subproject3/ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/internal-snapshot-dependencies-without-dependencies-version-update/subproject3/expected-pom.xml (with props) maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/internal-snapshot-dependencies-without-dependencies-version-update/subproject3/pom.xml (with props) maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/internal-snapshot-dependencies-without-dependencies-version-update/subproject4/ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/internal-snapshot-dependencies-without-dependencies-version-update/subproject4/expected-pom.xml (with props) maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/internal-snapshot-dependencies-without-dependencies-version-update/subproject4/pom.xml (with props) maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/internal-snapshot-dependencies-without-dependencies-version-update/subproject4/subsubproject/ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/internal-snapshot-dependencies-without-dependencies-version-update/subproject4/subsubproject/expected-pom.xml (with props) maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/internal-snapshot-dependencies-without-dependencies-version-update/subproject4/subsubproject/pom.xml (with props) Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java maven/release/trunk/maven-release-manager/src/main/mdo/release-descriptor.mdo maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhaseTest.java Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java?view=diff&rev=532344&r1=532343&r2=532344 == --- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java (original) +++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java Wed Apr 25 05:56:44 2007 @@ -218,7 +218,7 @@ rewriteVersion( rootElement, namespace, mappedVersions, projectId, project, parentVersion );
svn commit: r532350 - in /maven/release/trunk: maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ maven-release-plugin/src/main/java/org/apache/maven/plugins/release/
Author: evenisse
Date: Wed Apr 25 06:34:55 2007
New Revision: 532350
URL: http://svn.apache.org/viewvc?view=rev&rev=532350
Log:
[MRELEASE-145] Allow to do a partial release (don't have all projects as
SNAPSHOT projects)
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckPomPhase.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java
maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckPomPhase.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckPomPhase.java?view=diff&rev=532350&r1=532349&r2=532350
==
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckPomPhase.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckPomPhase.java
Wed Apr 25 06:34:55 2007
@@ -91,17 +91,21 @@
}
}
+boolean containsSnapshotProjects = false;
+
for ( Iterator it = reactorProjects.iterator(); it.hasNext(); )
{
MavenProject project = (MavenProject) it.next();
-String projectId = ArtifactUtils.versionlessKey(
project.getGroupId(), project.getArtifactId() );
-
-if ( !ArtifactUtils.isSnapshot( project.getVersion() ) )
+if ( ArtifactUtils.isSnapshot( project.getVersion() ) )
{
-throw new ReleaseFailureException(
-"The project " + projectId + " isn't a snapshot (" +
project.getVersion() + ")." );
+containsSnapshotProjects = true;
}
+}
+
+if ( !containsSnapshotProjects )
+{
+throw new ReleaseFailureException( "You don't have a SNAPSHOT
project in the reactor projects list." );
}
result.setResultCode( ReleaseResult.SUCCESS );
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java?view=diff&rev=532350&r1=532349&r2=532350
==
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java
Wed Apr 25 06:34:55 2007
@@ -125,28 +125,35 @@
}
else
{
-String nextVersion = null;
-if ( version != null )
+if ( ArtifactUtils.isSnapshot( project.getVersion() ) )
{
-nextVersion = version.getReleaseVersionString();
-}
+String nextVersion = null;
+if ( version != null )
+{
+nextVersion = version.getReleaseVersionString();
+}
-if ( releaseDescriptor.isInteractive() )
-{
-nextVersion = prompter.prompt(
-"What is the release version for \"" +
project.getName() + "\"? (" + projectId + ")",
-nextVersion );
+if ( releaseDescriptor.isInteractive() )
+{
+nextVersion = prompter.prompt(
+"What is the release version for \"" +
project.getName() + "\"? (" + projectId + ")",
+nextVersion );
+}
+else
+{
+Map relVersions =
releaseDescriptor.getReleaseVersions();
+if ( relVersions.containsKey( projectId ) )
+{
+nextVersion = relVersions.remove( projectId
).toString();
+}
+}
+
+releaseDescriptor.mapReleaseVersion( projectId,
nextVersion );
}
else
{
-Map relVersions =
releaseDescriptor.getReleaseVersions();
-if ( relVersions.containsKey( projectId ) )
-{
-nextVersion = relVersions.remove( projectId
)
svn commit: r532484 - in /maven/sandbox/trunk/wagon/wagon-scm: pom.xml src/main/java/org/apache/maven/wagon/providers/scm/ScmWagon.java
Author: kenney
Date: Wed Apr 25 13:57:30 2007
New Revision: 532484
URL: http://svn.apache.org/viewvc?view=rev&rev=532484
Log:
Fix wagon-scm:
- compilation: due to changes in scm some methods collided, fixed;
- unit test: update parent pom to wagon 1.0-rc1-SNAPSHOT; this also brings
in new deps which have fixed tests.
Modified:
maven/sandbox/trunk/wagon/wagon-scm/pom.xml
maven/sandbox/trunk/wagon/wagon-scm/src/main/java/org/apache/maven/wagon/providers/scm/ScmWagon.java
Modified: maven/sandbox/trunk/wagon/wagon-scm/pom.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/wagon/wagon-scm/pom.xml?view=diff&rev=532484&r1=532483&r2=532484
==
--- maven/sandbox/trunk/wagon/wagon-scm/pom.xml (original)
+++ maven/sandbox/trunk/wagon/wagon-scm/pom.xml Wed Apr 25 13:57:30 2007
@@ -6,7 +6,7 @@
wagon-providers
org.apache.maven.wagon
-1.0-beta-3-SNAPSHOT
+1.0-rc1-SNAPSHOT
../../wagon/pom.xml
4.0.0
Modified:
maven/sandbox/trunk/wagon/wagon-scm/src/main/java/org/apache/maven/wagon/providers/scm/ScmWagon.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/wagon/wagon-scm/src/main/java/org/apache/maven/wagon/providers/scm/ScmWagon.java?view=diff&rev=532484&r1=532483&r2=532484
==
---
maven/sandbox/trunk/wagon/wagon-scm/src/main/java/org/apache/maven/wagon/providers/scm/ScmWagon.java
(original)
+++
maven/sandbox/trunk/wagon/wagon-scm/src/main/java/org/apache/maven/wagon/providers/scm/ScmWagon.java
Wed Apr 25 13:57:30 2007
@@ -318,7 +318,7 @@
}
}
-result = scmProvider.checkIn( scmRepository, new ScmFileSet(
checkoutDirectory ), null, msg );
+result = scmProvider.checkIn( scmRepository, new ScmFileSet(
checkoutDirectory ), (String) null, msg );
checkScmResult( result );
}
@@ -368,7 +368,7 @@
try
{
while ( target.length() > 0 && !scmProvider
-.list( scmRepository, new ScmFileSet( new File( "." ), new
File( target ) ), false, null )
+.list( scmRepository, new ScmFileSet( new File( "." ), new
File( target ) ), false, (String) null )
.isSuccess() )
{
stack.push( FileUtils.filename( target ) );
@@ -390,7 +390,7 @@
scmRepository = getScmRepository( getRepository().getUrl() + "/" +
target );
CheckOutScmResult ret =
-scmProvider.checkOut( scmRepository, new ScmFileSet( new File(
checkoutDirectory, "" ) ), null, false );
+scmProvider.checkOut( scmRepository, new ScmFileSet( new File(
checkoutDirectory, "" ) ), (String) null, false );
checkScmResult( ret );
}
@@ -574,14 +574,14 @@
if ( reservedScmFile != null && new File( basedir, reservedScmFile
).exists() )
{
-scmProvider.update( scmRepository, new ScmFileSet( basedir ),
null );
+scmProvider.update( scmRepository, new ScmFileSet( basedir ),
(String) null );
}
else
{
// TODO: this should be checking out a full hierachy (requires
the -d equiv)
basedir.mkdirs();
-scmProvider.checkOut( scmRepository, new ScmFileSet( basedir
), null );
+scmProvider.checkOut( scmRepository, new ScmFileSet( basedir
), (String) null );
}
if ( !scmFile.exists() )
@@ -622,7 +622,7 @@
ScmProvider provider = getScmProvider( repository.getProvider() );
ListScmResult result =
-provider.list( repository, new ScmFileSet( new File( "." ),
new File( resourcePath ) ), false, null );
+provider.list( repository, new ScmFileSet( new File( "." ),
new File( resourcePath ) ), false, (String) null );
if ( !result.isSuccess() )
{
