svn commit: r1775988 - /maven/site/trunk/content/apt/plugins/index.apt

[rfscholte]

Author: rfscholte
Date: Sat Dec 24 18:32:46 2016
New Revision: 1775988

URL: http://svn.apache.org/viewvc?rev=1775988&view=rev
Log:
CMS commit to maven by rfscholte

Modified:
maven/site/trunk/content/apt/plugins/index.apt

Modified: maven/site/trunk/content/apt/plugins/index.apt
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/plugins/index.apt?rev=1775988&r1=1775987&r2=1775988&view=diff
==
--- maven/site/trunk/content/apt/plugins/index.apt (original)
+++ maven/site/trunk/content/apt/plugins/index.apt Sat Dec 24 18:32:46 2016
@@ -137,9 +137,9 @@ Available Plugins
 
*--++--++--+++
 | {{{/archetype/maven-archetype-plugin/} <<>>}} | B  | 
2.4  | 2015-08-09 | Generate a skeleton project structure from an 
archetype. | 
{{{https://git-wip-us.apache.org/repos/asf/maven-archetype.git}GIT}} | 
{{{https://issues.apache.org/jira/browse/ARCHETYPE}JIRA}}
 
*--++--++--+++
-| {{{/plugins/maven-assembly-plugin/} <<>>}} | B  | 
3.0.0  | 2016-11-12 | Build an assembly (distribution) of sources 
and/or binaries. | 
{{{https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-assembly-plugin}SVN}}
 | {{{https://issues.apache.org/jira/browse/MASSEMBLY}JIRA}}
+| {{{/plugins/maven-assembly-plugin/} <<>>}} | B  | 
3.0.0| 2016-11-12 | Build an assembly (distribution) of sources and/or 
binaries. | 
{{{https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-assembly-plugin}SVN}}
 | {{{https://issues.apache.org/jira/browse/MASSEMBLY}JIRA}}
 
*--++--++--+++
-| {{{/plugins/maven-dependency-plugin/} <<>>}} | B+R| 
2.10 | 2015-01-27 | Dependency manipulation (copy, unpack) and 
analysis. | 
{{{https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-dependency-plugin}SVN}}
 | {{{https://issues.apache.org/jira/browse/MDEP}JIRA}}
+| {{{/plugins/maven-dependency-plugin/} <<>>}} | B+R| 
3.0.0| 2016-12-12 | Dependency manipulation (copy, unpack) and 
analysis. | 
{{{https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-dependency-plugin}SVN}}
 | {{{https://issues.apache.org/jira/browse/MDEP}JIRA}}
 
*--++--++--+++
 | {{{/enforcer/maven-enforcer-plugin/} <<>>}}| B  | 
1.4.1| 2015-08-23 | Environmental constraint checking (Maven Version, 
JDK etc), User Custom Rule Execution. | 
{{{https://svn.apache.org/repos/asf/maven/enforcer/trunk/maven-enforcer-plugin}SVN}}
 | {{{https://issues.apache.org/jira/browse/MENFORCER}JIRA}}
 
*--++--++--+++

svn commit: r1778347 - in /maven/plugins/trunk/maven-compiler-plugin: ./ src/main/java/org/apache/maven/plugin/compiler/ src/test/java/org/apache/maven/plugin/compiler/

[rfscholte]

Author: rfscholte
Date: Wed Jan 11 20:47:29 2017
New Revision: 1778347

URL: http://svn.apache.org/viewvc?rev=1778347&view=rev
Log:
MCOMPILER-285: Support test-compile for JDK 9 build b148+
Introduce QDoxModuleInfoParser to have a fallback if ASM fails

Added:

maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/ModuleInfoParser.java.bak

maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/QDoxModuleInfoParser.java
Modified:
maven/plugins/trunk/maven-compiler-plugin/pom.xml

maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/AsmModuleInfoParser.java

maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/ModuleInfoParser.java

maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/TestCompilerMojo.java

maven/plugins/trunk/maven-compiler-plugin/src/test/java/org/apache/maven/plugin/compiler/CompilerMojoTestCase.java

Modified: maven/plugins/trunk/maven-compiler-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/pom.xml?rev=1778347&r1=1778346&r2=1778347&view=diff
==
--- maven/plugins/trunk/maven-compiler-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-compiler-plugin/pom.xml Wed Jan 11 20:47:29 2017
@@ -114,6 +114,11 @@ under the License.
   asm
   6.0_ALPHA
 
+
+  com.thoughtworks.qdox
+  qdox
+  2.0-M5
+
 
 
   org.codehaus.plexus
@@ -216,6 +221,21 @@ under the License.
 
   
 
+
+  
+org.codehaus.plexus
+plexus-component-metadata
+1.7
+
+  
+descriptors
+
+  generate-metadata
+
+  
+
+  
+
   
 
   

Modified: 
maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/AsmModuleInfoParser.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/AsmModuleInfoParser.java?rev=1778347&r1=1778346&r2=1778347&view=diff
==
--- 
maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/AsmModuleInfoParser.java
 (original)
+++ 
maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/AsmModuleInfoParser.java
 Wed Jan 11 20:47:29 2017
@@ -27,17 +27,25 @@ import java.io.InputStream;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 
+import org.codehaus.plexus.component.annotations.Component;
 import org.objectweb.asm.ClassReader;
 
 /**
  * Extract information from module with ASM
  * 
  * @author Robert Scholte
- * @since 3.5
+ * @since 3.6
  */
+@Component( role = ModuleInfoParser.class, hint = "asm" )
 public class AsmModuleInfoParser implements ModuleInfoParser
 {
 @Override
+public Type getType()
+{
+return Type.CLASS;
+}
+
+@Override
 public String getModuleName( File modulePath )
 throws IOException
 {

Modified: 
maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/ModuleInfoParser.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/ModuleInfoParser.java?rev=1778347&r1=1778346&r2=1778347&view=diff
==
--- 
maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/ModuleInfoParser.java
 (original)
+++ 
maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/ModuleInfoParser.java
 Wed Jan 11 20:47:29 2017
@@ -23,14 +23,35 @@ import java.io.File;
 import java.io.IOException;
 
 /**
- * Extract information from module
+ * Extract information from the module-info file
  * 
  * @author Robert Scholte
- * @since 3.5
+ * @since 3.6.0
  */
 public interface ModuleInfoParser
 {
+/**
+ * Defines the type of parser, i.e. using the source or the class files
+ */
+public enum Type
+{
+SOURCE, CLASS
+}
 
+/**
+ * What kind of file does the parser use
+ * 
+ * @return the type
+ */
+Type getType();
+
+/**
+ * Extracts the name from the module-info file
+ * 
+ * @param modulePath
+ * @return
+ * @throws IOException
+ */
 String getModuleName( File modulePath )
 throws IOException;
 

Added: 
maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/ModuleInfoParser.java.bak
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compil

svn commit: r1778530 - /maven/plugins/trunk/maven-compiler-plugin/src/site/apt/examples/module-info.apt.vm

[rfscholte]

Author: rfscholte
Date: Fri Jan 13 10:17:16 2017
New Revision: 1778530

URL: http://svn.apache.org/viewvc?rev=1778530&view=rev
Log:
[MCOMPILER-287] Adjust documentation module-info
Ensure test-compile uses correct source/target or release

Modified:

maven/plugins/trunk/maven-compiler-plugin/src/site/apt/examples/module-info.apt.vm

Modified: 
maven/plugins/trunk/maven-compiler-plugin/src/site/apt/examples/module-info.apt.vm
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/site/apt/examples/module-info.apt.vm?rev=1778530&r1=1778529&r2=1778530&view=diff
==
--- 
maven/plugins/trunk/maven-compiler-plugin/src/site/apt/examples/module-info.apt.vm
 (original)
+++ 
maven/plugins/trunk/maven-compiler-plugin/src/site/apt/examples/module-info.apt.vm
 Fri Jan 13 10:17:16 2017
@@ -66,21 +66,22 @@ Older projects with module-info
 
   compile
 
+
 
-  
+  
   
 [1.5,9)
   
-  9
+  1.5
+  1.5
 
   
 
@@ -118,19 +119,21 @@ Older projects with module-info
 
   compile
 
+
 
   
   
 9
   
+  6
 
   
 

svn commit: r1778540 - /maven/plugins/trunk/maven-compiler-plugin/pom.xml

[rfscholte]

Author: rfscholte
Date: Fri Jan 13 11:16:58 2017
New Revision: 1778540

URL: http://svn.apache.org/viewvc?rev=1778540&view=rev
Log:
[maven-release-plugin] prepare release maven-compiler-plugin-3.6.1

Modified:
maven/plugins/trunk/maven-compiler-plugin/pom.xml

Modified: maven/plugins/trunk/maven-compiler-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/pom.xml?rev=1778540&r1=1778539&r2=1778540&view=diff
==
--- maven/plugins/trunk/maven-compiler-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-compiler-plugin/pom.xml Fri Jan 13 11:16:58 2017
@@ -30,7 +30,7 @@ under the License.
   
 
   maven-compiler-plugin
-  3.6.1-SNAPSHOT
+  3.6.1
   maven-plugin
 
   Apache Maven Compiler Plugin
@@ -42,9 +42,9 @@ under the License.
   
 
   
-
scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-compiler-plugin/
-
scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-compiler-plugin/
-
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/
+
scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-compiler-plugin-3.6.1
+
scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-compiler-plugin-3.6.1
+
http://svn.apache.org/viewvc/maven/plugins/tags/maven-compiler-plugin-3.6.1
   
   
 JIRA

svn commit: r1778542 - /maven/plugins/trunk/maven-compiler-plugin/pom.xml

[rfscholte]

Author: rfscholte
Date: Fri Jan 13 11:17:13 2017
New Revision: 1778542

URL: http://svn.apache.org/viewvc?rev=1778542&view=rev
Log:
[maven-release-plugin] prepare for next development iteration

Modified:
maven/plugins/trunk/maven-compiler-plugin/pom.xml

Modified: maven/plugins/trunk/maven-compiler-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/pom.xml?rev=1778542&r1=1778541&r2=1778542&view=diff
==
--- maven/plugins/trunk/maven-compiler-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-compiler-plugin/pom.xml Fri Jan 13 11:17:13 2017
@@ -30,7 +30,7 @@ under the License.
   
 
   maven-compiler-plugin
-  3.6.1
+  3.6.2-SNAPSHOT
   maven-plugin
 
   Apache Maven Compiler Plugin
@@ -42,9 +42,9 @@ under the License.
   
 
   
-
scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-compiler-plugin-3.6.1
-
scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-compiler-plugin-3.6.1
-
http://svn.apache.org/viewvc/maven/plugins/tags/maven-compiler-plugin-3.6.1
+
scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-compiler-plugin/
+
scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-compiler-plugin/
+
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/
   
   
 JIRA

svn commit: r1778541 - /maven/plugins/tags/maven-compiler-plugin-3.6.1/

[rfscholte]

Author: rfscholte
Date: Fri Jan 13 11:17:11 2017
New Revision: 1778541

URL: http://svn.apache.org/viewvc?rev=1778541&view=rev
Log:
[maven-release-plugin] copy for tag maven-compiler-plugin-3.6.1

Added:
maven/plugins/tags/maven-compiler-plugin-3.6.1/   (props changed)
  - copied from r1778540, maven/plugins/trunk/maven-compiler-plugin/

Propchange: maven/plugins/tags/maven-compiler-plugin-3.6.1/
--
--- svn:ignore (added)
+++ svn:ignore Fri Jan 13 11:17:11 2017
@@ -0,0 +1,12 @@
+target
+*~
+*.log
+*.ipr
+*.iws
+*.iml
+.idea
+.wtpmodules
+.project
+.classpath
+.settings
+bin

Propchange: maven/plugins/tags/maven-compiler-plugin-3.6.1/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Jan 13 11:17:11 2017
@@ -0,0 +1 @@
+/maven/plugins/branches/maven-compiler-plugin-annotations:1337379-1351482

svn commit: r1778770 - in /maven/plugin-tools/trunk/maven-plugin-plugin/src/main/java/org/apache/maven: plugin/plugin/PluginReport.java plugins/ plugins/plugin/ plugins/plugin/descriptor/ plugins/plug

[rfscholte]

Author: rfscholte
Date: Sat Jan 14 13:39:47 2017
New Revision: 1778770

URL: http://svn.apache.org/viewvc?rev=1778770&view=rev
Log:
[MPLUGIN-319] @since values ignored in report
New strategy where we don't need a parameter anymore (who would change it?)

Added:

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

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

maven/plugin-tools/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugins/plugin/descriptor/

maven/plugin-tools/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugins/plugin/descriptor/MNG6109PluginDescriptorBuilder.java
Modified:

maven/plugin-tools/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java

Modified: 
maven/plugin-tools/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java
URL: 
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java?rev=1778770&r1=1778769&r2=1778770&view=diff
==
--- 
maven/plugin-tools/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java
 (original)
+++ 
maven/plugin-tools/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java
 Sat Jan 14 13:39:47 2017
@@ -47,6 +47,7 @@ import org.apache.maven.plugins.annotati
 import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
+import 
org.apache.maven.plugins.plugin.descriptor.MNG6109PluginDescriptorBuilder;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.reporting.AbstractMavenReport;
 import org.apache.maven.reporting.AbstractMavenReportRenderer;
@@ -195,18 +196,6 @@ public class PluginReport
  */
 @Component
 private RuntimeInformation rtInfo;
-
-/**
- * Maven version range where META-INF/maven/plugin.xml should 
be used to get plugin info:
- * when running with a Maven version not in the range, plugin info is 
extracted directly from plugin source.
- * Reading META-INF/maven/plugin.xml gives accurate 
since only with Maven-3.4.0+
- * (see MNG-6109).
- * For cases where missing since info is not an issue, this 
version range spec can be changed
- * to avoid extracting info from plugin source once again.
- * @since 3.5.1
- */
-@Parameter( defaultValue = "(3.3.9,)" )
-private String usePluginXmlMavenVersionRange;
 
 /**
  * {@inheritDoc}
@@ -271,26 +260,20 @@ public class PluginReport
 private PluginDescriptor extractPluginDescriptor()
 throws MavenReportException
 {
-if ( !usePluginXml() )
+PluginDescriptorBuilder builder = getPluginDescriptorBuilder();
+
+try
 {
-getLog().debug( "Mojo configured to avoid plugin.xml (MNG-6109): 
fall back to mojoScanner" );
+return builder.build( new FileReader( new File( 
project.getBuild().getOutputDirectory(),
+
"META-INF/maven/plugin.xml" ) ) );
 }
-else
+catch ( FileNotFoundException e )
 {
-PluginDescriptorBuilder builder = new PluginDescriptorBuilder();
-try
-{
-return builder.build( new FileReader( new File( 
project.getBuild().getOutputDirectory(),
-
"META-INF/maven/plugin.xml" ) ) );
-}
-catch ( FileNotFoundException e )
-{
-getLog().debug( "Failed to read META-INF/maven/plugin.xml, 
fall back to mojoScanner" );
-}
-catch ( PlexusConfigurationException e )
-{
-getLog().debug( "Failed to read META-INF/maven/plugin.xml, 
fall back to mojoScanner" );
-}
+getLog().debug( "Failed to read META-INF/maven/plugin.xml, fall 
back to mojoScanner" );
+}
+catch ( PlexusConfigurationException e )
+{
+getLog().debug( "Failed to read META-INF/maven/plugin.xml, fall 
back to mojoScanner" );
 }
 
 // Copy from AbstractGeneratorMojo#execute()
@@ -348,23 +331,35 @@ public class PluginReport
 }
 
 /**
- * Check if META-INF/maven/plugin.xml should be used (as expected 
initially) or not (because of Maven
- * MNG-6109 bug that won't give accurate since info when reading 
plugin.xml).
- * @return true if runing Maven version is in configured 
usePluginXmlMavenVersionRange range
+ * Return the pluginDescriptorBuilder to use based on the Maven version: 
either u

svn commit: r1778915 - /maven/plugin-tools/trunk/maven-plugin-plugin/src/site/apt/examples/using-annotations.apt.vm

[rfscholte]

Author: rfscholte
Date: Sun Jan 15 13:21:08 2017
New Revision: 1778915

URL: http://svn.apache.org/viewvc?rev=1778915&view=rev
Log:
[MPLUGIN-321] improve documentation on maven-plugin-annotations telling that 
optional=true is sufficient

Modified:

maven/plugin-tools/trunk/maven-plugin-plugin/src/site/apt/examples/using-annotations.apt.vm

Modified: 
maven/plugin-tools/trunk/maven-plugin-plugin/src/site/apt/examples/using-annotations.apt.vm
URL: 
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/src/site/apt/examples/using-annotations.apt.vm?rev=1778915&r1=1778914&r2=1778915&view=diff
==
--- 
maven/plugin-tools/trunk/maven-plugin-plugin/src/site/apt/examples/using-annotations.apt.vm
 (original)
+++ 
maven/plugin-tools/trunk/maven-plugin-plugin/src/site/apt/examples/using-annotations.apt.vm
 Sun Jan 15 13:21:08 2017
@@ -94,7 +94,7 @@ Using Plugin Tools Java5 Annotations
   org.apache.maven.plugin-tools
   maven-plugin-annotations
   ${project.version}
-  provided
+  true 
 
   
   ...

svn commit: r17821 - /release/maven/plugins/

[rfscholte]

Author: rfscholte
Date: Mon Jan 16 11:44:55 2017
New Revision: 17821

Log:
Maven Compiler Plugin 3.6.1

Added:
release/maven/plugins/maven-compiler-plugin-3.6.1-source-release.zip   
(with props)
release/maven/plugins/maven-compiler-plugin-3.6.1-source-release.zip.asc
release/maven/plugins/maven-compiler-plugin-3.6.1-source-release.zip.md5
Removed:
release/maven/plugins/maven-compiler-plugin-3.6.0-source-release.zip
release/maven/plugins/maven-compiler-plugin-3.6.0-source-release.zip.asc
release/maven/plugins/maven-compiler-plugin-3.6.0-source-release.zip.md5

Added: release/maven/plugins/maven-compiler-plugin-3.6.1-source-release.zip
==
Binary file - no diff available.

Propchange: release/maven/plugins/maven-compiler-plugin-3.6.1-source-release.zip
--
svn:mime-type = application/octet-stream

Added: release/maven/plugins/maven-compiler-plugin-3.6.1-source-release.zip.asc
==
--- release/maven/plugins/maven-compiler-plugin-3.6.1-source-release.zip.asc 
(added)
+++ release/maven/plugins/maven-compiler-plugin-3.6.1-source-release.zip.asc 
Mon Jan 16 11:44:55 2017
@@ -0,0 +1,7 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v2
+
+iF4EABEIAAYFAlh4t6YACgkQrlp/tgigIhw/agEAl4pxnxCuAUO83Gbg9mWbixVT
+Rhej0qiMNSI2yxbNJjwA/jzxCIMI5i5xLywll6m9LDg9tKFLzUCdHso+6YflSBV6
+=vAvA
+-END PGP SIGNATURE-

Added: release/maven/plugins/maven-compiler-plugin-3.6.1-source-release.zip.md5
==
--- release/maven/plugins/maven-compiler-plugin-3.6.1-source-release.zip.md5 
(added)
+++ release/maven/plugins/maven-compiler-plugin-3.6.1-source-release.zip.md5 
Mon Jan 16 11:44:55 2017
@@ -0,0 +1 @@
+0aff4956cf33aa47e8f4b27712ab0a6d
\ No newline at end of file

svn commit: r1779078 - /maven/site/trunk/content/apt/plugins/index.apt

[rfscholte]

Author: rfscholte
Date: Mon Jan 16 18:42:58 2017
New Revision: 1779078

URL: http://svn.apache.org/viewvc?rev=1779078&view=rev
Log:
CMS commit to maven by rfscholte

Modified:
maven/site/trunk/content/apt/plugins/index.apt

Modified: maven/site/trunk/content/apt/plugins/index.apt
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/plugins/index.apt?rev=1779078&r1=1779077&r2=1779078&view=diff
==
--- maven/site/trunk/content/apt/plugins/index.apt (original)
+++ maven/site/trunk/content/apt/plugins/index.apt Mon Jan 16 18:42:58 2017
@@ -69,7 +69,7 @@ Available Plugins
 
*--++--++--+++
 | {{{/plugins/maven-clean-plugin/} <<>>}}   | B  | 
3.0.0| 2015-10-22 | Clean up after the build. | 
{{{https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-clean-plugin}SVN}}
 | {{{https://issues.apache.org/jira/browse/MCLEAN}JIRA}}
 
*--++--++--+++
-| {{{/plugins/maven-compiler-plugin/} <<>>}} | B  | 
3.6.0| 2016-10-29 | Compiles Java sources. | 
{{{https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-compiler-plugin}SVN}}
 | {{{https://issues.apache.org/jira/browse/MCOMPILER}JIRA}}
+| {{{/plugins/maven-compiler-plugin/} <<>>}} | B  | 
3.6.1| 2017-01-16 | Compiles Java sources. | 
{{{https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-compiler-plugin}SVN}}
 | {{{https://issues.apache.org/jira/browse/MCOMPILER}JIRA}}
 
*--++--++--+++
 | {{{/plugins/maven-deploy-plugin/} <<>>}} | B  | 
2.8.2| 2014-08-27 | Deploy the built artifact to the remote repository. 
| 
{{{https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-deploy-plugin}SVN}}
 | {{{https://issues.apache.org/jira/browse/MDEPLOY}JIRA}}
 
*--++--++--+++

svn commit: r1779109 - /maven/site/trunk/content/apt/developers/release/maven-project-release-procedure.apt

[rfscholte]

Author: rfscholte
Date: Mon Jan 16 21:36:26 2017
New Revision: 1779109

URL: http://svn.apache.org/viewvc?rev=1779109&view=rev
Log:
CMS commit to maven by rfscholte

Modified:

maven/site/trunk/content/apt/developers/release/maven-project-release-procedure.apt

Modified: 
maven/site/trunk/content/apt/developers/release/maven-project-release-procedure.apt
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/developers/release/maven-project-release-procedure.apt?rev=1779109&r1=1779108&r2=1779109&view=diff
==
--- 
maven/site/trunk/content/apt/developers/release/maven-project-release-procedure.apt
 (original)
+++ 
maven/site/trunk/content/apt/developers/release/maven-project-release-procedure.apt
 Mon Jan 16 21:36:26 2017
@@ -195,6 +195,8 @@ wagon/wagon-2.2-source-release.zip.md5
   or {{{../website/component-reference-documentation-helper.html}Component 
Reference Documentation Helper}}.
   Note that not all projects follow these conventions exactly.
 
+  In case there's an overview table with version (e.g. 
{{{http://maven.apache.org/plugins/index.html}plugins}} and 
{{{https://maven.apache.org/shared/index.html}shared}} update it via 
{{https://cms.apache.org/}}
+
  [[3]] Update the version tracking in JIRA
 
  In the relevant project, go to Administration, then Versions. Mark

svn commit: r1779110 - /maven/site/trunk/content/apt/developers/release/maven-project-release-procedure.apt

[rfscholte]

Author: rfscholte
Date: Mon Jan 16 21:39:03 2017
New Revision: 1779110

URL: http://svn.apache.org/viewvc?rev=1779110&view=rev
Log:
CMS commit to maven by rfscholte

Modified:

maven/site/trunk/content/apt/developers/release/maven-project-release-procedure.apt

Modified: 
maven/site/trunk/content/apt/developers/release/maven-project-release-procedure.apt
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/developers/release/maven-project-release-procedure.apt?rev=1779110&r1=1779109&r2=1779110&view=diff
==
--- 
maven/site/trunk/content/apt/developers/release/maven-project-release-procedure.apt
 (original)
+++ 
maven/site/trunk/content/apt/developers/release/maven-project-release-procedure.apt
 Mon Jan 16 21:39:03 2017
@@ -195,7 +195,7 @@ wagon/wagon-2.2-source-release.zip.md5
   or {{{../website/component-reference-documentation-helper.html}Component 
Reference Documentation Helper}}.
   Note that not all projects follow these conventions exactly.
 
-  In case there's an overview table with version (e.g. 
{{{http://maven.apache.org/plugins/index.html}plugins}} and 
{{{https://maven.apache.org/shared/index.html}shared}} update it via 
{{https://cms.apache.org/}}
+  In case there's an overview table with version (e.g. 
{{{http://maven.apache.org/plugins/index.html}plugins}} and 
{{{https://maven.apache.org/shared/index.html}shared}}) update it via 
{{https://cms.apache.org/}}.
 
  [[3]] Update the version tracking in JIRA
 

svn commit: r1779169 - in /maven/plugins/trunk/maven-invoker-plugin/src/it: spaces-should-work_non-windows/ spaces-should-work_non-windows/src/ spaces-should-work_non-windows/src/it/ spaces-should-wor

[rfscholte]

Author: rfscholte
Date: Tue Jan 17 11:10:35 2017
New Revision: 1779169

URL: http://svn.apache.org/viewvc?rev=1779169&view=rev
Log:
[MINVOKER-209] ITs fail (on Windows 10) when working directory contains space
Split ITs since there's no multi-criteria support yet

Added:

maven/plugins/trunk/maven-invoker-plugin/src/it/spaces-should-work_non-windows/

maven/plugins/trunk/maven-invoker-plugin/src/it/spaces-should-work_non-windows/invoker.properties

maven/plugins/trunk/maven-invoker-plugin/src/it/spaces-should-work_non-windows/pom.xml

maven/plugins/trunk/maven-invoker-plugin/src/it/spaces-should-work_non-windows/setup.groovy

maven/plugins/trunk/maven-invoker-plugin/src/it/spaces-should-work_non-windows/src/

maven/plugins/trunk/maven-invoker-plugin/src/it/spaces-should-work_non-windows/src/it/

maven/plugins/trunk/maven-invoker-plugin/src/it/spaces-should-work_non-windows/src/it/minvoker-test/

maven/plugins/trunk/maven-invoker-plugin/src/it/spaces-should-work_non-windows/src/it/minvoker-test/invoker.properties

maven/plugins/trunk/maven-invoker-plugin/src/it/spaces-should-work_non-windows/src/it/minvoker-test/pom.xml

maven/plugins/trunk/maven-invoker-plugin/src/it/spaces-should-work_non-windows/src/it/minvoker-test/verify.groovy
maven/plugins/trunk/maven-invoker-plugin/src/it/spaces-should-work_windows/

maven/plugins/trunk/maven-invoker-plugin/src/it/spaces-should-work_windows/invoker.properties

maven/plugins/trunk/maven-invoker-plugin/src/it/spaces-should-work_windows/pom.xml

maven/plugins/trunk/maven-invoker-plugin/src/it/spaces-should-work_windows/setup.groovy

maven/plugins/trunk/maven-invoker-plugin/src/it/spaces-should-work_windows/src/

maven/plugins/trunk/maven-invoker-plugin/src/it/spaces-should-work_windows/src/it/

maven/plugins/trunk/maven-invoker-plugin/src/it/spaces-should-work_windows/src/it/minvoker-test/

maven/plugins/trunk/maven-invoker-plugin/src/it/spaces-should-work_windows/src/it/minvoker-test/invoker.properties

maven/plugins/trunk/maven-invoker-plugin/src/it/spaces-should-work_windows/src/it/minvoker-test/pom.xml

maven/plugins/trunk/maven-invoker-plugin/src/it/spaces-should-work_windows/src/it/minvoker-test/verify.groovy
Modified:

maven/plugins/trunk/maven-invoker-plugin/src/it/special-characters-should-work/setup.groovy

Added: 
maven/plugins/trunk/maven-invoker-plugin/src/it/spaces-should-work_non-windows/invoker.properties
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/it/spaces-should-work_non-windows/invoker.properties?rev=1779169&view=auto
==
--- 
maven/plugins/trunk/maven-invoker-plugin/src/it/spaces-should-work_non-windows/invoker.properties
 (added)
+++ 
maven/plugins/trunk/maven-invoker-plugin/src/it/spaces-should-work_non-windows/invoker.properties
 Tue Jan 17 11:10:35 2017
@@ -0,0 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+# 
+#   http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+invoker.goals = clean verify
+invoker.os.family = !windows
\ No newline at end of file

Added: 
maven/plugins/trunk/maven-invoker-plugin/src/it/spaces-should-work_non-windows/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/it/spaces-should-work_non-windows/pom.xml?rev=1779169&view=auto
==
--- 
maven/plugins/trunk/maven-invoker-plugin/src/it/spaces-should-work_non-windows/pom.xml
 (added)
+++ 
maven/plugins/trunk/maven-invoker-plugin/src/it/spaces-should-work_non-windows/pom.xml
 Tue Jan 17 11:10:35 2017
@@ -0,0 +1,64 @@
+
+
+
+
+http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
+  4.0.0
+
+  org.apache.maven.plugins.invoker.its
+  basedir-with-spaces
+  1.0-SNAPSHOT
+  pom
+
+  
+  
+Test to check for usage of spaces in folder names.
+  
+
+  
+UTF-8
+  
+
+  
+
+  
+org.apache.maven.plugins
+maven-invoker-plugin
+@project.version@
+   

svn commit: r1779182 - /maven/plugins/trunk/maven-invoker-plugin/pom.xml

[rfscholte]

Author: rfscholte
Date: Tue Jan 17 12:35:58 2017
New Revision: 1779182

URL: http://svn.apache.org/viewvc?rev=1779182&view=rev
Log:
[MINVOKER-215] Use maven-artifact-transfer to support multiple Aether 
implementations

Modified:
maven/plugins/trunk/maven-invoker-plugin/pom.xml

Modified: maven/plugins/trunk/maven-invoker-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/pom.xml?rev=1779182&r1=1779181&r2=1779182&view=diff
==
--- maven/plugins/trunk/maven-invoker-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-invoker-plugin/pom.xml Tue Jan 17 12:35:58 2017
@@ -131,7 +131,7 @@ under the License.
 
   org.apache.maven.shared
   maven-artifact-transfer
-  3.0.0-SNAPSHOT
+  0.9.0
 
 
 

svn commit: r1779183 - /maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java

[rfscholte]

Author: rfscholte
Date: Tue Jan 17 12:41:58 2017
New Revision: 1779183

URL: http://svn.apache.org/viewvc?rev=1779183&view=rev
Log:
Remove unnecessary casts

Modified:

maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java

Modified: 
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java?rev=1779183&r1=1779182&r2=1779183&view=diff
==
--- 
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java
 Tue Jan 17 12:41:58 2017
@@ -45,7 +45,6 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Properties;
-import java.util.Set;
 import java.util.StringTokenizer;
 import java.util.TreeSet;
 import java.util.concurrent.ExecutorService;
@@ -1710,7 +1709,7 @@ public abstract class AbstractInvokerMoj
 {
 Properties props = invokerProperties.getProperties();
 getLog().debug( "Using invoker properties:" );
-for ( String key : new TreeSet( (Set) props.keySet() ) )
+for ( String key : new TreeSet( 
props.stringPropertyNames() ) )
 {
 String value = props.getProperty( key );
 getLog().debug( "  " + key + " = " + value );
@@ -2522,7 +2521,7 @@ public abstract class AbstractInvokerMoj
 Interpolator interpolator = new RegexBasedInterpolator();
 interpolator.addValueSource( new MapBasedValueSource( 
getInterpolationValueSource( false ) ) );
 // CHECKSTYLE_OFF: LineLength
-for ( String key : (Set) ( (Map) props ).keySet() )
+for ( String key : props.stringPropertyNames() )
 {
 String value = props.getProperty( key );
 try

svn commit: r1779250 - in /maven/plugins/trunk/maven-invoker-plugin: ./ src/main/java/org/apache/maven/plugin/invoker/ src/test/java/org/apache/maven/plugin/invoker/

[rfscholte]

Author: rfscholte
Date: Tue Jan 17 20:20:02 2017
New Revision: 1779250

URL: http://svn.apache.org/viewvc?rev=1779250&view=rev
Log:
[MINVOKER-214] Allow indexed maven.version and os.familiy in invoker.properties

Added:

maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/Selector.java

maven/plugins/trunk/maven-invoker-plugin/src/test/java/org/apache/maven/plugin/invoker/SelectorTest.java
Modified:
maven/plugins/trunk/maven-invoker-plugin/pom.xml

maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java

maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerProperties.java

maven/plugins/trunk/maven-invoker-plugin/src/test/java/org/apache/maven/plugin/invoker/InvokerPropertiesTest.java

Modified: maven/plugins/trunk/maven-invoker-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/pom.xml?rev=1779250&r1=1779249&r2=1779250&view=diff
==
--- maven/plugins/trunk/maven-invoker-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-invoker-plugin/pom.xml Tue Jan 17 20:20:02 2017
@@ -213,7 +213,7 @@ under the License.
 
   junit
   junit
-  3.8.2
+  4.12
   test
 
 

Modified: 
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java?rev=1779250&r1=1779249&r2=1779250&view=diff
==
--- 
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java
 Tue Jan 17 20:20:02 2017
@@ -107,13 +107,6 @@ import static org.apache.maven.shared.ut
 public abstract class AbstractInvokerMojo
 extends AbstractMojo
 {
-
-private static final int SELECTOR_MAVENVERSION = 1;
-
-private static final int SELECTOR_JREVERSION = 2;
-
-private static final int SELECTOR_OSFAMILY = 4;
-
 /**
  * Flag used to suppress certain invocations. This is useful in tailoring 
the build using profiles.
  *
@@ -504,7 +497,7 @@ public abstract class AbstractInvokerMoj
  * # A comma separated list of JRE versions on which this build job should 
be run.
  * # Since plugin version 1.4
  * invoker.java.version = 1.4+, !1.4.1, 1.7-
- *
+ * 
  * # A comma separated list of OS families on which this build job should 
be run.
  * # Since plugin version 1.4
  * invoker.os.family = !windows, unix, mac
@@ -512,7 +505,16 @@ public abstract class AbstractInvokerMoj
  * # A comma separated list of Maven versions on which this build should 
be run.
  * # Since plugin version 1.5
  * invoker.maven.version = 2.0.10+, !2.1.0, !2.2.0
- *
+ * 
+ * # For java.version, maven.version and os.family it is possible to 
define multiple selectors.
+ * # If one of the indexed selectors matches, the test is executed.
+ * # With the invoker.x.y equivalents you can specify global matchers.  
+ * selector.1.java.version = 1.8+
+ * selector.1.maven.version = 3.2.5+
+ * selector.1.os.family = !windows
+ * selector.2.maven.version = 3.0+
+ * selector.3.java.version = 9+
+ * 
  * # A boolean value controlling the debug logging level of Maven, , 
defaults to "false"
  * # Since plugin version 1.8
  * invoker.debug = true
@@ -1533,25 +1535,32 @@ public abstract class AbstractInvokerMoj
 buildJob.setResult( BuildJob.Result.SKIPPED );
 
 StringBuilder message = new StringBuilder();
-if ( ( selection & SELECTOR_MAVENVERSION ) != 0 )
+if ( selection == Selector.SELECTOR_MULTI )
 {
-message.append( "Maven version" );
+message.append( "non-matching selectors" );
 }
-if ( ( selection & SELECTOR_JREVERSION ) != 0 )
+else
 {
-if ( message.length() > 0 )
+if ( ( selection & Selector.SELECTOR_MAVENVERSION ) != 0 )
 {
-message.append( ", " );
+message.append( "Maven version" );
 }
-message.append( "JRE version" );
-}
-if ( ( selection & SELECTOR_OSFAMILY ) != 0 )
-{
-if ( message.length() > 0 )
+if ( ( se

svn commit: r1779258 - in /maven/plugins/trunk/maven-shade-plugin: pom.xml src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java src/test/java/org/apache/maven/plugins/shade/mojo/ShadeMojoT

[rfscholte]

Author: rfscholte
Date: Tue Jan 17 20:43:28 2017
New Revision: 1779258

URL: http://svn.apache.org/viewvc?rev=1779258&view=rev
Log:
[MSHADE-246] Switch to maven-artifact-transfer to support both Aether 
implementations

Modified:
maven/plugins/trunk/maven-shade-plugin/pom.xml

maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java

maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/mojo/ShadeMojoTest.java

Modified: maven/plugins/trunk/maven-shade-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/pom.xml?rev=1779258&r1=1779257&r2=1779258&view=diff
==
--- maven/plugins/trunk/maven-shade-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-shade-plugin/pom.xml Tue Jan 17 20:43:28 2017
@@ -25,7 +25,7 @@
   
 maven-plugins
 org.apache.maven.plugins
-28
+30
 ../../pom/maven/maven-plugins/pom.xml
   
 
@@ -93,11 +93,6 @@
 
 
   org.apache.maven
-  maven-compat
-  ${mavenVersion}
-
-
-  org.apache.maven
   maven-artifact
   ${mavenVersion}
 
@@ -114,6 +109,11 @@
   3.0.24
 
 
+
+  org.apache.maven.shared
+  maven-artifact-transfer
+  0.9.0
+
 
 
   org.ow2.asm

Modified: 
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java?rev=1779258&r1=1779257&r2=1779258&view=diff
==
--- 
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java
 Tue Jan 17 20:43:28 2017
@@ -37,12 +37,7 @@ import java.util.Map;
 import java.util.Set;
 
 import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.factory.ArtifactFactory;
-import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
 import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
-import org.apache.maven.artifact.resolver.ArtifactResolutionException;
-import org.apache.maven.artifact.resolver.ArtifactResolver;
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.model.Dependency;
 import org.apache.maven.model.Exclusion;
@@ -70,6 +65,9 @@ import org.apache.maven.project.ProjectB
 import org.apache.maven.project.ProjectBuildingException;
 import org.apache.maven.project.ProjectBuildingRequest;
 import org.apache.maven.project.ProjectBuildingResult;
+import org.apache.maven.shared.artifact.DefaultArtifactCoordinate;
+import org.apache.maven.shared.artifact.resolve.ArtifactResolver;
+import org.apache.maven.shared.artifact.resolve.ArtifactResolverException;
 import org.apache.maven.shared.dependency.graph.DependencyGraphBuilder;
 import 
org.apache.maven.shared.dependency.graph.DependencyGraphBuilderException;
 import org.apache.maven.shared.dependency.graph.DependencyNode;
@@ -128,12 +126,6 @@ public class ShadeMojo
 private ProjectBuilder projectBuilder;
 
 /**
- * The artifact metadata source to use.
- */
-@Component
-private ArtifactMetadataSource artifactMetadataSource;
-
-/**
  * Remote repositories which will be searched for source attachments.
  */
 @Parameter( readonly = true, required = true, defaultValue = 
"${project.remoteArtifactRepositories}" )
@@ -146,12 +138,6 @@ public class ShadeMojo
 protected ArtifactRepository localRepository;
 
 /**
- * Artifact factory, needed to download source jars for inclusion in 
classpath.
- */
-@Component
-protected ArtifactFactory artifactFactory;
-
-/**
  * Artifact resolver, needed to download source jars for inclusion in 
classpath.
  */
 @Component
@@ -705,20 +691,20 @@ public class ShadeMojo
 
 private File resolveArtifactSources( Artifact artifact )
 {
-
-Artifact resolvedArtifact =
-artifactFactory.createArtifactWithClassifier( 
artifact.getGroupId(), artifact.getArtifactId(),
-  
artifact.getVersion(), "java-source", "sources" );
-
+DefaultArtifactCoordinate coordinate = new DefaultArtifactCoordinate();
+coordinate.setGroupId( artifact.getGroupId() );
+coordinate.setArtifactId( artifact.getArtifactId() );
+coordinate.setVersion( artifact.getVersion() );
+coordinate.setExtension( "jar" );
+coordinate.setClassifier( "sources" );
+
+Artifact resolved

svn commit: r1779270 - in /maven/plugins/trunk/maven-shade-plugin/src: it/project-with-reactors-included/verify.bsh main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java

[rfscholte]

Author: rfscholte
Date: Tue Jan 17 21:48:06 2017
New Revision: 1779270

URL: http://svn.apache.org/viewvc?rev=1779270&view=rev
Log:
[MSHADE-225] Writing output only once
Probably only happens in case of reducing reactor projects

Modified:

maven/plugins/trunk/maven-shade-plugin/src/it/project-with-reactors-included/verify.bsh

maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java

Modified: 
maven/plugins/trunk/maven-shade-plugin/src/it/project-with-reactors-included/verify.bsh
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/project-with-reactors-included/verify.bsh?rev=1779270&r1=1779269&r2=1779270&view=diff
==
--- 
maven/plugins/trunk/maven-shade-plugin/src/it/project-with-reactors-included/verify.bsh
 (original)
+++ 
maven/plugins/trunk/maven-shade-plugin/src/it/project-with-reactors-included/verify.bsh
 Tue Jan 17 21:48:06 2017
@@ -20,6 +20,8 @@
 import java.io.*;
 import java.util.jar.*;
 
+import org.codehaus.plexus.util.*;
+
 String[] wanted =
 {
 "org/apache/maven/plugins/shade/its/one/AppOne.class",
@@ -38,6 +40,14 @@ for ( String path : wanted )
 }
 }
 
+jarFile.close();
 
+// MSHADE-225 Writing output only once
+File logFile = new File( basedir, "build.log" );
+String log = FileUtils.fileRead( logFile );
 
-jarFile.close();
\ No newline at end of file
+int index = log.indexOf( "[INFO] Dependency-reduced POM written at: " );
+if ( log.indexOf( "[INFO] Dependency-reduced POM written at: ", index+1 ) >= 0 
)
+{
+  throw new IllegalStateException( "'[INFO] Dependency-reduced POM written at: 
' written more than once" + path );
+}

Modified: 
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java?rev=1779270&r1=1779269&r2=1779270&view=diff
==
--- 
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java
 Tue Jan 17 21:48:06 2017
@@ -959,7 +959,7 @@ public class ShadeMojo
 {
 if ( modified )
 {
-while ( modified )
+for ( int loopCounter = 0; modified; loopCounter++ )
 {
 
 model.setDependencies( dependencies );
@@ -981,7 +981,12 @@ public class ShadeMojo
 }
 
 File f = dependencyReducedPomLocation;
-getLog().info( "Dependency-reduced POM written at: " + 
f.getAbsolutePath() );
+// MSHADE-225 
+// Works for now, maybe there's a better algorithm where no 
for-loop is required
+if ( loopCounter == 0 )
+{
+getLog().info( "Dependency-reduced POM written at: " + 
f.getAbsolutePath() );
+}
 
 if ( f.exists() )
 {

svn commit: r1779329 - in /maven/plugins/trunk/maven-shade-plugin/src: it/MSHADE-232_ResourceBundleAppendingTransformer/ it/MSHADE-232_ResourceBundleAppendingTransformer/one/ it/MSHADE-232_ResourceBun

[rfscholte]

Author: rfscholte
Date: Wed Jan 18 14:24:55 2017
New Revision: 1779329

URL: http://svn.apache.org/viewvc?rev=1779329&view=rev
Log:
[MSHADE-232] Introduce ResourceBundleAppendingTransformer

Added:

maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-232_ResourceBundleAppendingTransformer/

maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-232_ResourceBundleAppendingTransformer/invoker.properties

maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-232_ResourceBundleAppendingTransformer/one/

maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-232_ResourceBundleAppendingTransformer/one/pom.xml

maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-232_ResourceBundleAppendingTransformer/one/src/

maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-232_ResourceBundleAppendingTransformer/one/src/main/

maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-232_ResourceBundleAppendingTransformer/one/src/main/resources/

maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-232_ResourceBundleAppendingTransformer/one/src/main/resources/org/

maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-232_ResourceBundleAppendingTransformer/one/src/main/resources/org/apache/

maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-232_ResourceBundleAppendingTransformer/one/src/main/resources/org/apache/maven/

maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-232_ResourceBundleAppendingTransformer/one/src/main/resources/org/apache/maven/plugins/

maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-232_ResourceBundleAppendingTransformer/one/src/main/resources/org/apache/maven/plugins/shade/

maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-232_ResourceBundleAppendingTransformer/one/src/main/resources/org/apache/maven/plugins/shade/its/

maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-232_ResourceBundleAppendingTransformer/one/src/main/resources/org/apache/maven/plugins/shade/its/Message.properties

maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-232_ResourceBundleAppendingTransformer/one/src/main/resources/org/apache/maven/plugins/shade/its/Message_nl.properties

maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-232_ResourceBundleAppendingTransformer/pom.xml

maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-232_ResourceBundleAppendingTransformer/two/

maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-232_ResourceBundleAppendingTransformer/two/pom.xml

maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-232_ResourceBundleAppendingTransformer/two/src/

maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-232_ResourceBundleAppendingTransformer/two/src/main/

maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-232_ResourceBundleAppendingTransformer/two/src/main/resources/

maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-232_ResourceBundleAppendingTransformer/two/src/main/resources/org/

maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-232_ResourceBundleAppendingTransformer/two/src/main/resources/org/apache/

maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-232_ResourceBundleAppendingTransformer/two/src/main/resources/org/apache/maven/

maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-232_ResourceBundleAppendingTransformer/two/src/main/resources/org/apache/maven/plugins/

maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-232_ResourceBundleAppendingTransformer/two/src/main/resources/org/apache/maven/plugins/shade/

maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-232_ResourceBundleAppendingTransformer/two/src/main/resources/org/apache/maven/plugins/shade/its/

maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-232_ResourceBundleAppendingTransformer/two/src/main/resources/org/apache/maven/plugins/shade/its/Message.properties

maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-232_ResourceBundleAppendingTransformer/two/src/main/resources/org/apache/maven/plugins/shade/its/Message_nl.properties

maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-232_ResourceBundleAppendingTransformer/verify.groovy

maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ResourceBundleAppendingTransformer.java

maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/ResourceBundleAppendingTransformerTest.java
Modified:

maven/plugins/trunk/maven-shade-plugin/src/site/apt/examples/resource-transformers.apt.vm

Added: 
maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-232_ResourceBundleAppendingTransformer/invoker.properties
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-232_ResourceBundleAppendingTransformer/invoker.properties?rev=1779329&view=auto
==
--- 
maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-232_ResourceBundleAppendingTransformer/invoker.pr

svn commit: r1779371 - in /maven/plugins/trunk/maven-shade-plugin/src: it/MSHADE-239_finalName-attachments/ main/java/org/apache/maven/plugins/shade/mojo/

[rfscholte]

Author: rfscholte
Date: Wed Jan 18 18:50:18 2017
New Revision: 1779371

URL: http://svn.apache.org/viewvc?rev=1779371&view=rev
Log:
[MSHADE-239] Shaded Source JAR not following finalName pattern
Contributed by Diego Rivera, verified and adjusted by Robert Scholte

Added:

maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-239_finalName-attachments/

maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-239_finalName-attachments/pom.xml

maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-239_finalName-attachments/verify.groovy
Modified:

maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java

Added: 
maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-239_finalName-attachments/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-239_finalName-attachments/pom.xml?rev=1779371&view=auto
==
--- 
maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-239_finalName-attachments/pom.xml
 (added)
+++ 
maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-239_finalName-attachments/pom.xml
 Wed Jan 18 18:50:18 2017
@@ -0,0 +1,59 @@
+
+
+
+
+http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
+  4.0.0
+
+  org.apache.maven.its.shade.fns
+  artifactId
+  version
+
+  https://issues.apache.org/jira/browse/MSHADE-239
+  
+  
+crapola
+  
+
+  
+
+  
+org.apache.maven.plugins
+maven-shade-plugin
+@project.version@
+
+  
+
+  shade
+
+
+  
${project.artifactId}-${project.version}-${some-other-crap}-exe
+  true
+  true
+  true
+  exe
+  true
+
+  
+
+  
+
+  
+

Added: 
maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-239_finalName-attachments/verify.groovy
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-239_finalName-attachments/verify.groovy?rev=1779371&view=auto
==
--- 
maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-239_finalName-attachments/verify.groovy
 (added)
+++ 
maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-239_finalName-attachments/verify.groovy
 Wed Jan 18 18:50:18 2017
@@ -0,0 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+assert new File( basedir, 'target/artifactId-version-crapola-exe.jar' 
).exists() : "target/artifactId-version-crapola-exe.jar doesn't exist"
+assert new File( basedir, 'target/artifactId-version-crapola-exe-sources.jar' 
).exists() : "target/artifactId-version-crapola-exe-sources.jar doesn't exist"
+assert new File( basedir, 'target/artifactId-version-crapola-exe-tests.jar' 
).exists() : "target/artifactId-version-crapola-exe-tests.jar doesn't exist"

Modified: 
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java?rev=1779371&r1=1779370&r2=1779371&view=diff
==
--- 
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java
 Wed Jan 18 18:50:18 2017
@@ -473,6 +473,24 @@ public class ShadeMojo
 replaceFile( finalFile, outputJar );
 outputJar = finalFile;
 
+// Also support the sources JAR
+if ( createSourcesJar )
+{
+finalFileName = finalName + "-so

svn commit: r1779644 - in /maven/plugins/trunk/maven-shade-plugin/src: it/MSHADE-240_reloc-mavenfiles/ main/java/org/apache/maven/plugins/shade/relocation/ test/java/org/apache/maven/plugins/shade/rel

[rfscholte]

Author: rfscholte
Date: Fri Jan 20 16:36:04 2017
New Revision: 1779644

URL: http://svn.apache.org/viewvc?rev=1779644&view=rev
Log:
[MSHADE-240] support relocation pom.properties and pom.xml descriptors in 
shaded jars

Added:
maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-240_reloc-mavenfiles/

maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-240_reloc-mavenfiles/pom.xml

maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-240_reloc-mavenfiles/verify.groovy
Modified:

maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/relocation/SimpleRelocator.java

maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/relocation/SimpleRelocatorTest.java

Added: 
maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-240_reloc-mavenfiles/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-240_reloc-mavenfiles/pom.xml?rev=1779644&view=auto
==
--- 
maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-240_reloc-mavenfiles/pom.xml
 (added)
+++ 
maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-240_reloc-mavenfiles/pom.xml
 Fri Jan 20 16:36:04 2017
@@ -0,0 +1,67 @@
+
+
+
+
+
+  4.0.0
+
+  org.apache.maven.plugins.shade.its
+  mshade240
+  1.0-SNAPSHOT
+
+  https://issues.apache.org/jira/browse/MSHADE-240
+  
+  
+
+  org.apache.maven
+  maven-core
+  3.0
+
+  
+
+  
+
+  
+org.apache.maven.plugins
+maven-shade-plugin
+@project.version@
+
+  
+
+  shade
+
+
+  false
+  
+
+  META-INF/maven
+  META-INF/shade/maven
+  
+
META-INF/maven/${project.groupId}/${project.artifactId}/pom.*
+  
+
+  
+
+  
+
+  
+
+  
+

Added: 
maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-240_reloc-mavenfiles/verify.groovy
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-240_reloc-mavenfiles/verify.groovy?rev=1779644&view=auto
==
--- 
maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-240_reloc-mavenfiles/verify.groovy
 (added)
+++ 
maven/plugins/trunk/maven-shade-plugin/src/it/MSHADE-240_reloc-mavenfiles/verify.groovy
 Fri Jan 20 16:36:04 2017
@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+def jarFile = new java.util.jar.JarFile( new File( basedir, 
"target/mshade240-1.0-SNAPSHOT.jar" ) )
+try 
+{
+  assert null != jarFile.getJarEntry( 
"META-INF/maven/org.apache.maven.plugins.shade.its/mshade240/pom.properties" )
+  assert null != jarFile.getJarEntry( 
"META-INF/maven/org.apache.maven.plugins.shade.its/mshade240/pom.xml" )
+  assert null != jarFile.getJarEntry( 
"META-INF/shade/maven/org.apache.maven/maven-core/pom.properties" )
+  assert null != jarFile.getJarEntry( 
"META-INF/shade/maven/org.apache.maven/maven-core/pom.xml" )
+
+  assert null == jarFile.getJarEntry( 
"META-INF/shade/maven/org.apache.maven.plugins.shade.its/mshade240/pom.properties"
 )
+  assert null == jarFile.getJarEntry( 
"META-INF/shade/maven/org.apache.maven.plugins.shade.its/mshade240/pom.xml" )
+  assert null == jarFile.getJarEntry( 
"META-INF/maven/org.apache.maven/maven-core/pom.properties" )
+  assert null == jarFile.getJarEntry( 
"META-INF/maven/org.apache.maven/maven-core/pom.xml" )
+}
+finally 
+{
+  jarFile.close()
+}

Modified: 
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/relocation/SimpleRelocator.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/relocation/SimpleRelocator.java?rev=1779644&r1=1779643&r2=1779644&view=diff
==
--- 
mave

svn commit: r1779751 - in /maven/plugins/trunk/maven-compiler-plugin/src/it/jdk9-exportsto: ./ bar/ bar/src/ bar/src/main/ bar/src/main/java/ foo/ foo/src/ foo/src/main/ foo/src/main/java/ foo/src/mai

[rfscholte]

Author: rfscholte
Date: Sat Jan 21 19:10:59 2017
New Revision: 1779751

URL: http://svn.apache.org/viewvc?rev=1779751&view=rev
Log:
Integration test of multimodule with exports to other module

Added:
maven/plugins/trunk/maven-compiler-plugin/src/it/jdk9-exportsto/
maven/plugins/trunk/maven-compiler-plugin/src/it/jdk9-exportsto/bar/
maven/plugins/trunk/maven-compiler-plugin/src/it/jdk9-exportsto/bar/pom.xml
maven/plugins/trunk/maven-compiler-plugin/src/it/jdk9-exportsto/bar/src/

maven/plugins/trunk/maven-compiler-plugin/src/it/jdk9-exportsto/bar/src/main/

maven/plugins/trunk/maven-compiler-plugin/src/it/jdk9-exportsto/bar/src/main/java/

maven/plugins/trunk/maven-compiler-plugin/src/it/jdk9-exportsto/bar/src/main/java/module-info.java
maven/plugins/trunk/maven-compiler-plugin/src/it/jdk9-exportsto/foo/
maven/plugins/trunk/maven-compiler-plugin/src/it/jdk9-exportsto/foo/pom.xml
maven/plugins/trunk/maven-compiler-plugin/src/it/jdk9-exportsto/foo/src/

maven/plugins/trunk/maven-compiler-plugin/src/it/jdk9-exportsto/foo/src/main/

maven/plugins/trunk/maven-compiler-plugin/src/it/jdk9-exportsto/foo/src/main/java/

maven/plugins/trunk/maven-compiler-plugin/src/it/jdk9-exportsto/foo/src/main/java/foo/

maven/plugins/trunk/maven-compiler-plugin/src/it/jdk9-exportsto/foo/src/main/java/foo/Foo.java

maven/plugins/trunk/maven-compiler-plugin/src/it/jdk9-exportsto/foo/src/main/java/module-info.java

maven/plugins/trunk/maven-compiler-plugin/src/it/jdk9-exportsto/invoker.properties
maven/plugins/trunk/maven-compiler-plugin/src/it/jdk9-exportsto/pom.xml

Added: 
maven/plugins/trunk/maven-compiler-plugin/src/it/jdk9-exportsto/bar/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/it/jdk9-exportsto/bar/pom.xml?rev=1779751&view=auto
==
--- maven/plugins/trunk/maven-compiler-plugin/src/it/jdk9-exportsto/bar/pom.xml 
(added)
+++ maven/plugins/trunk/maven-compiler-plugin/src/it/jdk9-exportsto/bar/pom.xml 
Sat Jan 21 19:10:59 2017
@@ -0,0 +1,40 @@
+
+
+
+http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
+  4.0.0
+
+  
+org.apache.maven.plugins.compiler.it
+exportsto
+1.0-SNAPSHOT
+  
+  bar
+
+  
+
+  org.apache.maven.plugins.compiler.it
+  foo
+  1.0-SNAPSHOT
+
+  
+

Added: 
maven/plugins/trunk/maven-compiler-plugin/src/it/jdk9-exportsto/bar/src/main/java/module-info.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/it/jdk9-exportsto/bar/src/main/java/module-info.java?rev=1779751&view=auto
==
--- 
maven/plugins/trunk/maven-compiler-plugin/src/it/jdk9-exportsto/bar/src/main/java/module-info.java
 (added)
+++ 
maven/plugins/trunk/maven-compiler-plugin/src/it/jdk9-exportsto/bar/src/main/java/module-info.java
 Sat Jan 21 19:10:59 2017
@@ -0,0 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+module bar {
+  requires foo;
+}
\ No newline at end of file

Added: 
maven/plugins/trunk/maven-compiler-plugin/src/it/jdk9-exportsto/foo/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/it/jdk9-exportsto/foo/pom.xml?rev=1779751&view=auto
==
--- maven/plugins/trunk/maven-compiler-plugin/src/it/jdk9-exportsto/foo/pom.xml 
(added)
+++ maven/plugins/trunk/maven-compiler-plugin/src/it/jdk9-exportsto/foo/pom.xml 
Sat Jan 21 19:10:59 2017
@@ -0,0 +1,33 @@
+
+
+
+http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
+  4.0.0
+
+  
+org.apache.maven.plugins.compiler.it
+exportsto
+1.0-SNAPSHOT
+  
+  foo
+
+
\ No newline at 

svn commit: r1779824 - in /maven/plugins/trunk/maven-invoker-plugin: ./ src/it/invocation-multiple/ src/it/invocation-multiple/src/it/project/ src/it/settings-merge/ src/it/settings-merge_jdk9+/ src/i

[rfscholte]

Author: rfscholte
Date: Sun Jan 22 15:11:16 2017
New Revision: 1779824

URL: http://svn.apache.org/viewvc?rev=1779824&view=rev
Log:
[MINVOKER-216] Prepare for Java9 (requires Groovy upgrade)

Added:
maven/plugins/trunk/maven-invoker-plugin/src/it/settings-merge_jdk9+/

maven/plugins/trunk/maven-invoker-plugin/src/it/settings-merge_jdk9+/invoker.properties
maven/plugins/trunk/maven-invoker-plugin/src/it/settings-merge_jdk9+/pom.xml
maven/plugins/trunk/maven-invoker-plugin/src/it/settings-merge_jdk9+/src/
maven/plugins/trunk/maven-invoker-plugin/src/it/settings-merge_jdk9+/src/it/

maven/plugins/trunk/maven-invoker-plugin/src/it/settings-merge_jdk9+/src/it/project/

maven/plugins/trunk/maven-invoker-plugin/src/it/settings-merge_jdk9+/src/it/project/pom.xml

maven/plugins/trunk/maven-invoker-plugin/src/it/settings-merge_jdk9+/src/it/project/postbuild.groovy

maven/plugins/trunk/maven-invoker-plugin/src/it/settings-merge_jdk9+/src/it/settings.xml
Modified:
maven/plugins/trunk/maven-invoker-plugin/pom.xml
maven/plugins/trunk/maven-invoker-plugin/src/it/invocation-multiple/pom.xml

maven/plugins/trunk/maven-invoker-plugin/src/it/invocation-multiple/src/it/project/pom.xml

maven/plugins/trunk/maven-invoker-plugin/src/it/settings-merge/invoker.properties

Modified: maven/plugins/trunk/maven-invoker-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/pom.xml?rev=1779824&r1=1779823&r2=1779824&view=diff
==
--- maven/plugins/trunk/maven-invoker-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-invoker-plugin/pom.xml Sun Jan 22 15:11:16 2017
@@ -68,10 +68,7 @@ under the License.
 2.0b4
 org.codehaus.groovy
 groovy-all
-2.0.1
-6
-1.${javaVersion}
-1.${javaVersion}
+2.2.2 
   
 
   
@@ -126,6 +123,13 @@ under the License.
   org.apache.maven.shared
   maven-script-interpreter
   1.1
+  
+
+
+  org.codehaus.groovy
+  groovy
+
+  
 
 
 
@@ -162,18 +166,15 @@ under the License.
   ${beanshell-groupId}
   ${beanshell-artifactId}
   ${beanshell-version}
+  runtime
 
 
   ${groovy-groupId}
   ${groovy-artifactId}
   ${groovy-version}
-  
-
-  junit
-  junit
-
-  
+  runtime
 
+
 
   org.codehaus.plexus
   plexus-utils
@@ -301,6 +302,10 @@ under the License.
 
${project.build.directory}/local-repo
 src/it/settings.xml
 
-Djava.io.tmpdir=${project.build.directory}
+
+  
${maven.compiler.source}
+  
${maven.compiler.target}
+
 
   clean
   initialize
@@ -348,5 +353,47 @@ under the License.
 
   
 
+
+  
+[1.7,)
+  
+  
+2.4.8
+  
+  
+
+  
+org.apache.maven.plugins
+maven-enforcer-plugin
+
+  
+  
+  
+enforce-bytecode-version
+
+  
+
+  
+runtime
+  
+
+  
+
+  
+  
+enforce-bytecode-version-runtime
+
+  
+
+  1.7
+
+  
+
+  
+
+  
+
+  
+
   
 

Modified: 
maven/plugins/trunk/maven-invoker-plugin/src/it/invocation-multiple/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/it/invocation-multiple/pom.xml?rev=1779824&r1=1779823&r2=1779824&view=diff
==
--- maven/plugins/trunk/maven-invoker-plugin/src/it/invocation-multiple/pom.xml 
(original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/it/invocation-multiple/pom.xml 
Sun Jan 22 15:11:16 2017
@@ -52,6 +52,10 @@ under the License.
   
 ${invoker.repo.local}
   
+  
+
${maven.compiler.source}
+
${maven.compiler.target}
+  
 
 
   

Modified: 
maven/plugins/trunk/maven-invoker-plugin/src/it/invocation-multiple/src/it/project/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/it/invocation-multiple/src/it/project/pom.xml?rev=1779824&r1=1779823&r2=1779824&view=diff
==
--- 
maven/plugins/trunk/maven-invoker-plugin/src/it/invocation-multiple/src/it/project/pom.xml
 (original)
+++ 

svn commit: r1779849 - /maven/shared/trunk/maven-invoker/pom.xml

[rfscholte]

Author: rfscholte
Date: Sun Jan 22 19:50:44 2017
New Revision: 1779849

URL: http://svn.apache.org/viewvc?rev=1779849&view=rev
Log:
[maven-release-plugin] prepare release maven-invoker-3.0.0

Modified:
maven/shared/trunk/maven-invoker/pom.xml

Modified: maven/shared/trunk/maven-invoker/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-invoker/pom.xml?rev=1779849&r1=1779848&r2=1779849&view=diff
==
--- maven/shared/trunk/maven-invoker/pom.xml (original)
+++ maven/shared/trunk/maven-invoker/pom.xml Sun Jan 22 19:50:44 2017
@@ -30,15 +30,15 @@ under the License.
   
 
   maven-invoker
-  3.0.0-SNAPSHOT
+  3.0.0
 
   Apache Maven Invoker
   A component to programmatically invoke Maven.
 
   
-
scm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-invoker
-
scm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-invoker
-http://svn.apache.org/viewvc/maven/shared/trunk/maven-invoker
+
scm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/maven-invoker-3.0.0
+
scm:svn:https://svn.apache.org/repos/asf/maven/shared/tags/maven-invoker-3.0.0
+
http://svn.apache.org/viewvc/maven/shared/tags/maven-invoker-3.0.0
   
   
 jira

svn commit: r1779850 - /maven/shared/tags/maven-invoker-3.0.0/

[rfscholte]

Author: rfscholte
Date: Sun Jan 22 19:50:57 2017
New Revision: 1779850

URL: http://svn.apache.org/viewvc?rev=1779850&view=rev
Log:
[maven-release-plugin] copy for tag maven-invoker-3.0.0

Added:
maven/shared/tags/maven-invoker-3.0.0/
  - copied from r1779849, maven/shared/trunk/maven-invoker/

svn commit: r1779851 - /maven/shared/trunk/maven-invoker/pom.xml

[rfscholte]

Author: rfscholte
Date: Sun Jan 22 19:50:59 2017
New Revision: 1779851

URL: http://svn.apache.org/viewvc?rev=1779851&view=rev
Log:
[maven-release-plugin] prepare for next development iteration

Modified:
maven/shared/trunk/maven-invoker/pom.xml

Modified: maven/shared/trunk/maven-invoker/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-invoker/pom.xml?rev=1779851&r1=1779850&r2=1779851&view=diff
==
--- maven/shared/trunk/maven-invoker/pom.xml (original)
+++ maven/shared/trunk/maven-invoker/pom.xml Sun Jan 22 19:50:59 2017
@@ -30,15 +30,15 @@ under the License.
   
 
   maven-invoker
-  3.0.0
+  3.0.1-SNAPSHOT
 
   Apache Maven Invoker
   A component to programmatically invoke Maven.
 
   
-
scm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/maven-invoker-3.0.0
-
scm:svn:https://svn.apache.org/repos/asf/maven/shared/tags/maven-invoker-3.0.0
-
http://svn.apache.org/viewvc/maven/shared/tags/maven-invoker-3.0.0
+
scm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-invoker
+
scm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-invoker
+http://svn.apache.org/viewvc/maven/shared/trunk/maven-invoker
   
   
 jira

[1/3] maven-archetype git commit: Move ITS to plugin

[rfscholte]

Repository: maven-archetype
Updated Branches:
  refs/heads/ARCHETYPE-514 [created] a02e9922c


Move ITS to plugin


Project: http://git-wip-us.apache.org/repos/asf/maven-archetype/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-archetype/commit/afdf0a2c
Tree: http://git-wip-us.apache.org/repos/asf/maven-archetype/tree/afdf0a2c
Diff: http://git-wip-us.apache.org/repos/asf/maven-archetype/diff/afdf0a2c

Branch: refs/heads/ARCHETYPE-514
Commit: afdf0a2c4ff57632044099b852b1d116531f81c2
Parents: 44e7ed6
Author: rfscholte 
Authored: Mon Jan 23 20:46:47 2017 +0100
Committer: rfscholte 
Committed: Mon Jan 23 20:46:47 2017 +0100

--
 .../creator/FilesetArchetypeCreator.java| 88 +++-
 archetype-testing/archetype-final/pom.xml   | 35 +---
 .../archetype.properties|  1 -
 .../invoker.properties  |  1 -
 .../pom.xml | 30 ---
 .../src/main/resources/file.txt |  0
 .../src/main/resources/file.xml |  0
 .../src/main/resources/toexclude/file.txt   |  0
 .../src/main/resources/toexclude/file.xml   |  0
 .../src/main/toexclude/file.txt |  0
 .../src/main/toexclude/file.xml |  0
 .../src/toexclude/file.txt  |  0
 .../src/toexclude/file.xml  |  0
 .../toexclude/file.txt  |  0
 .../toexclude/file.xml  |  0
 .../verify.bsh  | 46 --
 .../it/create-from-project/archetype.properties |  1 -
 .../it/create-from-project/invoker.properties   |  1 -
 .../src/it/create-from-project/pom.xml  | 30 ---
 .../src/main/java/foo/bar/App.java  | 32 ---
 .../src/it/create-from-project/verify.bsh   | 38 -
 .../archetype-final/src/it/settings.xml | 55 
 .../archetype.properties|  1 +
 .../invoker.properties  |  1 +
 .../pom.xml | 30 +++
 .../src/main/resources/file.txt |  0
 .../src/main/resources/file.xml |  0
 .../src/main/resources/toexclude/file.txt   |  0
 .../src/main/resources/toexclude/file.xml   |  0
 .../src/main/toexclude/file.txt |  0
 .../src/main/toexclude/file.xml |  0
 .../src/toexclude/file.txt  |  0
 .../src/toexclude/file.xml  |  0
 .../toexclude/file.txt  |  0
 .../toexclude/file.xml  |  0
 .../verify.bsh  | 46 ++
 .../it/create-from-project/archetype.properties |  1 +
 .../it/create-from-project/invoker.properties   |  1 +
 .../src/it/create-from-project/pom.xml  | 30 +++
 .../src/main/java/foo/bar/App.java  | 32 +++
 .../src/it/create-from-project/verify.bsh   | 38 +
 41 files changed, 211 insertions(+), 327 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/afdf0a2c/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java
--
diff --git 
a/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java
 
b/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java
index 22465fd..576d33b 100644
--- 
a/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java
+++ 
b/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java
@@ -48,7 +48,6 @@ import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.MavenProjectBuilder;
 import org.apache.maven.project.ProjectBuildingException;
 import org.apache.maven.shared.invoker.DefaultInvocationRequest;
-import org.apache.maven.shared.invoker.DefaultInvoker;
 import org.apache.maven.shared.invoker.InvocationRequest;
 import org.apache.maven.shared.invoker.InvocationResult;
 import org.apache.maven.shared.invoker.Invoker;
@@ -104,6 +103,9 @@ public class FilesetArchetypeCreator
 
 @Requirement
 private MavenProjectBuilder projectBuilder;
+
+@Requirement
+private Invoker invoker;
 
 public void createArchetype( ArchetypeCreationRequest request, 
ArchetypeCreationResult result )
 {
@@ -216,9 +218,8 @@ public class FilesetArchetypeCreator
 
 setParentArtifactId( reverseProperties, 
configurationProperties.getProperty( Constants.ARTIFACT_ID ) );
 
-for ( Iterator modules = pom.getModules().iterator(); 
modules.hasNext(); )
+for ( String moduleId : pom.getModules() )
 {
-String

[2/3] maven-archetype git commit: [ARCHETYPE-514] Tests fail with empty repository and 'mvn verify' Switch from surefire to failsafe to ensure jars have been created let maven-invoker-plugin prepare l

[rfscholte]

http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/a02e9922/archetype-testing/archetype-final/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripWithProxyTest.java
--
diff --git 
a/archetype-testing/archetype-final/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripWithProxyTest.java
 
b/archetype-testing/archetype-final/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripWithProxyTest.java
deleted file mode 100644
index a58b828..000
--- 
a/archetype-testing/archetype-final/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripWithProxyTest.java
+++ /dev/null
@@ -1,246 +0,0 @@
-package org.apache.maven.archetype.test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.commons.io.IOUtils;
-import org.apache.maven.archetype.ArchetypeCreationRequest;
-import org.apache.maven.archetype.ArchetypeCreationResult;
-import org.apache.maven.archetype.ArchetypeGenerationRequest;
-import org.apache.maven.archetype.ArchetypeGenerationResult;
-import org.apache.maven.archetype.ArchetypeManager;
-import org.apache.maven.archetype.catalog.Archetype;
-import org.apache.maven.archetype.catalog.ArchetypeCatalog;
-import org.apache.maven.archetype.catalog.io.xpp3.ArchetypeCatalogXpp3Writer;
-import org.apache.maven.archetype.common.ArchetypeRegistryManager;
-import org.apache.maven.artifact.manager.WagonManager;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.model.Model;
-import org.apache.maven.project.DefaultProjectBuilderConfiguration;
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.MavenProjectBuilder;
-import org.apache.maven.project.interpolation.ModelInterpolator;
-import org.codehaus.plexus.PlexusTestCase;
-import org.codehaus.plexus.util.FileUtils;
-import org.codehaus.plexus.util.StringUtils;
-import org.mortbay.jetty.Server;
-import org.mortbay.jetty.webapp.WebAppContext;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.FileWriter;
-import java.io.OutputStream;
-import java.io.Writer;
-import java.util.Properties;
-
-/**
- * @author Jason van Zyl
- */
-public class ArchetyperRoundtripWithProxyTest
-extends PlexusTestCase
-{
-Server proxyServer;
-
-int proxyPort;
-
-Server server;
-
-int port;
-
-public void testArchetyper()
-throws Exception
-{
-ArchetypeManager archetype = (ArchetypeManager) lookup( 
ArchetypeManager.ROLE );
-
-ArchetypeRegistryManager registryManager = (ArchetypeRegistryManager) 
lookup( ArchetypeRegistryManager.ROLE );
-
-MavenProjectBuilder projectBuilder = (MavenProjectBuilder) lookup( 
MavenProjectBuilder.ROLE );
-
-ArtifactRepository localRepository = registryManager.createRepository( 
new File( getBasedir(),
-   
  "target" + File.separator
-   
  + "test-classes"
-   
  + File.separator
-   
  + "repositories"
-   
  + File.separator
-   
  + "local" ).toURI().toURL().toExternalForm(),
-   
"local-repo" );
-ArtifactRepository centralRepository = 
registryManager.createRepository( new File( getBasedir(),
-   
"target" + File.separator
-   
+ "test-classes"
-   
+ File.separator
-

[3/3] maven-archetype git commit: [ARCHETYPE-514] Tests fail with empty repository and 'mvn verify' Switch from surefire to failsafe to ensure jars have been created let maven-invoker-plugin prepare l

[rfscholte]

[ARCHETYPE-514] Tests fail with empty repository and 'mvn verify'
Switch from surefire to failsafe to ensure jars have been created
let maven-invoker-plugin prepare local repo for failsafe ITs


Project: http://git-wip-us.apache.org/repos/asf/maven-archetype/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-archetype/commit/a02e9922
Tree: http://git-wip-us.apache.org/repos/asf/maven-archetype/tree/a02e9922
Diff: http://git-wip-us.apache.org/repos/asf/maven-archetype/diff/a02e9922

Branch: refs/heads/ARCHETYPE-514
Commit: a02e9922c62313ffa147b4f63d125f4dc41f7280
Parents: afdf0a2
Author: rfscholte 
Authored: Mon Jan 23 21:55:42 2017 +0100
Committer: rfscholte 
Committed: Mon Jan 23 21:55:42 2017 +0100

--
 archetype-testing/archetype-final/pom.xml   |  29 +-
 .../creator/DefaultArchetypeCreatorIT.java  | 511 +++
 .../creator/DefaultArchetypeCreatorTest.java| 510 --
 .../archetype/test/ArchetyperRoundtripIT.java   | 245 +
 .../archetype/test/ArchetyperRoundtripTest.java | 245 -
 .../test/ArchetyperRoundtripWithProxyIT.java| 246 +
 .../test/ArchetyperRoundtripWithProxyTest.java  | 246 -
 .../archetype/test/RoundtripMultiModuleIT.java  | 317 
 .../test/RoundtripMultiModuleTest.java  | 317 
 9 files changed, 1345 insertions(+), 1321 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/a02e9922/archetype-testing/archetype-final/pom.xml
--
diff --git a/archetype-testing/archetype-final/pom.xml 
b/archetype-testing/archetype-final/pom.xml
index 632aa2a..5420802 100644
--- a/archetype-testing/archetype-final/pom.xml
+++ b/archetype-testing/archetype-final/pom.xml
@@ -30,7 +30,7 @@
   
 
   archetype-final
-  jar
+  jar 
 
   Maven Archetype Testing Final
 
@@ -38,7 +38,6 @@
 1.0-alpha-6
   
 
-
   
 
   junit
@@ -138,7 +137,31 @@
   
   
 org.apache.maven.plugins
-maven-surefire-plugin
+maven-invoker-plugin
+
+  
+
+  install
+
+  
+
+
+  
target/test-classes/repositories/local
+
+  
+  
+  
+org.apache.maven.plugins
+maven-failsafe-plugin
+2.19.1
+
+  
+
+  integration-test
+  verify
+
+  
+
 
   
 ${maven.home}

http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/a02e9922/archetype-testing/archetype-final/src/test/java/org/apache/maven/archetype/creator/DefaultArchetypeCreatorIT.java
--
diff --git 
a/archetype-testing/archetype-final/src/test/java/org/apache/maven/archetype/creator/DefaultArchetypeCreatorIT.java
 
b/archetype-testing/archetype-final/src/test/java/org/apache/maven/archetype/creator/DefaultArchetypeCreatorIT.java
new file mode 100644
index 000..bd21568
--- /dev/null
+++ 
b/archetype-testing/archetype-final/src/test/java/org/apache/maven/archetype/creator/DefaultArchetypeCreatorIT.java
@@ -0,0 +1,511 @@
+package org.apache.maven.archetype.creator;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.maven.archetype.ArchetypeCreationRequest;
+import org.apache.maven.archetype.ArchetypeCreationResult;
+import org.apache.maven.archetype.common.Constants;
+import org.apache.maven.artifact.repository.DefaultArtifactRepository;
+import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
+import org.apache.maven.plugin.testing.AbstractMojoTestCase;
+import org.apache.maven.project.MavenProject;
+import org.apache.maven.project.MavenProjectBuilder;
+import org.apache.maven.project.MavenProjectBuildingResult;
+import org.codehaus.plexus.util.FileUtils;
+import org.codehaus.plexus.util.PropertyUtils;
+import org.codehaus.plexus.util.StringUtils;
+
+import java.io.File;
+import java.io.

[2/3] maven-archetype git commit: Squashed commit of the following:

[rfscholte]

http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/741f432b/archetype-testing/archetype-final/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripIT.java
--
diff --git 
a/archetype-testing/archetype-final/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripIT.java
 
b/archetype-testing/archetype-final/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripIT.java
new file mode 100644
index 000..139d78e
--- /dev/null
+++ 
b/archetype-testing/archetype-final/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripIT.java
@@ -0,0 +1,245 @@
+package org.apache.maven.archetype.test;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.commons.io.IOUtils;
+import org.apache.maven.archetype.ArchetypeCreationRequest;
+import org.apache.maven.archetype.ArchetypeCreationResult;
+import org.apache.maven.archetype.ArchetypeGenerationRequest;
+import org.apache.maven.archetype.ArchetypeGenerationResult;
+import org.apache.maven.archetype.ArchetypeManager;
+import org.apache.maven.archetype.catalog.Archetype;
+import org.apache.maven.archetype.catalog.ArchetypeCatalog;
+import org.apache.maven.archetype.catalog.io.xpp3.ArchetypeCatalogXpp3Writer;
+import org.apache.maven.archetype.common.ArchetypeRegistryManager;
+import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.model.Model;
+import org.apache.maven.project.DefaultProjectBuilderConfiguration;
+import org.apache.maven.project.MavenProject;
+import org.apache.maven.project.MavenProjectBuilder;
+import org.apache.maven.project.interpolation.ModelInterpolator;
+import org.codehaus.plexus.PlexusTestCase;
+import org.codehaus.plexus.util.FileUtils;
+import org.codehaus.plexus.util.StringUtils;
+import org.mortbay.jetty.Server;
+import org.mortbay.jetty.webapp.WebAppContext;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.Writer;
+import java.util.Properties;
+
+/**
+ * @author Jason van Zyl
+ */
+public class ArchetyperRoundtripIT
+extends PlexusTestCase
+{
+
+public void testArchetyper()
+throws Exception
+{
+
+ArchetypeManager archetype = (ArchetypeManager) lookup( 
ArchetypeManager.ROLE );
+
+ArchetypeRegistryManager registryManager = (ArchetypeRegistryManager) 
lookup( ArchetypeRegistryManager.ROLE );
+
+MavenProjectBuilder projectBuilder = (MavenProjectBuilder) lookup( 
MavenProjectBuilder.ROLE );
+
+ArtifactRepository localRepository = registryManager.createRepository( 
new File( getBasedir(),
+   
  "target" + File.separator
+   
  + "test-classes"
+   
  + File.separator
+   
  + "repositories"
+   
  + File.separator
+   
  + "local" ).toURI().toURL().toExternalForm(),
+   
"local-repo" );
+
+ArtifactRepository centralRepository = 
registryManager.createRepository( new File( getBasedir(),
+   
"target" + File.separator
+   
+ "test-classes"
+   
+ File.separator
+   
+ "repositories"
+   
+ File.separator
+   
+ "centra

[1/3] maven-archetype git commit: Squashed commit of the following:

[rfscholte]

Repository: maven-archetype
Updated Branches:
  refs/heads/master 44e7ed632 -> 741f432b8


http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/741f432b/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/pom.xml
--
diff --git 
a/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/pom.xml 
b/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/pom.xml
new file mode 100644
index 000..7a173a0
--- /dev/null
+++ b/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/pom.xml
@@ -0,0 +1,30 @@
+
+
+http://maven.apache.org/POM/4.0.0";
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+  4.0.0
+
+  org.apache.maven.plugins.archetype.its
+  create-from-project
+  1.0-SNAPSHOT
+
+  archetype:create-from-project It
+

http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/741f432b/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/src/main/resources/file.txt
--
diff --git 
a/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/src/main/resources/file.txt
 
b/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/src/main/resources/file.txt
new file mode 100644
index 000..e69de29

http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/741f432b/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/src/main/resources/file.xml
--
diff --git 
a/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/src/main/resources/file.xml
 
b/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/src/main/resources/file.xml
new file mode 100644
index 000..e69de29

http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/741f432b/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/src/main/resources/toexclude/file.txt
--
diff --git 
a/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/src/main/resources/toexclude/file.txt
 
b/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/src/main/resources/toexclude/file.txt
new file mode 100644
index 000..e69de29

http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/741f432b/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/src/main/resources/toexclude/file.xml
--
diff --git 
a/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/src/main/resources/toexclude/file.xml
 
b/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/src/main/resources/toexclude/file.xml
new file mode 100644
index 000..e69de29

http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/741f432b/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/src/main/toexclude/file.txt
--
diff --git 
a/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/src/main/toexclude/file.txt
 
b/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/src/main/toexclude/file.txt
new file mode 100644
index 000..e69de29

http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/741f432b/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/src/main/toexclude/file.xml
--
diff --git 
a/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/src/main/toexclude/file.xml
 
b/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/src/main/toexclude/file.xml
new file mode 100644
index 000..e69de29

http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/741f432b/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/src/toexclude/file.txt
--
diff --git 
a/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/src/toexclude/file.txt
 
b/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/src/toexclude/file.txt
new file mode 100644
index 000..e69de29

http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/741f432b/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/src/toexclude/file.xml
--
diff --git 
a/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/src/toexclude/file.xml
 
b/maven-archetype-plugin/src/it/create-from-project-exclude-patterns/src/toexclude/file.xml
new file mode 100644
index 000..e69de29

http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/741f432b/maven-archetype-plugin/src/it/

[3/3] maven-archetype git commit: Squashed commit of the following:

[rfscholte]

Squashed commit of the following:

commit a02e9922c62313ffa147b4f63d125f4dc41f7280
Author: rfscholte 
Date:   Mon Jan 23 21:55:42 2017 +0100

[ARCHETYPE-514] Tests fail with empty repository and 'mvn verify'
Switch from surefire to failsafe to ensure jars have been created
let maven-invoker-plugin prepare local repo for failsafe ITs

commit afdf0a2c4ff57632044099b852b1d116531f81c2
Author: rfscholte 
Date:   Mon Jan 23 20:46:47 2017 +0100

Move ITS to plugin


Project: http://git-wip-us.apache.org/repos/asf/maven-archetype/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-archetype/commit/741f432b
Tree: http://git-wip-us.apache.org/repos/asf/maven-archetype/tree/741f432b
Diff: http://git-wip-us.apache.org/repos/asf/maven-archetype/diff/741f432b

Branch: refs/heads/master
Commit: 741f432b806c0089e4a23ced80694b0e837122ee
Parents: 44e7ed6
Author: rfscholte 
Authored: Mon Jan 23 22:03:23 2017 +0100
Committer: rfscholte 
Committed: Mon Jan 23 22:03:23 2017 +0100

--
 .../creator/FilesetArchetypeCreator.java|  88 ++--
 archetype-testing/archetype-final/pom.xml   |  64 +--
 .../archetype.properties|   1 -
 .../invoker.properties  |   1 -
 .../pom.xml |  30 --
 .../src/main/resources/file.txt |   0
 .../src/main/resources/file.xml |   0
 .../src/main/resources/toexclude/file.txt   |   0
 .../src/main/resources/toexclude/file.xml   |   0
 .../src/main/toexclude/file.txt |   0
 .../src/main/toexclude/file.xml |   0
 .../src/toexclude/file.txt  |   0
 .../src/toexclude/file.xml  |   0
 .../toexclude/file.txt  |   0
 .../toexclude/file.xml  |   0
 .../verify.bsh  |  46 --
 .../it/create-from-project/archetype.properties |   1 -
 .../it/create-from-project/invoker.properties   |   1 -
 .../src/it/create-from-project/pom.xml  |  30 --
 .../src/main/java/foo/bar/App.java  |  32 --
 .../src/it/create-from-project/verify.bsh   |  38 --
 .../archetype-final/src/it/settings.xml |  55 --
 .../creator/DefaultArchetypeCreatorIT.java  | 511 +++
 .../creator/DefaultArchetypeCreatorTest.java| 510 --
 .../archetype/test/ArchetyperRoundtripIT.java   | 245 +
 .../archetype/test/ArchetyperRoundtripTest.java | 245 -
 .../test/ArchetyperRoundtripWithProxyIT.java| 246 +
 .../test/ArchetyperRoundtripWithProxyTest.java  | 246 -
 .../archetype/test/RoundtripMultiModuleIT.java  | 317 
 .../test/RoundtripMultiModuleTest.java  | 317 
 .../archetype.properties|   1 +
 .../invoker.properties  |   1 +
 .../pom.xml |  30 ++
 .../src/main/resources/file.txt |   0
 .../src/main/resources/file.xml |   0
 .../src/main/resources/toexclude/file.txt   |   0
 .../src/main/resources/toexclude/file.xml   |   0
 .../src/main/toexclude/file.txt |   0
 .../src/main/toexclude/file.xml |   0
 .../src/toexclude/file.txt  |   0
 .../src/toexclude/file.xml  |   0
 .../toexclude/file.txt  |   0
 .../toexclude/file.xml  |   0
 .../verify.bsh  |  46 ++
 .../it/create-from-project/archetype.properties |   1 +
 .../it/create-from-project/invoker.properties   |   1 +
 .../src/it/create-from-project/pom.xml  |  30 ++
 .../src/main/java/foo/bar/App.java  |  32 ++
 .../src/it/create-from-project/verify.bsh   |  38 ++
 49 files changed, 1556 insertions(+), 1648 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/741f432b/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java
--
diff --git 
a/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java
 
b/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java
index 22465fd..576d33b 100644
--- 
a/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java
+++ 
b/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java
@@ -48,7 +48,6 @@ import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.MavenProjectBuilder;
 import org.apache.maven.project.ProjectBuildingException;
 import org.apache.maven.shared.invoker.DefaultInvocationReques

[maven-archetype] Git Push Summary

[rfscholte]

Repository: maven-archetype
Updated Branches:
  refs/heads/ARCHETYPE-514 [deleted] a02e9922c

maven-archetype git commit: [ARCHETYPE-241] Filtering of directory name same as filenames

[rfscholte]

Repository: maven-archetype
Updated Branches:
  refs/heads/master 741f432b8 -> 8763512e7


[ARCHETYPE-241] Filtering of directory name same as filenames


Project: http://git-wip-us.apache.org/repos/asf/maven-archetype/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-archetype/commit/8763512e
Tree: http://git-wip-us.apache.org/repos/asf/maven-archetype/tree/8763512e
Diff: http://git-wip-us.apache.org/repos/asf/maven-archetype/diff/8763512e

Branch: refs/heads/master
Commit: 8763512e7b13f360916c8f5ee02b068bcee987ab
Parents: 741f432
Author: rfscholte 
Authored: Tue Jan 24 12:37:06 2017 +0100
Committer: rfscholte 
Committed: Tue Jan 24 12:37:06 2017 +0100

--
 .../DefaultFilesetArchetypeGenerator.java   | 24 ++
 .../archetype/pom.xml   | 46 ++
 .../META-INF/maven/archetype-metadata.xml   | 40 
 .../__projectName__-test2/pom.xml   | 33 +
 .../src/main/java/Test-__projectName__.java |  1 +
 .../__rootArtifactId__-test1/pom.xml| 33 +
 .../main/resources/archetype-resources/pom.xml  | 36 ++
 .../invoker.properties  | 23 +
 .../it/ARCHETYPE-241_filter-directory/pom.xml   | 49 
 .../project.properties  | 27 +++
 .../verify.groovy   | 21 +
 pom.xml | 23 +
 12 files changed, 334 insertions(+), 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/8763512e/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultFilesetArchetypeGenerator.java
--
diff --git 
a/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultFilesetArchetypeGenerator.java
 
b/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultFilesetArchetypeGenerator.java
index 1ce6c03..b21e1a0 100644
--- 
a/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultFilesetArchetypeGenerator.java
+++ 
b/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultFilesetArchetypeGenerator.java
@@ -578,10 +578,11 @@ public class DefaultFilesetArchetypeGenerator
 return count;
 }
 
-private void processFilesetModule( String rootArtifactId, String 
artifactId, final List archetypeResources,
-   File pom, final ZipFile 
archetypeZipFile, String moduleOffset, File basedirPom,
-   File outputDirectoryFile, final String 
packageName,
-   final AbstractArchetypeDescriptor 
archetypeDescriptor, final Context context )
+private void processFilesetModule( final String rootArtifactId, final 
String artifactId,
+   final List archetypeResources, 
File pom, final ZipFile archetypeZipFile,
+   String moduleOffset, File basedirPom, 
File outputDirectoryFile,
+   final String packageName, final 
AbstractArchetypeDescriptor archetypeDescriptor,
+   final Context context )
 throws DocumentException, XmlPullParserException, 
ArchetypeGenerationFailure, InvalidPackaging, IOException,
 OutputFileExists
 {
@@ -612,15 +613,18 @@ public class DefaultFilesetArchetypeGenerator
 {
 ModuleDescriptor project = subprojects.next();
 
-File moduleOutputDirectoryFile = new File( outputDirectoryFile,
-   StringUtils.replace( 
project.getDir(), "__rootArtifactId__",
-
rootArtifactId ) );
+String modulePath = StringUtils.replace( project.getDir(), 
"__rootArtifactId__", rootArtifactId );
+modulePath = replaceFilenameTokens( modulePath, context );
+
+File moduleOutputDirectoryFile = new File( outputDirectoryFile, 
modulePath );
 
 context.put( Constants.ARTIFACT_ID,
  StringUtils.replace( project.getId(), 
"${rootArtifactId}", rootArtifactId ) );
-
-processFilesetModule( rootArtifactId,
-  StringUtils.replace( project.getDir(), 
"__rootArtifactId__", rootArtifactId ),
+
+String moduleArtifactId = StringUtils.replace( project.getDir(), 
"__rootArtifactId__", rootArtifactId );
+moduleArtifactId = replaceFilenameTokens( moduleArtifactId, 
context );
+
+p

maven-archetype git commit: [ARCHETYPE-509] RequiredProperty not set in batch mode this closes #14 Signed-off-by: rfscholte

[rfscholte]

Repository: maven-archetype
Updated Branches:
  refs/heads/master 8763512e7 -> 9857d346b


[ARCHETYPE-509] RequiredProperty not set in batch mode
this closes #14
Signed-off-by: rfscholte 


Project: http://git-wip-us.apache.org/repos/asf/maven-archetype/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-archetype/commit/9857d346
Tree: http://git-wip-us.apache.org/repos/asf/maven-archetype/tree/9857d346
Diff: http://git-wip-us.apache.org/repos/asf/maven-archetype/diff/9857d346

Branch: refs/heads/master
Commit: 9857d346b7ec300cd7834cd4e3e6248770b20a8d
Parents: 8763512
Author: Max Norris 
Authored: Tue Sep 13 23:20:17 2016 +0200
Committer: rfscholte 
Committed: Tue Jan 24 20:19:41 2017 +0100

--
 .../DefaultArchetypeGenerationConfigurator.java |   8 +-
 ...ultArchetypeGenerationConfigurator2Test.java | 102 +++
 2 files changed, 107 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/9857d346/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeGenerationConfigurator.java
--
diff --git 
a/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeGenerationConfigurator.java
 
b/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeGenerationConfigurator.java
index cb0fb3a..bd35170 100644
--- 
a/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeGenerationConfigurator.java
+++ 
b/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeGenerationConfigurator.java
@@ -150,10 +150,10 @@ public class DefaultArchetypeGenerationConfigurator
 throw new ArchetypeGenerationConfigurationFailure( "The defined 
artifact is not an archetype" );
 }
 
+Context context = new VelocityContext();
 if ( interactiveMode.booleanValue() )
 {
 boolean confirmed = false;
-Context context = new VelocityContext();
 context.put( Constants.GROUP_ID, ad.getGroupId() );
 context.put( Constants.ARTIFACT_ID, ad.getArtifactId() );
 context.put( Constants.VERSION, ad.getVersion() );
@@ -253,8 +253,10 @@ public class DefaultArchetypeGenerationConfigurator
 if ( !archetypeConfiguration.isConfigured( 
requiredProperty ) && (
 archetypeConfiguration.getDefaultValue( 
requiredProperty ) != null ) )
 {
-archetypeConfiguration.setProperty( requiredProperty, 
archetypeConfiguration.getDefaultValue(
-requiredProperty ) );
+String value = archetypeConfiguration.getDefaultValue( 
requiredProperty );
+value = getTransitiveDefaultValue( value, 
archetypeConfiguration, requiredProperty, context );
+archetypeConfiguration.setProperty( requiredProperty, 
value );
+context.put( requiredProperty, value );
 }
 }
 

http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/9857d346/maven-archetype-plugin/src/test/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeGenerationConfigurator2Test.java
--
diff --git 
a/maven-archetype-plugin/src/test/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeGenerationConfigurator2Test.java
 
b/maven-archetype-plugin/src/test/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeGenerationConfigurator2Test.java
new file mode 100644
index 000..9393414
--- /dev/null
+++ 
b/maven-archetype-plugin/src/test/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeGenerationConfigurator2Test.java
@@ -0,0 +1,102 @@
+package org.apache.maven.archetype.ui.generation;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */

svn commit: r1780535 - /maven/site/trunk/content/apt/shared/index.apt

[rfscholte]

Author: rfscholte
Date: Fri Jan 27 10:35:43 2017
New Revision: 1780535

URL: http://svn.apache.org/viewvc?rev=1780535&view=rev
Log:
CMS commit to maven by rfscholte

Modified:
maven/site/trunk/content/apt/shared/index.apt

Modified: maven/site/trunk/content/apt/shared/index.apt
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/shared/index.apt?rev=1780535&r1=1780534&r2=1780535&view=diff
==
--- maven/site/trunk/content/apt/shared/index.apt (original)
+++ maven/site/trunk/content/apt/shared/index.apt Fri Jan 27 10:35:43 2017
@@ -54,7 +54,7 @@ The shared components are currently unde
 
*+--+---+--++-+
 | {{{/shared/maven-filtering/} <<>>}}   | 
3.1.1| 2016-06-02| Components for filtering resources. | 
{{{https://svn.apache.org/repos/asf/maven/shared/trunk/maven-filtering/}SVN}} | 
{{{https://issues.apache.org/jira/browse/MSHARED/component/13380}JIRA}}
 
*+--+---+--++-+
-| {{{/shared/maven-invoker/} <<>>}}   | 
2.2  | 2015-03-24| Fires up a Maven build in a new JVM. | 
{{{https://svn.apache.org/repos/asf/maven/shared/trunk/maven-invoker/}SVN}} | 
{{{https://issues.apache.org/jira/browse/MSHARED/component/13271}JIRA}}
+| {{{/shared/maven-invoker/} <<>>}}   | 
3.0.0| 2017-01-27| Fires up a Maven build in a new JVM. | 
{{{https://svn.apache.org/repos/asf/maven/shared/trunk/maven-invoker/}SVN}} | 
{{{https://issues.apache.org/jira/browse/MSHARED/component/13271}JIRA}}
 
*+--+---+--++-+
 | {{{/shared/maven-jarsigner/} <<>>}}   | 
1.4  | 2015-01-18| This component provides some utilities to 
sign/verify jars/files in your Mojos. | 
{{{https://svn.apache.org/repos/asf/maven/shared/trunk/maven-jarsigner/}SVN}} | 
{{{https://issues.apache.org/jira/browse/MSHARED/component/15255}JIRA}}
 
*+--+---+--++-+

svn commit: r18015 - /release/maven/shared/

[rfscholte]

Author: rfscholte
Date: Fri Jan 27 12:05:16 2017
New Revision: 18015

Log:
Maven Invoker 3.0.0

Added:
release/maven/shared/maven-invoker-3.0.0-source-release.zip   (with props)
release/maven/shared/maven-invoker-3.0.0-source-release.zip.asc
release/maven/shared/maven-invoker-3.0.0-source-release.zip.md5
Removed:
release/maven/shared/maven-invoker-2.2-source-release.zip
release/maven/shared/maven-invoker-2.2-source-release.zip.asc
release/maven/shared/maven-invoker-2.2-source-release.zip.md5

Added: release/maven/shared/maven-invoker-3.0.0-source-release.zip
==
Binary file - no diff available.

Propchange: release/maven/shared/maven-invoker-3.0.0-source-release.zip
--
svn:mime-type = application/octet-stream

Added: release/maven/shared/maven-invoker-3.0.0-source-release.zip.asc
==
--- release/maven/shared/maven-invoker-3.0.0-source-release.zip.asc (added)
+++ release/maven/shared/maven-invoker-3.0.0-source-release.zip.asc Fri Jan 27 
12:05:16 2017
@@ -0,0 +1,7 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v2
+
+iF4EABEIAAYFAliFDUQACgkQrlp/tgigIhz0oQD/UB2ZvOdmnZZH0/YE0vqeaO6s
+UgoSucq0+YCWakCe1F8A/3u/ReXhi3UuSimi1FYu3reU587w8CyLwYic4EV2Uvxr
+=9O7a
+-END PGP SIGNATURE-

Added: release/maven/shared/maven-invoker-3.0.0-source-release.zip.md5
==
--- release/maven/shared/maven-invoker-3.0.0-source-release.zip.md5 (added)
+++ release/maven/shared/maven-invoker-3.0.0-source-release.zip.md5 Fri Jan 27 
12:05:16 2017
@@ -0,0 +1 @@
+630bc883e226b6e8bab6188406cb30a1
\ No newline at end of file

[1/2] maven-archetype git commit: [ARCHETYPE-515] Migrate plugin to Maven3

[rfscholte]

Repository: maven-archetype
Updated Branches:
  refs/heads/master 9857d346b -> 624f9affd


http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/624f9aff/archetype-testing/archetype-final/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripWithProxyIT.java
--
diff --git 
a/archetype-testing/archetype-final/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripWithProxyIT.java
 
b/archetype-testing/archetype-final/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripWithProxyIT.java
index 6386214..73b9411 100644
--- 
a/archetype-testing/archetype-final/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripWithProxyIT.java
+++ 
b/archetype-testing/archetype-final/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripWithProxyIT.java
@@ -1,5 +1,12 @@
 package org.apache.maven.archetype.test;
 
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.FileWriter;
+import java.io.OutputStream;
+import java.io.Writer;
+import java.util.Properties;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -29,25 +36,21 @@ import org.apache.maven.archetype.catalog.Archetype;
 import org.apache.maven.archetype.catalog.ArchetypeCatalog;
 import org.apache.maven.archetype.catalog.io.xpp3.ArchetypeCatalogXpp3Writer;
 import org.apache.maven.archetype.common.ArchetypeRegistryManager;
-import org.apache.maven.artifact.manager.WagonManager;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.model.Model;
 import org.apache.maven.project.DefaultProjectBuilderConfiguration;
+import org.apache.maven.project.DefaultProjectBuildingRequest;
 import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.MavenProjectBuilder;
+import org.apache.maven.project.ProjectBuilder;
+import org.apache.maven.project.ProjectBuildingRequest;
 import org.apache.maven.project.interpolation.ModelInterpolator;
+import org.apache.maven.repository.internal.MavenRepositorySystemSession;
 import org.codehaus.plexus.PlexusTestCase;
 import org.codehaus.plexus.util.FileUtils;
 import org.codehaus.plexus.util.StringUtils;
 import org.mortbay.jetty.Server;
 import org.mortbay.jetty.webapp.WebAppContext;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.FileWriter;
-import java.io.OutputStream;
-import java.io.Writer;
-import java.util.Properties;
+import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
 
 /**
  * @author Jason van Zyl
@@ -70,7 +73,7 @@ public class ArchetyperRoundtripWithProxyIT
 
 ArchetypeRegistryManager registryManager = (ArchetypeRegistryManager) 
lookup( ArchetypeRegistryManager.ROLE );
 
-MavenProjectBuilder projectBuilder = (MavenProjectBuilder) lookup( 
MavenProjectBuilder.ROLE );
+ProjectBuilder projectBuilder = lookup( ProjectBuilder.class );
 
 ArtifactRepository localRepository = registryManager.createRepository( 
new File( getBasedir(),

  "target" + File.separator
@@ -109,7 +112,13 @@ public class ArchetyperRoundtripWithProxyIT
 // (2) create an archetype from the project
 File pom = new File( workingProject, "pom.xml" );
 
-MavenProject project = projectBuilder.build( pom, localRepository, 
null );
+ProjectBuildingRequest buildingRequest = new 
DefaultProjectBuildingRequest();
+MavenRepositorySystemSession repositorySession = new 
MavenRepositorySystemSession();
+repositorySession.setLocalRepositoryManager( new 
SimpleLocalRepositoryManager( localRepository.getBasedir() ) );
+buildingRequest.setRepositorySession( repositorySession );
+
+
+MavenProject project = projectBuilder.build( pom, buildingRequest 
).getProject();
 
 ArchetypeCreationRequest acr = new 
ArchetypeCreationRequest().setProject( project ).
 setLocalRepository( localRepository ).setPostPhase( "package" );
@@ -141,7 +150,8 @@ public class ArchetyperRoundtripWithProxyIT
  "target" + File.separator 
+ "generated-sources" + File.separator
  + "archetype" );
 File generatedArchetypePom = new File( generatedArchetypeDirectory, 
"pom.xml" );
-MavenProject generatedArchetypeProject = projectBuilder.build( 
generatedArchetypePom, localRepository, null );
+MavenProject generatedArchetypeProject = projectBuilder.build( 
generatedArchetypePom, buildingRequest ).getProject();
+
 ModelInterpolator modelInterpolator = (ModelInterpolator)lookup( 
ModelInterpolator.ROLE );
 Model generatedArchetypeModel = modelInterpolator.interpolate( 
generatedArchetypeProject.getModel(), generatedArchetypePom.ge

[2/2] maven-archetype git commit: [ARCHETYPE-515] Migrate plugin to Maven3

[rfscholte]

[ARCHETYPE-515] Migrate plugin to Maven3

Squashed commit of the following:

commit e1e6fff59037ba20a479cd1b1dcaa750bf6d1cd0
Author: rfscholte 
Date:   Fri Jan 27 14:08:13 2017 +0100

clean up dependencies

commit ffe813f486916b4d2d8ae249a64a818978f5bfc6
Author: rfscholte 
Date:   Thu Jan 26 17:23:29 2017 +0100

maven-compat now always has test scope

commit fa1a96680c77814f88cf5dc8b18227ab1e01ed87
Author: rfscholte 
Date:   Thu Jan 26 17:07:33 2017 +0100

Replace maven-compat classes in IntegrationTestMojo

commit 401832a7f95a508ad7ee6032950dd4df447ffb59
Author: rfscholte 
Date:   Thu Jan 26 12:39:50 2017 +0100

archetype-common main sources freed from maven-compat

commit d2ad8a7dde8ae5a7a64b2e6bb0aabfeb6cc6d7ad
Author: rfscholte 
Date:   Thu Jan 26 12:15:04 2017 +0100

Replace maven-compat class in DefaultArchetypeRegistryManager

commit 59e729068331b87fb68ec57c44a7d1d01f431b49
Author: rfscholte 
Date:   Thu Jan 26 11:42:42 2017 +0100

Replace maven-compat classes in DefaultDownloader

commit 08060f0ebd1e452d865ee11c0f66d36aef26e275
Author: rfscholte 
Date:   Wed Jan 25 16:05:23 2017 +0100

Maven 3.0 dependencies + maven-compat

commit 9415a13838fe4f3dbf82efc7cd064e7a27a4cfd4
Author: rfscholte 
Date:   Wed Jan 25 12:19:11 2017 +0100

Move parent to proper location

commit fff235b7df4c13f18a1b348649334d8b11dced65
Author: rfscholte 
Date:   Wed Jan 25 00:20:50 2017 +0100

[ARCHETYPE-515] Migrate plugin to Maven3
stop using legacy repository layout


Project: http://git-wip-us.apache.org/repos/asf/maven-archetype/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-archetype/commit/624f9aff
Tree: http://git-wip-us.apache.org/repos/asf/maven-archetype/tree/624f9aff
Diff: http://git-wip-us.apache.org/repos/asf/maven-archetype/diff/624f9aff

Branch: refs/heads/master
Commit: 624f9affdc27c8efe6443e03e89259dbe51d08dd
Parents: 9857d34
Author: rfscholte 
Authored: Fri Jan 27 14:13:54 2017 +0100
Committer: rfscholte 
Committed: Fri Jan 27 14:13:54 2017 +0100

--
 archetype-common/pom.xml|  46 +-
 .../archetype/ArchetypeGenerationRequest.java   |  14 ++
 .../common/ArchetypeArtifactManager.java|  30 ++--
 .../common/DefaultArchetypeArtifactManager.java |  46 +++---
 .../common/DefaultArchetypeRegistryManager.java |  31 ++--
 .../creator/FilesetArchetypeCreator.java|  57 
 .../archetype/downloader/DefaultDownloader.java |  84 +--
 .../maven/archetype/downloader/Downloader.java  |   9 +-
 .../generator/DefaultArchetypeGenerator.java|   5 +-
 .../archetype/old/DefaultOldArchetype.java  |   9 +-
 .../RemoteCatalogArchetypeDataSource.java   | 141 +--
 .../DefaultArchetypeGeneratorTest.java  |  10 ++
 .../maven/archetype/old/ArchetypeTest.java  |  37 +++--
 .../archetype/test/ArchetypeGenerationTest.java |  10 ++
 ...ternalCatalogArchetypesVerificationTest.java |  11 ++
 ...rchetype-quickstart-1.0-alpha-1-SNAPSHOT.jar | Bin 3624 -> 0 bytes
 ...rchetype-quickstart-1.0-alpha-1-SNAPSHOT.pom |  26 
 ...-quickstart-1.0-alpha-1-SNAPSHOT.version.txt |   1 -
 .../maven-archetypes-1.0-alpha-1-SNAPSHOT.pom   |  33 -
 ...-archetypes-1.0-alpha-1-SNAPSHOT.version.txt |   1 -
 ...rchetype-quickstart-1.0-alpha-1-SNAPSHOT.jar | Bin 0 -> 3624 bytes
 ...rchetype-quickstart-1.0-alpha-1-SNAPSHOT.pom |  26 
 .../maven-archetypes-1.0-alpha-1-SNAPSHOT.pom   |  33 +
 .../maven-archetype-1.0-alpha-1-SNAPSHOT.pom|  23 +++
 archetype-packaging/pom.xml |   7 -
 archetype-testing/archetype-final/pom.xml   |  33 ++---
 .../creator/DefaultArchetypeCreatorIT.java  |  29 ++--
 .../archetype/test/ArchetyperRoundtripIT.java   |  35 +++--
 .../test/ArchetyperRoundtripWithProxyIT.java|  41 --
 .../archetype/test/RoundtripMultiModuleIT.java  |  36 +++--
 archetype-testing/archetype-proxy/pom.xml   |   6 -
 archetype-testing/archetype-repository/pom.xml  |   6 -
 maven-archetype-plugin/pom.xml  |  52 +++
 .../mojos/CreateProjectFromArchetypeMojo.java   |  13 +-
 .../archetype/mojos/IntegrationTestMojo.java|  46 +++---
 .../archetype/mojos/MavenArchetypeMojo.java |  14 +-
 .../DefaultArchetypeGenerationConfigurator.java |  20 +--
 ...ultArchetypeGenerationConfigurator2Test.java |  15 +-
 ...aultArchetypeGenerationConfiguratorTest.java |  11 +-
 pom.xml |  60 ++--
 40 files changed, 718 insertions(+), 389 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/624f9aff/archetype-common/pom.xml
--
diff --git a/archetype-common/pom.xml b/archetype-common/pom.xml
index f32533f..0c9c7cb 100644
--- a/archetype-common/pom.xml
+++ b/archetype-common/pom.xml
@@ -43,12 

maven-archetype git commit: [ARCHETYPE-437] Remove support for the create goal

[rfscholte]

Repository: maven-archetype
Updated Branches:
  refs/heads/master 624f9affd -> b48013975


[ARCHETYPE-437] Remove support for the create goal


Project: http://git-wip-us.apache.org/repos/asf/maven-archetype/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-archetype/commit/b4801397
Tree: http://git-wip-us.apache.org/repos/asf/maven-archetype/tree/b4801397
Diff: http://git-wip-us.apache.org/repos/asf/maven-archetype/diff/b4801397

Branch: refs/heads/master
Commit: b48013975c827f9bfcf1185214ac25ff93799720
Parents: 624f9af
Author: rfscholte 
Authored: Fri Jan 27 14:22:57 2017 +0100
Committer: rfscholte 
Committed: Fri Jan 27 14:22:57 2017 +0100

--
 .../archetype/mojos/MavenArchetypeMojo.java | 266 ---
 .../src/site/apt/index.apt.vm   |   3 -
 2 files changed, 269 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/b4801397/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/MavenArchetypeMojo.java
--
diff --git 
a/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/MavenArchetypeMojo.java
 
b/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/MavenArchetypeMojo.java
deleted file mode 100644
index d6a09d5..000
--- 
a/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/MavenArchetypeMojo.java
+++ /dev/null
@@ -1,266 +0,0 @@
-package org.apache.maven.archetype.mojos;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.archetype.ArchetypeGenerationRequest;
-import org.apache.maven.archetype.exception.UnknownArchetype;
-import org.apache.maven.archetype.old.OldArchetype;
-import org.apache.maven.archetype.old.ArchetypeDescriptorException;
-import org.apache.maven.archetype.old.ArchetypeNotFoundException;
-import org.apache.maven.archetype.old.ArchetypeTemplateProcessingException;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
-import org.apache.maven.artifact.repository.MavenArtifactRepository;
-import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
-import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.util.StringUtils;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * The archetype creation goal looks for an archetype with a given groupId,
- * artifactId, and version and retrieves it from the remote repository. Once 
the
- * archetype is retrieved, it is then processed against a set of user 
parameters
- * to create a working Maven project.
- *
- * @description Creates a project from an archetype.
- * @requiresProject false
- * @goal create
- * @deprecated Please use the generate mojo instead.
- */
-public class MavenArchetypeMojo
-extends AbstractMojo
-{
-/**
- * Used to create the Archetype specified by the groupId, artifactId, and
- * version from the remote repository.
- *
- * @component
- */
-private OldArchetype archetype;
-
-/**
- * Determines whether the layout is legacy or not.
- *
- * @component 
role="org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout" 
roleHint="default"
- */
-private ArtifactRepositoryLayout defaultArtifactRepositoryLayout;
-
-
-/**
- * Maven's local repository.
- *
- * @parameter property="localRepository"
- * @required
- * @read-only
- */
-private ArtifactRepository localRepository;
-
-/**
- * The Archetype Group Id to be used.
- *
- * @parameter property="archetypeGroupId" 
default-value="org.apache.maven.archetypes"
- * @required
- */
-private String archetypeGroupId;
-
-/**
- * The Archetype Artifact Id to be used.
- *
- * @parameter property="archetypeArtifactId&q

[2/6] maven-archetype git commit: UpdateCatalog now uses projectBuildingRequest with actual localRepository

[rfscholte]

UpdateCatalog now uses projectBuildingRequest with actual localRepository


Project: http://git-wip-us.apache.org/repos/asf/maven-archetype/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-archetype/commit/7571fa59
Tree: http://git-wip-us.apache.org/repos/asf/maven-archetype/tree/7571fa59
Diff: http://git-wip-us.apache.org/repos/asf/maven-archetype/diff/7571fa59

Branch: refs/heads/master
Commit: 7571fa59ca01aafe3ae19243930a8e2dc4d0c3d0
Parents: 1263477
Author: rfscholte 
Authored: Fri Jan 27 15:52:49 2017 +0100
Committer: rfscholte 
Committed: Fri Jan 27 15:52:49 2017 +0100

--
 .../apache/maven/archetype/ArchetypeManager.java  |  5 ++---
 .../maven/archetype/DefaultArchetypeManager.java  | 12 +++-
 .../archetype/source/ArchetypeDataSource.java |  3 ++-
 .../source/CatalogArchetypeDataSource.java| 18 +++---
 .../source/RemoteCatalogArchetypeDataSource.java  |  3 ++-
 .../archetype/source/WikiArchetypeDataSource.java |  3 ++-
 .../archetype/mojos/UpdateLocalCatalogMojo.java   |  7 +--
 7 files changed, 27 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/7571fa59/archetype-common/src/main/java/org/apache/maven/archetype/ArchetypeManager.java
--
diff --git 
a/archetype-common/src/main/java/org/apache/maven/archetype/ArchetypeManager.java
 
b/archetype-common/src/main/java/org/apache/maven/archetype/ArchetypeManager.java
index 8985b8f..f14f8a8 100644
--- 
a/archetype-common/src/main/java/org/apache/maven/archetype/ArchetypeManager.java
+++ 
b/archetype-common/src/main/java/org/apache/maven/archetype/ArchetypeManager.java
@@ -22,6 +22,7 @@ package org.apache.maven.archetype;
 import org.apache.maven.archetype.catalog.Archetype;
 import org.apache.maven.archetype.catalog.ArchetypeCatalog;
 import org.apache.maven.artifact.DependencyResolutionRequiredException;
+import org.apache.maven.project.ProjectBuildingRequest;
 
 import java.io.File;
 import java.io.IOException;
@@ -103,7 +104,5 @@ public interface ArchetypeManager
 File archiveArchetype( File archetypeDirectory, File outputDirectory, 
String finalName )
 throws DependencyResolutionRequiredException, IOException;
 
-void updateLocalCatalog( Archetype archetype, String path );
-
-void updateLocalCatalog( Archetype archetype );
+void updateLocalCatalog( ProjectBuildingRequest buildingRequest, Archetype 
archetype );
 }

http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/7571fa59/archetype-common/src/main/java/org/apache/maven/archetype/DefaultArchetypeManager.java
--
diff --git 
a/archetype-common/src/main/java/org/apache/maven/archetype/DefaultArchetypeManager.java
 
b/archetype-common/src/main/java/org/apache/maven/archetype/DefaultArchetypeManager.java
index da8207c..cd2f216 100644
--- 
a/archetype-common/src/main/java/org/apache/maven/archetype/DefaultArchetypeManager.java
+++ 
b/archetype-common/src/main/java/org/apache/maven/archetype/DefaultArchetypeManager.java
@@ -26,6 +26,7 @@ import 
org.apache.maven.archetype.generator.ArchetypeGenerator;
 import org.apache.maven.archetype.source.ArchetypeDataSource;
 import org.apache.maven.archetype.source.ArchetypeDataSourceException;
 import org.apache.maven.artifact.DependencyResolutionRequiredException;
+import org.apache.maven.project.ProjectBuildingRequest;
 import org.codehaus.plexus.component.annotations.Component;
 import org.codehaus.plexus.component.annotations.Requirement;
 import org.codehaus.plexus.logging.AbstractLogEnabled;
@@ -221,20 +222,13 @@ public class DefaultArchetypeManager
 }
 }
 
-public void updateLocalCatalog( Archetype archetype )
-{
-updateLocalCatalog( archetype, 
"${user.home}/.m2/archetype-catalog.xml" );
-}
-
-public void updateLocalCatalog( Archetype archetype, String path )
+public void updateLocalCatalog( ProjectBuildingRequest buildingRequest, 
Archetype archetype )
 {
 try
 {
-Properties properties = new Properties();
-properties.setProperty( "file", path );
 ArchetypeDataSource source = archetypeSources.get( "catalog" );
 
-source.updateCatalog( properties, archetype );
+source.updateCatalog( buildingRequest, archetype );
 }
 catch ( ArchetypeDataSourceException e )
 {

http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/7571fa59/archetype-common/src/main/java/org/apache/maven/archetype/source/ArchetypeDataSource.java
--
diff --git 
a/archetype-common/src/main/java/org/apache/maven/archetype/source/ArchetypeDataSource.java
 
b/arch

[4/6] maven-archetype git commit: Remove WikiArchetypeDataSource, implementation only used in test

[rfscholte]

Remove WikiArchetypeDataSource, implementation only used in test


Project: http://git-wip-us.apache.org/repos/asf/maven-archetype/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-archetype/commit/fbf678b6
Tree: http://git-wip-us.apache.org/repos/asf/maven-archetype/tree/fbf678b6
Diff: http://git-wip-us.apache.org/repos/asf/maven-archetype/diff/fbf678b6

Branch: refs/heads/master
Commit: fbf678b62cb90c3a4d070545ccc1c46105120581
Parents: 69a9513
Author: rfscholte 
Authored: Fri Jan 27 21:24:21 2017 +0100
Committer: rfscholte 
Committed: Fri Jan 27 21:24:21 2017 +0100

--
 .../source/WikiArchetypeDataSource.java | 140 ---
 .../source/WikiArchetypeDataSourceTest.java |  79 ---
 2 files changed, 219 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/fbf678b6/archetype-common/src/test/java/org/apache/maven/archetype/source/WikiArchetypeDataSource.java
--
diff --git 
a/archetype-common/src/test/java/org/apache/maven/archetype/source/WikiArchetypeDataSource.java
 
b/archetype-common/src/test/java/org/apache/maven/archetype/source/WikiArchetypeDataSource.java
deleted file mode 100644
index 92e3a60..000
--- 
a/archetype-common/src/test/java/org/apache/maven/archetype/source/WikiArchetypeDataSource.java
+++ /dev/null
@@ -1,140 +0,0 @@
-package org.apache.maven.archetype.source;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.archetype.catalog.Archetype;
-import org.apache.maven.archetype.catalog.ArchetypeCatalog;
-import org.apache.maven.archetype.source.ArchetypeDataSource;
-import org.apache.maven.archetype.source.ArchetypeDataSourceException;
-import org.apache.maven.project.ProjectBuildingRequest;
-import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.util.IOUtil;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import java.net.URL;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * An archetype data source getting its content from a Confluence Wiki page.
- * By default, http://docs.codehaus.org/display/MAVENUSER/Archetypes+List";>MAVENUSER/Archetypes
 List
- * is used.
- *
- * @authorJason van Zyl
- */
-@Component( role = ArchetypeDataSource.class, hint = "wiki" )
-public class WikiArchetypeDataSource
-implements ArchetypeDataSource
-{
-private static String DEFAULT_ARCHETYPE_INVENTORY_PAGE =
-"http://docs.codehaus.org/pages/viewpagesrc.action?pageId=48400";;
-
-static String cleanup( String val )
-{
-val = val.replaceAll( "\\r|\\n|\\s{2,}|\\[|\\|[^\\]]+]|\\]", "" );
-return val;
-}
-
-static String cleanupUrl( String val )
-{
-return val.replaceAll( "\\r|\\n|\\s{2,}|\\[|\\]|\\ ", "" );
-}
-
-public ArchetypeCatalog getArchetypeCatalog( ProjectBuildingRequest 
buildingRequest, Properties properties )
-throws ArchetypeDataSourceException
-{
-ArchetypeCatalog ac = new ArchetypeCatalog();
-ac.setArchetypes( getArchetypes( properties ) );
-return ac;
-}
-
-public List getArchetypes( Properties properties )
-throws ArchetypeDataSourceException
-{
-String url = properties.getProperty( "url" );
-
-if ( url == null )
-{
-url = DEFAULT_ARCHETYPE_INVENTORY_PAGE;
-}
-
-List archetypes = new ArrayList();
-
-String pageSource = "";
-InputStream in = null;
-try
-{
-in = new URL( cleanupUrl( url ) ).openStream();
-
-pageSource = IOUtil.toString( in );
-}
-catch ( IOException e )
-{
-throw new ArchetypeDataSourceException( "Error retrieving list of 
archetypes from " + url );
-}
-finally
-{

[1/6] maven-archetype git commit: Remove DataSink, it's never used

[rfscholte]

Repository: maven-archetype
Updated Branches:
  refs/heads/master b48013975 -> 933180233


Remove DataSink, it's never used


Project: http://git-wip-us.apache.org/repos/asf/maven-archetype/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-archetype/commit/1263477e
Tree: http://git-wip-us.apache.org/repos/asf/maven-archetype/tree/1263477e
Diff: http://git-wip-us.apache.org/repos/asf/maven-archetype/diff/1263477e

Branch: refs/heads/master
Commit: 1263477e2b3a59ca31f5913fa969c882fb8a5801
Parents: b480139
Author: rfscholte 
Authored: Fri Jan 27 15:37:47 2017 +0100
Committer: rfscholte 
Committed: Fri Jan 27 15:37:47 2017 +0100

--
 .../archetype/source/ArchetypeDataSink.java | 36 -
 .../source/ArchetypeDataSinkException.java  | 40 --
 .../source/CatalogArchetypeDataSink.java| 71 -
 .../source/CatalogArchetypeDataSinkTest.java| 80 
 4 files changed, 227 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/1263477e/archetype-common/src/main/java/org/apache/maven/archetype/source/ArchetypeDataSink.java
--
diff --git 
a/archetype-common/src/main/java/org/apache/maven/archetype/source/ArchetypeDataSink.java
 
b/archetype-common/src/main/java/org/apache/maven/archetype/source/ArchetypeDataSink.java
deleted file mode 100644
index ce3e331..000
--- 
a/archetype-common/src/main/java/org/apache/maven/archetype/source/ArchetypeDataSink.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.apache.maven.archetype.source;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.Writer;
-import java.util.List;
-import java.util.Properties;
-
-import org.apache.maven.archetype.catalog.Archetype;
-
-/** @author Jason van Zyl */
-public interface ArchetypeDataSink
-{
-void putArchetypes( List archetypes, Writer writer )
-throws ArchetypeDataSinkException;
-
-void putArchetypes( ArchetypeDataSource source, Properties properties, 
Writer writer )
-throws ArchetypeDataSourceException, ArchetypeDataSinkException;
-}

http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/1263477e/archetype-common/src/main/java/org/apache/maven/archetype/source/ArchetypeDataSinkException.java
--
diff --git 
a/archetype-common/src/main/java/org/apache/maven/archetype/source/ArchetypeDataSinkException.java
 
b/archetype-common/src/main/java/org/apache/maven/archetype/source/ArchetypeDataSinkException.java
deleted file mode 100644
index 2de90d0..000
--- 
a/archetype-common/src/main/java/org/apache/maven/archetype/source/ArchetypeDataSinkException.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.apache.maven.archetype.source;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/** @author Jason van Zyl */
-public class ArchetypeDataSinkException
-extends Exception
-{
-public ArchetypeDataSinkException( String message )
-{
-super( message );
-}
-
-public ArchetypeDataSinkException( String message, Throwable throwable )
-{
-super( message, throwable );
-}
-
-public ArchetypeDataSinkException( Throwable throwable )
-  

[3/6] maven-archetype git commit: getArchetypeCatalog now uses actual locaRepository

[rfscholte]

getArchetypeCatalog now uses actual locaRepository


Project: http://git-wip-us.apache.org/repos/asf/maven-archetype/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-archetype/commit/69a9513a
Tree: http://git-wip-us.apache.org/repos/asf/maven-archetype/tree/69a9513a
Diff: http://git-wip-us.apache.org/repos/asf/maven-archetype/diff/69a9513a

Branch: refs/heads/master
Commit: 69a9513ac5e3be7ff56462e8e034192abe75c9f2
Parents: 7571fa5
Author: rfscholte 
Authored: Fri Jan 27 21:20:25 2017 +0100
Committer: rfscholte 
Committed: Fri Jan 27 21:20:25 2017 +0100

--
 .../maven/archetype/ArchetypeManager.java   |  19 +--
 .../archetype/DefaultArchetypeManager.java  |  20 +--
 .../archetype/source/ArchetypeDataSource.java   |   4 +-
 .../source/CatalogArchetypeDataSource.java  | 130 +-
 .../InternalCatalogArchetypeDataSource.java |  11 +-
 .../source/LocalCatalogArchetypeDataSource.java | 137 +++
 .../RemoteCatalogArchetypeDataSource.java   |   8 +-
 .../maven/archetype/ArchetypeCatalogsTest.java  |  24 +++-
 .../source/WikiArchetypeDataSource.java |   2 +-
 .../source/WikiArchetypeDataSourceTest.java |   5 +-
 .../archetype/test/ArchetypeGenerationTest.java |  16 +--
 .../ui/generation/DefaultArchetypeSelector.java |  20 +--
 12 files changed, 210 insertions(+), 186 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/69a9513a/archetype-common/src/main/java/org/apache/maven/archetype/ArchetypeManager.java
--
diff --git 
a/archetype-common/src/main/java/org/apache/maven/archetype/ArchetypeManager.java
 
b/archetype-common/src/main/java/org/apache/maven/archetype/ArchetypeManager.java
index f14f8a8..fea2d1a 100644
--- 
a/archetype-common/src/main/java/org/apache/maven/archetype/ArchetypeManager.java
+++ 
b/archetype-common/src/main/java/org/apache/maven/archetype/ArchetypeManager.java
@@ -58,38 +58,33 @@ public interface ArchetypeManager
 ArchetypeCatalog getInternalCatalog();
 
 /**
- * Gives the catalog of archetypes located in 
${user.home}/.m2/repository/archetype-catalog.xml.
- * 
- * @return the catalog.
- */
-ArchetypeCatalog getDefaultLocalCatalog();
-
-/**
  * Gives the catalog of archetypes located in the given path.
  * if path is a file, it used as is.
  * if path is a directory, archetype-catalog.xml is appended to it.
  * 
- * @param path the catalog file path or directory containing the catalog 
file.
+ * @param buildingRequest the catalog file path or directory containing 
the catalog file.
  * @return the catalog.
  */
-ArchetypeCatalog getLocalCatalog( String path );
+ArchetypeCatalog getLocalCatalog( ProjectBuildingRequest buildingRequest );
 
 /**
  * Gives the catalog of archetypes located at
  * http://repo.maven.apache.org/maven2/archetype-catalog.xml.
+ * @param buildingRequest TODO
  * 
  * @return the catalog.
  */
-ArchetypeCatalog getRemoteCatalog();
+ArchetypeCatalog getRemoteCatalog( ProjectBuildingRequest buildingRequest 
);
 
 /**
  * Gives the catalog of archetypes located at the given url.
  * if the url doesn't define a catalog, then 
'archetype-catalog.xml' is appended to it for search.
- * 
+ * @param buildingRequest TODO
  * @param url the catalog url or base url containing the catalog file.
+ * 
  * @return the catalog.
  */
-ArchetypeCatalog getRemoteCatalog( String url );
+ArchetypeCatalog getRemoteCatalog( ProjectBuildingRequest buildingRequest, 
String url );
 
 /**
  * Creates a jar file for an archetype.

http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/69a9513a/archetype-common/src/main/java/org/apache/maven/archetype/DefaultArchetypeManager.java
--
diff --git 
a/archetype-common/src/main/java/org/apache/maven/archetype/DefaultArchetypeManager.java
 
b/archetype-common/src/main/java/org/apache/maven/archetype/DefaultArchetypeManager.java
index cd2f216..301b8af 100644
--- 
a/archetype-common/src/main/java/org/apache/maven/archetype/DefaultArchetypeManager.java
+++ 
b/archetype-common/src/main/java/org/apache/maven/archetype/DefaultArchetypeManager.java
@@ -172,7 +172,7 @@ public class DefaultArchetypeManager
 {
 ArchetypeDataSource source = archetypeSources.get( 
"internal-catalog" );
 
-return source.getArchetypeCatalog( new Properties() );
+return source.getArchetypeCatalog( null, new Properties() );
 }
 catch ( ArchetypeDataSourceException e )
 {
@@ -180,20 +180,14 @@ public class DefaultArchetypeManager
 }
 }
 
-  

[6/6] maven-archetype git commit: [ARCHETYPE-438] Remove support for specifying catalogs through direct URLs

[rfscholte]

[ARCHETYPE-438] Remove support for specifying catalogs through direct URLs


Project: http://git-wip-us.apache.org/repos/asf/maven-archetype/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-archetype/commit/93318023
Tree: http://git-wip-us.apache.org/repos/asf/maven-archetype/tree/93318023
Diff: http://git-wip-us.apache.org/repos/asf/maven-archetype/diff/93318023

Branch: refs/heads/master
Commit: 93318023353fd1a90f9a0b554dffd90f6de0cb56
Parents: 4b2d005
Author: rfscholte 
Authored: Sat Jan 28 13:45:41 2017 +0100
Committer: rfscholte 
Committed: Sat Jan 28 13:45:41 2017 +0100

--
 .../maven/archetype/ArchetypeManager.java   | 10 
 .../archetype/DefaultArchetypeManager.java  | 15 +
 .../archetype/source/ArchetypeDataSource.java   |  4 +-
 .../InternalCatalogArchetypeDataSource.java |  3 +-
 .../source/LocalCatalogArchetypeDataSource.java |  5 +-
 .../RemoteCatalogArchetypeDataSource.java   | 58 +---
 .../RemoteCatalogArchetypeDataSourceTest.java   |  8 ++-
 .../mojos/CreateProjectFromArchetypeMojo.java   |  3 -
 .../ui/generation/DefaultArchetypeSelector.java | 21 ++-
 9 files changed, 46 insertions(+), 81 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/93318023/archetype-common/src/main/java/org/apache/maven/archetype/ArchetypeManager.java
--
diff --git 
a/archetype-common/src/main/java/org/apache/maven/archetype/ArchetypeManager.java
 
b/archetype-common/src/main/java/org/apache/maven/archetype/ArchetypeManager.java
index fea2d1a..60a7af2 100644
--- 
a/archetype-common/src/main/java/org/apache/maven/archetype/ArchetypeManager.java
+++ 
b/archetype-common/src/main/java/org/apache/maven/archetype/ArchetypeManager.java
@@ -77,16 +77,6 @@ public interface ArchetypeManager
 ArchetypeCatalog getRemoteCatalog( ProjectBuildingRequest buildingRequest 
);
 
 /**
- * Gives the catalog of archetypes located at the given url.
- * if the url doesn't define a catalog, then 
'archetype-catalog.xml' is appended to it for search.
- * @param buildingRequest TODO
- * @param url the catalog url or base url containing the catalog file.
- * 
- * @return the catalog.
- */
-ArchetypeCatalog getRemoteCatalog( ProjectBuildingRequest buildingRequest, 
String url );
-
-/**
  * Creates a jar file for an archetype.
  *
  * @param archetypeDirectory

http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/93318023/archetype-common/src/main/java/org/apache/maven/archetype/DefaultArchetypeManager.java
--
diff --git 
a/archetype-common/src/main/java/org/apache/maven/archetype/DefaultArchetypeManager.java
 
b/archetype-common/src/main/java/org/apache/maven/archetype/DefaultArchetypeManager.java
index 301b8af..5ad3e78 100644
--- 
a/archetype-common/src/main/java/org/apache/maven/archetype/DefaultArchetypeManager.java
+++ 
b/archetype-common/src/main/java/org/apache/maven/archetype/DefaultArchetypeManager.java
@@ -37,7 +37,6 @@ import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.Map;
-import java.util.Properties;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
@@ -172,7 +171,7 @@ public class DefaultArchetypeManager
 {
 ArchetypeDataSource source = archetypeSources.get( 
"internal-catalog" );
 
-return source.getArchetypeCatalog( null, new Properties() );
+return source.getArchetypeCatalog( null );
 }
 catch ( ArchetypeDataSourceException e )
 {
@@ -184,10 +183,9 @@ public class DefaultArchetypeManager
 {
 try
 {
-Properties properties = new Properties();
 ArchetypeDataSource source = archetypeSources.get( "catalog" );
 
-return source.getArchetypeCatalog( buildingRequest, properties );
+return source.getArchetypeCatalog( buildingRequest );
 }
 catch ( ArchetypeDataSourceException e )
 {
@@ -197,18 +195,11 @@ public class DefaultArchetypeManager
 
 public ArchetypeCatalog getRemoteCatalog( ProjectBuildingRequest 
buildingRequest )
 {
-return getRemoteCatalog( buildingRequest, 
"http://repo.maven.apache.org/maven2"; );
-}
-
-public ArchetypeCatalog getRemoteCatalog( ProjectBuildingRequest 
buildingRequest, String url )
-{
 try
 {
-Properties properties = new Properties();
-properties.setProperty( "repository", url );
 ArchetypeDataSource source = archetypeSources.get( 
"remote-catalog" );
 
-return source.getArchetypeCatalog( buildingRequ

[5/6] maven-archetype git commit: Separate tests from ArchetypeCatalogsTest, ensure LocalCatalogArchetypeDataSource isn't using a webserver

[rfscholte]

Separate tests from ArchetypeCatalogsTest, ensure 
LocalCatalogArchetypeDataSource isn't using a webserver


Project: http://git-wip-us.apache.org/repos/asf/maven-archetype/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-archetype/commit/4b2d005f
Tree: http://git-wip-us.apache.org/repos/asf/maven-archetype/tree/4b2d005f
Diff: http://git-wip-us.apache.org/repos/asf/maven-archetype/diff/4b2d005f

Branch: refs/heads/master
Commit: 4b2d005ff99d15c5d7612351fae9f232b07fd87e
Parents: fbf678b
Author: rfscholte 
Authored: Fri Jan 27 23:49:14 2017 +0100
Committer: rfscholte 
Committed: Fri Jan 27 23:49:14 2017 +0100

--
 .../maven/archetype/ArchetypeCatalogsTest.java  | 130 ---
 .../LocalCatalogArchetypeDataSourceTest.java|  81 
 .../RemoteCatalogArchetypeDataSourceTest.java   | 105 +++
 3 files changed, 186 insertions(+), 130 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/4b2d005f/archetype-common/src/test/java/org/apache/maven/archetype/ArchetypeCatalogsTest.java
--
diff --git 
a/archetype-common/src/test/java/org/apache/maven/archetype/ArchetypeCatalogsTest.java
 
b/archetype-common/src/test/java/org/apache/maven/archetype/ArchetypeCatalogsTest.java
deleted file mode 100644
index c4cc5ec..000
--- 
a/archetype-common/src/test/java/org/apache/maven/archetype/ArchetypeCatalogsTest.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package org.apache.maven.archetype;
-
-/*
- *  Copyright 2007 rafale.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *  under the License.
- */
-
-import org.apache.commons.io.IOUtils;
-import org.apache.maven.archetype.catalog.Archetype;
-import org.apache.maven.archetype.catalog.ArchetypeCatalog;
-import org.apache.maven.archetype.catalog.io.xpp3.ArchetypeCatalogXpp3Writer;
-import org.apache.maven.project.DefaultProjectBuildingRequest;
-import org.apache.maven.project.ProjectBuildingRequest;
-import org.apache.maven.repository.internal.MavenRepositorySystemSession;
-import org.codehaus.plexus.PlexusTestCase;
-import org.mortbay.jetty.Server;
-import org.mortbay.jetty.webapp.WebAppContext;
-import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
-
-import java.io.File;
-import java.io.FileWriter;
-import java.io.Writer;
-
-/**
- * @author rafale
- */
-public class ArchetypeCatalogsTest
-extends PlexusTestCase
-{
-public void testRemoteCatalog()
-throws Exception
-{
-ArchetypeManager archetype = lookup( ArchetypeManager.class );
-
-ProjectBuildingRequest buildingRequest = new 
DefaultProjectBuildingRequest();
-
-ArchetypeCatalog result = archetype.getRemoteCatalog( buildingRequest, 
"http://localhost:"; + port + "/repo/" );
-
-assertEquals( 1, result.getArchetypes().size() );
-assertEquals( "groupId", result.getArchetypes().get( 0 ).getGroupId() 
);
-assertEquals( "artifactId", result.getArchetypes().get( 0 
).getArtifactId() );
-assertEquals( "1", result.getArchetypes().get( 0 ).getVersion() );
-assertEquals( "http://localhost:"; + port + "/repo/", 
result.getArchetypes().get( 0 ).getRepository() );
-}
-
-public void testLocalCatalog()
-throws Exception
-{
-ArchetypeManager archetype = lookup( ArchetypeManager.class );
-
-ProjectBuildingRequest buildingRequest = new 
DefaultProjectBuildingRequest();
-MavenRepositorySystemSession repositorySession = new 
MavenRepositorySystemSession();
-repositorySession.setLocalRepositoryManager( new 
SimpleLocalRepositoryManager( getTestFile( 
"target/test-classes/repositories/test-catalog" ) ) );
-buildingRequest.setRepositorySession( repositorySession );
-
-
-ArchetypeCatalog result = archetype.getLocalCatalog( buildingRequest );
-
-assertEquals( 1, result.getArchetypes().size() );
-assertEquals( "groupId", result.getArchetypes().get( 0 ).getGroupId() 
);
-assertEquals( "artifactId", result.getArchetypes().get( 0 
).getArtifactId() );
-assertEquals( "1", result.getArchetypes()

maven-archetype git commit: [ARCHETYPE-358] Following mirror configuration from settings.xml

[rfscholte]

Repository: maven-archetype
Updated Branches:
  refs/heads/master 933180233 -> cc7f9bc43


[ARCHETYPE-358] Following mirror configuration from settings.xml


Project: http://git-wip-us.apache.org/repos/asf/maven-archetype/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-archetype/commit/cc7f9bc4
Tree: http://git-wip-us.apache.org/repos/asf/maven-archetype/tree/cc7f9bc4
Diff: http://git-wip-us.apache.org/repos/asf/maven-archetype/diff/cc7f9bc4

Branch: refs/heads/master
Commit: cc7f9bc4354d7411273ceecdcb46988905c99c16
Parents: 9331802
Author: rfscholte 
Authored: Mon Jan 30 13:29:56 2017 +0100
Committer: rfscholte 
Committed: Mon Jan 30 13:29:56 2017 +0100

--
 .../RemoteCatalogArchetypeDataSource.java   | 198 ++-
 .../RemoteCatalogArchetypeDataSourceTest.java   |   9 +-
 2 files changed, 202 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/cc7f9bc4/archetype-common/src/main/java/org/apache/maven/archetype/source/RemoteCatalogArchetypeDataSource.java
--
diff --git 
a/archetype-common/src/main/java/org/apache/maven/archetype/source/RemoteCatalogArchetypeDataSource.java
 
b/archetype-common/src/main/java/org/apache/maven/archetype/source/RemoteCatalogArchetypeDataSource.java
index f10f4a5..c88dae9 100644
--- 
a/archetype-common/src/main/java/org/apache/maven/archetype/source/RemoteCatalogArchetypeDataSource.java
+++ 
b/archetype-common/src/main/java/org/apache/maven/archetype/source/RemoteCatalogArchetypeDataSource.java
@@ -31,6 +31,7 @@ import org.apache.maven.execution.MavenExecutionRequest;
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.plugin.LegacySupport;
 import org.apache.maven.project.ProjectBuildingRequest;
+import org.apache.maven.settings.Mirror;
 import org.apache.maven.settings.Proxy;
 import org.apache.maven.settings.Server;
 import org.apache.maven.settings.crypto.DefaultSettingsDecryptionRequest;
@@ -45,6 +46,7 @@ import org.apache.maven.wagon.repository.Repository;
 import org.codehaus.plexus.component.annotations.Component;
 import org.codehaus.plexus.component.annotations.Requirement;
 import org.codehaus.plexus.util.ReaderFactory;
+import org.codehaus.plexus.util.StringUtils;
 
 /**
  * @author Jason van Zyl
@@ -61,26 +63,57 @@ public class RemoteCatalogArchetypeDataSource extends 
CatalogArchetypeDataSource
 @Requirement
 private SettingsDecrypter settingsDecrypter;
 
+//Should be used for mirror/proxy/authentication
+//available since M3.2.3
+//@Requirement
+//private MavenRepositorySystem;
+
 /**
  * Id of the repository used to download catalog file. Proxy or 
authentication info can
  * be setup in settings.xml.
  */
-public static final String REPOSITORY_ID = "archetype";
+public static final String ARCHETYPE_REPOSITORY_ID = "archetype";
+
+public static final String CENTRAL_REPOSITORY_ID = "central";
 
 @Override
 public ArchetypeCatalog getArchetypeCatalog( ProjectBuildingRequest 
buildingRequest )
 throws ArchetypeDataSourceException
 {
+// With M3 artifactRepositories are already injected with their 
mirror, including the new id
+// First look for mirrorId of both 'central' and 'archetype'
+final String archetypeRepoId;
+Mirror archetypeMirror = getMirror( ARCHETYPE_REPOSITORY_ID );
+if ( archetypeMirror != null )
+{
+archetypeRepoId = archetypeMirror.getId();
+}
+else
+{
+archetypeRepoId = ARCHETYPE_REPOSITORY_ID;
+}
+
+final String centralRepoId;
+Mirror centralMirror = getMirror( CENTRAL_REPOSITORY_ID );
+if ( centralMirror != null )
+{
+centralRepoId = centralMirror.getId();
+}
+else
+{
+centralRepoId = CENTRAL_REPOSITORY_ID;
+}
+
 ArtifactRepository centralRepository = null;
 ArtifactRepository archetypeRepository = null;
 for ( ArtifactRepository remoteRepository : 
buildingRequest.getRemoteRepositories() )
 {
-if ( REPOSITORY_ID.equals( remoteRepository.getId() ) )
+if ( archetypeRepoId.equals( remoteRepository.getId() ) )
 {
 archetypeRepository = remoteRepository;
 break;
 }
-else if ( "central".equals( remoteRepository.getId() ) )
+else if ( centralRepoId.equals( remoteRepository.getId() ) )
 {
 centralRepository = remoteRepository;
 }
@@ -257,4 +290,163 @@ public class RemoteCatalogArchetypeDataSource extends 
CatalogArchetypeDataSource
 
 return 

maven-archetype git commit: [ARCHETYPE-433] Remove unused archetype registry stuff

[rfscholte]

Repository: maven-archetype
Updated Branches:
  refs/heads/master cc7f9bc43 -> e81651025


[ARCHETYPE-433] Remove unused archetype registry stuff


Project: http://git-wip-us.apache.org/repos/asf/maven-archetype/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-archetype/commit/e8165102
Tree: http://git-wip-us.apache.org/repos/asf/maven-archetype/tree/e8165102
Diff: http://git-wip-us.apache.org/repos/asf/maven-archetype/diff/e8165102

Branch: refs/heads/master
Commit: e816510255bf0f5b6bb006854f051c56195c6de6
Parents: cc7f9bc
Author: rfscholte 
Authored: Mon Jan 30 15:43:04 2017 +0100
Committer: rfscholte 
Committed: Mon Jan 30 15:43:04 2017 +0100

--
 archetype-common/pom.xml|   4 -
 .../archetype/ArchetypeCreationRequest.java |  14 --
 .../common/ArchetypeRegistryManager.java|  53 -
 .../common/DefaultArchetypeRegistryManager.java | 205 ---
 .../generator/DefaultArchetypeGenerator.java|  34 ++-
 .../archetype/test/ArchetypeGenerationTest.java |  25 ++-
 ...ternalCatalogArchetypesVerificationTest.java |  25 ++-
 archetype-models/archetype-registry/pom.xml |  59 --
 .../src/main/mdo/archetype-registry.mdo |  60 --
 .../archetype-registry/src/site/apt/index.apt   |  39 
 .../archetype-registry/src/site/site.xml|  37 
 archetype-models/pom.xml|   1 -
 .../archetype/test/ArchetyperRoundtripIT.java   |  27 ++-
 .../test/ArchetyperRoundtripWithProxyIT.java|  27 ++-
 .../archetype/test/RoundtripMultiModuleIT.java  |  27 ++-
 .../mojos/CreateArchetypeFromProjectMojo.java   |   9 +-
 .../DefaultArchetypeGenerationConfigurator.java |  35 +++-
 17 files changed, 171 insertions(+), 510 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/e8165102/archetype-common/pom.xml
--
diff --git a/archetype-common/pom.xml b/archetype-common/pom.xml
index 0c9c7cb..486dc6a 100644
--- a/archetype-common/pom.xml
+++ b/archetype-common/pom.xml
@@ -57,10 +57,6 @@
   archetype-descriptor
 
 
-  org.apache.maven.archetype
-  archetype-registry
-
-
   net.sourceforge.jchardet
   jchardet
 

http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/e8165102/archetype-common/src/main/java/org/apache/maven/archetype/ArchetypeCreationRequest.java
--
diff --git 
a/archetype-common/src/main/java/org/apache/maven/archetype/ArchetypeCreationRequest.java
 
b/archetype-common/src/main/java/org/apache/maven/archetype/ArchetypeCreationRequest.java
index 2617da5..e85e6a8 100644
--- 
a/archetype-common/src/main/java/org/apache/maven/archetype/ArchetypeCreationRequest.java
+++ 
b/archetype-common/src/main/java/org/apache/maven/archetype/ArchetypeCreationRequest.java
@@ -48,8 +48,6 @@ public class ArchetypeCreationRequest
 
 private boolean partialArchetype = false;
 
-private File archetypeRegistryFile;
-
 private String packageName;
 
 private Properties properties;
@@ -178,18 +176,6 @@ public class ArchetypeCreationRequest
 return this;
 }
 
-public File getArchetypeRegistryFile()
-{
-return archetypeRegistryFile;
-}
-
-public ArchetypeCreationRequest setArchetypeRegistryFile( File 
archetypeRegistryFile )
-{
-this.archetypeRegistryFile = archetypeRegistryFile;
-
-return this;
-}
-
 public Properties getProperties()
 {
 return properties;

http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/e8165102/archetype-common/src/main/java/org/apache/maven/archetype/common/ArchetypeRegistryManager.java
--
diff --git 
a/archetype-common/src/main/java/org/apache/maven/archetype/common/ArchetypeRegistryManager.java
 
b/archetype-common/src/main/java/org/apache/maven/archetype/common/ArchetypeRegistryManager.java
deleted file mode 100644
index e178f09..000
--- 
a/archetype-common/src/main/java/org/apache/maven/archetype/common/ArchetypeRegistryManager.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package org.apache.maven.archetype.common;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License i

maven-archetype git commit: [ARCHETYPE-440] Additional goals specified through goals param should be added to any goals specified by the used archetype

[rfscholte]

Repository: maven-archetype
Updated Branches:
  refs/heads/master e81651025 -> db50d01a1


[ARCHETYPE-440] Additional goals specified through goals param should be added 
to any goals specified by the used archetype


Project: http://git-wip-us.apache.org/repos/asf/maven-archetype/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-archetype/commit/db50d01a
Tree: http://git-wip-us.apache.org/repos/asf/maven-archetype/tree/db50d01a
Diff: http://git-wip-us.apache.org/repos/asf/maven-archetype/diff/db50d01a

Branch: refs/heads/master
Commit: db50d01a1c74bb31afc1e38207cda7782bd0dc74
Parents: e816510
Author: rfscholte 
Authored: Tue Jan 31 23:07:22 2017 +0100
Committer: rfscholte 
Committed: Tue Jan 31 23:07:22 2017 +0100

--
 .../maven/archetype/mojos/CreateProjectFromArchetypeMojo.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/db50d01a/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateProjectFromArchetypeMojo.java
--
diff --git 
a/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateProjectFromArchetypeMojo.java
 
b/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateProjectFromArchetypeMojo.java
index 4a6b8e7..5300373 100644
--- 
a/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateProjectFromArchetypeMojo.java
+++ 
b/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateProjectFromArchetypeMojo.java
@@ -135,7 +135,7 @@ public class CreateProjectFromArchetypeMojo
 private MavenSession session;
 
 /**
- * Additional goals to immediately run on the project created from the 
archetype.
+ * Goals to immediately run on the project created from the archetype.
  */
 @Parameter( property = "goals" )
 private String goals;

svn commit: r1781389 - in /maven/release/trunk: ./ maven-release-api/src/main/java/org/apache/maven/shared/release/policy/naming/ maven-release-manager/ maven-release-manager/src/main/ maven-release-m

[rfscholte]

Author: rfscholte
Date: Thu Feb  2 13:06:22 2017
New Revision: 1781389

URL: http://svn.apache.org/viewvc?rev=1781389&view=rev
Log:
[MRELEASE-979] Support NamingPolicies to manage Branch and Tag names
Patch provided by Henning Schmiedehausen, reviewed and adjusted by Robert 
Scholte

Added:

maven/release/trunk/maven-release-api/src/main/java/org/apache/maven/shared/release/policy/naming/

maven/release/trunk/maven-release-api/src/main/java/org/apache/maven/shared/release/policy/naming/NamingPolicy.java

maven/release/trunk/maven-release-api/src/main/java/org/apache/maven/shared/release/policy/naming/NamingPolicyRequest.java

maven/release/trunk/maven-release-api/src/main/java/org/apache/maven/shared/release/policy/naming/NamingPolicyResult.java

maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/policies/DefaultNamingPolicy.java

maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/policies/

maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/policies/DefaultNamingPolicyTest.java
Modified:
maven/release/trunk/maven-release-manager/pom.xml
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/main/mdo/release-descriptor.mdo

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

maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java
maven/release/trunk/pom.xml

Added: 
maven/release/trunk/maven-release-api/src/main/java/org/apache/maven/shared/release/policy/naming/NamingPolicy.java
URL: 
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-api/src/main/java/org/apache/maven/shared/release/policy/naming/NamingPolicy.java?rev=1781389&view=auto
==
--- 
maven/release/trunk/maven-release-api/src/main/java/org/apache/maven/shared/release/policy/naming/NamingPolicy.java
 (added)
+++ 
maven/release/trunk/maven-release-api/src/main/java/org/apache/maven/shared/release/policy/naming/NamingPolicy.java
 Thu Feb  2 13:06:22 2017
@@ -0,0 +1,37 @@
+package org.apache.maven.shared.release.policy.naming;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.maven.shared.release.policy.PolicyException;
+
+/**
+ * API for branch and tag naming. Used by maven-release-plugin to suggest 
names for tags and branches.
+ *
+ * @since 3.0.0 (MRELEASE-979)
+ */
+public interface NamingPolicy
+{
+/**
+ * Calculation of the name used for branching or tagging.
+ */
+NamingPolicyResult getName( NamingPolicyRequest request )
+throws PolicyException;
+
+}

Added: 
maven/release/trunk/maven-release-api/src/main/java/org/apache/maven/shared/release/policy/naming/NamingPolicyRequest.java
URL: 
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-api/src/main/java/org/apache/maven/shared/release/policy/naming/NamingPolicyRequest.java?rev=1781389&view=auto
==
--- 
maven/release/trunk/maven-release-api/src/main/java/org/apache/maven/shared/release/policy/naming/NamingPolicyRequest.java
 (added)
+++ 
maven/release/trunk/maven-release-api/src/main/java/org/apache/maven/shared/release/policy/naming/NamingPolicyRequest.java
 Thu Feb  2 13:06:22 2017
@@ -0,0 +1,67 @@
+package org.apache.maven.shared.release.policy.naming;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apac

[maven-checkstyle-plugin] branch master updated: Can't generate checkstyle report with same version, due to usage of replaced parameter

[rfscholte]

This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-checkstyle-plugin.git


The following commit(s) were added to refs/heads/master by this push:
 new eb11ed6  Can't generate checkstyle report with same version, due to 
usage of replaced parameter
eb11ed6 is described below

commit eb11ed637a75271ba87880d8625b9052b91d403e
Author: rfscholte 
AuthorDate: Thu Jan 4 11:08:41 2018 +0100

Can't generate checkstyle report with same version, due to usage of 
replaced parameter
---
 pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index fdaa4e2..22ae4ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -376,7 +376,8 @@ under the License.
   Use the current version to generate sample with the last 
features/fixes of the plugin.
   It implies that the current version is already deployed to 
generate the site.
 -->
-${project.version}
+
+
   
   
 org.codehaus.mojo

-- 
To stop receiving notification emails like this one, please contact
['"commits@maven.apache.org" '].

[maven-checkstyle-plugin] branch master updated: [maven-release-plugin] prepare release maven-checkstyle-plugin-3.0.0

[rfscholte]

This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-checkstyle-plugin.git


The following commit(s) were added to refs/heads/master by this push:
 new 7803030  [maven-release-plugin] prepare release 
maven-checkstyle-plugin-3.0.0
7803030 is described below

commit 7803030e7488fef1820dcabc307f0842810137c7
Author: rfscholte 
AuthorDate: Thu Jan 4 11:09:47 2018 +0100

[maven-release-plugin] prepare release maven-checkstyle-plugin-3.0.0
---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 22ae4ca..16b2e3d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@ under the License.
   
 
   maven-checkstyle-plugin
-  3.0.0-SNAPSHOT
+  3.0.0
   maven-plugin
 
   Apache Maven Checkstyle Plugin
@@ -45,7 +45,7 @@ under the License.
 
scm:git:https://gitbox.apache.org/repos/asf/maven-checkstyle-plugin.git
 
scm:git:https://gitbox.apache.org/repos/asf/maven-checkstyle-plugin.git
 
https://github.com/apache/maven-checkstyle-plugin/tree/${project.scm.tag}
-HEAD
+maven-checkstyle-plugin-3.0.0
   
   
 JIRA

-- 
To stop receiving notification emails like this one, please contact
['"commits@maven.apache.org" '].

[maven-checkstyle-plugin] annotated tag maven-checkstyle-plugin-3.0.0 created (now c27a913)

[rfscholte]

This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a change to annotated tag maven-checkstyle-plugin-3.0.0
in repository https://gitbox.apache.org/repos/asf/maven-checkstyle-plugin.git.


  at c27a913  (tag)
 tagging 7803030e7488fef1820dcabc307f0842810137c7 (commit)
 replaces maven-checkstyle-plugin-2.17
  by rfscholte
  on Thu Jan 4 11:10:02 2018 +0100

- Log -
[maven-release-plugin] copy for tag maven-checkstyle-plugin-3.0.0
---

No new revisions were added by this update.

-- 
To stop receiving notification emails like this one, please contact
['"commits@maven.apache.org" '].

[maven-checkstyle-plugin] branch master updated: [maven-release-plugin] prepare for next development iteration

[rfscholte]

This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-checkstyle-plugin.git


The following commit(s) were added to refs/heads/master by this push:
 new e4f5f0c  [maven-release-plugin] prepare for next development iteration
e4f5f0c is described below

commit e4f5f0c067261126bcd5d0c06aa25d0c6bc88282
Author: rfscholte 
AuthorDate: Thu Jan 4 11:10:12 2018 +0100

[maven-release-plugin] prepare for next development iteration
---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 16b2e3d..eefd0e1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@ under the License.
   
 
   maven-checkstyle-plugin
-  3.0.0
+  3.0.1-SNAPSHOT
   maven-plugin
 
   Apache Maven Checkstyle Plugin
@@ -45,7 +45,7 @@ under the License.
 
scm:git:https://gitbox.apache.org/repos/asf/maven-checkstyle-plugin.git
 
scm:git:https://gitbox.apache.org/repos/asf/maven-checkstyle-plugin.git
 
https://github.com/apache/maven-checkstyle-plugin/tree/${project.scm.tag}
-maven-checkstyle-plugin-3.0.0
+HEAD
   
   
 JIRA

-- 
To stop receiving notification emails like this one, please contact
['"commits@maven.apache.org" '].

[maven-release] branch master updated: Fix relativePath

[rfscholte]

This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-release.git


The following commit(s) were added to refs/heads/master by this push:
 new ee17ade  Fix relativePath
ee17ade is described below

commit ee17aded2275e88d58eae50218d4ab6f2773d6f2
Author: rfscholte 
AuthorDate: Thu Jan 4 11:55:07 2018 +0100

Fix relativePath
---
 .../multimodule-with-deep-subprojects/sub/subproject2/expected-pom.xml   | 1 +
 .../multimodule-with-deep-subprojects/sub/subproject2/pom.xml| 1 +
 .../multimodule-with-deep-subprojects/sub/subproject2/expected-pom.xml   | 1 +
 .../multimodule-with-deep-subprojects/sub/subproject2/pom.xml| 1 +
 4 files changed, 4 insertions(+)

diff --git 
a/maven-release-manager/src/test/resources/projects/rewrite-for-branch/multimodule-with-deep-subprojects/sub/subproject2/expected-pom.xml
 
b/maven-release-manager/src/test/resources/projects/rewrite-for-branch/multimodule-with-deep-subprojects/sub/subproject2/expected-pom.xml
index 7b1c3fd..8c1f219 100644
--- 
a/maven-release-manager/src/test/resources/projects/rewrite-for-branch/multimodule-with-deep-subprojects/sub/subproject2/expected-pom.xml
+++ 
b/maven-release-manager/src/test/resources/projects/rewrite-for-branch/multimodule-with-deep-subprojects/sub/subproject2/expected-pom.xml
@@ -23,6 +23,7 @@
 groupId
 artifactId
 1.0-SNAPSHOT
+../..
   
 
   
diff --git 
a/maven-release-manager/src/test/resources/projects/rewrite-for-branch/multimodule-with-deep-subprojects/sub/subproject2/pom.xml
 
b/maven-release-manager/src/test/resources/projects/rewrite-for-branch/multimodule-with-deep-subprojects/sub/subproject2/pom.xml
index 317de78..ec9bbaf 100644
--- 
a/maven-release-manager/src/test/resources/projects/rewrite-for-branch/multimodule-with-deep-subprojects/sub/subproject2/pom.xml
+++ 
b/maven-release-manager/src/test/resources/projects/rewrite-for-branch/multimodule-with-deep-subprojects/sub/subproject2/pom.xml
@@ -23,6 +23,7 @@
 groupId
 artifactId
 1.0-SNAPSHOT
+../..
   
 
   
diff --git 
a/maven-release-manager/src/test/resources/projects/rewrite-for-release/multimodule-with-deep-subprojects/sub/subproject2/expected-pom.xml
 
b/maven-release-manager/src/test/resources/projects/rewrite-for-release/multimodule-with-deep-subprojects/sub/subproject2/expected-pom.xml
index 5fa5259..762f835 100644
--- 
a/maven-release-manager/src/test/resources/projects/rewrite-for-release/multimodule-with-deep-subprojects/sub/subproject2/expected-pom.xml
+++ 
b/maven-release-manager/src/test/resources/projects/rewrite-for-release/multimodule-with-deep-subprojects/sub/subproject2/expected-pom.xml
@@ -23,6 +23,7 @@
 groupId
 artifactId
 1.0
+../..
   
 
   
diff --git 
a/maven-release-manager/src/test/resources/projects/rewrite-for-release/multimodule-with-deep-subprojects/sub/subproject2/pom.xml
 
b/maven-release-manager/src/test/resources/projects/rewrite-for-release/multimodule-with-deep-subprojects/sub/subproject2/pom.xml
index 317de78..ec9bbaf 100644
--- 
a/maven-release-manager/src/test/resources/projects/rewrite-for-release/multimodule-with-deep-subprojects/sub/subproject2/pom.xml
+++ 
b/maven-release-manager/src/test/resources/projects/rewrite-for-release/multimodule-with-deep-subprojects/sub/subproject2/pom.xml
@@ -23,6 +23,7 @@
 groupId
 artifactId
 1.0-SNAPSHOT
+../..
   
 
   

-- 
To stop receiving notification emails like this one, please contact
['"commits@maven.apache.org" '].

[maven-dependency-analyzer] branch MSHARED-674_Detect_Java_8_type_annotations created (now ae647e0)

[rfscholte]

This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a change to branch MSHARED-674_Detect_Java_8_type_annotations
in repository https://gitbox.apache.org/repos/asf/maven-dependency-analyzer.git.


  at ae647e0  [MSHARED-674] Maven Dependency Analyzer ignores Java 8 type 
annotations

This branch includes the following new commits:

 new ae647e0  [MSHARED-674] Maven Dependency Analyzer ignores Java 8 type 
annotations

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


-- 
To stop receiving notification emails like this one, please contact
['"commits@maven.apache.org" '].

[maven-dependency-analyzer] 01/01: [MSHARED-674] Maven Dependency Analyzer ignores Java 8 type annotations

[rfscholte]

This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a commit to branch MSHARED-674_Detect_Java_8_type_annotations
in repository https://gitbox.apache.org/repos/asf/maven-dependency-analyzer.git

commit ae647e0fa95611c1f3036bb6f64f7d7670e662b8
Author: rfscholte 
AuthorDate: Thu Jan 4 12:26:34 2018 +0100

[MSHARED-674] Maven Dependency Analyzer ignores Java 8 type annotations
---
 .../analyzer/asm/DefaultMethodVisitor.java |  8 +
 .../DefaultProjectDependencyAnalyzerTest.java  | 36 ---
 .../typeUseAnnotationDependency/annotation/pom.xml | 33 ++
 .../annotation/Annotation.java | 30 
 .../resources/typeUseAnnotationDependency/pom.xml  | 38 
 .../typeUseAnnotationDependency/usage/pom.xml  | 40 ++
 .../typeUseAnnotationDependency/usage/Usage.java   | 28 +++
 7 files changed, 209 insertions(+), 4 deletions(-)

diff --git 
a/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultMethodVisitor.java
 
b/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultMethodVisitor.java
index 795398c..bde6173 100644
--- 
a/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultMethodVisitor.java
+++ 
b/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultMethodVisitor.java
@@ -24,6 +24,7 @@ import org.objectweb.asm.Label;
 import org.objectweb.asm.MethodVisitor;
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.Type;
+import org.objectweb.asm.TypePath;
 import org.objectweb.asm.signature.SignatureReader;
 import org.objectweb.asm.signature.SignatureVisitor;
 
@@ -60,6 +61,13 @@ public class DefaultMethodVisitor
 return annotationVisitor;
 }
 
+@Override
+public AnnotationVisitor visitTypeAnnotation( int typeRef, TypePath 
typePath, String desc, boolean visible )
+{
+resultCollector.addDesc( desc );
+
+return annotationVisitor;
+}
 
 public AnnotationVisitor visitParameterAnnotation( final int parameter, 
final String desc, final boolean visible )
 {
diff --git 
a/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.java
 
b/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.java
index 1e2466b..1599369 100644
--- 
a/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.java
+++ 
b/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.java
@@ -43,6 +43,7 @@ import org.apache.maven.shared.test.plugin.ProjectTool;
 import org.apache.maven.shared.test.plugin.RepositoryTool;
 import org.apache.maven.shared.test.plugin.TestToolsException;
 import org.codehaus.plexus.PlexusTestCase;
+import org.junit.Assume;
 
 /**
  * Tests DefaultProjectDependencyAnalyzer.
@@ -302,17 +303,44 @@ public class DefaultProjectDependencyAnalyzerTest
 assertEquals( expectedAnalysis, actualAnalysis );
 }
 
+public void testTypeUseAnnotationDependency()
+throws TestToolsException, ProjectDependencyAnalyzerException
+{
+// java.lang.annotation.ElementType.TYPE_USE introduced with Java 1.8
+Assume.assumeTrue( SystemUtils.isJavaVersionAtLeast( 
JavaVersion.JAVA_1_8 ) );
+
+Properties properties = new Properties();
+properties.put( "maven.compiler.source", "1.8" );
+properties.put( "maven.compiler.target", "1.8" );
+compileProject( "typeUseAnnotationDependency/pom.xml", properties );
+
+MavenProject usage = getProject( 
"typeUseAnnotationDependency/usage/pom.xml" );
+
+ProjectDependencyAnalysis actualAnalysis = analyzer.analyze( usage );
+
+Artifact annotation = createArtifact( 
"org.apache.maven.shared.dependency-analyzer.tests",
+  
"typeUseAnnotationDependencyAnnotation", "jar", "1.0", "compile" );
+Set usedDeclaredArtifacts = Collections.singleton( 
annotation );
+ProjectDependencyAnalysis expectedAnalysis = new 
ProjectDependencyAnalysis( usedDeclaredArtifacts, null, null );
+
+assertEquals( expectedAnalysis, actualAnalysis );
+}
+
 // private methods 
 
 private void compileProject( String pomPath )
 throws TestToolsException
 {
+compileProject( pomPath, new Properties() );
+}
+
+private void compileProject(String pomPath, Properties properties) throws 
TestToolsException {
 File pom = getTestFile( "target/test-classes/", pomPath );
-Properties properties = new Properties();
-if ( SystemUtils.isJavaVersionAtLeast( JavaVersion.JAVA_9 ) )
+if ( SystemUtils.isJavaVersionAtLeast( JavaVer

[maven-dependency-analyzer] branch MSHARED-674_Detect_Java_8_type_annotations updated: Don't use assume

[rfscholte]

This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a commit to branch MSHARED-674_Detect_Java_8_type_annotations
in repository https://gitbox.apache.org/repos/asf/maven-dependency-analyzer.git


The following commit(s) were added to 
refs/heads/MSHARED-674_Detect_Java_8_type_annotations by this push:
 new 410acd0  Don't use assume
410acd0 is described below

commit 410acd0dce0c33e608ea18a33f24785a473c4f3d
Author: rfscholte 
AuthorDate: Thu Jan 4 13:32:13 2018 +0100

Don't use assume
---
 .../dependency/analyzer/DefaultProjectDependencyAnalyzerTest.java| 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git 
a/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.java
 
b/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.java
index 1599369..d31f92e 100644
--- 
a/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.java
+++ 
b/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.java
@@ -307,7 +307,10 @@ public class DefaultProjectDependencyAnalyzerTest
 throws TestToolsException, ProjectDependencyAnalyzerException
 {
 // java.lang.annotation.ElementType.TYPE_USE introduced with Java 1.8
-Assume.assumeTrue( SystemUtils.isJavaVersionAtLeast( 
JavaVersion.JAVA_1_8 ) );
+if ( !SystemUtils.isJavaVersionAtLeast( JavaVersion.JAVA_1_8 ) )
+{
+return;
+}
 
 Properties properties = new Properties();
 properties.put( "maven.compiler.source", "1.8" );

-- 
To stop receiving notification emails like this one, please contact
['"commits@maven.apache.org" '].

[maven-dependency-analyzer] branch master updated: [MSHARED-674] Detect Java 8 type annotations (#1)

[rfscholte]

This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-dependency-analyzer.git


The following commit(s) were added to refs/heads/master by this push:
 new 51ff6e8  [MSHARED-674] Detect Java 8 type annotations (#1)
51ff6e8 is described below

commit 51ff6e801a4b9d206ddb42645658355b43540bba
Author: Andreas Hubold 
AuthorDate: Thu Jan 4 13:36:25 2018 +0100

[MSHARED-674] Detect Java 8 type annotations (#1)

* [MSHARED-674] Detect Java 8 type annotations

by implementing DefaultMethodVisitor#visitTypeAnnotation

* [MSHARED-674] Do not use assumeTrue in junit test

assumptions do not work in old methodName based junit tests
---
 .../analyzer/asm/DefaultMethodVisitor.java |  8 +
 .../DefaultProjectDependencyAnalyzerTest.java  | 38 +---
 .../typeUseAnnotationDependency/annotation/pom.xml | 33 ++
 .../annotation/Annotation.java | 30 
 .../resources/typeUseAnnotationDependency/pom.xml  | 38 
 .../typeUseAnnotationDependency/usage/pom.xml  | 40 ++
 .../typeUseAnnotationDependency/usage/Usage.java   | 28 +++
 7 files changed, 211 insertions(+), 4 deletions(-)

diff --git 
a/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultMethodVisitor.java
 
b/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultMethodVisitor.java
index 795398c..bde6173 100644
--- 
a/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultMethodVisitor.java
+++ 
b/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultMethodVisitor.java
@@ -24,6 +24,7 @@ import org.objectweb.asm.Label;
 import org.objectweb.asm.MethodVisitor;
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.Type;
+import org.objectweb.asm.TypePath;
 import org.objectweb.asm.signature.SignatureReader;
 import org.objectweb.asm.signature.SignatureVisitor;
 
@@ -60,6 +61,13 @@ public class DefaultMethodVisitor
 return annotationVisitor;
 }
 
+@Override
+public AnnotationVisitor visitTypeAnnotation( int typeRef, TypePath 
typePath, String desc, boolean visible )
+{
+resultCollector.addDesc( desc );
+
+return annotationVisitor;
+}
 
 public AnnotationVisitor visitParameterAnnotation( final int parameter, 
final String desc, final boolean visible )
 {
diff --git 
a/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.java
 
b/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.java
index 1e2466b..9e412f2 100644
--- 
a/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.java
+++ 
b/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.java
@@ -302,17 +302,47 @@ public class DefaultProjectDependencyAnalyzerTest
 assertEquals( expectedAnalysis, actualAnalysis );
 }
 
+public void testTypeUseAnnotationDependency()
+throws TestToolsException, ProjectDependencyAnalyzerException
+{
+// java.lang.annotation.ElementType.TYPE_USE introduced with Java 1.8
+if ( !SystemUtils.isJavaVersionAtLeast( JavaVersion.JAVA_1_8 ) )
+{
+return;
+}
+
+Properties properties = new Properties();
+properties.put( "maven.compiler.source", "1.8" );
+properties.put( "maven.compiler.target", "1.8" );
+compileProject( "typeUseAnnotationDependency/pom.xml", properties);
+
+MavenProject usage = getProject( 
"typeUseAnnotationDependency/usage/pom.xml" );
+
+ProjectDependencyAnalysis actualAnalysis = analyzer.analyze( usage );
+
+Artifact annotation = createArtifact( 
"org.apache.maven.shared.dependency-analyzer.tests",
+
"typeUseAnnotationDependencyAnnotation", "jar", "1.0", "compile" );
+Set usedDeclaredArtifacts = Collections.singleton( 
annotation );
+ProjectDependencyAnalysis expectedAnalysis = new 
ProjectDependencyAnalysis(usedDeclaredArtifacts, null, null);
+
+assertEquals( expectedAnalysis, actualAnalysis );
+}
+
 // private methods 
 
 private void compileProject( String pomPath )
 throws TestToolsException
 {
+compileProject( pomPath, new Properties() );
+}
+
+private void compileProject(String pomPath, Properties properties) throws 
TestToolsException {
 File pom = getTestFile( "target/test-classes/", pomPath );
-Properties properties = new Properties();
-if ( Sys

[maven-artifact-transfer] branch master updated: Fix Javadoc reported error

[rfscholte]

This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-artifact-transfer.git


The following commit(s) were added to refs/heads/master by this push:
 new 64401d4  Fix Javadoc reported error
64401d4 is described below

commit 64401d442c0a19236d07ad15d84fb1b97b97c182
Author: rfscholte 
AuthorDate: Thu Jan 4 16:46:44 2018 +0100

Fix Javadoc reported error
---
 .../internal/DefaultArtifactDeployerTest.java  | 22 ++
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git 
a/src/test/java/org/apache/maven/shared/artifact/deploy/internal/DefaultArtifactDeployerTest.java
 
b/src/test/java/org/apache/maven/shared/artifact/deploy/internal/DefaultArtifactDeployerTest.java
index f8fca0e..cfd9587 100644
--- 
a/src/test/java/org/apache/maven/shared/artifact/deploy/internal/DefaultArtifactDeployerTest.java
+++ 
b/src/test/java/org/apache/maven/shared/artifact/deploy/internal/DefaultArtifactDeployerTest.java
@@ -25,8 +25,10 @@ import java.util.Collections;
 
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.project.ProjectBuildingRequest;
+import org.apache.maven.shared.artifact.deploy.ArtifactDeployer;
 import org.apache.maven.shared.artifact.deploy.ArtifactDeployerException;
 import 
org.apache.maven.shared.artifact.deploy.internal.DefaultArtifactDeployer;
+import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
@@ -40,13 +42,19 @@ public class DefaultArtifactDeployerTest
 {
 @Rule
 public ExpectedException thrown = ExpectedException.none();
+
+private ArtifactDeployer dap;
+
+@Before
+public void setUp()
+{
+dap = new DefaultArtifactDeployer();
+}
 
 @Test
 public void 
deployShouldReturnIllegalArgumentExceptionForFirstParameterWithNull()
 throws ArtifactDeployerException
 {
-DefaultArtifactDeployer dap = new DefaultArtifactDeployer();
-
 thrown.expect( IllegalArgumentException.class );
 thrown.expectMessage( "The parameter request is not allowed to be 
null." );
 dap.deploy( null, Collections.emptyList() );
@@ -56,8 +64,6 @@ public class DefaultArtifactDeployerTest
 public void 
deployShouldReturnIllegalArgumentExceptionForSecondParameterWithNull()
 throws ArtifactDeployerException
 {
-DefaultArtifactDeployer dap = new DefaultArtifactDeployer();
-
 thrown.expect( IllegalArgumentException.class );
 thrown.expectMessage( "The parameter mavenArtifacts is not allowed to 
be null." );
 ProjectBuildingRequest pbr = mock( ProjectBuildingRequest.class );
@@ -68,8 +74,6 @@ public class DefaultArtifactDeployerTest
 public void 
deployShouldReturnIllegalArgumentExceptionForSecondParameterWithEmpty()
 throws ArtifactDeployerException
 {
-DefaultArtifactDeployer dap = new DefaultArtifactDeployer();
-
 thrown.expect( IllegalArgumentException.class );
 thrown.expectMessage( "The collection mavenArtifacts is not allowed to 
be empty." );
 ProjectBuildingRequest pbr = mock( ProjectBuildingRequest.class );
@@ -81,8 +85,6 @@ public class DefaultArtifactDeployerTest
 public void 
deploy3ParametersShouldReturnIllegalArgumentExceptionForFirstParameterWithNull()
 throws ArtifactDeployerException
 {
-DefaultArtifactDeployer dap = new DefaultArtifactDeployer();
-
 thrown.expect( IllegalArgumentException.class );
 thrown.expectMessage( "The parameter request is not allowed to be 
null." );
 dap.deploy( null, null, Collections.emptyList() );
@@ -92,8 +94,6 @@ public class DefaultArtifactDeployerTest
 public void 
deploy3ParametersShouldReturnIllegalArgumentExceptionForSecondParameterWithNull()
 throws ArtifactDeployerException
 {
-DefaultArtifactDeployer dap = new DefaultArtifactDeployer();
-
 thrown.expect( IllegalArgumentException.class );
 thrown.expectMessage( "The parameter mavenArtifacts is not allowed to 
be null." );
 ProjectBuildingRequest pbr = mock( ProjectBuildingRequest.class );
@@ -104,8 +104,6 @@ public class DefaultArtifactDeployerTest
 public void 
deploy3ParametersShouldReturnIllegalArgumentExceptionForSecondParameterWithEmpty()
 throws ArtifactDeployerException
 {
-DefaultArtifactDeployer dap = new DefaultArtifactDeployer();
-
 thrown.expect( IllegalArgumentException.class );
 thrown.expectMessage( "The collection mavenArtifacts is not allowed to 
be empty." );
 ProjectBuildingRequest pbr = mock( ProjectBuildingRequest.class );

-- 
To stop receiving notification emails like this one, please contact
['"commits@maven.apache.org" '].

[maven-release] branch master updated (ee17ade -> 65b332c)

[rfscholte]

This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/maven-release.git.


from ee17ade  Fix relativePath
 new 1acfbc4  With Maven3+ distributionManagement.status not allowed in 
effective pom
 new f0fbfa8  Prepare pathTranslator replacement with SuperPomProvider
 new 65b332c  Make org.eclipse.aether:aether-util optional, so 
maven-artifact-transfer can work with Maven 3.0 too.

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 maven-release-api/pom.xml  | 1 +
 .../maven/shared/release/phase/GenerateReleasePomsPhase.java   | 7 ++-
 .../parent-artifactId/1-SNAPSHOT/parent-artifactId-1-SNAPSHOT.pom  | 3 ---
 .../external/parent-artifactId/1/parent-artifactId-1.pom   | 3 ---
 4 files changed, 7 insertions(+), 7 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
['"commits@maven.apache.org" '].

[maven-release] 02/03: Prepare pathTranslator replacement with SuperPomProvider

[rfscholte]

This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-release.git

commit f0fbfa8f66b9f412b1a0efc872ce7cf377191c79
Author: rfscholte 
AuthorDate: Fri Jan 5 14:18:12 2018 +0100

Prepare pathTranslator replacement with SuperPomProvider
---
 .../maven/shared/release/phase/GenerateReleasePomsPhase.java   | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git 
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java
 
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java
index 4cca3a9..a9cd688 100644
--- 
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java
+++ 
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java
@@ -292,11 +292,16 @@ public class GenerateReleasePomsPhase
 releaseModel.getBuild().setExtensions( createReleaseExtensions( 
originalVersions, mappedVersions,
 
releaseProject ) );
 
-pathTranslator.unalignFromBaseDirectory( releaseProject.getModel(), 
project.getFile().getParentFile() );
+unalignFromBaseDirectory( releaseModel, 
project.getFile().getParentFile() );
 
 return releaseModel;
 }
 
+private void unalignFromBaseDirectory( Model releaseModel, File baseDir )
+{
+pathTranslator.unalignFromBaseDirectory( releaseModel, baseDir );  
+}
+
 private String findOriginalFinalName( MavenProject project )
 {
 if ( project.getOriginalModel().getBuild() != null

-- 
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" .

[maven-release] 01/03: With Maven3+ distributionManagement.status not allowed in effective pom

[rfscholte]

This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-release.git

commit 1acfbc46f443d6ab3a18a637b55fe6990be8557b
Author: rfscholte 
AuthorDate: Fri Jan 5 14:15:52 2018 +0100

With Maven3+ distributionManagement.status not allowed in effective pom
---
 .../parent-artifactId/1-SNAPSHOT/parent-artifactId-1-SNAPSHOT.pom  | 3 ---
 .../external/parent-artifactId/1/parent-artifactId-1.pom   | 3 ---
 2 files changed, 6 deletions(-)

diff --git 
a/maven-release-manager/src/test/remote-repository/external/parent-artifactId/1-SNAPSHOT/parent-artifactId-1-SNAPSHOT.pom
 
b/maven-release-manager/src/test/remote-repository/external/parent-artifactId/1-SNAPSHOT/parent-artifactId-1-SNAPSHOT.pom
index cce0b4d..e3a25ad 100644
--- 
a/maven-release-manager/src/test/remote-repository/external/parent-artifactId/1-SNAPSHOT/parent-artifactId-1-SNAPSHOT.pom
+++ 
b/maven-release-manager/src/test/remote-repository/external/parent-artifactId/1-SNAPSHOT/parent-artifactId-1-SNAPSHOT.pom
@@ -30,7 +30,4 @@
 
scm:svn:file://localhost/tmp/scm-repo/trunk
 file://localhost/tmp/scm-repo/trunk
   
-  
-deployed
-  
 
\ No newline at end of file
diff --git 
a/maven-release-manager/src/test/remote-repository/external/parent-artifactId/1/parent-artifactId-1.pom
 
b/maven-release-manager/src/test/remote-repository/external/parent-artifactId/1/parent-artifactId-1.pom
index 7f2eac1..2f3ee63 100644
--- 
a/maven-release-manager/src/test/remote-repository/external/parent-artifactId/1/parent-artifactId-1.pom
+++ 
b/maven-release-manager/src/test/remote-repository/external/parent-artifactId/1/parent-artifactId-1.pom
@@ -30,7 +30,4 @@
 
scm:svn:file://localhost/tmp/scm-repo/trunk
 file://localhost/tmp/scm-repo/trunk
   
-  
-deployed
-  
 
\ No newline at end of file

-- 
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" .

[maven-release] 03/03: Make org.eclipse.aether:aether-util optional, so maven-artifact-transfer can work with Maven 3.0 too.

[rfscholte]

This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-release.git

commit 65b332c063d1aa7b0249f45d8147ef433561d3db
Author: rfscholte 
AuthorDate: Fri Jan 5 14:26:14 2018 +0100

Make org.eclipse.aether:aether-util optional, so maven-artifact-transfer 
can work with Maven 3.0 too.
---
 maven-release-api/pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/maven-release-api/pom.xml b/maven-release-api/pom.xml
index 2de416d..e96feff 100644
--- a/maven-release-api/pom.xml
+++ b/maven-release-api/pom.xml
@@ -44,6 +44,7 @@
   org.eclipse.aether
   aether-util
   1.0.0.v20140518
+  true
 
 
 

-- 
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" .

[maven-javadoc-plugin] branch master updated: [MJAVADOC-504] NullPointerException in JavadocUtil.getJavaHome() when JAVA_HOME isn't set

[rfscholte]

This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git


The following commit(s) were added to refs/heads/master by this push:
 new 79a6b4b  [MJAVADOC-504] NullPointerException in 
JavadocUtil.getJavaHome() when JAVA_HOME isn't set
79a6b4b is described below

commit 79a6b4b69383d3bf5c342c12dc483bc3d4b82336
Author: rfscholte 
AuthorDate: Fri Jan 5 21:15:22 2018 +0100

[MJAVADOC-504] NullPointerException in JavadocUtil.getJavaHome() when 
JAVA_HOME isn't set
---
 .../apache/maven/plugins/javadoc/JavadocUtil.java  | 28 --
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java 
b/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java
index 4dc7631..f575455 100644
--- a/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java
+++ b/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java
@@ -1278,10 +1278,22 @@ public class JavadocUtil
 private static File getJavaHome( Log log )
 {
 File javaHome = null;
+
+String javaHomeValue = null;
+try
+{
+javaHomeValue = CommandLineUtils.getSystemEnvVars().getProperty( 
"JAVA_HOME" );
+}
+catch ( IOException e )
+{
+if ( log != null && log.isDebugEnabled() )
+{
+log.debug( "IOException: " + e.getMessage() );
+}
+}
 
 // if maven.home is set, we can assume JAVA_HOME must be used for 
testing
-
-if ( System.getProperty( "maven.home" ) == null )
+if ( System.getProperty( "maven.home" ) == null || javaHomeValue == 
null )
 {
 // JEP220 (Java9) restructured the JRE/JDK runtime image
 if ( ( SystemUtils.IS_OS_MAC_OSX
@@ -1297,17 +1309,7 @@ public class JavadocUtil
 
 if ( javaHome == null || !javaHome.exists() )
 {
-try
-{
-javaHome = new File( 
CommandLineUtils.getSystemEnvVars().getProperty( "JAVA_HOME" ) );
-}
-catch ( IOException e )
-{
-if ( log != null && log.isDebugEnabled() )
-{
-log.debug( "IOException: " + e.getMessage() );
-}
-}
+javaHome = new File( javaHomeValue );
 }
 
 if ( javaHome == null || !javaHome.exists() )

-- 
To stop receiving notification emails like this one, please contact
['"commits@maven.apache.org" '].

[maven-javadoc-plugin] branch master updated: Make unittests more solid

[rfscholte]

This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git


The following commit(s) were added to refs/heads/master by this push:
 new 9809cf1  Make unittests more solid
9809cf1 is described below

commit 9809cf172071db21fd0f0482d944fd963dd2a2b3
Author: rfscholte 
AuthorDate: Sat Jan 6 13:39:09 2018 +0100

Make unittests more solid
---
 .../apache/maven/plugins/javadoc/JavadocReportTest.java   | 15 +--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git 
a/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java 
b/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java
index 19d6fa9..a521839 100644
--- a/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java
+++ b/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java
@@ -27,6 +27,8 @@ import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
 import java.io.Reader;
+import java.net.HttpURLConnection;
+import java.net.URL;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -228,7 +230,15 @@ public class JavadocReportTest
 
 File generatedFile = new File( apidocs, "def/configuration/App.html" );
 assertTrue( generatedFile.exists() );
-assertTrue( FileUtils.fileRead( generatedFile, "UTF-8" ).contains( 
"/docs/api/java/lang/Object.html" ) );
+
+// only test when URL can be reached
+String url = JavadocReport.DEFAULT_JAVA_API_LINKS.getProperty( "api_9" 
);
+HttpURLConnection connection = (HttpURLConnection) new URL( url 
).openConnection();
+connection.setRequestMethod( "HEAD" );
+if ( connection.getResponseCode() == 200 )
+{
+assertTrue( FileUtils.fileRead( generatedFile, "UTF-8" ).contains( 
"/docs/api/java/lang/Object.html" ) );
+}
 
 assertTrue( new File( apidocs, "def/configuration/AppSample.html" 
).exists() );
 assertTrue( new File( apidocs, "def/configuration/package-frame.html" 
).exists() );
@@ -654,7 +664,8 @@ public class JavadocReportTest
 if( javadocVersion.compareTo( JavadocVersion.parse( "1.8" ) ) >= 0  && 
javadocVersion.compareTo( JavadocVersion.parse( "10" ) ) < 0)
 {
 // https://bugs.openjdk.java.net/browse/JDK-8032205
-assertTrue( "This bug appeared in JDK8 and was planned to be fixed 
in JDK9, see JDK-8032205",
+assertTrue( "Javadoc runtime version: " + javadocVersion
++ "\nThis bug appeared in JDK8 and was planned to be fixed in 
JDK9, see JDK-8032205",
 new File( apidocs, 
"resources/test/doc-files/maven-feather.png" ).exists() );
 }
 else

-- 
To stop receiving notification emails like this one, please contact
['"commits@maven.apache.org" '].

[maven-javadoc-plugin] branch Jenkins_investigation created (now d1ba6b2)

[rfscholte]

This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a change to branch Jenkins_investigation
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git.


  at d1ba6b2  show output javadoc -J-version show content javadoc file

This branch includes the following new commits:

 new d1ba6b2  show output javadoc -J-version show content javadoc file

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


-- 
To stop receiving notification emails like this one, please contact
['"commits@maven.apache.org" '].

[maven-javadoc-plugin] 01/01: show output javadoc -J-version show content javadoc file

[rfscholte]

This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a commit to branch Jenkins_investigation
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git

commit d1ba6b27e93f4dcadb9c7c3622d8e98d079f4c1f
Author: rfscholte 
AuthorDate: Sat Jan 6 14:40:46 2018 +0100

show output javadoc -J-version
show content javadoc file
---
 .../org/apache/maven/plugins/javadoc/JavadocUtil.java| 16 +---
 .../apache/maven/plugins/javadoc/JavadocReportTest.java  |  2 +-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java 
b/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java
index f575455..5c37f72 100644
--- a/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java
+++ b/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java
@@ -540,13 +540,23 @@ public class JavadocUtil
 
 if ( StringUtils.isNotEmpty( err.getOutput() ) )
 {
-return JavadocVersion.parse( extractJavadocVersion( 
err.getOutput() ) );
+JavadocVersion jv= JavadocVersion.parse( extractJavadocVersion( 
err.getOutput() ) );
+//if ( "2".equals( jv.toString() ) )
+{
+System.out.print( "stderr: " + err.getOutput() );
+}
+return jv;
 }
 else if ( StringUtils.isNotEmpty( out.getOutput() ) )
 {
-return JavadocVersion.parse( extractJavadocVersion( 
out.getOutput() ) );
+JavadocVersion jv= JavadocVersion.parse( extractJavadocVersion( 
out.getOutput() ) );
+//if ( "2".equals( jv.toString() ) )
+{
+System.out.print( "stdout: " + out.getOutput() );
+}
+return jv;
 }
-
+
 throw new IllegalArgumentException( "No output found from the command 
line 'javadoc -J-version'" );
 }
 
diff --git 
a/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java 
b/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java
index a521839..516a26b 100644
--- a/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java
+++ b/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java
@@ -237,7 +237,7 @@ public class JavadocReportTest
 connection.setRequestMethod( "HEAD" );
 if ( connection.getResponseCode() == 200 )
 {
-assertTrue( FileUtils.fileRead( generatedFile, "UTF-8" ).contains( 
"/docs/api/java/lang/Object.html" ) );
+assertTrue( FileUtils.fileRead( generatedFile, "UTF-8" ), 
FileUtils.fileRead( generatedFile, "UTF-8" ).contains( 
"/docs/api/java/lang/Object.html" ) );
 }
 
 assertTrue( new File( apidocs, "def/configuration/AppSample.html" 
).exists() );

-- 
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" .

[maven-javadoc-plugin] branch master updated: Introduce consumer to ignore lines starting with 'Picked up '

[rfscholte]

This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git


The following commit(s) were added to refs/heads/master by this push:
 new 12dbbde  Introduce consumer to ignore lines starting with 'Picked up '
12dbbde is described below

commit 12dbbde29cf6277ca311cb8afffdf02dbfe0c9b4
Author: rfscholte 
AuthorDate: Sat Jan 6 15:22:11 2018 +0100

Introduce consumer to ignore lines starting with 'Picked up '
---
 .../apache/maven/plugins/javadoc/JavadocUtil.java  | 22 --
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java 
b/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java
index f575455..73ae0f2 100644
--- a/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java
+++ b/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java
@@ -525,8 +525,8 @@ public class JavadocUtil
 cmd.setWorkingDirectory( javadocExe.getParentFile() );
 cmd.createArg().setValue( "-J-version" );
 
-CommandLineUtils.StringStreamConsumer out = new 
CommandLineUtils.StringStreamConsumer();
-CommandLineUtils.StringStreamConsumer err = new 
CommandLineUtils.StringStreamConsumer();
+CommandLineUtils.StringStreamConsumer out = new 
JavadocOutputStreamConsumer();
+CommandLineUtils.StringStreamConsumer err = new 
JavadocOutputStreamConsumer();
 
 int exitCode = CommandLineUtils.executeCommandLine( cmd, out, err );
 
@@ -1512,6 +1512,24 @@ public class JavadocUtil
 return token;
 }
 }
+
+/**
+ * Ignores line like 'Picked up JAVA_TOOL_OPTIONS: ...' as can happen on 
CI servers.
+ * 
+ * @author Robert Scholte
+ * @since 3.0.1
+ */
+private static class JavadocOutputStreamConsumer extends 
CommandLineUtils.StringStreamConsumer
+{
+@Override
+public void consumeLine( String line )
+{
+if ( !line.startsWith( "Picked up " ) )
+{
+super.consumeLine( line );
+}
+}
+}
 
 static List toList( String src )
 {

-- 
To stop receiving notification emails like this one, please contact
['"commits@maven.apache.org" '].

[maven-release] branch master updated: Unittests expect expression for finalName, ITs expect explicit value. Let's make it explicit for both

[rfscholte]

This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-release.git


The following commit(s) were added to refs/heads/master by this push:
 new 2d3f020  Unittests expect expression for finalName, ITs expect 
explicit value. Let's make it explicit for both
2d3f020 is described below

commit 2d3f020ff659e56d421d4aa8c6567ab6304b18c0
Author: rfscholte 
AuthorDate: Sat Jan 6 21:26:08 2018 +0100

Unittests expect expression for finalName, ITs expect explicit value. Let's 
make it explicit for both
---
 .../release/phase/GenerateReleasePomsPhase.java| 29 --
 .../basic-pom-entities/expected-release-pom.xml|  2 +-
 .../basic-pom-namespace/expected-release-pom.xml   |  2 +-
 .../expected-release-pom.xml   |  2 +-
 .../basic-pom/expected-release-pom-with-schema.xml |  2 +-
 .../basic-pom/expected-release-pom.xml |  2 +-
 .../cdata-around-values/expected-release-pom.xml   |  2 +-
 .../subproject1/expected-release-pom.xml   |  2 +-
 .../subproject2/expected-release-pom.xml   |  2 +-
 .../expected-release-pom.xml   |  2 +-
 .../subproject1/expected-release-pom.xml   |  2 +-
 .../expected-release-pom.xml   |  2 +-
 .../expected-release-pom.xml   |  2 +-
 .../subproject1/expected-release-pom.xml   |  2 +-
 .../subproject2/expected-release-pom.xml   |  2 +-
 .../expected-release-pom.xml   |  2 +-
 .../subproject1/expected-release-pom.xml   |  2 +-
 .../subproject2/expected-release-pom.xml   |  2 +-
 .../expected-release-pom.xml   |  2 +-
 .../subproject1/expected-release-pom.xml   |  2 +-
 .../subproject2/expected-release-pom.xml   |  2 +-
 .../expected-release-pom.xml   |  2 +-
 .../subproject1/expected-release-pom.xml   |  2 +-
 .../subproject2/expected-release-pom.xml   |  2 +-
 .../expected-release-pom.xml   |  2 +-
 .../subproject1/expected-release-pom.xml   |  2 +-
 .../subproject2/expected-release-pom.xml   |  2 +-
 .../subproject3/expected-release-pom.xml   |  2 +-
 .../expected-release-pom.xml   |  2 +-
 .../subproject1/expected-release-pom.xml   |  2 +-
 .../subproject2/expected-release-pom.xml   |  2 +-
 .../subproject3/expected-release-pom.xml   |  2 +-
 .../expected-release-pom.xml   |  2 +-
 .../subproject1/expected-release-pom.xml   |  2 +-
 .../subproject2/expected-release-pom.xml   |  2 +-
 .../subproject3/expected-release-pom.xml   |  2 +-
 .../subproject4/expected-release-pom.xml   |  2 +-
 .../subsubproject/expected-release-pom.xml |  2 +-
 .../expected-release-pom.xml   |  2 +-
 .../subproject1/expected-release-pom.xml   |  2 +-
 .../subproject2/expected-release-pom.xml   |  2 +-
 .../subproject3/expected-release-pom.xml   |  2 +-
 .../expected-release-pom.xml   |  2 +-
 .../subproject1/expected-release-pom.xml   |  2 +-
 .../subproject2/expected-release-pom.xml   |  2 +-
 .../subproject3/expected-release-pom.xml   |  2 +-
 .../subproject4/expected-release-pom.xml   |  2 +-
 .../expected-release-pom.xml   |  2 +-
 .../subproject1/expected-release-pom.xml   |  2 +-
 .../subproject2/expected-release-pom.xml   |  2 +-
 .../subproject3/expected-release-pom.xml   |  2 +-
 .../subproject4/expected-release-pom.xml   |  2 +-
 .../expected-release-pom.xml   |  2 +-
 .../expected-release-pom-version-changed.xml   |  2 +-
 .../subproject1/expected-release-pom.xml   |  2 +-
 .../pom-with-namespace/expected-release-pom.xml|  2 +-
 .../subproject1/expected-release-pom.xml   |  2 +-
 .../subproject2/expected-release-pom.xml   |  2 +-
 .../pom-with-parent/expected-release-pom.xml   |  2 +-
 .../subproject1/expected-release-pom.xml   |  2 +-
 .../expected-release-pom.xml   |  2 +-
 .../subproject1/expected-release-pom.xml   |  2 +-
 .../expected-release-pom.xml   |  2 +-
 .../expected-release-pom.xml   |  2 +-
 .../subproject1/expected-release-pom.xml   |  2 +-
 .../subproject2/expected-release-pom.xml   |  2 +-
 66 files changed, 81 insertions(+), 78 deletions(-)

diff --git 
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java
 
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java
index a9cd688..969ccb9 100644
--- 
a/maven-release-manager/src/main/java/org/apache/maven/shared/rel

[maven-release] branch master updated: Add missing remote extension artifact

[rfscholte]

This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-release.git


The following commit(s) were added to refs/heads/master by this push:
 new a297874  Add missing remote extension artifact
a297874 is described below

commit a297874b4e9cf8e948d153f9929df69d3fe9665f
Author: rfscholte 
AuthorDate: Sat Jan 6 21:39:22 2018 +0100

Add missing remote extension artifact
---
 .../extension-artifactId-1.3-SNAPSHOT.jar  |  1 +
 .../extension-artifactId-1.3-SNAPSHOT.pom  | 32 ++
 2 files changed, 33 insertions(+)

diff --git 
a/maven-release-manager/src/test/remote-repository/external/extension-artifactId/1.3-SNAPSHOT/extension-artifactId-1.3-SNAPSHOT.jar
 
b/maven-release-manager/src/test/remote-repository/external/extension-artifactId/1.3-SNAPSHOT/extension-artifactId-1.3-SNAPSHOT.jar
new file mode 100644
index 000..421376d
--- /dev/null
+++ 
b/maven-release-manager/src/test/remote-repository/external/extension-artifactId/1.3-SNAPSHOT/extension-artifactId-1.3-SNAPSHOT.jar
@@ -0,0 +1 @@
+dummy
diff --git 
a/maven-release-manager/src/test/remote-repository/external/extension-artifactId/1.3-SNAPSHOT/extension-artifactId-1.3-SNAPSHOT.pom
 
b/maven-release-manager/src/test/remote-repository/external/extension-artifactId/1.3-SNAPSHOT/extension-artifactId-1.3-SNAPSHOT.pom
new file mode 100644
index 000..f6ad12f
--- /dev/null
+++ 
b/maven-release-manager/src/test/remote-repository/external/extension-artifactId/1.3-SNAPSHOT/extension-artifactId-1.3-SNAPSHOT.pom
@@ -0,0 +1,32 @@
+
+
+
+
+  4.0.0
+  external
+  extension-artifactId
+  1.3-SNAPSHOT
+  POM was created from deploy:deploy-file
+  
+scm:svn:file://localhost/tmp/scm-repo/trunk
+
scm:svn:file://localhost/tmp/scm-repo/trunk
+file://localhost/tmp/scm-repo/trunk
+  
+
\ No newline at end of file

-- 
To stop receiving notification emails like this one, please contact
['"commits@maven.apache.org" '].

[maven-release] branch master updated: Clone incorrectly set project.reporting.excludeDefaults from null to Boolean.FALSE

[rfscholte]

This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-release.git


The following commit(s) were added to refs/heads/master by this push:
 new 4a0ef66  Clone incorrectly set project.reporting.excludeDefaults from 
null to Boolean.FALSE
4a0ef66 is described below

commit 4a0ef663c551291437e56016d69935e104cd9398
Author: rfscholte 
AuthorDate: Sun Jan 7 15:47:27 2018 +0100

Clone incorrectly set project.reporting.excludeDefaults from null to 
Boolean.FALSE
---
 .../maven/shared/release/phase/GenerateReleasePomsPhase.java   | 10 ++
 .../basic-pom-entities/expected-release-pom.xml|  1 -
 .../basic-pom-namespace/expected-release-pom.xml   |  1 -
 .../basic-pom-with-encoding/expected-release-pom.xml   |  1 -
 .../basic-pom/expected-release-pom-with-schema.xml |  1 -
 .../generate-release-poms/basic-pom/expected-release-pom.xml   |  1 -
 .../cdata-around-values/expected-release-pom.xml   |  1 -
 .../cdata-around-values/subproject1/expected-release-pom.xml   |  1 -
 .../cdata-around-values/subproject2/expected-release-pom.xml   |  1 -
 .../comments-around-values/expected-release-pom.xml|  1 -
 .../subproject1/expected-release-pom.xml   |  1 -
 .../external-range-dependency/expected-release-pom.xml |  1 -
 .../expected-release-pom.xml   |  1 -
 .../subproject1/expected-release-pom.xml   |  1 -
 .../subproject2/expected-release-pom.xml   |  1 -
 .../expected-release-pom.xml   |  1 -
 .../subproject1/expected-release-pom.xml   |  1 -
 .../subproject2/expected-release-pom.xml   |  1 -
 .../expected-release-pom.xml   |  1 -
 .../subproject1/expected-release-pom.xml   |  1 -
 .../subproject2/expected-release-pom.xml   |  1 -
 .../expected-release-pom.xml   |  1 -
 .../subproject1/expected-release-pom.xml   |  1 -
 .../subproject2/expected-release-pom.xml   |  1 -
 .../expected-release-pom.xml   |  1 -
 .../subproject1/expected-release-pom.xml   |  1 -
 .../subproject2/expected-release-pom.xml   |  1 -
 .../subproject3/expected-release-pom.xml   |  1 -
 .../internal-managed-snapshot-plugin/expected-release-pom.xml  |  1 -
 .../subproject1/expected-release-pom.xml   |  1 -
 .../subproject2/expected-release-pom.xml   |  1 -
 .../subproject3/expected-release-pom.xml   |  1 -
 .../internal-snapshot-dependencies/expected-release-pom.xml|  1 -
 .../subproject1/expected-release-pom.xml   |  1 -
 .../subproject2/expected-release-pom.xml   |  1 -
 .../subproject3/expected-release-pom.xml   |  1 -
 .../subproject4/expected-release-pom.xml   |  1 -
 .../subproject4/subsubproject/expected-release-pom.xml |  1 -
 .../internal-snapshot-extension/expected-release-pom.xml   |  1 -
 .../subproject1/expected-release-pom.xml   |  1 -
 .../subproject2/expected-release-pom.xml   |  1 -
 .../subproject3/expected-release-pom.xml   |  1 -
 .../internal-snapshot-plugins/expected-release-pom.xml |  1 -
 .../subproject1/expected-release-pom.xml   |  1 -
 .../subproject2/expected-release-pom.xml   |  1 -
 .../subproject3/expected-release-pom.xml   |  1 -
 .../subproject4/expected-release-pom.xml   |  1 -
 .../internal-snapshot-report-plugins/expected-release-pom.xml  |  1 -
 .../subproject1/expected-release-pom.xml   |  1 -
 .../subproject2/expected-release-pom.xml   |  1 -
 .../subproject3/expected-release-pom.xml   |  1 -
 .../subproject4/expected-release-pom.xml   |  1 -
 .../pom-with-finalname/expected-release-pom.xml|  1 -
 .../pom-with-inherited-version/expected-release-pom.xml|  1 -
 .../subproject1/expected-release-pom-version-changed.xml   |  1 -
 .../subproject1/expected-release-pom.xml   |  1 -
 .../pom-with-namespace/expected-release-pom.xml|  1 -
 .../pom-with-namespace/subproject1/expected-release-pom.xml|  1 -
 .../pom-with-namespace/subproject2/expected-release-pom.xml|  1 -
 .../pom-with-parent/expected-release-pom.xml   |  1 -
 .../pom-with-parent/subproject1/expected-release-pom.xml   |  1 -
 .../pom-with-released-parent/expected-release-pom.xml  |  1

svn commit: r24058 - /release/maven/plugins/

[rfscholte]

Author: rfscholte
Date: Sun Jan  7 21:26:02 2018
New Revision: 24058

Log:
Maven Checkstyle Plugin 3.0.0

Added:
release/maven/plugins/maven-checkstyle-plugin-3.0.0-source-release.zip   
(with props)
release/maven/plugins/maven-checkstyle-plugin-3.0.0-source-release.zip.asc
release/maven/plugins/maven-checkstyle-plugin-3.0.0-source-release.zip.md5
Removed:
release/maven/plugins/maven-checkstyle-plugin-2.17-source-release.zip
release/maven/plugins/maven-checkstyle-plugin-2.17-source-release.zip.asc
release/maven/plugins/maven-checkstyle-plugin-2.17-source-release.zip.md5

Added: release/maven/plugins/maven-checkstyle-plugin-3.0.0-source-release.zip
==
Binary file - no diff available.

Propchange: 
release/maven/plugins/maven-checkstyle-plugin-3.0.0-source-release.zip
--
svn:mime-type = application/octet-stream

Added: 
release/maven/plugins/maven-checkstyle-plugin-3.0.0-source-release.zip.asc
==
--- release/maven/plugins/maven-checkstyle-plugin-3.0.0-source-release.zip.asc 
(added)
+++ release/maven/plugins/maven-checkstyle-plugin-3.0.0-source-release.zip.asc 
Sun Jan  7 21:26:02 2018
@@ -0,0 +1,7 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v2
+
+iF4EABEIAAYFAlpN/jMACgkQrlp/tgigIhxOigD/ZAictsmyZql2G4ASYPjwuM5e
+HEiKgiJ25zskDUxbNgQA/AsH5XNsqACvtVIEIk7JOnEkSI/KohcuUO7Hxtk2uWw0
+=YxaU
+-END PGP SIGNATURE-

Added: 
release/maven/plugins/maven-checkstyle-plugin-3.0.0-source-release.zip.md5
==
--- release/maven/plugins/maven-checkstyle-plugin-3.0.0-source-release.zip.md5 
(added)
+++ release/maven/plugins/maven-checkstyle-plugin-3.0.0-source-release.zip.md5 
Sun Jan  7 21:26:02 2018
@@ -0,0 +1 @@
+15cdc99540a4dded637a6dbcacc39352
\ No newline at end of file

svn commit: r1820502 - /maven/site/trunk/content/apt/plugins/index.apt

[rfscholte]

Author: rfscholte
Date: Sun Jan  7 21:31:29 2018
New Revision: 1820502

URL: http://svn.apache.org/viewvc?rev=1820502&view=rev
Log:
Maven Checkstyle Plugin 3.0.0

Modified:
maven/site/trunk/content/apt/plugins/index.apt

Modified: maven/site/trunk/content/apt/plugins/index.apt
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/plugins/index.apt?rev=1820502&r1=1820501&r2=1820502&view=diff
==
--- maven/site/trunk/content/apt/plugins/index.apt (original)
+++ maven/site/trunk/content/apt/plugins/index.apt Sun Jan  7 21:31:29 2018
@@ -113,7 +113,7 @@ Available Plugins
 
*--++--++--+++
 | {{{/plugins/maven-changes-plugin/} <<>>}}   | B+R| 
2.12.1   | 2016-11-01 | Generate a report from an issue tracker or a change 
document. | 
{{{https://gitbox.apache.org/repos/asf/maven-changes-plugin.git}GIT}} / 
{{{https://github.com/apache/maven-changes-plugin/}GitHub}} | 
{{{https://issues.apache.org/jira/browse/MCHANGES}JIRA}}
 
*--++--++--+++
-| {{{/plugins/maven-checkstyle-plugin/} <<>>}} | B+R| 
2.17 | 2015-10-15 | Generate a Checkstyle report. | 
{{{https://gitbox.apache.org/repos/asf/maven-checkstyle-plugin.git}GIT}} / 
{{{https://github.com/apache/maven-checkstyle-plugin/}GitHub}} | 
{{{https://issues.apache.org/jira/browse/MCHECKSTYLE}JIRA}}
+| {{{/plugins/maven-checkstyle-plugin/} <<>>}} | B+R| 
3.0.0| 2018-01-07 | Generate a Checkstyle report. | 
{{{https://gitbox.apache.org/repos/asf/maven-checkstyle-plugin.git}GIT}} / 
{{{https://github.com/apache/maven-checkstyle-plugin/}GitHub}} | 
{{{https://issues.apache.org/jira/browse/MCHECKSTYLE}JIRA}}
 
*--++--++--+++
 | {{{/plugins/maven-doap-plugin/} <<>>}} | B  | 
1.2  | 2015-03-17 | Generate a Description of a Project (DOAP) file 
from a POM. | 
{{{https://gitbox.apache.org/repos/asf/maven-doap-plugin.git}GIT}} / 
{{{https://github.com/apache/maven-doap-plugin/}GitHub}} | 
{{{https://issues.apache.org/jira/browse/MDOAP}JIRA}}
 
*--++--++--+++

[maven-release] branch MRELEASE-994 created (now 0e16d46)

[rfscholte]

This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a change to branch MRELEASE-994
in repository https://gitbox.apache.org/repos/asf/maven-release.git.


  at 0e16d46  [MRELEASE-994] Drop Maven2 support Upgrade mavenVersion 
dependencies to 3.0 (cleanup maven dependencies) GenerateReleasePomsPhase, 
replace deprecated PathTranslator with SuperPomProvider and ModelInterpolator 
JDomReporting, delete removed overridden methods

This branch includes the following new commits:

 new 0e16d46  [MRELEASE-994] Drop Maven2 support Upgrade mavenVersion 
dependencies to 3.0 (cleanup maven dependencies) GenerateReleasePomsPhase, 
replace deprecated PathTranslator with SuperPomProvider and ModelInterpolator 
JDomReporting, delete removed overridden methods

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


-- 
To stop receiving notification emails like this one, please contact
['"commits@maven.apache.org" '].

[maven-release] 01/01: [MRELEASE-994] Drop Maven2 support Upgrade mavenVersion dependencies to 3.0 (cleanup maven dependencies) GenerateReleasePomsPhase, replace deprecated PathTranslator with SuperPo

[rfscholte]

This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a commit to branch MRELEASE-994
in repository https://gitbox.apache.org/repos/asf/maven-release.git

commit 0e16d46e3ac627dd3dddf28347178054cf77f7de
Author: rfscholte 
AuthorDate: Tue Jan 9 22:43:49 2018 +0100

[MRELEASE-994] Drop Maven2 support
Upgrade mavenVersion dependencies to 3.0 (cleanup maven dependencies)
GenerateReleasePomsPhase, replace deprecated PathTranslator with 
SuperPomProvider and ModelInterpolator
JDomReporting, delete removed overridden methods

PlexusJUnit4TestCase, use code from org.sonatype.sisu:sisu-inject-plexus
AbstractReleaseTestCase, replace deprecated MavenProjectBuilder with 
ProjectBuilder
AbstractRewritingReleasePhaseTestCase, ignore internal extension based 
tests, not supported anymore
DefaultVersionInfoTest, adjust tests due to new comparison results
Add dummy org.codehaus.plexus:plexus-utils:1.1, required due to auto 
injection by org.apache.maven.plugin.internal.PlexusUtilsInjector
---
 maven-release-manager/pom.xml  |  30 ++-
 .../phase/CheckDependencySnapshotsPhase.java   |  16 +-
 .../release/phase/GenerateReleasePomsPhase.java| 128 +--
 .../release/transform/jdom/JDomReporting.java  |  18 --
 .../maven/shared/release/PlexusJUnit4TestCase.java | 202 ++---
 .../release/phase/AbstractReleaseTestCase.java | 244 ++---
 .../AbstractRewritingReleasePhaseTestCase.java |   5 +
 .../phase/GenerateReleasePomsPhaseTest.java|   2 +-
 .../release/phase/RemoveReleasePomsPhaseTest.java  |   8 +-
 .../phase/ScmCommitPreparationPhaseTest.java   |   2 +-
 .../release/versions/DefaultVersionInfoTest.java   |  54 -
 .../plexus/plexus-utils/1.1/plexus-utils-1.1.jar   |   1 +
 .../plexus/plexus-utils/1.1/plexus-utils-1.1.pom   |  30 +++
 .../subproject4/expected-release-pom.xml   |   2 +-
 .../internal-snapshot-plugins/subproject4/pom.xml  |   1 +
 .../subproject1/expected-pom.xml   |   1 +
 .../pom-with-parent-flat/subproject1/pom.xml   |   1 +
 .../subproject3/expected-pom-different-version.xml |  15 +-
 .../subproject3/expected-pom.xml   |  15 +-
 .../interpolated-versions/subproject3/pom.xml  |  15 +-
 maven-release-plugin/pom.xml   |  19 +-
 pom.xml|  12 +-
 22 files changed, 499 insertions(+), 322 deletions(-)

diff --git a/maven-release-manager/pom.xml b/maven-release-manager/pom.xml
index 0209122..b8b26b5 100644
--- a/maven-release-manager/pom.xml
+++ b/maven-release-manager/pom.xml
@@ -39,11 +39,6 @@
 
 
   org.codehaus.plexus
-  plexus-container-default
-  1.0-alpha-9
-
-
-  org.codehaus.plexus
   plexus-utils
 
 
@@ -88,11 +83,7 @@
 
 
   org.apache.maven
-  maven-artifact-manager
-
-
-  org.apache.maven
-  maven-project
+  maven-core
 
 
   org.apache.maven
@@ -144,6 +135,11 @@
   org.apache.maven.scm
   maven-scm-provider-svn-commons
 
+
+  org.apache.maven.shared
+  maven-artifact-transfer
+  0.9.1
+
 
 
   org.jdom
@@ -157,7 +153,7 @@
 
 
   org.apache.maven
-  maven-core
+  maven-compat
   test
 
 
@@ -175,6 +171,18 @@
   xmlunit-core
   test
 
+
+  org.sonatype.aether
+  aether-connector-file
+  1.7
+  test
+
+
+  org.sonatype.aether
+  aether-connector-wagon
+  1.7
+  test
+
   
 
   
diff --git 
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java
 
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java
index e76bb80..6332083 100644
--- 
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java
+++ 
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java
@@ -34,7 +34,6 @@ import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.ArtifactUtils;
 import org.apache.maven.artifact.factory.ArtifactFactory;
 import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.artifact.InvalidDependencyVersionException;
 import org.apache.maven.shared.release.ReleaseExecutionException;
 import org.apache.maven.shared.release.ReleaseFailureException;
 import org.apache.maven.shared.release.ReleaseResult;
@@ -132,16 +131,9 @@ public class CheckDependencySnapshotsPhase
 }
 }
 
-try
-{
-@SuppressWarnings( "unchecked" )
-Set dependencyArtifacts = project.createArtifacts( 
artifactFactory, null, null );
-checkDependencies( originalVersions, releaseDescriptor, 
artifactMap, dependenc

[maven-release] branch master updated (4a0ef66 -> 0e16d46)

[rfscholte]

This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/maven-release.git.


from 4a0ef66  Clone incorrectly set project.reporting.excludeDefaults from 
null to Boolean.FALSE
 add 0e16d46  [MRELEASE-994] Drop Maven2 support Upgrade mavenVersion 
dependencies to 3.0 (cleanup maven dependencies) GenerateReleasePomsPhase, 
replace deprecated PathTranslator with SuperPomProvider and ModelInterpolator 
JDomReporting, delete removed overridden methods

No new revisions were added by this update.

Summary of changes:
 maven-release-manager/pom.xml  |  30 ++-
 .../phase/CheckDependencySnapshotsPhase.java   |  16 +-
 .../release/phase/GenerateReleasePomsPhase.java| 128 +--
 .../release/transform/jdom/JDomReporting.java  |  18 --
 .../maven/shared/release/PlexusJUnit4TestCase.java | 202 ++---
 .../release/phase/AbstractReleaseTestCase.java | 244 ++---
 .../AbstractRewritingReleasePhaseTestCase.java |   5 +
 .../phase/GenerateReleasePomsPhaseTest.java|   2 +-
 .../release/phase/RemoveReleasePomsPhaseTest.java  |   8 +-
 .../phase/ScmCommitPreparationPhaseTest.java   |   2 +-
 .../release/versions/DefaultVersionInfoTest.java   |  54 -
 .../plexus/plexus-utils/1.1/plexus-utils-1.1.jar}  |   0
 .../plexus/plexus-utils/1.1/plexus-utils-1.1.pom}  |   8 +-
 .../subproject4/expected-release-pom.xml   |   2 +-
 .../internal-snapshot-plugins/subproject4/pom.xml  |   1 +
 .../subproject1/expected-pom.xml   |   1 +
 .../pom-with-parent-flat/subproject1/pom.xml   |   1 +
 .../subproject3/expected-pom-different-version.xml |  15 +-
 .../subproject3/expected-pom.xml   |  15 +-
 .../interpolated-versions/subproject3/pom.xml  |  15 +-
 maven-release-plugin/pom.xml   |  19 +-
 pom.xml|  12 +-
 22 files changed, 472 insertions(+), 326 deletions(-)
 copy 
maven-release-manager/src/test/remote-repository/{external/plugin-artifactId/1.1-SNAPSHOT/plugin-artifactId-1.1-20060424.131158-1.jar
 => org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.jar} (100%)
 copy 
maven-release-manager/src/test/remote-repository/{external/artifactId/1.0-SNAPSHOT/artifactId-1.0-20060424.060453-1.pom
 => org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom} (82%)

-- 
To stop receiving notification emails like this one, please contact
['"commits@maven.apache.org" '].

[maven-release] branch MRELEASE-994 deleted (was 0e16d46)

[rfscholte]

This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a change to branch MRELEASE-994
in repository https://gitbox.apache.org/repos/asf/maven-release.git.


 was 0e16d46  [MRELEASE-994] Drop Maven2 support Upgrade mavenVersion 
dependencies to 3.0 (cleanup maven dependencies) GenerateReleasePomsPhase, 
replace deprecated PathTranslator with SuperPomProvider and ModelInterpolator 
JDomReporting, delete removed overridden methods

The revisions that were on this branch are still contained in
other references; therefore, this change does not discard any commits
from the repository.

-- 
To stop receiving notification emails like this one, please contact
['"commits@maven.apache.org" '].

[maven-release] branch maven-3.x deleted (was c84a815)

[rfscholte]

This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a change to branch maven-3.x
in repository https://gitbox.apache.org/repos/asf/maven-release.git.


 was c84a815  migrate to maven 3.x dependencies

The revisions that were on this branch are still contained in
other references; therefore, this change does not discard any commits
from the repository.

-- 
To stop receiving notification emails like this one, please contact
['"commits@maven.apache.org" '].

[maven-release] branch master updated: Use try-with-resources Remove unnecessary @SuppressWarnings( "unchecked" )

[rfscholte]

This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-release.git


The following commit(s) were added to refs/heads/master by this push:
 new 4cf927f  Use try-with-resources Remove unnecessary @SuppressWarnings( 
"unchecked" )
4cf927f is described below

commit 4cf927fa86e39aeb9c2228ee06fa0a068644a54c
Author: rfscholte 
AuthorDate: Thu Jan 11 18:47:34 2018 +0100

Use try-with-resources
Remove unnecessary @SuppressWarnings( "unchecked" )
---
 .../config/PropertiesReleaseDescriptorStore.java   | 21 ++--
 .../shared/release/exec/ForkedMavenExecutor.java   | 10 ++
 .../shared/release/exec/InvokerMavenExecutor.java  | 38 +++---
 .../phase/CheckDependencySnapshotsPhase.java   | 12 +--
 .../release/phase/GenerateReleasePomsPhase.java| 14 ++--
 .../release/transform/jdom/JDomModelETL.java   | 11 ++-
 .../maven/shared/release/util/PomFinder.java   | 31 ++
 .../maven/shared/release/util/ReleaseUtil.java |  8 +
 .../src/main/mdo/release-descriptor.mdo|  2 +-
 9 files changed, 33 insertions(+), 114 deletions(-)

diff --git 
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java
 
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java
index 78f55c0..9498e42 100644
--- 
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java
+++ 
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java
@@ -37,7 +37,6 @@ import org.apache.maven.shared.release.scm.IdentifiedScm;
 import org.codehaus.plexus.component.annotations.Component;
 import org.codehaus.plexus.component.annotations.Requirement;
 import org.codehaus.plexus.logging.AbstractLogEnabled;
-import org.codehaus.plexus.util.IOUtil;
 import org.sonatype.plexus.components.cipher.DefaultPlexusCipher;
 import org.sonatype.plexus.components.cipher.PlexusCipherException;
 import org.sonatype.plexus.components.sec.dispatcher.DefaultSecDispatcher;
@@ -82,11 +81,8 @@ public class PropertiesReleaseDescriptorStore
 {
 Properties properties = new Properties();
 
-InputStream inStream = null;
-try
+try ( InputStream inStream = new FileInputStream( file ) )
 {
-inStream = new FileInputStream( file );
-
 properties.load( inStream );
 }
 catch ( FileNotFoundException e )
@@ -98,10 +94,6 @@ public class PropertiesReleaseDescriptorStore
 throw new ReleaseDescriptorStoreException(
 "Error reading properties file '" + file.getName() + "': " + 
e.getMessage(), e );
 }
-finally
-{
-IOUtil.close( inStream );
-}
 
 ReleaseDescriptor releaseDescriptor = 
ReleaseUtils.copyPropertiesToReleaseDescriptor( properties );
 
@@ -301,12 +293,8 @@ public class PropertiesReleaseDescriptorStore
 processResolvedDependencies( properties, 
config.getResolvedSnapshotDependencies() );
 }
 
-OutputStream outStream = null;
-//noinspection OverlyBroadCatchBlock
-try
+try ( OutputStream outStream = new FileOutputStream( file ) )
 {
-outStream = new FileOutputStream( file );
-
 properties.store( outStream, "release configuration" );
 }
 catch ( IOException e )
@@ -314,11 +302,6 @@ public class PropertiesReleaseDescriptorStore
 throw new ReleaseDescriptorStoreException(
 "Error writing properties file '" + file.getName() + "': " + 
e.getMessage(), e );
 }
-finally
-{
-IOUtil.close( outStream );
-}
-
 }
 
 private void processResolvedDependencies( Properties prop, Map 
resolvedDependencies )
diff --git 
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/ForkedMavenExecutor.java
 
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/ForkedMavenExecutor.java
index aeb0a30..472d385 100644
--- 
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/ForkedMavenExecutor.java
+++ 
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/ForkedMavenExecutor.java
@@ -31,7 +31,6 @@ import org.apache.maven.shared.release.ReleaseResult;
 import org.apache.maven.shared.release.env.ReleaseEnvironment;
 import org.codehaus.plexus.component.annotations.Component;
 import org.codehaus.plexus.component.annotations.Requirement;
-import org.codehaus.plexus.util.IOUtil;
 import org.codehaus.plexus.util.StringUtils;
 import org.codehaus.plexus.util.cli.CommandLineException;
 import org.

[maven-release] branch master updated: Clean up code, no implementation changes

[rfscholte]

This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-release.git


The following commit(s) were added to refs/heads/master by this push:
 new a046f0a  Clean up code, no implementation changes
a046f0a is described below

commit a046f0afce9c01138f54ba4201bb7b57d8980a3c
Author: rfscholte 
AuthorDate: Fri Jan 12 11:53:16 2018 +0100

Clean up code, no implementation changes
---
 .../maven/plugins/release/AbstractReleaseMojo.java   |  8 
 .../maven/plugins/release/AbstractScmReleaseMojo.java| 14 ++
 .../apache/maven/plugins/release/BranchReleaseMojo.java  |  8 +++-
 .../apache/maven/plugins/release/CleanReleaseMojo.java   |  5 +
 .../apache/maven/plugins/release/PerformReleaseMojo.java |  8 ++--
 .../apache/maven/plugins/release/PrepareReleaseMojo.java |  9 -
 .../maven/plugins/release/PrepareWithPomReleaseMojo.java |  3 ++-
 .../maven/plugins/release/RollbackReleaseMojo.java   |  5 +
 .../apache/maven/plugins/release/StageReleaseMojo.java   |  4 ++--
 .../apache/maven/plugins/release/UpdateVersionsMojo.java | 16 +++-
 10 files changed, 32 insertions(+), 48 deletions(-)

diff --git 
a/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractReleaseMojo.java
 
b/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractReleaseMojo.java
index ab1fb11..faa9805 100644
--- 
a/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractReleaseMojo.java
+++ 
b/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractReleaseMojo.java
@@ -176,7 +176,7 @@ public abstract class AbstractReleaseMojo
 args += ",";
 }
 }
-
+
 if ( additionalProfiles != null )
 {
 if ( !profileIds.isEmpty() )
@@ -192,7 +192,7 @@ public abstract class AbstractReleaseMojo
 }
 
 /**
- * 
+ *
  * @return a List with profile ids, never {@code null}
  */
 @SuppressWarnings( "unchecked" )
@@ -215,7 +215,7 @@ public abstract class AbstractReleaseMojo
 }
 else
 {
-profiles = new ArrayList( 
project.getActiveProfiles().size() );
+profiles = new ArrayList<>( project.getActiveProfiles().size() 
);
 for ( Object profile : project.getActiveProfiles() )
 {
 profiles.add( ( (Profile) profile ).getId() );
@@ -254,7 +254,7 @@ public abstract class AbstractReleaseMojo
 {
 return settings;
 }
-
+
 protected final File getBasedir()
 {
 return basedir;
diff --git 
a/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractScmReleaseMojo.java
 
b/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractScmReleaseMojo.java
index 87aca4a..b57aab4 100644
--- 
a/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractScmReleaseMojo.java
+++ 
b/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractScmReleaseMojo.java
@@ -29,8 +29,8 @@ import org.apache.maven.scm.manager.ScmManager;
 import org.apache.maven.shared.release.config.ReleaseDescriptor;
 
 /**
- * Abstract Mojo containing SCM parameters 
- *  
+ * Abstract Mojo containing SCM parameters
+ *
  * @author Robert Scholte
  */
 // Extra layer since 2.4. Don't use @since doclet, these would be inherited by 
the subclasses
@@ -95,7 +95,7 @@ public abstract class AbstractScmReleaseMojo
 private boolean pushChanges = true;
 
 /**
- * Add a new or overwrite the default implementation per provider. 
+ * Add a new or overwrite the default implementation per provider.
  * The key is the scm prefix and the value is the role hint of the
  * {@link org.apache.maven.scm.provider.ScmProvider}.
  *
@@ -104,16 +104,14 @@ public abstract class AbstractScmReleaseMojo
  */
 @Parameter
 private Map providerImplementations;
-
+
 /**
  * The SCM manager.
  */
 @Component
 private ScmManager scmManager;
 
-/**
- * {@inheritDoc}
- */
+@Override
 public void execute()
 throws MojoExecutionException, MojoFailureException
 {
@@ -127,7 +125,7 @@ public abstract class AbstractScmReleaseMojo
 }
 }
 }
-
+
 @Override
 protected ReleaseDescriptor createReleaseDescriptor()
 {
diff --git 
a/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/BranchReleaseMojo.java
 
b/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/BranchReleaseMojo.java
index 4a429a2..1ba1a46 100644
--- 
a/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/BranchReleaseMojo.java
+++ 
b/maven-release-plugin/src/main/java/org/apache/maven/plugins

[maven-parent] branch master updated: Andreas Gudian resigned, now Emeritus

[rfscholte]

This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-parent.git


The following commit(s) were added to refs/heads/master by this push:
 new 19f749e  Andreas Gudian resigned, now Emeritus
19f749e is described below

commit 19f749e3965801a664194d3d4f2d07cab2a52865
Author: rfscholte 
AuthorDate: Fri Jan 12 12:16:07 2018 +0100

Andreas Gudian resigned, now Emeritus
---
 pom.xml | 18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index 719fdcd..f6dd3cc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,15 +52,6 @@ under the License.
   Europe/Amsterdam
 
 
-  agudian
-  Andreas Gudian
-  agud...@apache.org
-  
-PMC Member
-  
-  Europe/Berlin
-
-
   aheritier
   Arnaud Héritier
   aherit...@apache.org
@@ -549,6 +540,15 @@ under the License.
 
 
 
+  agudian
+  Andreas Gudian
+  agud...@apache.org
+  
+Emeritus
+  
+  Europe/Berlin
+
+
   aramirez
   Allan Q. Ramirez
   

-- 
To stop receiving notification emails like this one, please contact
['"commits@maven.apache.org" '].

[maven-release] branch master updated: Clean up code, no implementation changes

[rfscholte]

This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-release.git


The following commit(s) were added to refs/heads/master by this push:
 new b98f634  Clean up code, no implementation changes
b98f634 is described below

commit b98f634cdd194b7d80f48265bd990313e64fe7a5
Author: rfscholte 
AuthorDate: Fri Jan 12 12:20:29 2018 +0100

Clean up code, no implementation changes
---
 .../shared/release/DefaultReleaseManagerTest.java  | 41 ++---
 .../maven/shared/release/PlexusJUnit4TestCase.java |  6 +-
 .../PropertiesReleaseDescriptorStoreTest.java  | 13 ++--
 .../release/config/ReleaseDescriptorStoreStub.java |  3 +
 .../shared/release/config/ReleaseUtilsTest.java| 26 
 .../release/exec/CommandLineFactoryTest.java   |  1 +
 .../release/exec/ForkedMavenExecutorTest.java  | 37 ++--
 .../release/exec/InvokerMavenExecutorTest.java | 11 ++--
 .../maven/shared/release/exec/TeeConsumerTest.java |  1 +
 .../shared/release/exec/TeeOutputStreamTest.java   |  3 +-
 .../release/phase/AbstractBackupPomsPhaseTest.java |  3 +-
 .../release/phase/AbstractReleaseTestCase.java | 54 -
 .../AbstractRewritingReleasePhaseTestCase.java | 16 ++---
 .../phase/BranchInputVariablesPhaseTest.java   |  9 +--
 .../phase/CheckDependencySnapshotsPhaseTest.java   |  1 +
 .../shared/release/phase/CheckPomPhaseTest.java|  1 +
 .../release/phase/CheckoutProjectFromScmTest.java  | 13 ++--
 .../release/phase/CreateBackupPomsPhaseTest.java   |  1 +
 .../shared/release/phase/EndReleasePhaseTest.java  |  1 +
 .../phase/GenerateReleasePomsPhaseTest.java| 16 -
 .../release/phase/InputVariablesPhaseTest.java |  1 +
 .../shared/release/phase/IsScmFileSetEquals.java   |  2 +-
 .../phase/MapDevelopmentVersionPhaseIT.java|  6 +-
 .../shared/release/phase/MapVersionsPhaseTest.java | 13 ++--
 .../shared/release/phase/ReleasePhaseStub.java |  5 ++
 .../release/phase/RemoveReleasePomsPhaseTest.java  |  3 +-
 .../release/phase/RestoreBackupPomsPhaseTest.java  |  1 +
 .../phase/RewritePomsForBranchPhaseTest.java   |  8 +++
 .../phase/RewritePomsForDevelopmentPhaseTest.java  | 10 +++-
 .../phase/RewritePomsForReleasePhaseTest.java  |  8 +++
 .../release/phase/RunCompleteGoalsPhaseTest.java   |  3 +-
 .../release/phase/RunPerformGoalsPhaseTest.java| 69 +++---
 .../release/phase/RunPrepareGoalsPhaseTest.java|  7 ++-
 .../shared/release/phase/ScmBranchPhaseTest.java   |  1 +
 .../phase/ScmCheckModificationsPhaseTest.java  |  3 +-
 .../phase/ScmCommitDevelopmentPhaseTest.java   |  1 +
 .../phase/ScmCommitPreparationPhaseTest.java   |  5 +-
 .../shared/release/phase/ScmTagPhaseTest.java  |  3 +-
 .../release/policies/DefaultNamingPolicyTest.java  |  4 +-
 .../release/scm/ClearCaseScmTranslatorTest.java|  8 +--
 .../shared/release/scm/CvsScmTranslatorTest.java   |  8 +--
 .../scm/DefaultScmRepositoryConfiguratorTest.java  |  1 +
 .../shared/release/scm/GitScmTranslatorTest.java   |  2 +-
 .../shared/release/scm/HgScmTranslatorTest.java|  8 +--
 .../shared/release/scm/JazzScmTranslatorTest.java  |  4 +-
 .../release/scm/SubversionScmTranslatorTest.java   |  6 +-
 .../shared/release/stubs/MavenExecutorWrapper.java |  2 +-
 .../maven/shared/release/stubs/ScmManagerStub.java |  6 +-
 .../release/transform/jdom/JDomBuildTest.java  |  4 +-
 .../jdom/JDomDependencyManagementTest.java |  4 +-
 .../release/transform/jdom/JDomDependencyTest.java |  8 +--
 .../release/transform/jdom/JDomExtensionTest.java  |  8 +--
 .../release/transform/jdom/JDomModelTest.java  | 16 ++---
 .../release/transform/jdom/JDomParentTest.java |  8 +--
 .../release/transform/jdom/JDomPropertiesTest.java |  6 +-
 .../shared/release/transform/jdom/JDomScmTest.java | 22 +++
 .../maven/shared/release/util/PomFinderTest.java   |  1 +
 .../maven/shared/release/util/ReleaseUtilTest.java |  6 +-
 .../release/versions/DefaultVersionInfoTest.java   | 20 +++
 pom.xml|  6 +-
 60 files changed, 317 insertions(+), 247 deletions(-)

diff --git 
a/maven-release-manager/src/test/java/org/apache/maven/shared/release/DefaultReleaseManagerTest.java
 
b/maven-release-manager/src/test/java/org/apache/maven/shared/release/DefaultReleaseManagerTest.java
index 511bd02..28bb32e 100644
--- 
a/maven-release-manager/src/test/java/org/apache/maven/shared/release/DefaultReleaseManagerTest.java
+++ 
b/maven-release-manager/src/test/java/org/apache/maven/shared/release/DefaultReleaseManagerTest.java
@@ -67,6 +67,7 @@ public class DefaultReleaseManagerTest
 private ReleaseDescriptorStoreStub configStore;
 
 
+@Override
 protected void setUp()
 throws Exception
 {
@@ -306,7 +307,7 @@ public class DefaultReleaseManagerTest
 // good
 assertEquals

[maven-release] branch master updated: Ensure all Maps in ReleaseDescriptor have proper generics

[rfscholte]

This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-release.git


The following commit(s) were added to refs/heads/master by this push:
 new 9ad75c8  Ensure all Maps in ReleaseDescriptor have proper generics
9ad75c8 is described below

commit 9ad75c8ee06ac2652585d88f0e8480d82083f2e3
Author: rfscholte 
AuthorDate: Fri Jan 12 14:34:57 2018 +0100

Ensure all Maps in ReleaseDescriptor have proper generics
---
 maven-release-manager/pom.xml  |   2 +-
 .../release/phase/AbstractRewritePomsPhase.java|   1 -
 .../release/phase/GenerateReleasePomsPhase.java|   1 -
 .../shared/release/phase/InputVariablesPhase.java  |   2 +-
 .../shared/release/phase/MapVersionsPhase.java |   4 +-
 .../release/phase/RewritePomVersionsPhase.java |   1 -
 .../release/phase/RewritePomsForBranchPhase.java   |   1 -
 .../phase/RewritePomsForDevelopmentPhase.java  |   3 -
 .../release/phase/RewritePomsForReleasePhase.java  |   1 -
 .../maven/shared/release/versions/VersionInfo.java |   2 +-
 .../src/main/mdo/release-descriptor.mdo| 237 -
 .../shared/release/config/ReleaseUtilsTest.java|   6 +-
 .../phase/CheckDependencySnapshotsPhaseTest.java   |  16 +-
 .../maven/plugins/release/UpdateVersionsMojo.java  |  10 +-
 pom.xml|   4 -
 15 files changed, 198 insertions(+), 93 deletions(-)

diff --git a/maven-release-manager/pom.xml b/maven-release-manager/pom.xml
index b8b26b5..6d970d7 100644
--- a/maven-release-manager/pom.xml
+++ b/maven-release-manager/pom.xml
@@ -200,7 +200,7 @@
   
 org.codehaus.modello
 modello-maven-plugin
-1.7
+1.9.1
 
   
 
diff --git 
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
 
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
index 01f8952..6fd4cb6 100644
--- 
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
+++ 
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
@@ -241,7 +241,6 @@ public abstract class AbstractRewritePomsPhase
 {
 Map mappedVersions = getNextVersionMap( 
releaseDescriptor );
 Map originalVersions = getOriginalVersionMap( 
releaseDescriptor, reactorProjects, simulate );
-@SuppressWarnings( "unchecked" )
 Map> resolvedSnapshotDependencies =
 releaseDescriptor.getResolvedSnapshotDependencies();
 Model model = project.getModel();
diff --git 
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java
 
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java
index 0265dfe..fbb0749 100644
--- 
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java
+++ 
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java
@@ -425,7 +425,6 @@ public class GenerateReleasePomsPhase
 return releaseDescriptor.getOriginalVersions( reactorProjects );
 }
 
-@SuppressWarnings( "unchecked" )
 protected Map getNextVersionMap( ReleaseDescriptor 
releaseDescriptor )
 {
 return releaseDescriptor.getReleaseVersions();
diff --git 
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/InputVariablesPhase.java
 
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/InputVariablesPhase.java
index 7373c69..985b9cf 100644
--- 
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/InputVariablesPhase.java
+++ 
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/InputVariablesPhase.java
@@ -134,7 +134,7 @@ public class InputVariablesPhase
 {
 // Must get default version from mapped versions, as the project 
will be the incorrect snapshot
 String key = ArtifactUtils.versionlessKey( project.getGroupId(), 
project.getArtifactId() );
-String releaseVersion = (String) 
releaseDescriptor.getReleaseVersions().get( key );
+String releaseVersion = 
releaseDescriptor.getReleaseVersions().get( key );
 if ( releaseVersion == null )
 {
 throw new ReleaseExecutionException( "Project tag cannot be 
selected if version is not yet mapped" );
diff --git 
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java
 
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java
index 4ae295a..443d9fd 100644
--- 
a/maven-release-manager/src/main/java/org/

[maven-release] branch master updated: OddEvenVersionPolicy should not depend on maven-release-manager

[rfscholte]

This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-release.git


The following commit(s) were added to refs/heads/master by this push:
 new e505fac  OddEvenVersionPolicy should not depend on 
maven-release-manager
e505fac is described below

commit e505fac1b055f0fdeb2d84c24ad82cdd6a601d7f
Author: rfscholte 
AuthorDate: Fri Jan 12 16:20:38 2018 +0100

OddEvenVersionPolicy should not depend on maven-release-manager
---
 .../maven/shared/release/versions/Version.java | 66 +--
 .../maven-release-oddeven-policy/pom.xml   | 12 ++--
 .../policy/oddeven/OddEvenVersionPolicy.java   | 77 +-
 .../maven-release-semver-policy/pom.xml|  1 -
 4 files changed, 114 insertions(+), 42 deletions(-)

diff --git 
a/maven-release-api/src/main/java/org/apache/maven/shared/release/versions/Version.java
 
b/maven-release-api/src/main/java/org/apache/maven/shared/release/versions/Version.java
index b41593f..c408756 100644
--- 
a/maven-release-api/src/main/java/org/apache/maven/shared/release/versions/Version.java
+++ 
b/maven-release-api/src/main/java/org/apache/maven/shared/release/versions/Version.java
@@ -21,6 +21,7 @@ package org.apache.maven.shared.release.versions;
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -31,7 +32,7 @@ import org.codehaus.plexus.util.StringUtils;
  * 
  */
 public class Version
-implements Comparable
+implements Comparable, Cloneable
 {
 private final AetherVersion aetherVersion;
 
@@ -51,7 +52,7 @@ public class Version
 
 private String annotationRevSeparator;
 
-private final String buildSeparator;
+private String buildSeparator;
 
 private static final int DIGITS_INDEX = 1;
 
@@ -70,6 +71,10 @@ public class Version
 private static final String SNAPSHOT_IDENTIFIER = "SNAPSHOT";
 
 private static final String DIGIT_SEPARATOR_STRING = ".";
+
+private static final String DEFAULT_ANNOTATION_REV_SEPARATOR = "-";
+
+private static final String DEFAULT_BUILD_SEPARATOR = "-";
 
 public static final Pattern STANDARD_PATTERN = Pattern.compile( 
"^((?:\\d+\\.)*\\d+)" // digit(s) and '.' repeated -

   // followed by digit (version
@@ -86,6 +91,23 @@ public class Version
  */
 // for SNAPSHOT releases only (possible versions include: trunk-SNAPSHOT 
or SNAPSHOT)
 public static final Pattern ALTERNATE_PATTERN = Pattern.compile( 
"^(SNAPSHOT|[a-zA-Z]+[_-]SNAPSHOT)" );
+
+private Version( List digits, String annotation, String 
annotationRevision, String buildSpecifier,
+   String annotationSeparator, String 
annotationRevSeparator, String buildSeparator )
+{
+this.digits = digits;
+this.annotation = annotation;
+this.annotationRevision = annotationRevision;
+this.buildSpecifier = buildSpecifier;
+this.annotationSeparator = annotationSeparator;
+this.annotationRevSeparator = annotationRevSeparator;
+this.buildSeparator = buildSeparator;
+this.strVersion = getVersionString( this, buildSpecifier, 
buildSeparator );
+
+// for now no need to reparse, original version was valid 
+this.aetherVersion = null;
+this.mavenArtifactVersion = null;
+}
 
 public Version( String version )
 throws VersionParseException
@@ -220,7 +242,7 @@ public class Version
 {
 return digits;
 }
-
+
 public String getAnnotation()
 {
 return annotation;
@@ -245,7 +267,43 @@ public class Version
 {
 return buildSpecifier;
 }
-
+
+/**
+ * 
+ * @param newDigits the new list of digits
+ * @return a new instance of Version
+ */
+public Version setDigits( List newDigits )
+{
+return new Version( newDigits, this.annotation, 
this.annotationRevision, this.buildSpecifier,
+this.annotationSeparator, 
this.annotationRevSeparator, this.buildSeparator );
+}
+
+/**
+ * 
+ * @param newAnnotationRevision the new annotation revision
+ * @return a new instance of Version
+ */
+public Version setAnnotationRevision( String newAnnotationRevision )
+{
+return new Version( this.digits, this.annotation, 
newAnnotationRevision, this.buildSpecifier,
+this.annotationSeparator,
+Objects.toString( this.annotationRevSeparator, 
DEFAULT_ANNOTATION_REV_SEPARATOR ),
+this.buildSeparator );
+}
+
+/**
+ * 
+ * @param newBuildSpecifier the new build specifier

[maven-release] branch master updated: Remove all overloaded methods from ReleaseManager, only use ReleaseRequest

[rfscholte]

This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-release.git


The following commit(s) were added to refs/heads/master by this push:
 new 2bef00a  Remove all overloaded methods from ReleaseManager, only use 
ReleaseRequest
2bef00a is described below

commit 2bef00a6c8a925d511c5eac697a47718c3a4b630
Author: rfscholte 
AuthorDate: Fri Jan 12 20:51:14 2018 +0100

Remove all overloaded methods from ReleaseManager, only use 
ReleaseRequest
---
 .../shared/release/DefaultReleaseManager.java  | 300 +
 .../maven/shared/release/ReleaseManager.java   | 372 +
 .../shared/release/DefaultReleaseManagerTest.java  | 186 ---
 .../maven/plugins/release/BranchReleaseMojo.java   |   9 +-
 .../maven/plugins/release/CleanReleaseMojo.java|   8 +-
 .../maven/plugins/release/PrepareReleaseMojo.java  |  10 +-
 .../maven/plugins/release/RollbackReleaseMojo.java |  11 +-
 .../maven/plugins/release/UpdateVersionsMojo.java  |   8 +-
 .../plugins/release/CleanReleaseMojoTest.java  |  14 +-
 .../plugins/release/PrepareReleaseMojoTest.java|  46 ++-
 10 files changed, 228 insertions(+), 736 deletions(-)

diff --git 
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/DefaultReleaseManager.java
 
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/DefaultReleaseManager.java
index a674bc7..c6e45f5 100644
--- 
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/DefaultReleaseManager.java
+++ 
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/DefaultReleaseManager.java
@@ -28,13 +28,9 @@ import java.util.Map;
 import java.util.Set;
 
 import org.apache.commons.lang3.BooleanUtils;
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.settings.Settings;
 import org.apache.maven.shared.release.config.ReleaseDescriptor;
 import org.apache.maven.shared.release.config.ReleaseDescriptorStore;
 import org.apache.maven.shared.release.config.ReleaseDescriptorStoreException;
-import org.apache.maven.shared.release.env.DefaultReleaseEnvironment;
-import org.apache.maven.shared.release.env.ReleaseEnvironment;
 import org.apache.maven.shared.release.phase.ReleasePhase;
 import org.codehaus.plexus.logging.AbstractLogEnabled;
 import org.codehaus.plexus.util.StringUtils;
@@ -86,25 +82,7 @@ public class DefaultReleaseManager
 private static final int PHASE_SKIP = 0, PHASE_START = 1, PHASE_END = 2, 
GOAL_START = 11, GOAL_END = 12, ERROR = 99;
 
 @Override
-public void prepare( ReleaseDescriptor releaseDescriptor, 
ReleaseEnvironment releaseEnvironment,
- List reactorProjects )
-throws ReleaseExecutionException, ReleaseFailureException
-{
-prepare( releaseDescriptor, releaseEnvironment, reactorProjects, true, 
false, null );
-}
-
-@Override
-public void prepare( ReleaseDescriptor releaseDescriptor, 
ReleaseEnvironment releaseEnvironment,
- List reactorProjects, boolean resume, 
boolean dryRun )
-throws ReleaseExecutionException, ReleaseFailureException
-{
-prepare( releaseDescriptor, releaseEnvironment, reactorProjects, 
resume, dryRun, null );
-}
-
-@Override
-public ReleaseResult prepareWithResult( ReleaseDescriptor 
releaseDescriptor, ReleaseEnvironment releaseEnvironment,
-List 
reactorProjects, boolean resume, boolean dryRun,
-ReleaseManagerListener listener )
+public ReleaseResult prepareWithResult( ReleasePrepareRequest 
prepareRequest )
 {
 ReleaseResult result = new ReleaseResult();
 
@@ -112,17 +90,13 @@ public class DefaultReleaseManager
 
 try
 {
-prepare( releaseDescriptor, releaseEnvironment, reactorProjects, 
resume, dryRun, listener, result );
+prepare( prepareRequest, result );
 
 result.setResultCode( ReleaseResult.SUCCESS );
 }
-catch ( ReleaseExecutionException e )
-{
-captureException( result, listener, e );
-}
-catch ( ReleaseFailureException e )
+catch ( ReleaseExecutionException | ReleaseFailureException e )
 {
-captureException( result, listener, e );
+captureException( result, 
prepareRequest.getReleaseManagerListener(), e );
 }
 finally
 {
@@ -133,37 +107,12 @@ public class DefaultReleaseManager
 }
 
 @Override
-public void prepare( ReleaseDescriptor releaseDescriptor, 
ReleaseEnvironment releaseEnvironment,
- List reactorProjects, boolean resume, 
boolean dryRun,
- ReleaseManagerListener listener )
-throws ReleaseExecutionException, ReleaseFailureException
-{
-prepare( releaseDescriptor

[maven-release] 01/02: simplify code, replace iterators with foreach loops

[rfscholte]

This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-release.git

commit 047d09e4868a4248e6b5acb72a70187bc926ce18
Author: rfscholte 
AuthorDate: Fri Jan 12 22:50:46 2018 +0100

simplify code, replace iterators with foreach loops
---
 .../config/PropertiesReleaseDescriptorStore.java   | 34 +++---
 .../release/phase/AbstractReleaseTestCase.java | 19 
 .../phase/CheckDependencySnapshotsPhaseTest.java   |  3 +-
 3 files changed, 18 insertions(+), 38 deletions(-)

diff --git 
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java
 
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java
index 9498e42..8162b5f 100644
--- 
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java
+++ 
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java
@@ -26,11 +26,8 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.util.Iterator;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Properties;
-import java.util.Set;
 
 import org.apache.maven.model.Scm;
 import org.apache.maven.shared.release.scm.IdentifiedScm;
@@ -237,22 +234,19 @@ public class PropertiesReleaseDescriptorStore
 // others boolean properties are not written to the properties file 
because the value from the caller is always
 // used
 
-for ( Iterator i = 
config.getReleaseVersions().entrySet().iterator(); i.hasNext(); )
+for ( Map.Entry entry : 
config.getReleaseVersions().entrySet() )
 {
-Map.Entry entry = (Map.Entry) i.next();
-properties.setProperty( "project.rel." + entry.getKey(), (String) 
entry.getValue() );
+properties.setProperty( "project.rel." + entry.getKey(), 
entry.getValue() );
 }
 
-for ( Iterator i = 
config.getDevelopmentVersions().entrySet().iterator(); i.hasNext(); )
+for ( Map.Entry entry : 
config.getDevelopmentVersions().entrySet() )
 {
-Map.Entry entry = (Map.Entry) i.next();
 properties.setProperty( "project.dev." + entry.getKey(), (String) 
entry.getValue() );
 }
 
-for ( Iterator i = 
config.getOriginalScmInfo().entrySet().iterator(); i.hasNext(); )
+for ( Map.Entry entry : 
config.getOriginalScmInfo().entrySet() )
 {
-Map.Entry entry = (Map.Entry) i.next();
-Scm scm = (Scm) entry.getValue();
+Scm scm = entry.getValue();
 String prefix = "project.scm." + entry.getKey();
 if ( scm != null )
 {
@@ -304,22 +298,16 @@ public class PropertiesReleaseDescriptorStore
 }
 }
 
-private void processResolvedDependencies( Properties prop, Map 
resolvedDependencies )
+private void processResolvedDependencies( Properties prop, Map> resolvedDependencies )
 {
-Set entries = resolvedDependencies.entrySet();
-Iterator iterator = entries.iterator();
-Entry currentEntry;
-
-while ( iterator.hasNext() )
+for ( Map.Entry> currentEntry : 
resolvedDependencies.entrySet() )
 {
-currentEntry = (Entry) iterator.next();
-
-Map versionMap = (Map) currentEntry.getValue();
-
+Map versionMap = currentEntry.getValue();
+
 prop.setProperty( "dependency." + currentEntry.getKey() + 
".release",
-  (String) versionMap.get( 
ReleaseDescriptor.RELEASE_KEY ) );
+  versionMap.get( ReleaseDescriptor.RELEASE_KEY ) 
);
 prop.setProperty( "dependency." + currentEntry.getKey() + 
".development",
-  (String) versionMap.get( 
ReleaseDescriptor.DEVELOPMENT_KEY ) );
+  versionMap.get( 
ReleaseDescriptor.DEVELOPMENT_KEY ) );
 }
 }
 
diff --git 
a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractReleaseTestCase.java
 
b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractReleaseTestCase.java
index 506a880..2deaf8b 100644
--- 
a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractReleaseTestCase.java
+++ 
b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractReleaseTestCase.java
@@ -35,11 +35,9 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Ob

[maven-release] 02/02: [MRELEASE-956] Release Strategy Interface

[rfscholte]

This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-release.git

commit bea23130c9cf66fbc21061822d185b331a2c93b3
Author: rfscholte 
AuthorDate: Sat Jan 13 16:43:25 2018 +0100

[MRELEASE-956] Release Strategy Interface
---
 .../maven/shared/release/strategy/Strategy.java|  68 +
 .../src/main/components-fragment.xml   |  15 +-
 .../shared/release/DefaultReleaseManager.java  | 160 +
 .../maven/shared/release/ReleaseManager.java   |   3 +-
 .../config/PropertiesReleaseDescriptorStore.java   |   8 ++
 .../maven/shared/release/config/ReleaseUtils.java  |   3 +
 .../shared/release/strategies/DefaultStrategy.java | 112 +++
 .../src/main/mdo/release-descriptor.mdo|   9 ++
 .../shared/release/DefaultReleaseManagerTest.java  |   5 +-
 .../shared/release/DefaultReleaseManagerTest.xml   |  23 +++
 .../maven/plugins/release/AbstractReleaseMojo.java |  12 ++
 .../maven/plugins/release/CleanReleaseMojo.java|  10 +-
 .../plugins/release/CleanReleaseMojoTest.java  |   5 +-
 .../plugins/release/PrepareReleaseMojoTest.java|   3 -
 .../plugins/release/StageReleaseMojoTest.java  |   6 -
 15 files changed, 357 insertions(+), 85 deletions(-)

diff --git 
a/maven-release-api/src/main/java/org/apache/maven/shared/release/strategy/Strategy.java
 
b/maven-release-api/src/main/java/org/apache/maven/shared/release/strategy/Strategy.java
new file mode 100644
index 000..faca146
--- /dev/null
+++ 
b/maven-release-api/src/main/java/org/apache/maven/shared/release/strategy/Strategy.java
@@ -0,0 +1,68 @@
+package org.apache.maven.shared.release.strategy;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.util.List;
+
+/**
+ * Interface to override default strategy.
+ * 
+ * If a method returns {@code null}, the default will be used, otherwise the 
provided collection of phaseIds  
+ * 
+ * @author Robert Scholte
+ * @since 3.0.0
+ */
+public interface Strategy
+{
+/**
+ * The release phases to execute the calling the prepare goal 
+ * 
+ * @return
+ */
+List getPreparePhases();
+
+/**
+ * The release phases to execute the calling the perform goal 
+ * 
+ * @return
+ */
+List getPerformPhases();
+
+/**
+ * The release phases to execute the calling the branch goal 
+ * 
+ * @return
+ */
+List getBranchPhases();
+
+/**
+ * The release phases to execute the calling the rollback goal 
+ * 
+ * @return
+ */
+List getRollbackPhases();
+
+/**
+ * The release phases to execute the calling the update-versions goal 
+ * 
+ * @return
+ */
+List getUpdateVersionsPhases();
+}
diff --git a/maven-release-manager/src/main/components-fragment.xml 
b/maven-release-manager/src/main/components-fragment.xml
index 92ebfd3..6f156e9 100644
--- a/maven-release-manager/src/main/components-fragment.xml
+++ b/maven-release-manager/src/main/components-fragment.xml
@@ -21,20 +21,9 @@
 
   
 
-  org.apache.maven.shared.release.ReleaseManager
+  org.apache.maven.shared.release.strategy.Strategy
   default
-  
org.apache.maven.shared.release.DefaultReleaseManager
-  
-
-  org.apache.maven.shared.release.phase.ReleasePhase
-  releasePhases
-
-
-  
org.apache.maven.shared.release.config.ReleaseDescriptorStore
-  properties
-  configStore
-
-  
+  
org.apache.maven.shared.release.strategies.DefaultStrategy
   
 
   check-poms
diff --git 
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/DefaultReleaseManager.java
 
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/DefaultReleaseManager.java
index c6e45f5..ad93daa 100644
--- 
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/DefaultReleaseManager.java
+++ 
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/DefaultReleaseManager.java
@@ -20,7 +20,6 @@ package org.apache.maven.shared.rel

[maven-release] branch master updated (2bef00a -> bea2313)

[rfscholte]

This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/maven-release.git.


from 2bef00a  Remove all overloaded methods from ReleaseManager, only use 
ReleaseRequest
 new 047d09e  simplify code, replace iterators with foreach loops
 new bea2313  [MRELEASE-956] Release Strategy Interface

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../maven/shared/release/strategy/Strategy.java|  68 +
 .../src/main/components-fragment.xml   |  15 +-
 .../shared/release/DefaultReleaseManager.java  | 160 +
 .../maven/shared/release/ReleaseManager.java   |   3 +-
 .../config/PropertiesReleaseDescriptorStore.java   |  42 +++---
 .../maven/shared/release/config/ReleaseUtils.java  |   3 +
 .../shared/release/strategies/DefaultStrategy.java | 112 +++
 .../src/main/mdo/release-descriptor.mdo|   9 ++
 .../shared/release/DefaultReleaseManagerTest.java  |   5 +-
 .../release/phase/AbstractReleaseTestCase.java |  19 +--
 .../phase/CheckDependencySnapshotsPhaseTest.java   |   3 +-
 .../shared/release/DefaultReleaseManagerTest.xml   |  23 +++
 .../maven/plugins/release/AbstractReleaseMojo.java |  12 ++
 .../maven/plugins/release/CleanReleaseMojo.java|  10 +-
 .../plugins/release/CleanReleaseMojoTest.java  |   5 +-
 .../plugins/release/PrepareReleaseMojoTest.java|   3 -
 .../plugins/release/StageReleaseMojoTest.java  |   6 -
 17 files changed, 375 insertions(+), 123 deletions(-)
 create mode 100644 
maven-release-api/src/main/java/org/apache/maven/shared/release/strategy/Strategy.java
 create mode 100644 
maven-release-manager/src/main/java/org/apache/maven/shared/release/strategies/DefaultStrategy.java

-- 
To stop receiving notification emails like this one, please contact
['"commits@maven.apache.org" '].

[maven-release] branch master updated: [MRELEASE-992] Deprecated maven flag --no-plugin-updates shows warnings in the console output

[rfscholte]

This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-release.git


The following commit(s) were added to refs/heads/master by this push:
 new 69831b6  [MRELEASE-992] Deprecated maven flag --no-plugin-updates 
shows warnings in the console output
69831b6 is described below

commit 69831b60fedba2d94afd8d15a81e580acdef23e7
Author: rfscholte 
AuthorDate: Sun Jan 14 13:07:50 2018 +0100

[MRELEASE-992] Deprecated maven flag --no-plugin-updates shows warnings in 
the console output
---
 .../shared/release/exec/ForkedMavenExecutor.java   |  2 --
 .../shared/release/exec/InvokerMavenExecutor.java  | 34 --
 .../release/exec/ForkedMavenExecutorTest.java  | 15 --
 3 files changed, 5 insertions(+), 46 deletions(-)

diff --git 
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/ForkedMavenExecutor.java
 
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/ForkedMavenExecutor.java
index 472d385..2db71e9 100644
--- 
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/ForkedMavenExecutor.java
+++ 
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/ForkedMavenExecutor.java
@@ -118,8 +118,6 @@ public class ForkedMavenExecutor
 cl.createArg().setValue( goal );
 }
 
-cl.createArg().setValue( "--no-plugin-updates" );
-
 if ( !interactive )
 {
 cl.createArg().setValue( "--batch-mode" );
diff --git 
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java
 
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java
index c0f9761..df61c39 100644
--- 
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java
+++ 
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java
@@ -74,14 +74,6 @@ public class InvokerMavenExecutor
 
 private static final char ACTIVATE_PROFILES = 'P';
 
-private static final String FORCE_PLUGIN_UPDATES = "cpu";
-
-private static final String FORCE_PLUGIN_UPDATES2 = "up";
-
-private static final String SUPPRESS_PLUGIN_UPDATES = "npu";
-
-private static final String SUPPRESS_PLUGIN_REGISTRY = "npr";
-
 private static final char CHECKSUM_FAILURE_POLICY = 'C';
 
 private static final char CHECKSUM_WARNING_POLICY = 'c';
@@ -135,18 +127,6 @@ public class InvokerMavenExecutor
 OPTIONS.addOption( OptionBuilder.withLongOpt( "activate-profiles" 
).withDescription(
 "Comma-delimited list of profiles to activate" ).hasArg().create( 
ACTIVATE_PROFILES ) );
 
-OPTIONS.addOption( OptionBuilder.withLongOpt( "check-plugin-updates" 
).withDescription(
-"Force upToDate check for any relevant registered plugins" 
).create( FORCE_PLUGIN_UPDATES ) );
-
-OPTIONS.addOption( OptionBuilder.withLongOpt( "update-plugins" 
).withDescription(
-"Synonym for " + FORCE_PLUGIN_UPDATES ).create( 
FORCE_PLUGIN_UPDATES2 ) );
-
-OPTIONS.addOption( OptionBuilder.withLongOpt( "no-plugin-updates" 
).withDescription(
-"Suppress upToDate check for any relevant registered plugins" 
).create( SUPPRESS_PLUGIN_UPDATES ) );
-
-OPTIONS.addOption( OptionBuilder.withLongOpt( "no-plugin-registry" 
).withDescription(
-"Don't use ~/.m2/plugin-registry.xml for plugin versions" 
).create( SUPPRESS_PLUGIN_REGISTRY ) );
-
 OPTIONS.addOption( OptionBuilder.withLongOpt( "strict-checksums" 
).withDescription(
 "Fail the build if checksums don't match" ).create( 
CHECKSUM_FAILURE_POLICY ) );
 
@@ -261,20 +241,6 @@ public class InvokerMavenExecutor
 }
 }
 
-if ( cli.hasOption( FORCE_PLUGIN_UPDATES ) || cli.hasOption( 
FORCE_PLUGIN_UPDATES2 ) )
-{
-getLogger().warn( "Forcing plugin updates is not supported 
currently." );
-}
-else if ( cli.hasOption( SUPPRESS_PLUGIN_UPDATES ) )
-{
-req.setNonPluginUpdates( true );
-}
-
-if ( cli.hasOption( SUPPRESS_PLUGIN_REGISTRY ) )
-{
-getLogger().warn( "Explicit suppression of the plugin registry 
is not supported currently." );
-}
-
 if ( cli.hasOption( CHECKSUM_FAILURE_POLICY ) )
 {
 req.setGlobalChecksumPolicy( 
InvocationRequest.CHECKSUM_POLICY_FAIL );
diff --git 
a/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec

[maven-dependency-analyzer] branch master updated: [maven-release-plugin] prepare release maven-dependency-analyzer-1.8

[rfscholte]

This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-dependency-analyzer.git


The following commit(s) were added to refs/heads/master by this push:
 new b216b5d  [maven-release-plugin] prepare release 
maven-dependency-analyzer-1.8
b216b5d is described below

commit b216b5d60a6bc56f0fda90faba9a8df5a37bfcf8
Author: rfscholte 
AuthorDate: Sun Jan 14 17:27:06 2018 +0100

[maven-release-plugin] prepare release maven-dependency-analyzer-1.8
---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 896e07d..c3b9c93 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
 
   maven-dependency-analyzer
   jar
-  1.8-SNAPSHOT
+  1.8
 
   Apache Maven Dependency Analyzer
   
@@ -41,7 +41,7 @@
 
scm:git:https://gitbox.apache.org/repos/asf/maven-dependency-analyzer.git
 
scm:git:https://gitbox.apache.org/repos/asf/maven-dependency-analyzer.git
 
https://github.com/apache/maven-dependency-analyzer/tree/${project.scm.tag}
-HEAD
+maven-dependency-analyzer-1.8
   
   
 jira

-- 
To stop receiving notification emails like this one, please contact
['"commits@maven.apache.org" '].

[maven-dependency-analyzer] annotated tag maven-dependency-analyzer-1.8 created (now baa041c)

[rfscholte]

This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a change to annotated tag maven-dependency-analyzer-1.8
in repository https://gitbox.apache.org/repos/asf/maven-dependency-analyzer.git.


  at baa041c  (tag)
 tagging b216b5d60a6bc56f0fda90faba9a8df5a37bfcf8 (commit)
 replaces maven-dependency-analyzer-1.7
  by rfscholte
  on Sun Jan 14 17:27:23 2018 +0100

- Log -
[maven-release-plugin] copy for tag maven-dependency-analyzer-1.8
---

No new revisions were added by this update.

-- 
To stop receiving notification emails like this one, please contact
['"commits@maven.apache.org" '].

[maven-dependency-analyzer] branch master updated: [maven-release-plugin] prepare for next development iteration

[rfscholte]

This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-dependency-analyzer.git


The following commit(s) were added to refs/heads/master by this push:
 new ed34d8e  [maven-release-plugin] prepare for next development iteration
ed34d8e is described below

commit ed34d8e68fffca6e8d6184dbfdcace8c5f779c4c
Author: rfscholte 
AuthorDate: Sun Jan 14 17:27:29 2018 +0100

[maven-release-plugin] prepare for next development iteration
---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index c3b9c93..6946ea1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
 
   maven-dependency-analyzer
   jar
-  1.8
+  1.9-SNAPSHOT
 
   Apache Maven Dependency Analyzer
   
@@ -41,7 +41,7 @@
 
scm:git:https://gitbox.apache.org/repos/asf/maven-dependency-analyzer.git
 
scm:git:https://gitbox.apache.org/repos/asf/maven-dependency-analyzer.git
 
https://github.com/apache/maven-dependency-analyzer/tree/${project.scm.tag}
-maven-dependency-analyzer-1.8
+HEAD
   
   
 jira

-- 
To stop receiving notification emails like this one, please contact
['"commits@maven.apache.org" '].

[maven-release] branch master updated (69831b6 -> 94dee2a)

[rfscholte]

This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/maven-release.git.


from 69831b6  [MRELEASE-992] Deprecated maven flag --no-plugin-updates 
shows warnings in the console output
 new 80f49d9  Replace ROLE name with class
 new de5c863  Apply multi-catch
 new 94dee2a  Remove more deprecated/overloaded methods

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../config/PropertiesReleaseDescriptorStore.java   |  20 +--
 .../release/config/ReleaseDescriptorStore.java |   5 -
 .../shared/release/exec/AbstractMavenExecutor.java |  57 +---
 .../shared/release/exec/CommandLineFactory.java|   5 -
 .../maven/shared/release/exec/MavenExecutor.java   |  57 
 .../shared/release/phase/AbstractReleasePhase.java |  23 ---
 .../release/phase/AbstractRunGoalsPhase.java   |  13 --
 .../phase/CheckDependencySnapshotsPhase.java   |   6 +-
 .../shared/release/phase/MapVersionsPhase.java |   6 +-
 .../maven/shared/release/phase/ReleasePhase.java   |  38 -
 .../release/scm/ScmRepositoryConfigurator.java |   5 -
 .../maven/shared/release/scm/ScmTranslator.java|   5 -
 .../release/transform/jdom/JDomModelETL.java   |   6 +-
 .../shared/release/DefaultReleaseManagerTest.java  |  72 +-
 .../PropertiesReleaseDescriptorStoreTest.java  |   4 +-
 .../release/exec/AbstractMavenExecutorTest.java|  15 +-
 .../release/exec/CommandLineFactoryTest.java   |   2 +-
 .../release/exec/ForkedMavenExecutorTest.java  |  17 +--
 .../release/exec/InvokerMavenExecutorTest.java |   6 +-
 .../release/phase/AbstractBackupPomsPhaseTest.java |   5 +-
 ...tractEditModeRewritingReleasePhaseTestCase.java |   4 +-
 .../AbstractRewritingReleasePhaseTestCase.java |   8 +-
 .../phase/BranchInputVariablesPhaseTest.java   |   2 +-
 .../phase/CheckDependencySnapshotsPhaseTest.java   |  46 +++---
 .../shared/release/phase/CheckPomPhaseTest.java|   2 +-
 .../release/phase/CheckoutProjectFromScmTest.java  |  12 +-
 .../release/phase/CreateBackupPomsPhaseTest.java   |   2 +-
 .../shared/release/phase/EndReleasePhaseTest.java  |   2 +-
 .../phase/GenerateReleasePomsPhaseTest.java|   2 +-
 .../release/phase/InputVariablesPhaseTest.java |   2 +-
 .../shared/release/phase/MapVersionsPhaseTest.java | 160 ++---
 .../shared/release/phase/ReleasePhaseStub.java |  25 
 .../release/phase/RemoveReleasePomsPhaseTest.java  |  12 +-
 .../release/phase/RestoreBackupPomsPhaseTest.java  |   2 +-
 .../release/phase/RunCompleteGoalsPhaseTest.java   |   2 +-
 .../release/phase/RunPerformGoalsPhaseTest.java|  12 +-
 .../release/phase/RunPrepareGoalsPhaseTest.java|   2 +-
 .../shared/release/phase/ScmBranchPhaseTest.java   |  20 +--
 .../phase/ScmCheckModificationsPhaseTest.java  |  12 +-
 .../phase/ScmCommitDevelopmentPhaseTest.java   |   6 +-
 .../phase/ScmCommitPreparationPhaseTest.java   |  28 ++--
 .../shared/release/phase/ScmTagPhaseTest.java  |  20 +--
 .../scm/DefaultScmRepositoryConfiguratorTest.java  |   2 +-
 .../shared/release/stubs/MavenExecutorWrapper.java |  24 
 .../maven/shared/release/util/PomFinderTest.java   |   4 +-
 45 files changed, 250 insertions(+), 530 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
['"commits@maven.apache.org" '].

[maven-release] 02/03: Apply multi-catch

[rfscholte]

This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-release.git

commit de5c863786e1ceb0c19e350417f7128d5b738e8d
Author: rfscholte 
AuthorDate: Mon Jan 15 21:22:36 2018 +0100

Apply multi-catch
---
 .../config/PropertiesReleaseDescriptorStore.java   | 20 ++-
 .../shared/release/exec/AbstractMavenExecutor.java | 30 +++---
 .../phase/CheckDependencySnapshotsPhase.java   |  6 +
 .../shared/release/phase/MapVersionsPhase.java |  6 +
 .../release/transform/jdom/JDomModelETL.java   |  6 +
 5 files changed, 8 insertions(+), 60 deletions(-)

diff --git 
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java
 
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java
index 673ca9b..7256ce3 100644
--- 
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java
+++ 
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java
@@ -144,15 +144,7 @@ public class PropertiesReleaseDescriptorStore
 {
 password = encryptAndDecorate( password );
 }
-catch ( IllegalStateException e )
-{
-getLogger().debug( e.getMessage() );
-}
-catch ( SecDispatcherException e )
-{
-getLogger().debug( e.getMessage() );
-}
-catch ( PlexusCipherException e )
+catch ( IllegalStateException | SecDispatcherException | 
PlexusCipherException e )
 {
 getLogger().debug( e.getMessage() );
 }
@@ -169,15 +161,7 @@ public class PropertiesReleaseDescriptorStore
 {
 passPhrase = encryptAndDecorate( passPhrase );
 }
-catch ( IllegalStateException e )
-{
-getLogger().debug( e.getMessage() );
-}
-catch ( SecDispatcherException e )
-{
-getLogger().debug( e.getMessage() );
-}
-catch ( PlexusCipherException e )
+catch ( IllegalStateException | SecDispatcherException | 
PlexusCipherException e )
 {
 getLogger().debug( e.getMessage() );
 }
diff --git 
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/AbstractMavenExecutor.java
 
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/AbstractMavenExecutor.java
index 2f5a954..3ad1ce7 100644
--- 
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/AbstractMavenExecutor.java
+++ 
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/AbstractMavenExecutor.java
@@ -147,15 +147,7 @@ public abstract class AbstractMavenExecutor
 {
 server.setPassword( encryptAndDecorate( password ) );
 }
-catch ( IllegalStateException e )
-{
-// ignore
-}
-catch ( SecDispatcherException e )
-{
-// ignore
-}
-catch ( PlexusCipherException e )
+catch ( IllegalStateException | SecDispatcherException | 
PlexusCipherException e )
 {
 // ignore
 }
@@ -168,15 +160,7 @@ public abstract class AbstractMavenExecutor
 {
 server.setPassphrase( encryptAndDecorate( passphrase ) );
 }
-catch ( IllegalStateException e )
-{
-// ignore
-}
-catch ( SecDispatcherException e )
-{
-// ignore
-}
-catch ( PlexusCipherException e )
+catch ( IllegalStateException | SecDispatcherException | 
PlexusCipherException e )
 {
 // ignore
 }
@@ -192,15 +176,7 @@ public abstract class AbstractMavenExecutor
 {
 proxy.setPassword( encryptAndDecorate( password ) );
 }
-catch ( IllegalStateException e )
-{
-// ignore
-}
-catch ( SecDispatcherException e )
-{
-// ignore
-}
-catch ( PlexusCipherException e )
+catch ( IllegalStateException | SecDispatcherException | 
PlexusCipherException e )
 {
 // ignore
 }
diff --git 
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase

[maven-release] 03/03: Remove more deprecated/overloaded methods

[rfscholte]

This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-release.git

commit 94dee2aca4dc916c968a69cacf8f3cc137f7bfb0
Author: rfscholte 
AuthorDate: Mon Jan 15 22:18:40 2018 +0100

Remove more deprecated/overloaded methods
---
 .../shared/release/exec/AbstractMavenExecutor.java | 27 ---
 .../maven/shared/release/exec/MavenExecutor.java   | 52 --
 .../shared/release/phase/AbstractReleasePhase.java | 23 --
 .../release/phase/AbstractRunGoalsPhase.java   | 13 --
 .../maven/shared/release/phase/ReleasePhase.java   | 33 --
 .../release/exec/AbstractMavenExecutorTest.java| 15 ---
 .../release/exec/ForkedMavenExecutorTest.java  | 13 +++---
 .../release/exec/InvokerMavenExecutorTest.java |  2 +-
 .../release/phase/AbstractBackupPomsPhaseTest.java |  5 +--
 .../shared/release/phase/ReleasePhaseStub.java | 25 ---
 .../shared/release/stubs/MavenExecutorWrapper.java | 24 --
 11 files changed, 17 insertions(+), 215 deletions(-)

diff --git 
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/AbstractMavenExecutor.java
 
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/AbstractMavenExecutor.java
index 3ad1ce7..e70fa0e 100644
--- 
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/AbstractMavenExecutor.java
+++ 
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/AbstractMavenExecutor.java
@@ -29,7 +29,6 @@ import org.apache.maven.settings.Settings;
 import org.apache.maven.settings.SettingsUtils;
 import org.apache.maven.settings.io.xpp3.SettingsXpp3Writer;
 import org.apache.maven.shared.release.ReleaseResult;
-import org.apache.maven.shared.release.env.DefaultReleaseEnvironment;
 import org.apache.maven.shared.release.env.ReleaseEnvironment;
 import org.codehaus.plexus.component.annotations.Requirement;
 import org.codehaus.plexus.logging.LogEnabled;
@@ -71,32 +70,6 @@ public abstract class AbstractMavenExecutor
 }
 
 @Override
-public void executeGoals( File workingDirectory, String goals, boolean 
interactive, String additionalArguments,
-  String pomFileName, ReleaseResult result )
-throws MavenExecutorException
-{
-executeGoals( workingDirectory, goals, new 
DefaultReleaseEnvironment(), interactive, additionalArguments,
-  pomFileName, result );
-}
-
-@Override
-public void executeGoals( File workingDirectory, String goals, boolean 
interactive, String additionalArguments,
-  ReleaseResult result )
-throws MavenExecutorException
-{
-executeGoals( workingDirectory, goals, new 
DefaultReleaseEnvironment(), interactive, additionalArguments,
-  result );
-}
-
-@Override
-public void executeGoals( File workingDirectory, String goals, 
ReleaseEnvironment releaseEnvironment,
-  boolean interactive, String arguments, 
ReleaseResult result )
-throws MavenExecutorException
-{
-executeGoals( workingDirectory, goals, releaseEnvironment, 
interactive, arguments, null, result );
-}
-
-@Override
 public void executeGoals( File workingDirectory, String goals, 
ReleaseEnvironment releaseEnvironment,
   boolean interactive, String additionalArguments, 
String pomFileName,
   ReleaseResult result )
diff --git 
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/MavenExecutor.java
 
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/MavenExecutor.java
index 3fa7bec..e1fe9f5 100644
--- 
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/MavenExecutor.java
+++ 
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/MavenExecutor.java
@@ -46,56 +46,4 @@ public interface MavenExecutor
 void executeGoals( File workingDirectory, String goals, ReleaseEnvironment 
releaseEnvironment,
boolean interactive, String additionalArguments, String 
pomFileName, ReleaseResult result )
 throws MavenExecutorException;
-
-/**
- * Execute goals using Maven.
- *
- * @param workingDirectorythe directory to execute in
- * @param goals   the goals to run (space delimited)
- * @param releaseEnvironment  the environmental settings, maven-home, etc 
used for this release
- * @param interactive whether to execute in interactive mode, or 
the default batch mode
- * @param additionalArguments additional arguments to pass to the Maven 
command
- * @param result  holds all results of the execution
- * @throws MavenExecutorException if an error occurred executing Maven
- */
-void

[maven-release] 01/03: Replace ROLE name with class

[rfscholte]

This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-release.git

commit 80f49d9399a026507ff3b158ee6a3e2d18aa27d7
Author: rfscholte 
AuthorDate: Mon Jan 15 20:52:38 2018 +0100

Replace ROLE name with class
---
 .../release/config/ReleaseDescriptorStore.java |   5 -
 .../shared/release/exec/CommandLineFactory.java|   5 -
 .../maven/shared/release/exec/MavenExecutor.java   |   5 -
 .../maven/shared/release/phase/ReleasePhase.java   |   5 -
 .../release/scm/ScmRepositoryConfigurator.java |   5 -
 .../maven/shared/release/scm/ScmTranslator.java|   5 -
 .../shared/release/DefaultReleaseManagerTest.java  |  72 +-
 .../PropertiesReleaseDescriptorStoreTest.java  |   4 +-
 .../release/exec/CommandLineFactoryTest.java   |   2 +-
 .../release/exec/ForkedMavenExecutorTest.java  |   4 +-
 .../release/exec/InvokerMavenExecutorTest.java |   4 +-
 ...tractEditModeRewritingReleasePhaseTestCase.java |   4 +-
 .../AbstractRewritingReleasePhaseTestCase.java |   8 +-
 .../phase/BranchInputVariablesPhaseTest.java   |   2 +-
 .../phase/CheckDependencySnapshotsPhaseTest.java   |  46 +++---
 .../shared/release/phase/CheckPomPhaseTest.java|   2 +-
 .../release/phase/CheckoutProjectFromScmTest.java  |  12 +-
 .../release/phase/CreateBackupPomsPhaseTest.java   |   2 +-
 .../shared/release/phase/EndReleasePhaseTest.java  |   2 +-
 .../phase/GenerateReleasePomsPhaseTest.java|   2 +-
 .../release/phase/InputVariablesPhaseTest.java |   2 +-
 .../shared/release/phase/MapVersionsPhaseTest.java | 160 ++---
 .../release/phase/RemoveReleasePomsPhaseTest.java  |  12 +-
 .../release/phase/RestoreBackupPomsPhaseTest.java  |   2 +-
 .../release/phase/RunCompleteGoalsPhaseTest.java   |   2 +-
 .../release/phase/RunPerformGoalsPhaseTest.java|  12 +-
 .../release/phase/RunPrepareGoalsPhaseTest.java|   2 +-
 .../shared/release/phase/ScmBranchPhaseTest.java   |  20 +--
 .../phase/ScmCheckModificationsPhaseTest.java  |  12 +-
 .../phase/ScmCommitDevelopmentPhaseTest.java   |   6 +-
 .../phase/ScmCommitPreparationPhaseTest.java   |  28 ++--
 .../shared/release/phase/ScmTagPhaseTest.java  |  20 +--
 .../scm/DefaultScmRepositoryConfiguratorTest.java  |   2 +-
 .../maven/shared/release/util/PomFinderTest.java   |   4 +-
 34 files changed, 225 insertions(+), 255 deletions(-)

diff --git 
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseDescriptorStore.java
 
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseDescriptorStore.java
index 174cb4c..5b1e8c4 100644
--- 
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseDescriptorStore.java
+++ 
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseDescriptorStore.java
@@ -27,11 +27,6 @@ package org.apache.maven.shared.release.config;
 public interface ReleaseDescriptorStore
 {
 /**
- * The Plexus role.
- */
-String ROLE = ReleaseDescriptorStore.class.getName();
-
-/**
  * Read a configuration.
  *
  * @param mergeDescriptor configuration to merge with the loaded 
configuration. Some values are used as defaults,
diff --git 
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/CommandLineFactory.java
 
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/CommandLineFactory.java
index e8c3618..3699f68 100644
--- 
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/CommandLineFactory.java
+++ 
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/CommandLineFactory.java
@@ -29,11 +29,6 @@ import org.codehaus.plexus.util.cli.Commandline;
 public interface CommandLineFactory
 {
 /**
- * Plexus role.
- */
-String ROLE = CommandLineFactory.class.getName();
-
-/**
  * Create a command line object with default environment for the given 
executable.
  *
  * @param executable the executable
diff --git 
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/MavenExecutor.java
 
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/MavenExecutor.java
index 0875dd1..3fa7bec 100644
--- 
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/MavenExecutor.java
+++ 
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/MavenExecutor.java
@@ -32,11 +32,6 @@ import java.io.File;
 public interface MavenExecutor
 {
 /**
- * Plexus Role.
- */
-String ROLE = MavenExecutor.class.getName();
-
-/**
  * Execute goals using Maven.
  *
  * @param workingDirectorythe directory to execute in
diff --git 
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ReleasePhase.java
 
b/maven-release-manager/src/main

svn commit: r24271 - /release/maven/shared/

[rfscholte]

Author: rfscholte
Date: Wed Jan 17 19:07:33 2018
New Revision: 24271

Log:
Maven Dependency Analyzer 1.8

Added:
release/maven/shared/maven-dependency-analyzer-1.8-source-release.zip   
(with props)
release/maven/shared/maven-dependency-analyzer-1.8-source-release.zip.asc
release/maven/shared/maven-dependency-analyzer-1.8-source-release.zip.md5
Removed:
release/maven/shared/maven-dependency-analyzer-1.7-source-release.zip
release/maven/shared/maven-dependency-analyzer-1.7-source-release.zip.asc
release/maven/shared/maven-dependency-analyzer-1.7-source-release.zip.md5

Added: release/maven/shared/maven-dependency-analyzer-1.8-source-release.zip
==
Binary file - no diff available.

Propchange: 
release/maven/shared/maven-dependency-analyzer-1.8-source-release.zip
--
svn:mime-type = application/octet-stream

Added: release/maven/shared/maven-dependency-analyzer-1.8-source-release.zip.asc
==
--- release/maven/shared/maven-dependency-analyzer-1.8-source-release.zip.asc 
(added)
+++ release/maven/shared/maven-dependency-analyzer-1.8-source-release.zip.asc 
Wed Jan 17 19:07:33 2018
@@ -0,0 +1,7 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v2
+
+iF4EABEIAAYFAlpbhS0ACgkQrlp/tgigIhxKOAEAw2A5wPd4hGHftmNVhGFWsNmr
+s7Db1TU107PZJm9fQkAA/0JjA7WOYpIam6QMz1weXuwE99vKo9oTEtWXf8QTjSX1
+=SNSS
+-END PGP SIGNATURE-

Added: release/maven/shared/maven-dependency-analyzer-1.8-source-release.zip.md5
==
--- release/maven/shared/maven-dependency-analyzer-1.8-source-release.zip.md5 
(added)
+++ release/maven/shared/maven-dependency-analyzer-1.8-source-release.zip.md5 
Wed Jan 17 19:07:33 2018
@@ -0,0 +1 @@
+42bca912bef2ea677cd82400f8e31eec
\ No newline at end of file

svn commit: r1821406 - /maven/site/trunk/content/apt/shared/index.apt

[rfscholte]

Author: rfscholte
Date: Wed Jan 17 19:15:06 2018
New Revision: 1821406

URL: http://svn.apache.org/viewvc?rev=1821406&view=rev
Log:
Maven Dependency Analyzer 1.8

Modified:
maven/site/trunk/content/apt/shared/index.apt

Modified: maven/site/trunk/content/apt/shared/index.apt
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/shared/index.apt?rev=1821406&r1=1821405&r2=1821406&view=diff
==
--- maven/site/trunk/content/apt/shared/index.apt (original)
+++ maven/site/trunk/content/apt/shared/index.apt Wed Jan 17 19:15:06 2018
@@ -46,7 +46,7 @@ The shared components are currently unde
 
*+--+---+--++-+
 | {{{/shared/maven-common-artifact-filters/} 
<<>>}}  | 3.0.1 | 2016-10-31| Used to 
filter lists of Artifact instances. | 
{{{https://gitbox.apache.org/repos/asf/maven-common-artifact-filters.git}GIT}} 
/ {{{https://github.com/apache/maven-common-artifact-filters/}GitHub}} | 
{{{https://issues.apache.org/jira/browse/MSHARED/component/13269}JIRA}}
 
*+--+---+--++-+
-| {{{/shared/maven-dependency-analyzer/} <<>>}}   | 
1.7  | 2017-04-29| Maven Dependency Analyzer component. | 
{{{https://gitbox.apache.org/repos/asf/maven-dependency-analyzer.git}GIT}} / 
{{{https://github.com/apache/maven-dependency-analyzer/}GitHub}} | 
{{{https://issues.apache.org/jira/browse/MSHARED/component/13265}JIRA}}
+| {{{/shared/maven-dependency-analyzer/} <<>>}}   | 
1.8  | 2018-01-17| Maven Dependency Analyzer component. | 
{{{https://gitbox.apache.org/repos/asf/maven-dependency-analyzer.git}GIT}} / 
{{{https://github.com/apache/maven-dependency-analyzer/}GitHub}} | 
{{{https://issues.apache.org/jira/browse/MSHARED/component/13265}JIRA}}
 
*+--+---+--++-+
 | {{{/shared/maven-dependency-tree/} <<>>}}   | 
3.0.1| 2017-05-07| Maven Dependency Tree constructs a tree 
model of a Maven project's dependencies. | 
{{{https://gitbox.apache.org/repos/asf/maven-dependency-tree.git}GIT}} / 
{{{https://github.com/apache/maven-dependency-tree/}GitHub}} | 
{{{https://issues.apache.org/jira/browse/MSHARED/component/13264}JIRA}}
 
*+--+---+--++-+

[maven-dependency-plugin] branch master updated: [MDEP-578] Fix IT

[rfscholte]

This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-dependency-plugin.git


The following commit(s) were added to refs/heads/master by this push:
 new f5953f3  [MDEP-578] Fix IT
f5953f3 is described below

commit f5953f36fbda641c0fa3e9d1d1c2d351280b4146
Author: rfscholte 
AuthorDate: Wed Jan 17 21:58:26 2018 +0100

[MDEP-578] Fix IT
---
 .../mdep-578_display-reason-invalid-module/invoker.properties   | 2 +-
 .../projects/mdep-578_display-reason-invalid-module/verify.groovy   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git 
a/src/it/projects/mdep-578_display-reason-invalid-module/invoker.properties 
b/src/it/projects/mdep-578_display-reason-invalid-module/invoker.properties
index cfe3542..ea537ae 100644
--- a/src/it/projects/mdep-578_display-reason-invalid-module/invoker.properties
+++ b/src/it/projects/mdep-578_display-reason-invalid-module/invoker.properties
@@ -16,4 +16,4 @@
 # under the License.
 
 invoker.java.version = 9+
-invoker.goals = dependency:resolve
+invoker.goals = 
${project.groupId}:${project.artifactId}:${project.version}:resolve
diff --git 
a/src/it/projects/mdep-578_display-reason-invalid-module/verify.groovy 
b/src/it/projects/mdep-578_display-reason-invalid-module/verify.groovy
index d2a3e1d..7bfaa91 100644
--- a/src/it/projects/mdep-578_display-reason-invalid-module/verify.groovy
+++ b/src/it/projects/mdep-578_display-reason-invalid-module/verify.groovy
@@ -25,12 +25,12 @@ String buildLog = file.getText( "UTF-8" );
 // Cause message is JDK specific and can change over time
 
 // JDOMAbout$Author.class found in top-level directory (unnamed package not 
allowed in module)
-assert buildLog.contains( "Can't get module name from jdom-1.0.jar: " );
+assert buildLog.contains( "Can't extract module name from jdom-1.0.jar: " );
 
 // geronimo.servlet.2.4.spec: Invalid module name: '2' is not a Java identifier
-assert buildLog.contains( "Can't get module name from 
geronimo-servlet_2.4_spec-1.1.1.jar: " );
+assert buildLog.contains( "Can't extract module name from 
geronimo-servlet_2.4_spec-1.1.1.jar: " );
 
 // geronimo.jta.1.1.spec: Invalid module name: '1' is not a Java identifier
-assert buildLog.contains( "Can't get module name from 
geronimo-jta_1.1_spec-1.1.jar: " );
+assert buildLog.contains( "Can't extract module name from 
geronimo-jta_1.1_spec-1.1.jar: " );
 
 return true;

-- 
To stop receiving notification emails like this one, please contact
['"commits@maven.apache.org" '].