From ca5253159a2f18a3f04c6d5ec2a3886fd8ba12d8 Mon Sep 17 00:00:00 2001 From: Brett Leslie Porter Date: Wed, 14 Sep 2005 02:27:44 +0000 Subject: [PATCH] default to true for resume mode, use default-value for parameter defaults, and leave in parent so release-pom works even if it is now substandard due to some regressions git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@280745 13f79535-47bb-0310-9956-ffa450edef68 --- .../maven/plugins/release/PrepareReleaseMojo.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java b/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java index f55407acc1..1d28e375e3 100644 --- a/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java +++ b/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java @@ -141,14 +141,14 @@ public class PrepareReleaseMojo private String tag; /** - * @parameter expression="${tagBase}" + * @parameter expression="${tagBase}" default-value="../tags" */ - private String tagBase = "../tags"; + private String tagBase; /** - * @parameter expression="${resume}" + * @parameter expression="${resume}" default-value="true" */ - private boolean resume = false; + private boolean resume; private String userTag; @@ -829,11 +829,13 @@ public class PrepareReleaseMojo fixNullValueInModel( releaseModel, project.getModel() ); // Remove parent +/* TODO: put this back after it is properly resolved again if ( releaseModel.getParent() != null ) { releaseModel.setParent( null ); } +*/ Set artifacts = releaseProject.getArtifacts(); if ( artifacts != null )