You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2012/09/14 22:59:55 UTC
svn commit: r1384919 -
/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java
Author: rfscholte
Date: Fri Sep 14 20:59:54 2012
New Revision: 1384919
URL: http://svn.apache.org/viewvc?rev=1384919&view=rev
Log:
Extract methods from checkProject, so we can also check pluginManagement, dependencyManagement and profiles in the near future
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java?rev=1384919&r1=1384918&r2=1384919&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java Fri Sep 14 20:59:54 2012
@@ -129,23 +129,59 @@ public class CheckDependencySnapshotsPha
{
@SuppressWarnings( "unchecked" )
Set<Artifact> dependencyArtifacts = project.createArtifacts( artifactFactory, null, null );
-
- for ( Artifact artifact : dependencyArtifacts )
- {
- if ( checkArtifact( artifact, originalVersions, artifactMap, releaseDescriptor ) )
- {
- snapshotDependencies.add( getArtifactFromMap( artifact, artifactMap ) );
- }
- }
+ checkDependencies( originalVersions, releaseDescriptor, artifactMap, dependencyArtifacts );
}
catch ( InvalidDependencyVersionException e )
{
throw new ReleaseExecutionException( "Failed to create dependency artifacts", e );
}
+ //@todo check dependencyManagement
@SuppressWarnings( "unchecked" )
Set<Artifact> pluginArtifacts = project.getPluginArtifacts();
+ checkPlugins( originalVersions, releaseDescriptor, artifactMap, pluginArtifacts );
+ //@todo check pluginManagement
+
+ @SuppressWarnings( "unchecked" )
+ Set<Artifact> reportArtifacts = project.getReportArtifacts();
+ checkReports( originalVersions, releaseDescriptor, artifactMap, reportArtifacts );
+
+ @SuppressWarnings( "unchecked" )
+ Set<Artifact> extensionArtifacts = project.getExtensionArtifacts();
+ checkExtensions( originalVersions, releaseDescriptor, artifactMap, extensionArtifacts );
+
+ //@todo check profiles
+
+ if ( !snapshotDependencies.isEmpty() || !snapshotReportDependencies.isEmpty()
+ || !snapshotExtensionsDependencies.isEmpty() || !snapshotPluginDependencies.isEmpty() )
+ {
+ if ( releaseDescriptor.isInteractive() )
+ {
+ resolveSnapshots( snapshotDependencies, snapshotReportDependencies, snapshotExtensionsDependencies,
+ snapshotPluginDependencies, releaseDescriptor );
+ }
+ if ( !snapshotDependencies.isEmpty() || !snapshotReportDependencies.isEmpty()
+ || !snapshotExtensionsDependencies.isEmpty() || !snapshotPluginDependencies.isEmpty() )
+ {
+ StringBuilder message = new StringBuilder();
+
+ printSnapshotDependencies( snapshotDependencies, message );
+ printSnapshotDependencies( snapshotReportDependencies, message );
+ printSnapshotDependencies( snapshotExtensionsDependencies, message );
+ printSnapshotDependencies( snapshotPluginDependencies, message );
+ message.append( "in project '" + project.getName() + "' (" + project.getId() + ")" );
+
+ throw new ReleaseFailureException(
+ "Can't release project due to non released dependencies :\n" + message );
+ }
+ }
+ }
+
+ private void checkPlugins( Map<String, String> originalVersions, ReleaseDescriptor releaseDescriptor,
+ Map<String, Artifact> artifactMap, Set<Artifact> pluginArtifacts )
+ throws ReleaseExecutionException
+ {
for ( Artifact artifact : pluginArtifacts )
{
if ( checkArtifact( artifact, originalVersions, artifactMap, releaseDescriptor ) )
@@ -209,10 +245,23 @@ public class CheckDependencySnapshotsPha
}
}
}
+ }
- @SuppressWarnings( "unchecked" )
- Set<Artifact> reportArtifacts = project.getReportArtifacts();
+ private void checkDependencies( Map<String, String> originalVersions, ReleaseDescriptor releaseDescriptor,
+ Map<String, Artifact> artifactMap, Set<Artifact> dependencyArtifacts )
+ {
+ for ( Artifact artifact : dependencyArtifacts )
+ {
+ if ( checkArtifact( artifact, originalVersions, artifactMap, releaseDescriptor ) )
+ {
+ snapshotDependencies.add( getArtifactFromMap( artifact, artifactMap ) );
+ }
+ }
+ }
+ private void checkReports( Map<String, String> originalVersions, ReleaseDescriptor releaseDescriptor,
+ Map<String, Artifact> artifactMap, Set<Artifact> reportArtifacts )
+ {
for ( Artifact artifact : reportArtifacts )
{
if ( checkArtifact( artifact, originalVersions, artifactMap, releaseDescriptor ) )
@@ -221,10 +270,11 @@ public class CheckDependencySnapshotsPha
snapshotReportDependencies.add( artifact );
}
}
+ }
- @SuppressWarnings( "unchecked" )
- Set<Artifact> extensionArtifacts = project.getExtensionArtifacts();
-
+ private void checkExtensions( Map<String, String> originalVersions, ReleaseDescriptor releaseDescriptor,
+ Map<String, Artifact> artifactMap, Set<Artifact> extensionArtifacts )
+ {
for ( Artifact artifact : extensionArtifacts )
{
if ( checkArtifact( artifact, originalVersions, artifactMap, releaseDescriptor ) )
@@ -232,31 +282,6 @@ public class CheckDependencySnapshotsPha
snapshotExtensionsDependencies.add( artifact );
}
}
-
- if ( !snapshotDependencies.isEmpty() || !snapshotReportDependencies.isEmpty()
- || !snapshotExtensionsDependencies.isEmpty() || !snapshotPluginDependencies.isEmpty() )
- {
- if ( releaseDescriptor.isInteractive() )
- {
- resolveSnapshots( snapshotDependencies, snapshotReportDependencies, snapshotExtensionsDependencies,
- snapshotPluginDependencies, releaseDescriptor );
- }
-
- if ( !snapshotDependencies.isEmpty() || !snapshotReportDependencies.isEmpty()
- || !snapshotExtensionsDependencies.isEmpty() || !snapshotPluginDependencies.isEmpty() )
- {
- StringBuilder message = new StringBuilder();
-
- printSnapshotDependencies( snapshotDependencies, message );
- printSnapshotDependencies( snapshotReportDependencies, message );
- printSnapshotDependencies( snapshotExtensionsDependencies, message );
- printSnapshotDependencies( snapshotPluginDependencies, message );
- message.append( "in project '" + project.getName() + "' (" + project.getId() + ")" );
-
- throw new ReleaseFailureException(
- "Can't release project due to non released dependencies :\n" + message );
- }
- }
}
private static boolean checkArtifact( Artifact artifact, Map<String, String> originalVersions, Map<String, Artifact> artifactMapByVersionlessId, ReleaseDescriptor releaseDescriptor )