From bfad4bb46292e4d97aae0ebd3958eecf106d5004 Mon Sep 17 00:00:00 2001 From: Emmanuel Venisse Date: Mon, 16 May 2005 20:12:09 +0000 Subject: [PATCH] o Activate some methods o Remove unused dependencies git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@170442 13f79535-47bb-0310-9956-ffa450edef68 --- maven-plugins/maven-release-plugin/pom.xml | 11 ----------- .../apache/maven/plugin/release/ReleaseMojo.java | 14 +++++++------- 2 files changed, 7 insertions(+), 18 deletions(-) diff --git a/maven-plugins/maven-release-plugin/pom.xml b/maven-plugins/maven-release-plugin/pom.xml index ef69555b6c..4d05b87782 100644 --- a/maven-plugins/maven-release-plugin/pom.xml +++ b/maven-plugins/maven-release-plugin/pom.xml @@ -30,16 +30,5 @@ maven-scm-provider-svn 1.0-alpha-1-SNAPSHOT - - org.apache.maven.wagon - wagon-provider-api - 1.0-alpha-3 - - - org.apache.maven.wagon - wagon-file - 1.0-alpha-3 - test - diff --git a/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugin/release/ReleaseMojo.java b/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugin/release/ReleaseMojo.java index 8f2ebeb86a..93bbcb45c5 100644 --- a/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugin/release/ReleaseMojo.java +++ b/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugin/release/ReleaseMojo.java @@ -163,7 +163,7 @@ public class ReleaseMojo private void prepareRelease() throws MojoExecutionException { - //checkStatus(); + checkStatus(); checkDependencies(); @@ -171,13 +171,13 @@ public class ReleaseMojo //commit(); - //tag(); + tag(); } private void performRelease() throws MojoExecutionException { - //checkout(); + checkout(); } private boolean isSnapshot( String version ) @@ -208,7 +208,7 @@ public class ReleaseMojo if ( isSnapshot( parentArtifact.getVersion() ) ) { -// throw new MojoExecutionException( "Can't release project due to non released parent." ); + throw new MojoExecutionException( "Can't release project due to non released parent." ); } currentProject = project.getParent(); @@ -247,8 +247,8 @@ public class ReleaseMojo message.append( artifact.getVersion() ); message.append( "\n" ); } -// throw new MojoExecutionException( "Can't release project due to non released dependencies :\n" + -// message.toString() ); + throw new MojoExecutionException( "Can't release project due to non released dependencies :\n" + + message.toString() ); } } @@ -326,7 +326,6 @@ public class ReleaseMojo } //Rewrite plugins version - //TODO Resolve version for ( Iterator i = plugins.iterator(); i.hasNext(); ) { Artifact artifact = (Artifact) i.next(); @@ -349,6 +348,7 @@ public class ReleaseMojo try { //TODO: Write in pom file + //TODO: Write only necessary informations java.io.StringWriter writer = new java.io.StringWriter(); modelWriter.write( writer, model ); getLog().info( writer.toString() );