svn commit: r1779527 - in /maven/plugins/trunk/maven-checkstyle-plugin: ./ src/main/java/org/apache/maven/plugin/ src/main/java/org/apache/maven/plugins/ src/main/java/org/apache/maven/plugins/checkst

2017-01-19 Thread gboue 
Author: gboue
Date: Thu Jan 19 21:06:23 2017
New Revision: 1779527

URL: http://svn.apache.org/viewvc?rev=1779527=rev
Log:
[MCHECKSTYLE-335] Migrate plugin to Maven 3.0

Upgrading the Maven version to 3.0 in the POM:
 - Passing version to 3.0.0-SNAPSHOT to mark the upgrade
 - Renaming the packages to org.apache.maven.plugins
 - Removing Maven 2 specific quirks

Added:

maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/

maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/

maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/AbstractCheckstyleReport.java
  - copied, changed from r1776692, 
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/AbstractCheckstyleReport.java

maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleAggregateReport.java
  - copied, changed from r1776692, 
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleAggregateReport.java

maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleReport.java
  - copied, changed from r1776692, 
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java

maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleReportGenerator.java
  - copied, changed from r1776692, 
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportGenerator.java

maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleViolationCheckMojo.java
  - copied, changed from r1776692, 
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleViolationCheckMojo.java

maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/IconTool.java
  - copied, changed from r1776692, 
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/IconTool.java

maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/ReportResource.java
  - copied, changed from r1776692, 
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/ReportResource.java

maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/RuleUtil.java
  - copied, changed from r1776692, 
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/RuleUtil.java

maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/exec/
  - copied from r1779526, 
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/exec/

maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/resource/
  - copied from r1779526, 
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/resource/

maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/rss/
  - copied from r1779526, 
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/rss/

maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/org/apache/maven/plugins/
  - copied from r1779526, 
maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/org/apache/maven/plugin/

maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugins/

maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugins/checkstyle/

maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugins/checkstyle/CheckstyleReportTest.java
  - copied, changed from r1776692, 
maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/CheckstyleReportTest.java

maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugins/checkstyle/CheckstyleViolationCheckMojoTest.java
  - copied, changed from r1776692, 
maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/CheckstyleViolationCheckMojoTest.java

maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugins/checkstyle/ReportResourceTest.java
  - copied, changed from r1776692, 
maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/ReportResourceTest.java

maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugins/checkstyle/RuleUtilTest.java
  - copied, changed from r1776692,

svn commit: r1779510 - in /maven/release/trunk: maven-release-manager/src/main/ maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ maven-release-manager/src/test/java/org/apach

2017-01-19 Thread gboue 
Author: gboue
Date: Thu Jan 19 19:22:25 2017
New Revision: 1779510

URL: http://svn.apache.org/viewvc?rev=1779510=rev
Log:
[MRELEASE-977] release:branch should prompt for branch name if none is given
Submitted by Henning Schmiedehausen

When a release is made in interactive mode, the plugin will now ask for a 
branch name instead of ending with an error. In batch mode, the branch name is 
still required, so the current behaviour is unchanged.

Added:

maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/BranchInputVariablesPhaseTest.java
   (with props)
Modified:
maven/release/trunk/maven-release-manager/src/main/components-fragment.xml

maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/InputVariablesPhase.java

maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/InputVariablesPhaseTest.java

maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/BranchReleaseMojo.java

Modified: 
maven/release/trunk/maven-release-manager/src/main/components-fragment.xml
URL: 
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/components-fragment.xml?rev=1779510=1779509=1779510=diff
==
--- maven/release/trunk/maven-release-manager/src/main/components-fragment.xml 
(original)
+++ maven/release/trunk/maven-release-manager/src/main/components-fragment.xml 
Thu Jan 19 19:22:25 2017
@@ -70,6 +70,7 @@
   scm-check-modifications
   create-backup-poms
   map-branch-versions
+  branch-input-variables
   map-development-versions
   rewrite-poms-for-branch
   scm-commit-branch
@@ -220,6 +221,40 @@
 
   
org.apache.maven.shared.release.scm.ScmRepositoryConfigurator
 
+  
+
+
+  org.apache.maven.shared.release.phase.ReleasePhase
+  input-variables
+  
org.apache.maven.shared.release.phase.InputVariablesPhase
+  
+false
+  
+  
+
+  org.codehaus.plexus.components.interactivity.Prompter
+  default
+
+
+  
org.apache.maven.shared.release.scm.ScmRepositoryConfigurator
+
+  
+
+
+  org.apache.maven.shared.release.phase.ReleasePhase
+  branch-input-variables
+  
org.apache.maven.shared.release.phase.InputVariablesPhase
+  
+true
+  
+  
+
+  org.codehaus.plexus.components.interactivity.Prompter
+  default
+
+
+  
org.apache.maven.shared.release.scm.ScmRepositoryConfigurator
+
   
 
   

Modified: 
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/InputVariablesPhase.java
URL: 
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/InputVariablesPhase.java?rev=1779510=1779509=1779510=diff
==
--- 
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/InputVariablesPhase.java
 (original)
+++ 
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/InputVariablesPhase.java
 Thu Jan 19 19:22:25 2017
@@ -32,7 +32,6 @@ import org.apache.maven.shared.release.e
 import org.apache.maven.shared.release.scm.ReleaseScmRepositoryException;
 import org.apache.maven.shared.release.scm.ScmRepositoryConfigurator;
 import org.apache.maven.shared.release.util.ReleaseUtil;
-import org.codehaus.plexus.component.annotations.Component;
 import org.codehaus.plexus.component.annotations.Requirement;
 import org.codehaus.plexus.components.interactivity.Prompter;
 import org.codehaus.plexus.components.interactivity.PrompterException;
@@ -42,6 +41,7 @@ import org.codehaus.plexus.interpolation
 import org.codehaus.plexus.interpolation.PrefixedPropertiesValueSource;
 import org.codehaus.plexus.interpolation.RecursionInterceptor;
 import org.codehaus.plexus.interpolation.StringSearchInterpolator;
+import org.codehaus.plexus.util.StringUtils;
 
 import java.util.List;
 import java.util.Properties;
@@ -51,7 +51,6 @@ import java.util.Properties;
  *
  * @author mailto:br...@apache.org;>Brett Porter
  */
-@Component( role = ReleasePhase.class, hint = "input-variables" )
 public class InputVariablesPhase
 extends AbstractReleasePhase
 {
@@ -62,6 +61,11 @@ public class InputVariablesPhase
 private Prompter prompter;
 
 /**
+ * Whether this is a branch or a tag operation.
+ */
+private boolean branchOperation;
+
+/**
  * Tool that gets a configured SCM repository from release configuration.
  */
 @Requirement
@@ -72,6 +76,11 @@ public class InputVariablesPhase
 this.prompter = prompter;
 }
 
+boolean