svn commit: r1754566 - /maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/mojos/AbstractAssemblyMojo.java

[gboue]

Author: gboue
Date: Fri Jul 29 19:22:01 2016
New Revision: 1754566

URL: http://svn.apache.org/viewvc?rev=1754566=rev
Log:
[MASSEMBLY-824] Use of appendAssemblyId and finalName can cause problems

Updated documentation to clarify that setting 'appendAssemblyId' to 'false' 
also removes the classifier and can lead to warnings about changing the file of 
the main project artifact.

Modified:

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/mojos/AbstractAssemblyMojo.java

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/mojos/AbstractAssemblyMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/mojos/AbstractAssemblyMojo.java?rev=1754566=1754565=1754566=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/mojos/AbstractAssemblyMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/mojos/AbstractAssemblyMojo.java
 Fri Jul 29 19:22:01 2016
@@ -72,7 +72,9 @@ public abstract class AbstractAssemblyMo
 protected FixedStringSearchInterpolator rootInterpolator;
 
 /**
- * Set to false to exclude the assembly id from the assembly final name.
+ * Set to false to exclude the assembly id from the assembly final name, 
and to create the resultant assembly
+ * artifacts without classifier. As such, an assembly artifact having the 
same format as the packaging of the
+ * current Maven project will replace the file for this main project 
artifact.
  */
 @Parameter( property = "assembly.appendAssemblyId", defaultValue = "true" )
 boolean appendAssemblyId;

svn commit: r1754565 - /maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/mojos/AbstractAssemblyMojo.java

[gboue]

Author: gboue
Date: Fri Jul 29 19:19:16 2016
New Revision: 1754565

URL: http://svn.apache.org/viewvc?rev=1754565=rev
Log:
[MASSEMBLY-818] Remove deprecated parameters for the single goal

Updated warning message about setting 'appendAssemblyId' to false: 'classifier' 
option was removed so it should not be mentioned anymore.

Modified:

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/mojos/AbstractAssemblyMojo.java

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/mojos/AbstractAssemblyMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/mojos/AbstractAssemblyMojo.java?rev=1754565=1754564=1754565=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/mojos/AbstractAssemblyMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/mojos/AbstractAssemblyMojo.java
 Fri Jul 29 19:19:16 2016
@@ -490,8 +490,7 @@ public abstract class AbstractAssemblyMo
 {
 final StringBuilder message = new 
StringBuilder();
 
-message.append( "Configuration options: 
'appendAssemblyId' is set to false, "
-+ "and 'classifier' is 
missing." );
+message.append( "Configuration option 
'appendAssemblyId' is set to false." );
 message.append( "\nInstead of attaching the 
assembly file: " ).append( destFile );
 message.append( ", it will become the file for 
main project artifact." );
 message.append( "\nNOTE: If multiple 
descriptors or descriptor-formats are provided "

svn commit: r1754050 - in /maven/plugin-tools/trunk/maven-plugin-tools-generators/src: main/java/org/apache/maven/tools/plugin/generator/ main/resources/ test/java/org/apache/maven/tools/plugin/genera

[gboue]

Author: gboue
Date: Mon Jul 25 21:19:22 2016
New Revision: 1754050

URL: http://svn.apache.org/viewvc?rev=1754050=rev
Log:
[MPLUGIN-307] The "alias" field on the annotation "@Parameter" is not 
considered for goal "plugin:report"

PluginXdocGenerator didn't include the alias for parameters in the report. 
Added to the end of the bullet list.

Modified:

maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginXdocGenerator.java

maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/resources/pluginxdoc.properties

maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/resources/pluginxdoc_de.properties

maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/resources/pluginxdoc_fr.properties

maven/plugin-tools/trunk/maven-plugin-tools-generators/src/test/java/org/apache/maven/tools/plugin/generator/AbstractGeneratorTestCase.java

maven/plugin-tools/trunk/maven-plugin-tools-generators/src/test/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGeneratorTest.java

Modified: 
maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginXdocGenerator.java
URL: 
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginXdocGenerator.java?rev=1754050=1754049=1754050=diff
==
--- 
maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginXdocGenerator.java
 (original)
+++ 
maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginXdocGenerator.java
 Mon Jul 25 21:19:22 2016
@@ -543,6 +543,10 @@ public class PluginXdocGenerator
 addedUl = addUl( w, addedUl, parameter.getDefaultValue() );
 writeDetail( getString( 
"pluginxdoc.mojodescriptor.parameter.default" ),
  escapeXml( parameter.getDefaultValue() ), w );
+
+addedUl = addUl( w, addedUl, parameter.getAlias() );
+writeDetail( getString( 
"pluginxdoc.mojodescriptor.parameter.alias" ), escapeXml( parameter.getAlias() 
),
+ w );
 
 if ( addedUl )
 {
@@ -719,6 +723,13 @@ public class PluginXdocGenerator
 if ( property != null )
 {
 w.writeMarkup( format( 
"pluginxdoc.mojodescriptor.parameter.property.description", property ) );
+w.writeMarkup( "" );
+}
+
+if ( StringUtils.isNotEmpty( parameter.getAlias() ) )
+{
+w.writeMarkup( format( 
"pluginxdoc.mojodescriptor.parameter.alias.description",
+   escapeXml( parameter.getAlias() ) ) );
 }
 
 w.endElement(); //td

Modified: 
maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/resources/pluginxdoc.properties
URL: 
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/resources/pluginxdoc.properties?rev=1754050=1754049=1754050=diff
==
--- 
maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/resources/pluginxdoc.properties
 (original)
+++ 
maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/resources/pluginxdoc.properties
 Mon Jul 25 21:19:22 2016
@@ -53,6 +53,8 @@ pluginxdoc.mojodescriptor.parameter.prop
 pluginxdoc.mojodescriptor.parameter.property.description=User property 
is: {0}.
 pluginxdoc.mojodescriptor.parameter.default=Default
 pluginxdoc.mojodescriptor.parameter.defaultValue=Default value 
is: {0}.
+pluginxdoc.mojodescriptor.parameter.alias=Alias
+pluginxdoc.mojodescriptor.parameter.alias.description=Alias 
is: {0}.
 pluginxdoc.mojodescriptor.requiredParameters=Required Parameters
 pluginxdoc.mojodescriptor.optionalParameters=Optional Parameters
 pluginxdoc.mojodescriptor.parameters=Parameters

Modified: 
maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/resources/pluginxdoc_de.properties
URL: 
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/resources/pluginxdoc_de.properties?rev=1754050=1754049=1754050=diff
==
--- 
maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/resources/pluginxdoc_de.properties
 (original)
+++ 
maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/resources/pluginxdoc_de.properties
 Mon Jul 25 21:19:22 2016
@@ -47,6 +47,8 @@ pluginxdoc.mojodescriptor.parameter.requ
 pluginxdoc.mojodescriptor.parameter.expression=Ausdruck
 pluginxdoc.mojodescriptor.parameter

svn commit: r1756026 - in /maven/plugins/trunk/maven-dependency-plugin/src: it/mrm/ it/projects/copy-from-remote-repository/ it/projects/copy-from-remote-repository/repo/ it/projects/copy-from-remote-

[gboue]

Author: gboue
Date: Thu Aug 11 18:40:43 2016
New Revision: 1756026

URL: http://svn.apache.org/viewvc?rev=1756026=rev
Log:
Project remote repositories need to be considered when resolving artifacts, it 
could be that a repository is only declared in the POM of the current project.

Added:

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-remote-repository/

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-remote-repository/invoker.properties
   (with props)

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-remote-repository/pom.xml
   (with props)

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-remote-repository/repo/

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-remote-repository/repo/org/

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-remote-repository/repo/org/apache/

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-remote-repository/repo/org/apache/maven/

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-remote-repository/repo/org/apache/maven/its/

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-remote-repository/repo/org/apache/maven/its/dependency/

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-remote-repository/repo/org/apache/maven/its/dependency/fake-remote-copy/

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-remote-repository/repo/org/apache/maven/its/dependency/fake-remote-copy/1.0/

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-remote-repository/repo/org/apache/maven/its/dependency/fake-remote-copy/1.0/fake-remote-copy-1.0.jar
   (with props)

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-remote-repository/verify.groovy
   (with props)

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/unpack-from-remote-repository/

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/unpack-from-remote-repository/invoker.properties
   (with props)

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/unpack-from-remote-repository/pom.xml
   (with props)

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/unpack-from-remote-repository/repo/

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/unpack-from-remote-repository/repo/org/

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/unpack-from-remote-repository/repo/org/apache/

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/unpack-from-remote-repository/repo/org/apache/maven/

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/unpack-from-remote-repository/repo/org/apache/maven/its/

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/unpack-from-remote-repository/repo/org/apache/maven/its/dependency/

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/unpack-from-remote-repository/repo/org/apache/maven/its/dependency/fake-remote-unpack/

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/unpack-from-remote-repository/repo/org/apache/maven/its/dependency/fake-remote-unpack/1.0/

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/unpack-from-remote-repository/repo/org/apache/maven/its/dependency/fake-remote-unpack/1.0/fake-remote-unpack-1.0.jar
   (with props)

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/unpack-from-remote-repository/verify.groovy
   (with props)
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/it/mrm/settings.xml

maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/AbstractDependencyMojo.java

maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/fromConfiguration/AbstractFromConfigurationMojo.java

maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/AbstractDependencyFilterMojo.java

maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/CopyDependenciesMojo.java

maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/resolvers/AbstractResolveMojo.java

Modified: maven/plugins/trunk/maven-dependency-plugin/src/it/mrm/settings.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/it/mrm/settings.xml?rev=1756026=1756025=1756026=diff
==
--- maven/plugins/trunk/maven-dependency-plugin/src/it/mrm/settings.xml 
(original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/it/mrm/settings.xml Thu Aug 
11 18:40:43 2016
@@ -24,7 +24,7 @@ under the License.
   mrm-maven-plugin
   Mock Repository Manager
   @repository.proxy.url@
-  *
+  *,!fake

svn commit: r1752607 - /maven/pom/trunk/maven/pom.xml

[gboue]

Author: gboue
Date: Thu Jul 14 09:10:51 2016
New Revision: 1752607

URL: http://svn.apache.org/viewvc?rev=1752607=rev
Log:
Added Guillaume Boué in the list of committers

Modified:
maven/pom/trunk/maven/pom.xml

Modified: maven/pom/trunk/maven/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/pom/trunk/maven/pom.xml?rev=1752607=1752606=1752607=diff
==
--- maven/pom/trunk/maven/pom.xml (original)
+++ maven/pom/trunk/maven/pom.xml Thu Jul 14 09:10:51 2016
@@ -372,6 +372,15 @@ under the License.
   +1
 
 
+  gboue
+  Guillaume Boué
+  gb...@apache.org
+  
+Committer
+  
+  Europe/Paris
+
+
   godin
   Evgeny Mandrikov
   SonarSource

svn commit: r1753082 - in /maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples: multimodule/module-source-inclusion-simple.apt.vm single/filtering-some-distribution-files.apt.vm single/usi

[gboue]

Author: gboue
Date: Sun Jul 17 15:11:06 2016
New Revision: 1753082

URL: http://svn.apache.org/viewvc?rev=1753082=rev
Log:
[MASSEMBLY-823] Documentation refers to deprecated goals

Documentation is updated to only to refer to the "single" goal. This requires 
the example code for the "Include Module Sources" to be adapted, mainly by 
adding the "useAllReactorProjects" parameter and fixing a deprecation warning 
about fileSet inclusions.

Modified:

maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/multimodule/module-source-inclusion-simple.apt.vm

maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/single/filtering-some-distribution-files.apt.vm

maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/single/using-repositories.apt.vm

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/multimodule/module-source-inclusion-simple.apt.vm
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/multimodule/module-source-inclusion-simple.apt.vm?rev=1753082=1753081=1753082=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/multimodule/module-source-inclusion-simple.apt.vm
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/multimodule/module-source-inclusion-simple.apt.vm
 Sun Jul 17 15:11:06 2016
@@ -54,11 +54,20 @@ Including Module Sources
   false
   
 
+  true
   
 org.test:child1
   
   
-sources/${artifactId}
+false
+
+  
+sources/${module.artifactId}
+
+  ${project.build.directory}/**
+
+  
+
   
 
   
@@ -75,11 +84,18 @@ Including Module Sources
   sources should be contained within the directory structure
   <<>> for this module, since the outputDirectory expression
   will be interpolated on a module-by-module basis.
+  
+  By default, the Assembly Plugin will add the sources under a folder named 
with the artifactId 
+  of each module; this can be disabled by setting <<>> 
to <<>>.
+  
+  Note that the build directory (<<>> by default) will be included, so 
it is explicitly excluded 
+  since this is a temporary storage for files produced during the build and it 
should not contain any 
+  project sources.
 
 * The POM
 
   Now, let's review the POM configuration necessary to enable the building of
-  this assembly via the  goal:
+  this assembly via the  goal:
 
 +---+
 
@@ -125,7 +141,7 @@ Including Module Sources
   To build the assembly, we issue the following command:
 
 +---+
-mvn clean assembly:directory
+mvn clean assembly:single
 +---+
 
   This will ensure that the output directory (normally, <<>>), is

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/single/filtering-some-distribution-files.apt.vm
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/single/filtering-some-distribution-files.apt.vm?rev=1753082=1753081=1753082=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/single/filtering-some-distribution-files.apt.vm
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/single/filtering-some-distribution-files.apt.vm
 Sun Jul 17 15:11:06 2016
@@ -182,5 +182,5 @@ variable2=value2
   To generate the distribution assembly, we then use:
 
 +-
-mvn assembly:assembly
+mvn clean assembly:single
 +-

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/single/using-repositories.apt.vm
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/single/using-repositories.apt.vm?rev=1753082=1753081=1753082=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/single/using-repositories.apt.vm
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/examples/single/using-repositories.apt.vm
 Sun Jul 17 15:11:06 2016
@@ -95,7 +95,7 @@ Using Repositories
   The assembly archive is then created using:
 
 +-
-mvn assembly:assembly
+mvn clean assembly:single
 +-
 
   The generated archive can be extracted to an internal repository so users of

svn commit: r1753135 - in /maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features: simple-dir-format/ space & special char/

[gboue]

Author: gboue
Date: Sun Jul 17 23:19:50 2016
New Revision: 1753135

URL: http://svn.apache.org/viewvc?rev=1753135=rev
Log:
Revert r1753099: this IT test is used to check for spaces and other special 
chars.

Added:

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/space 
& special char/
  - copied from r1753098, 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/this & 
that/
Removed:

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/simple-dir-format/

svn commit: r1753099 - in /maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features: simple-dir-format/ this & that/

[gboue]

Author: gboue
Date: Sun Jul 17 18:34:01 2016
New Revision: 1753099

URL: http://svn.apache.org/viewvc?rev=1753099=rev
Log:
Renamed "this & that" IT test folder to "simple-dir-format", as this breaks the 
ITs when run on Windows: the '&' gets interpreted and Windows tries to launch 
the "that" program.

Added:

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/simple-dir-format/
  - copied from r1753098, 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/this & 
that/
Removed:

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/this & 
that/

svn commit: r1755406 - /maven/plugins/trunk/maven-deploy-plugin/src/it/MDEPLOY-181/

[gboue]

Author: gboue
Date: Sat Aug  6 18:38:21 2016
New Revision: 1755406

URL: http://svn.apache.org/viewvc?rev=1755406=rev
Log:
[MDEPLOY-181] DeployAtEnd cannot be overwritten from command line using 
-DdeployAtEnd=false

This issue is closed as "Not A Problem", removing the IT introduced in 
r1620139. It is expected for the parameters configured in the POM to have 
precedence over the ones from the default configuration.

Removed:
maven/plugins/trunk/maven-deploy-plugin/src/it/MDEPLOY-181/

svn commit: r1755441 - in /maven/plugins/trunk/maven-deploy-plugin/src: it/3rd-party-pom-with-extras/ it/MDEPLOY-212/ it/MDEPLOY-212/src/ it/MDEPLOY-212/src/main/ it/MDEPLOY-212/src/main/java/ it/MDEP

[gboue]

Author: gboue
Date: Sun Aug  7 14:14:46 2016
New Revision: 1755441

URL: http://svn.apache.org/viewvc?rev=1755441=rev
Log:
[MDEPLOY-212] deploy-file incorrectly deploys attached artifacts
[MDEPLOY-213] deploy-file replaces main artifact of a project

The deploy-file Mojo now creates a new MavenProject and attaches to this 
project all artifacts to deploy. This also fixes the use of deprecated code 
from ArtifactFactory.

Added:
maven/plugins/trunk/maven-deploy-plugin/src/it/3rd-party-pom-with-extras/

maven/plugins/trunk/maven-deploy-plugin/src/it/3rd-party-pom-with-extras/invoker.properties
   (with props)

maven/plugins/trunk/maven-deploy-plugin/src/it/3rd-party-pom-with-extras/pom.xml
   (with props)

maven/plugins/trunk/maven-deploy-plugin/src/it/3rd-party-pom-with-extras/test-0.1-src.tar.gz
   (with props)

maven/plugins/trunk/maven-deploy-plugin/src/it/3rd-party-pom-with-extras/test-0.1.pom
   (with props)

maven/plugins/trunk/maven-deploy-plugin/src/it/3rd-party-pom-with-extras/test-0.1.tar.gz
   (with props)

maven/plugins/trunk/maven-deploy-plugin/src/it/3rd-party-pom-with-extras/test-0.1.zip
   (with props)

maven/plugins/trunk/maven-deploy-plugin/src/it/3rd-party-pom-with-extras/test.properties
   (with props)

maven/plugins/trunk/maven-deploy-plugin/src/it/3rd-party-pom-with-extras/verify.bsh
   (with props)
maven/plugins/trunk/maven-deploy-plugin/src/it/MDEPLOY-212/

maven/plugins/trunk/maven-deploy-plugin/src/it/MDEPLOY-212/invoker.properties   
(with props)
maven/plugins/trunk/maven-deploy-plugin/src/it/MDEPLOY-212/pom.xml   (with 
props)
maven/plugins/trunk/maven-deploy-plugin/src/it/MDEPLOY-212/src/
maven/plugins/trunk/maven-deploy-plugin/src/it/MDEPLOY-212/src/main/
maven/plugins/trunk/maven-deploy-plugin/src/it/MDEPLOY-212/src/main/java/

maven/plugins/trunk/maven-deploy-plugin/src/it/MDEPLOY-212/src/main/java/org/

maven/plugins/trunk/maven-deploy-plugin/src/it/MDEPLOY-212/src/main/java/org/apache/

maven/plugins/trunk/maven-deploy-plugin/src/it/MDEPLOY-212/src/main/java/org/apache/maven/

maven/plugins/trunk/maven-deploy-plugin/src/it/MDEPLOY-212/src/main/java/org/apache/maven/test/

maven/plugins/trunk/maven-deploy-plugin/src/it/MDEPLOY-212/src/main/java/org/apache/maven/test/HelloWorld.java
   (with props)
maven/plugins/trunk/maven-deploy-plugin/src/it/MDEPLOY-212/test-1.0.tar.gz  
 (with props)
maven/plugins/trunk/maven-deploy-plugin/src/it/MDEPLOY-212/test-1.0.zip   
(with props)
maven/plugins/trunk/maven-deploy-plugin/src/it/MDEPLOY-212/verify.bsh   
(with props)
maven/plugins/trunk/maven-deploy-plugin/src/it/MDEPLOY-213/

maven/plugins/trunk/maven-deploy-plugin/src/it/MDEPLOY-213/invoker.properties   
(with props)
maven/plugins/trunk/maven-deploy-plugin/src/it/MDEPLOY-213/pom.xml   (with 
props)
maven/plugins/trunk/maven-deploy-plugin/src/it/MDEPLOY-213/src/
maven/plugins/trunk/maven-deploy-plugin/src/it/MDEPLOY-213/src/main/
maven/plugins/trunk/maven-deploy-plugin/src/it/MDEPLOY-213/src/main/java/

maven/plugins/trunk/maven-deploy-plugin/src/it/MDEPLOY-213/src/main/java/org/

maven/plugins/trunk/maven-deploy-plugin/src/it/MDEPLOY-213/src/main/java/org/apache/

maven/plugins/trunk/maven-deploy-plugin/src/it/MDEPLOY-213/src/main/java/org/apache/maven/

maven/plugins/trunk/maven-deploy-plugin/src/it/MDEPLOY-213/src/main/java/org/apache/maven/test/

maven/plugins/trunk/maven-deploy-plugin/src/it/MDEPLOY-213/src/main/java/org/apache/maven/test/HelloWorld.java
   (with props)
maven/plugins/trunk/maven-deploy-plugin/src/it/MDEPLOY-213/test-1.0.tar.gz  
 (with props)
maven/plugins/trunk/maven-deploy-plugin/src/it/MDEPLOY-213/test-1.0.zip   
(with props)
maven/plugins/trunk/maven-deploy-plugin/src/it/MDEPLOY-213/verify.bsh   
(with props)
Modified:

maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugins/deploy/DeployFileMojo.java

maven/plugins/trunk/maven-deploy-plugin/src/test/java/org/apache/maven/plugins/deploy/DeployFileMojoTest.java

Added: 
maven/plugins/trunk/maven-deploy-plugin/src/it/3rd-party-pom-with-extras/invoker.properties
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/it/3rd-party-pom-with-extras/invoker.properties?rev=1755441=auto
==
--- 
maven/plugins/trunk/maven-deploy-plugin/src/it/3rd-party-pom-with-extras/invoker.properties
 (added)
+++ 
maven/plugins/trunk/maven-deploy-plugin/src/it/3rd-party-pom-with-extras/invoker.properties
 Sun Aug  7 14:14:46 2016
@@ -0,0 +1,18 @@
+# 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&q

svn commit: r1756544 - in /maven/plugins/trunk/maven-dependency-plugin: ./ src/it/projects/purge-local-repository-without-pom/ src/main/java/org/apache/maven/plugins/dependency/

[gboue]

Author: gboue
Date: Tue Aug 16 19:16:32 2016
New Revision: 1756544

URL: http://svn.apache.org/viewvc?rev=1756544=rev
Log:
[MDEP-537] Goal purge-local-repository requires a Maven project, even with 
manualIncludes

The goal purge-local-repository does not require a Maven project to be 
executed, since it can be configured to remove dependencies given manually.

Added:

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-without-pom/

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-without-pom/invoker.properties
   (with props)

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-without-pom/setup.bsh
   (with props)

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-without-pom/test.properties
   (with props)

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-without-pom/verify.bsh
   (with props)
Modified:
maven/plugins/trunk/maven-dependency-plugin/pom.xml

maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/PurgeLocalRepositoryMojo.java

Modified: maven/plugins/trunk/maven-dependency-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/pom.xml?rev=1756544=1756543=1756544=diff
==
--- maven/plugins/trunk/maven-dependency-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-dependency-plugin/pom.xml Tue Aug 16 19:16:32 2016
@@ -367,6 +367,10 @@ under the License.
 
 tree-verbose/pom.xml
   
+  
+*/pom.xml
+purge-local-repository-without-pom
+  
   
   src/it/mrm/settings.xml
   

Added: 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-without-pom/invoker.properties
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-without-pom/invoker.properties?rev=1756544=auto
==
--- 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-without-pom/invoker.properties
 (added)
+++ 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-without-pom/invoker.properties
 Tue Aug 16 19:16:32 2016
@@ -0,0 +1,18 @@
+# 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 = 
${project.groupId}:${project.artifactId}:${project.version}:purge-local-repository

Propchange: 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-without-pom/invoker.properties
--
svn:eol-style = native

Propchange: 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-without-pom/invoker.properties
--
svn:keywords = Author Date Id Revision

Added: 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-without-pom/setup.bsh
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-without-pom/setup.bsh?rev=1756544=auto
==
--- 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-without-pom/setup.bsh
 (added)
+++ 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/purge-local-repository-without-pom/setup.bsh
 Tue Aug 16 19:16:32 2016
@@ -0,0 +1,29 @@
+/*
+ * 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 ma

maven git commit: [MNG-6105] properties.internal.SystemProperties.addSystemProperties() is not really thread-safe

[gboue]

Repository: maven
Updated Branches:
  refs/heads/MNG-6105 [created] 39c1f80cc


[MNG-6105] properties.internal.SystemProperties.addSystemProperties() is not 
really thread-safe

Refactoring the current code setting system properties to synchronize correctly 
on the given ones: avoids ConcurrentModificationException and 
NullPointerException if the properties is modified by another thread.


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

Branch: refs/heads/MNG-6105
Commit: 39c1f80cc4c23e19f236f8a0fa493aa3493cd070
Parents: 733eedc
Author: Guillaume Boué 
Authored: Sun Oct 16 01:40:46 2016 +0200
Committer: Guillaume Boué 
Committed: Tue Jan 24 19:55:30 2017 +0100

--
 .../internal/MavenRepositorySystemUtils.java| 14 +
 .../execution/DefaultMavenExecutionRequest.java |  4 +--
 .../project/DefaultProjectBuildingRequest.java  |  7 ++---
 .../properties/internal/SystemProperties.java   | 30 ++--
 .../building/DefaultModelBuildingRequest.java   |  5 +++-
 .../DefaultSettingsBuildingRequest.java |  7 ++---
 6 files changed, 42 insertions(+), 25 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/39c1f80c/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java
--
diff --git 
a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java
 
b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java
index 5b240ef..1b11cb3 100644
--- 
a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java
+++ 
b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java
@@ -126,14 +126,18 @@ public final class MavenRepositorySystemUtils
 
 session.setArtifactDescriptorPolicy( new 
SimpleArtifactDescriptorPolicy( true, true ) );
 
+final Properties systemProperties = new Properties();
+
 // MNG-5670 guard against ConcurrentModificationException
-Properties sysProps = new Properties();
-for ( String key : System.getProperties().stringPropertyNames() )
+// MNG-6053 guard against key without value
+Properties sysProp = System.getProperties();
+synchronized ( sysProp )
 {
-sysProps.put( key, System.getProperty( key ) );
+systemProperties.putAll( sysProp );
 }
-session.setSystemProperties( sysProps );
-session.setConfigProperties( sysProps );
+
+session.setSystemProperties( systemProperties );
+session.setConfigProperties( systemProperties );
 
 return session;
 }

http://git-wip-us.apache.org/repos/asf/maven/blob/39c1f80c/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
 
b/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
index 71a6894..d67061f 100644
--- 
a/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
+++ 
b/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
@@ -33,6 +33,7 @@ import org.apache.maven.eventspy.internal.EventSpyDispatcher;
 import org.apache.maven.model.Profile;
 import org.apache.maven.project.DefaultProjectBuildingRequest;
 import org.apache.maven.project.ProjectBuildingRequest;
+import org.apache.maven.properties.internal.SystemProperties;
 import org.apache.maven.settings.Mirror;
 import org.apache.maven.settings.Proxy;
 import org.apache.maven.settings.Server;
@@ -535,8 +536,7 @@ public class DefaultMavenExecutionRequest
 {
 if ( properties != null )
 {
-this.systemProperties = new Properties();
-this.systemProperties.putAll( properties );
+this.systemProperties = SystemProperties.copyProperties( 
properties );
 }
 else
 {

http://git-wip-us.apache.org/repos/asf/maven/blob/39c1f80c/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java
 
b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java
index f439240..f1b271b 

maven git commit: [MNG-6105] properties.internal.SystemProperties.addSystemProperties() is not really thread-safe

[gboue]

Repository: maven
Updated Branches:
  refs/heads/master 1e2a80ece -> 5b4b8bd94


[MNG-6105] properties.internal.SystemProperties.addSystemProperties() is not 
really thread-safe

Refactoring the current code setting system properties to synchronize correctly 
on the given ones: avoids ConcurrentModificationException and 
NullPointerException if the properties is modified by another thread.


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

Branch: refs/heads/master
Commit: 5b4b8bd94c87afd2a1527d6a860e9673bdaf4a22
Parents: 1e2a80e
Author: Guillaume Boué 
Authored: Sun Oct 16 01:40:46 2016 +0200
Committer: Guillaume Boué 
Committed: Sat Jan 28 14:07:59 2017 +0100

--
 .../internal/MavenRepositorySystemUtils.java| 14 +
 .../execution/DefaultMavenExecutionRequest.java |  4 +--
 .../project/DefaultProjectBuildingRequest.java  |  7 ++---
 .../properties/internal/SystemProperties.java   | 30 ++--
 .../building/DefaultModelBuildingRequest.java   |  5 +++-
 .../DefaultSettingsBuildingRequest.java |  7 ++---
 6 files changed, 42 insertions(+), 25 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/5b4b8bd9/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java
--
diff --git 
a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java
 
b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java
index 5b240ef..1b11cb3 100644
--- 
a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java
+++ 
b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java
@@ -126,14 +126,18 @@ public final class MavenRepositorySystemUtils
 
 session.setArtifactDescriptorPolicy( new 
SimpleArtifactDescriptorPolicy( true, true ) );
 
+final Properties systemProperties = new Properties();
+
 // MNG-5670 guard against ConcurrentModificationException
-Properties sysProps = new Properties();
-for ( String key : System.getProperties().stringPropertyNames() )
+// MNG-6053 guard against key without value
+Properties sysProp = System.getProperties();
+synchronized ( sysProp )
 {
-sysProps.put( key, System.getProperty( key ) );
+systemProperties.putAll( sysProp );
 }
-session.setSystemProperties( sysProps );
-session.setConfigProperties( sysProps );
+
+session.setSystemProperties( systemProperties );
+session.setConfigProperties( systemProperties );
 
 return session;
 }

http://git-wip-us.apache.org/repos/asf/maven/blob/5b4b8bd9/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
 
b/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
index 71a6894..d67061f 100644
--- 
a/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
+++ 
b/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
@@ -33,6 +33,7 @@ import org.apache.maven.eventspy.internal.EventSpyDispatcher;
 import org.apache.maven.model.Profile;
 import org.apache.maven.project.DefaultProjectBuildingRequest;
 import org.apache.maven.project.ProjectBuildingRequest;
+import org.apache.maven.properties.internal.SystemProperties;
 import org.apache.maven.settings.Mirror;
 import org.apache.maven.settings.Proxy;
 import org.apache.maven.settings.Server;
@@ -535,8 +536,7 @@ public class DefaultMavenExecutionRequest
 {
 if ( properties != null )
 {
-this.systemProperties = new Properties();
-this.systemProperties.putAll( properties );
+this.systemProperties = SystemProperties.copyProperties( 
properties );
 }
 else
 {

http://git-wip-us.apache.org/repos/asf/maven/blob/5b4b8bd9/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java
 
b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java
index f439240..f1b271b 

[maven] Git Push Summary

[gboue]

Repository: maven
Updated Branches:
  refs/heads/MNG-6105 [deleted] 39c1f80cc

svn commit: r1780613 - in /maven/plugins/trunk/maven-checkstyle-plugin/src: main/java/org/apache/maven/plugins/checkstyle/ site/apt/examples/ test/plugin-configs/

[gboue]

Author: gboue
Date: Fri Jan 27 21:29:10 2017
New Revision: 1780613

URL: http://svn.apache.org/viewvc?rev=1780613=rev
Log:
[MCHECKSTYLE-275] remove old deprecated parameters from report

Now that we're moving to the next major 3.0.0, the old deprecated parameters 
from CheckstyleReport can be removed. The parameter packageNamesLocation, 
although not officially deprecated, doesn't do anything since the upgrade to 
Checkstyle 5.0 (circa 2009 in version 2.4 with r825243 in CHECKSTYLE-105) which 
removed that support, and can safely be removed as well.

Modified:

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

maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/examples/custom-developed-checkstyle.apt.vm

maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/custom-plugin-config.xml

maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/dep-resolution-exception-plugin-config.xml

maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/fail-on-error-plugin-config.xml

maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/min-plugin-config.xml

maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/no-files-plugin-config.xml

maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/no-rules-plugin-config.xml

maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/no-severity-plugin-config.xml

maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/no-source-plugin-config.xml

maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/test-source-directory-plugin-config.xml

maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/useFile-plugin-config.xml

Modified: 
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleReport.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleReport.java?rev=1780613=1780612=1780613=diff
==
--- 
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleReport.java
 (original)
+++ 
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleReport.java
 Fri Jan 27 21:29:10 2017
@@ -20,21 +20,15 @@ package org.apache.maven.plugins.checkst
  */
 
 import java.io.File;
-import java.net.URL;
-import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
-import java.util.Map;
 
 import org.apache.maven.model.Resource;
 import org.apache.maven.plugins.annotations.Mojo;
-import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.plugins.annotations.ResolutionScope;
 import org.apache.maven.plugins.checkstyle.exec.CheckstyleExecutorRequest;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.reporting.MavenReportException;
-import org.codehaus.plexus.util.StringUtils;
 
 /**
  * A reporting task that performs Checkstyle analysis and generates an HTML
@@ -49,96 +43,6 @@ import org.codehaus.plexus.util.StringUt
 public class CheckstyleReport
 extends AbstractCheckstyleReport
 {
-/**
- * @deprecated Remove with format parameter.
- */
-private static final Map<String, String> FORMAT_TO_CONFIG_LOCATION;
-
-static
-{
-Map<String, String> fmt2Cfg = new HashMap<>();
-
-fmt2Cfg.put( "sun", "sun_checks.xml" );
-
-FORMAT_TO_CONFIG_LOCATION = Collections.unmodifiableMap( fmt2Cfg );
-}
-
-/**
- * Specifies what predefined check set to use. Available sets are "sun" 
(for
- * the Sun coding conventions), and "maven".
- *
- * @deprecated Use configLocation instead.
- */
-@Parameter( defaultValue = "sun" )
-private String format;
-
-/**
- * Specifies the location of the Checkstyle properties file that will be 
used to
- * check the source.
- *
- * @deprecated Use propertiesLocation instead.
- */
-@Parameter
-private File propertiesFile;
-
-/**
- * Specifies the URL of the Checkstyle properties that will be used to 
check
- * the source.
- *
- * @deprecated Use propertiesLocation instead.
- */
-@Parameter
-private URL propertiesURL;
-
-/**
- * Specifies the location of the License file (a.k.a. the header file) that
- * is used by Checkstyle to verify that source code has the correct
- * license header.
- *
- * @deprecated Use headerLocation instead.
- */
-@Parameter( defaultValue = "${basedir}/LICENSE.txt" )
-private File headerFile;
-
-/**
- * Specifies the location of the suppre

svn commit: r1780625 - /maven/plugins/trunk/maven-dependency-plugin/pom.xml

[gboue]

Author: gboue
Date: Sat Jan 28 01:11:07 2017
New Revision: 1780625

URL: http://svn.apache.org/viewvc?rev=1780625=rev
Log:
The list-repositories IT is broken with Maven 3.0.x because of a downstream bug 
in maven-artifact-trasnfer 0.9.0. Using the latest snapshot that fixes it 
(MSHARED-602).

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

Modified: maven/plugins/trunk/maven-dependency-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/pom.xml?rev=1780625=1780624=1780625=diff
==
--- maven/plugins/trunk/maven-dependency-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-dependency-plugin/pom.xml Sat Jan 28 01:11:07 2017
@@ -222,7 +222,7 @@ under the License.
 
   org.apache.maven.shared
   maven-artifact-transfer
-  0.9.0
+  0.9.1-SNAPSHOT
 
 
 

svn commit: r1780622 - in /maven/plugins/trunk/maven-checkstyle-plugin/src: it/MCHECKSTYLE-260-sourceDirectories/ it/MCHECKSTYLE-260-sourceDirectories/child-a/ it/MCHECKSTYLE-260-sourceDirectories/chi

[gboue]

Author: gboue
Date: Sat Jan 28 00:50:38 2017
New Revision: 1780622

URL: http://svn.apache.org/viewvc?rev=1780622=rev
Log:
[MCHECKSTYLE-260] sourceDirectories property is ignored in multi-modules

Because of a bug in Sisu, plugin parameters of type Collection or array are 
always using their default value if it is specified (MNG-5440). This was fixed 
in 3.3.9, but to be able to have compatibility for all Maven 3.x versions, we 
have to handle the default value manually, instead of relying on @Parameter's 
defaultValue mechanism.

Updating the MavenProject stub tests so that they return meaningful values for 
compileSourceRoot and testCompileSourceRoot (thus getting rid of the specific 
code inside the actual Mojo checking for null when that cannot happen on a real 
project).

Added:

maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-260-sourceDirectories/

maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-260-sourceDirectories/child-a/

maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-260-sourceDirectories/child-a/pom.xml
   (with props)

maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-260-sourceDirectories/child-a/src/

maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-260-sourceDirectories/child-a/src/generated/

maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-260-sourceDirectories/child-a/src/generated/java/

maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-260-sourceDirectories/child-a/src/generated/java/org/

maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-260-sourceDirectories/child-a/src/generated/java/org/MyClass.java
   (with props)

maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-260-sourceDirectories/child-b/

maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-260-sourceDirectories/child-b/pom.xml
   (with props)

maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-260-sourceDirectories/child-b/src/

maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-260-sourceDirectories/child-b/src/generated/

maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-260-sourceDirectories/child-b/src/generated/java/

maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-260-sourceDirectories/child-b/src/generated/java/org/

maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-260-sourceDirectories/child-b/src/generated/java/org/MyClass.java
   (with props)

maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-260-sourceDirectories/invoker.properties
   (with props)

maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-260-sourceDirectories/pom.xml
   (with props)

maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-260-sourceDirectories/verify.groovy
   (with props)

maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-260-testSourceDirectories/

maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-260-testSourceDirectories/child-a/

maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-260-testSourceDirectories/child-a/pom.xml
   (with props)

maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-260-testSourceDirectories/child-a/src/

maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-260-testSourceDirectories/child-a/src/generated/

maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-260-testSourceDirectories/child-a/src/generated/java/

maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-260-testSourceDirectories/child-a/src/generated/java/org/

maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-260-testSourceDirectories/child-a/src/generated/java/org/MyClass.java
   (with props)

maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-260-testSourceDirectories/child-b/

maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-260-testSourceDirectories/child-b/pom.xml
   (with props)

maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-260-testSourceDirectories/child-b/src/

maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-260-testSourceDirectories/child-b/src/generated/

maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-260-testSourceDirectories/child-b/src/generated/java/

maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-260-testSourceDirectories/child-b/src/generated/java/org/

maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-260-testSourceDirectories/child-b/src/generated/java/org/MyClass.java
   (with props)

maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-260-testSourceDirectories/invoker.properties
   (with props)

maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-260-testSourceDirectories/pom.xml
   (with props)

maven/plugins/trunk/maven-checkstyle

svn commit: r1780608 - in /maven/plugins/trunk/maven-checkstyle-plugin/src/it: check-tests-only/verify.groovy inlinerules/verify.groovy

[gboue]

Author: gboue
Date: Fri Jan 27 20:37:20 2017
New Revision: 1780608

URL: http://svn.apache.org/viewvc?rev=1780608=rev
Log:
Improving current ITs, that are testing the failure of the build, by checking 
what was the actual cause of the failure. This makes sure the build didn't fail 
for another reason which isn't the one intended.

Added:

maven/plugins/trunk/maven-checkstyle-plugin/src/it/check-tests-only/verify.groovy
   (with props)
Modified:
maven/plugins/trunk/maven-checkstyle-plugin/src/it/inlinerules/verify.groovy

Added: 
maven/plugins/trunk/maven-checkstyle-plugin/src/it/check-tests-only/verify.groovy
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/it/check-tests-only/verify.groovy?rev=1780608=auto
==
--- 
maven/plugins/trunk/maven-checkstyle-plugin/src/it/check-tests-only/verify.groovy
 (added)
+++ 
maven/plugins/trunk/maven-checkstyle-plugin/src/it/check-tests-only/verify.groovy
 Fri Jan 27 20:37:20 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.
+ */
+def buildLog = new File( basedir, 'build.log' )
+
+assert buildLog.text =~ /There are \d+ errors reported by Checkstyle/

Propchange: 
maven/plugins/trunk/maven-checkstyle-plugin/src/it/check-tests-only/verify.groovy
--
svn:eol-style = native

Propchange: 
maven/plugins/trunk/maven-checkstyle-plugin/src/it/check-tests-only/verify.groovy
--
svn:keywords = Author Date Id Revision

Modified: 
maven/plugins/trunk/maven-checkstyle-plugin/src/it/inlinerules/verify.groovy
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/it/inlinerules/verify.groovy?rev=1780608=1780607=1780608=diff
==
--- 
maven/plugins/trunk/maven-checkstyle-plugin/src/it/inlinerules/verify.groovy 
(original)
+++ 
maven/plugins/trunk/maven-checkstyle-plugin/src/it/inlinerules/verify.groovy 
Fri Jan 27 20:37:20 2017
@@ -20,5 +20,7 @@ assert new File(basedir, 'target/checkst
 assert new File(basedir, 'target/checkstyle-header.txt').exists();
 assert new File(basedir, 'target/checkstyle-result.xml').exists();
 
+def buildLog = new File( basedir, 'build.log' )
+assert buildLog.text =~ /There are \d+ errors reported by Checkstyle/
 
 return true;

svn commit: r1784411 [2/2] - in /maven/plugins/trunk/maven-changes-plugin: ./ src/main/java/org/apache/maven/plugin/ src/main/java/org/apache/maven/plugins/ src/main/java/org/apache/maven/plugins/anno

[gboue]

Modified: 
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/jira/JiraHelper.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/jira/JiraHelper.java?rev=1784411=1784410=1784411=diff
==
--- 
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/jira/JiraHelper.java
 (original)
+++ 
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/jira/JiraHelper.java
 Sat Feb 25 22:36:31 2017
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.jira;
+package org.apache.maven.plugins.jira;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -23,12 +23,10 @@ import java.text.NumberFormat;
 import java.text.ParsePosition;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.StringTokenizer;
 
 import org.apache.commons.httpclient.HttpClient;
 import org.apache.commons.httpclient.methods.GetMethod;
 import org.apache.maven.plugin.logging.Log;
-import org.apache.maven.wagon.proxy.ProxyInfo;
 
 /**
  * A helper class with common JIRA related functionality.
@@ -144,47 +142,6 @@ public class JiraHelper
 return jiraId;
 }
 
-/**
- * Check if the specified host is in the list of non proxy hosts.
- * 
- * Method copied from org.apache.maven.wagon.proxy.ProxyUtils. Can be 
deleted when maven-changes-plugin references a
- * more recent version of maven-project
- *
- * @param proxy the proxy info object contains set of properties.
- * @param targetHost the target hostname
- * @return true if the hostname is in the list of non proxy hosts, false 
otherwise.
- */
-public static boolean validateNonProxyHosts( ProxyInfo proxy, String 
targetHost )
-{
-String tHost = targetHost;
-if ( tHost == null )
-{
-tHost = "";
-}
-if ( proxy == null )
-{
-return false;
-}
-String nonProxyHosts = proxy.getNonProxyHosts();
-if ( nonProxyHosts == null )
-{
-return false;
-}
-
-StringTokenizer tokenizer = new StringTokenizer( nonProxyHosts, "|" );
-
-while ( tokenizer.hasMoreTokens() )
-{
-String pattern = tokenizer.nextToken();
-pattern = pattern.replaceAll( "\\.", "." ).replaceAll( "\\*", 
".*" );
-if ( tHost.matches( pattern ) )
-{
-return true;
-}
-}
-return false;
-}
-
 private JiraHelper()
 {
 // utility class
@@ -237,6 +194,8 @@ public class JiraHelper
 }
 
 /**
+ * @param url URL.
+ * @return the base URL.
  * @since 2.8
  */
 public static String getBaseUrl( String url )

Modified: 
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/jira/JiraMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/jira/JiraMojo.java?rev=1784411=1784410=1784411=diff
==
--- 
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/jira/JiraMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/jira/JiraMojo.java
 Sat Feb 25 22:36:31 2017
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.jira;
+package org.apache.maven.plugins.jira;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -27,14 +27,14 @@ import java.util.Map;
 import java.util.ResourceBundle;
 
 import org.apache.commons.lang.StringUtils;
-import org.apache.maven.plugin.changes.AbstractChangesReport;
-import org.apache.maven.plugin.changes.ProjectUtils;
-import org.apache.maven.plugin.issues.Issue;
-import org.apache.maven.plugin.issues.IssueUtils;
-import org.apache.maven.plugin.issues.IssuesReportGenerator;
-import org.apache.maven.plugin.issues.IssuesReportHelper;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.plugins.changes.AbstractChangesReport;
+import org.apache.maven.plugins.changes.ProjectUtils;
+import org.apache.maven.plugins.issues.Issue;
+import org.apache.maven.plugins.issues.IssueUtils;
+import org.apache.maven.plugins.issues.IssuesReportGenerator;
+import org.apache.maven.plugins.issues.IssuesReportHelper;
 import org.apache.maven.reporting.MavenReportException;
 import org.apache.maven.settings.Settings;
 

Modified: 
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/jira/JiraQueryBuilder.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/jira/JiraQueryBuilder.java?rev=1784411=1784410=1784411=diff

svn commit: r1784411 [1/2] - in /maven/plugins/trunk/maven-changes-plugin: ./ src/main/java/org/apache/maven/plugin/ src/main/java/org/apache/maven/plugins/ src/main/java/org/apache/maven/plugins/anno

[gboue]

Author: gboue
Date: Sat Feb 25 22:36:31 2017
New Revision: 1784411

URL: http://svn.apache.org/viewvc?rev=1784411=rev
Log:
[MCHANGES-381] Migrate plugin to Maven 3.0

 * Replacing usage of deprecated APIs in favor of maven-artifact-transfer
 * Renaming the packages to org.apache.maven.plugins
 * Failing the build if any deprecated parameters are used, in preparation of 
their complete removal
 * Removing Maven 2 specific code
 * Fixing Javadoc comments
 * Removing the use of raw types where possible

Added:

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

maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/announcement/

maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/announcement/AbstractAnnouncementMojo.java
  - copied, changed from r1781298, 
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AbstractAnnouncementMojo.java

maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/announcement/AnnouncementMailMojo.java
  - copied, changed from r1781298, 
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMailMojo.java

maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/announcement/AnnouncementMojo.java
  - copied, changed from r1781298, 
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java

maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/announcement/MailSender.java
  - copied, changed from r1781298, 
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/MailSender.java

maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/announcement/mailsender/
  - copied from r1784410, 
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/mailsender/

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

maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/AbstractChangesMojo.java
  - copied, changed from r1781298, 
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/AbstractChangesMojo.java

maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/AbstractChangesReport.java
  - copied, changed from r1781298, 
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/AbstractChangesReport.java

maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/ChangesCheckMojo.java
  - copied, changed from r1781298, 
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesCheckMojo.java

maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/ChangesMojo.java
  - copied, changed from r1781298, 
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesMojo.java

maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/ChangesReportGenerator.java
  - copied, changed from r1781298, 
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java

maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/ChangesValidatorMojo.java
  - copied, changed from r1781298, 
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesValidatorMojo.java

maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/ChangesXML.java
  - copied, changed from r1781298, 
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesXML.java

maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/ChangesXMLRuntimeException.java
  - copied, changed from r1784410, 
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesXMLRuntimeException.java

maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/FeedGenerator.java
  - copied, changed from r1781298, 
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/FeedGenerator.java

maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/IssueAdapter.java
  - copied, changed from r1781298, 
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/IssueAdapter.java

maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/changes/IssueType.java
  - copied, changed from r1781298, 
maven/plugins/trunk/maven-changes-plugin/src

svn commit: r1782495 - in /maven/shared/trunk/maven-reporting-exec/src/it/pluginManagement_dependencies: pom.xml verify.groovy

[gboue]

Author: gboue
Date: Fri Feb 10 18:31:28 2017
New Revision: 1782495

URL: http://svn.apache.org/viewvc?rev=1782495=rev
Log:
[MSHARED-616] Dependencies inside pluginManagement are not taken into account 
in reporting

Fixing the tests so that they run with Java **6**, 7 and 8...

Modified:

maven/shared/trunk/maven-reporting-exec/src/it/pluginManagement_dependencies/pom.xml

maven/shared/trunk/maven-reporting-exec/src/it/pluginManagement_dependencies/verify.groovy

Modified: 
maven/shared/trunk/maven-reporting-exec/src/it/pluginManagement_dependencies/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-reporting-exec/src/it/pluginManagement_dependencies/pom.xml?rev=1782495=1782494=1782495=diff
==
--- 
maven/shared/trunk/maven-reporting-exec/src/it/pluginManagement_dependencies/pom.xml
 (original)
+++ 
maven/shared/trunk/maven-reporting-exec/src/it/pluginManagement_dependencies/pom.xml
 Fri Feb 10 18:31:28 2017
@@ -32,12 +32,12 @@ under the License.
   
 
   maven-checkstyle-plugin
-  2.17
+  2.10
   
 
   com.puppycrawl.tools
   checkstyle
-  6.18
+  5.8
 
   
 

Modified: 
maven/shared/trunk/maven-reporting-exec/src/it/pluginManagement_dependencies/verify.groovy
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-reporting-exec/src/it/pluginManagement_dependencies/verify.groovy?rev=1782495=1782494=1782495=diff
==
--- 
maven/shared/trunk/maven-reporting-exec/src/it/pluginManagement_dependencies/verify.groovy
 (original)
+++ 
maven/shared/trunk/maven-reporting-exec/src/it/pluginManagement_dependencies/verify.groovy
 Fri Feb 10 18:31:28 2017
@@ -20,7 +20,7 @@
 
 content = new File( basedir, 'build.log' ).text;
 
-assert !content.contains( 'com.puppycrawl.tools:checkstyle:jar:6.11.2' );
-assert content.contains( 'com.puppycrawl.tools:checkstyle:jar:6.18' );
+assert !content.contains( 'com.puppycrawl.tools:checkstyle:jar:5.6' );
+assert content.contains( 'com.puppycrawl.tools:checkstyle:jar:5.8' );
 
 return true;
\ No newline at end of file

maven git commit: [MNG-6117] ${session.parallel} not correctly set

[gboue]

Repository: maven
Updated Branches:
  refs/heads/master c6c5192d4 -> d413296cf


[MNG-6117] ${session.parallel} not correctly set

MultiThreadedBuilder must set parallel to true when it's using more than
1 thread to build: i.e. a degree of concurrency greater than 1 (-T) and
more than 1 project to build. Since each ProjectSegment works on a
cloned session instance (see
BuildListCalculator#calculateProjectBuilds), the flag must be also set
on each cloned session.

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

Branch: refs/heads/master
Commit: d413296cf396d4df385d1323843f9464af0c8a3e
Parents: c6c5192
Author: Guillaume Boué 
Authored: Sun Nov 13 22:46:18 2016 +0100
Committer: Guillaume Boué 
Committed: Mon Jan 16 20:29:49 2017 +0100

--
 .../multithreaded/MultiThreadedBuilder.java   | 18 ++
 1 file changed, 14 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/d413296c/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java
 
b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java
index b3e35e0..f0fa2ac 100644
--- 
a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java
+++ 
b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java
@@ -44,7 +44,11 @@ import org.codehaus.plexus.component.annotations.Requirement;
 import org.codehaus.plexus.logging.Logger;
 
 /**
- * Builds the full lifecycle in weave-mode (phase by phase as opposed to 
project-by-project)
+ * Builds the full lifecycle in weave-mode (phase by phase as opposed to 
project-by-project).
+ * 
+ * This builder uses a number of threads equal to the minimum of the degree of 
concurrency (which is the thread count
+ * set with -T on the command-line) and the number of projects to 
build. As such, building a single project
+ * will always result in a sequential build, regardless of the thread count.
  *
  * @since 3.0
  * @author Kristian Rosenvold
@@ -73,9 +77,15 @@ public class MultiThreadedBuilder
List taskSegments, ReactorBuildStatus 
reactorBuildStatus )
 throws ExecutionException, InterruptedException
 {
-ExecutorService executor =
-Executors.newFixedThreadPool( Math.min( 
session.getRequest().getDegreeOfConcurrency(),
-
session.getProjects().size() ), new BuildThreadFactory() );
+int nThreads = Math.min( 
session.getRequest().getDegreeOfConcurrency(), session.getProjects().size() );
+boolean parallel = nThreads >= 2;
+// Propagate the parallel flag to the root session and all of the 
cloned sessions in each project segment
+session.setParallel( parallel );
+for ( ProjectSegment segment : projectBuilds )
+{
+segment.getSession().setParallel( parallel );
+}
+ExecutorService executor = Executors.newFixedThreadPool( nThreads, new 
BuildThreadFactory() );
 CompletionService service = new 
ExecutorCompletionService<>( executor );
 ConcurrencyDependencyGraph analyzer =
 new ConcurrencyDependencyGraph( projectBuilds, 
session.getProjectDependencyGraph() );

[maven] Git Push Summary

[gboue]

Repository: maven
Updated Branches:
  refs/heads/MNG-6117 [deleted] bd98ae6a3

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

[gboue]

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

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

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

Added:

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

[gboue]

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

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

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

Added:

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

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

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

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

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

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

svn commit: r1784412 - in /maven/plugins/trunk/maven-changes-plugin: ./ src/main/java/org/apache/maven/plugins/announcement/ src/main/java/org/apache/maven/plugins/github/ src/test/java/org/apache/mav

[gboue]

Author: gboue
Date: Sun Feb 26 00:33:12 2017
New Revision: 1784412

URL: http://svn.apache.org/viewvc?rev=1784412=rev
Log:
[MCHANGES-379] [REGRESSION] Authentication does not work after Upgrade

Using built-in SettingsDecrypter component to decrypt the password in the 
settings.

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

maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/announcement/AnnouncementMojo.java

maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/github/GitHubDownloader.java

maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/github/GitHubMojo.java

maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugins/github/GitHubDownloaderTestCase.java

Modified: maven/plugins/trunk/maven-changes-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/pom.xml?rev=1784412=1784411=1784412=diff
==
--- maven/plugins/trunk/maven-changes-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-changes-plugin/pom.xml Sun Feb 26 00:33:12 2017
@@ -382,6 +382,12 @@ under the License.
   test
 
 
+  org.mockito
+  mockito-core
+  1.9.5
+  test
+
+
   org.apache.maven.plugin-testing
   maven-plugin-testing-harness
   2.1

Modified: 
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/announcement/AnnouncementMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/announcement/AnnouncementMojo.java?rev=1784412=1784411=1784412=diff
==
--- 
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/announcement/AnnouncementMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/announcement/AnnouncementMojo.java
 Sun Feb 26 00:33:12 2017
@@ -49,6 +49,7 @@ import org.apache.maven.plugins.trac.Tra
 import org.apache.maven.plugins.trac.TracIssueManagmentSystem;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.settings.Settings;
+import org.apache.maven.settings.crypto.SettingsDecrypter;
 import org.apache.velocity.Template;
 import org.apache.velocity.app.VelocityEngine;
 import org.apache.velocity.context.Context;
@@ -235,6 +236,12 @@ public class AnnouncementMojo
 private VelocityComponent velocity;
 
 /**
+ * Component used to decrypt server information.
+ */
+@Component
+private SettingsDecrypter settingsDecrypter;
+
+/**
  * Version of the artifact.
  */
 @Parameter( property = "changes.version", defaultValue = 
"${project.version}", required = true )
@@ -845,7 +852,7 @@ public class AnnouncementMojo
 GitHubDownloader issueDownloader =
 new GitHubDownloader( project, githubAPIScheme, githubAPIPort, 
includeOpenIssues, true );
 
-issueDownloader.configureAuthentication( githubAPIServerId, 
settings, getLog() );
+issueDownloader.configureAuthentication( settingsDecrypter, 
githubAPIServerId, settings, getLog() );
 
 return getReleases( issueDownloader.getIssueList(), new 
GitHubIssueManagementSystem() );
 }

Modified: 
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/github/GitHubDownloader.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/github/GitHubDownloader.java?rev=1784412=1784411=1784412=diff
==
--- 
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/github/GitHubDownloader.java
 (original)
+++ 
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugins/github/GitHubDownloader.java
 Sun Feb 26 00:33:12 2017
@@ -24,7 +24,10 @@ import org.apache.maven.plugins.issues.I
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.settings.Server;
 import org.apache.maven.settings.Settings;
-
+import org.apache.maven.settings.building.SettingsProblem;
+import org.apache.maven.settings.crypto.DefaultSettingsDecryptionRequest;
+import org.apache.maven.settings.crypto.SettingsDecrypter;
+import org.apache.maven.settings.crypto.SettingsDecryptionResult;
 import org.eclipse.egit.github.core.Label;
 import org.eclipse.egit.github.core.client.GitHubClient;
 import org.eclipse.egit.github.core.service.IssueService;
@@ -212,7 +215,8 @@ public class GitHubDownloader
 return issueList;
 }
 
-public void configureAuthentication( String githubAPIServerId, Settings 
settings, Log log )
+public void configureAuthentication( SettingsDecrypter decrypter, String 
githubAPIServerI

svn commit: r1784413 - in /maven/plugins/trunk/maven-javadoc-plugin/src/it: MJAVADOC-181/ MJAVADOC-181/application/src/main/java/app/ MJAVADOC-181/library/module-a/src/main/java/aaa/ MJAVADOC-181/libr

[gboue]

Author: gboue
Date: Sun Feb 26 00:55:45 2017
New Revision: 1784413

URL: http://svn.apache.org/viewvc?rev=1784413=rev
Log:
Fixing the ITs so that the project can be built with JDK 8

 * Self-enclosing elements are disallowed so  should be used instead of 

 * Custom tags cannot start with a dot anymore 
(http://stackoverflow.com/q/28726294)
 * A link to a non-existent class generates an error and not a warning anymore 
(but only with Oracle JDK 8, not OpenJDK 8)

Modified:

maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-181/application/src/main/java/app/App.java

maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-181/library/module-a/src/main/java/aaa/App.java

maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-181/library/module-b/src/main/java/bbb/App.java
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-181/pom.xml

maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-278/src/main/java/com/mycompany/myapp/App.java

maven/plugins/trunk/maven-javadoc-plugin/src/it/dependencySource-3/MJAVADOC-280-3-modA/pom.xml

maven/plugins/trunk/maven-javadoc-plugin/src/it/dependencySource-3/MJAVADOC-280-3-modA/src/main/java/org/apache/maven/plugins/mjavadoc/it/moda/App.java

maven/plugins/trunk/maven-javadoc-plugin/src/it/dependencySource-3/MJAVADOC-280-3-modB/pom.xml

maven/plugins/trunk/maven-javadoc-plugin/src/it/dependencySource-3/MJAVADOC-280-3-modB/src/main/java/org/apache/maven/plugins/mjavadoc/it/modb/App.java

maven/plugins/trunk/maven-javadoc-plugin/src/it/dependencySource-4/MJAVADOC-280-4-projects/MJAVADOC-280-4-modA/src/main/java/org/apache/maven/plugins/mjavadoc/it/moda/App.java

maven/plugins/trunk/maven-javadoc-plugin/src/it/dependencySource-4/MJAVADOC-280-4-projects/MJAVADOC-280-4-modB/src/main/java/org/apache/maven/plugins/mjavadoc/it/modb/App.java

maven/plugins/trunk/maven-javadoc-plugin/src/it/dependencySource-4/MJAVADOC-280-4-projects/pom.xml
maven/plugins/trunk/maven-javadoc-plugin/src/it/detectLinks/pom.xml

Modified: 
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-181/application/src/main/java/app/App.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-181/application/src/main/java/app/App.java?rev=1784413=1784412=1784413=diff
==
--- 
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-181/application/src/main/java/app/App.java
 (original)
+++ 
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-181/application/src/main/java/app/App.java
 Sun Feb 26 00:55:45 2017
@@ -22,10 +22,10 @@ package app;
 /**
  * Hello world class.
  *
- * @.fooA 1st custom javadoc tag.
+ * @m.fooA 1st custom javadoc tag.
  * @author  Me
  * @version 1st
- * @.barA 2nd custom javadoc tag.
+ * @m.barA 2nd custom javadoc tag.
  * @see String#startsWith(String)
  */
 public class App
@@ -33,7 +33,7 @@ public class App
 /**
  * Hello world method.
  *
- * @.fooA 1st custom javadoc tag.
+ * @m.fooA 1st custom javadoc tag.
  * @see String#endsWith(String)
  */
 public static void main( String[] args )

Modified: 
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-181/library/module-a/src/main/java/aaa/App.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-181/library/module-a/src/main/java/aaa/App.java?rev=1784413=1784412=1784413=diff
==
--- 
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-181/library/module-a/src/main/java/aaa/App.java
 (original)
+++ 
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-181/library/module-a/src/main/java/aaa/App.java
 Sun Feb 26 00:55:45 2017
@@ -22,10 +22,10 @@ package aaa;
 /**
  * Hello world class.
  *
- * @.fooA 1st custom javadoc tag.
+ * @m.fooA 1st custom javadoc tag.
  * @author  Me
  * @version 1st
- * @.barA 2nd custom javadoc tag.
+ * @m.barA 2nd custom javadoc tag.
  * @see String#startsWith(String)
  */
 public class App
@@ -33,7 +33,7 @@ public class App
 /**
  * Hello world method.
  *
- * @.fooA 1st custom javadoc tag.
+ * @m.fooA 1st custom javadoc tag.
  * @see String#endsWith(String)
  */
 public static void main( String[] args )

Modified: 
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-181/library/module-b/src/main/java/bbb/App.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-181/library/module-b/src/main/java/bbb/App.java?rev=1784413=1784412=1784413=diff
==
--- 
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-181/library/module-b/src/main/java/bbb/App.java
 (original)
+++ 
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-181/library

svn commit: r1784489 - /maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-262/pom.xml

[gboue]

Author: gboue
Date: Sun Feb 26 23:30:12 2017
New Revision: 1784489

URL: http://svn.apache.org/viewvc?rev=1784489=rev
Log:
Using the correct family name of 'unix' for Unix systems so that the build 
works on BSD as well.

Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-262/pom.xml

Modified: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-262/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-262/pom.xml?rev=1784489=1784488=1784489=diff
==
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-262/pom.xml 
(original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-262/pom.xml Sun 
Feb 26 23:30:12 2017
@@ -73,7 +73,7 @@
   unix
   
 
-  linux
+  unix
 
   
   

svn commit: r1760101 - in /maven/plugins/trunk/maven-war-plugin: ./ src/it/MWAR-396_no-servlet30/ src/it/MWAR-396_servlet30/ src/main/java/org/apache/maven/plugins/war/ src/test/java/org/apache/maven/

[gboue]

Author: gboue
Date: Fri Sep  9 17:49:34 2016
New Revision: 1760101

URL: http://svn.apache.org/viewvc?rev=1760101=rev
Log:
[MWAR-396] Check the existence of the web.xml based on the existence of 
particular classes

In 3.0, the default value of 'failOnMissingWebXml' was changed to be 'false'. 
With this fix, the default value is set to 'null' so that:
 - when the parameter is explicitly specified, it is used;
 - when it is not specified, it defaults to whether or not we can detect a 
Servlet 3.0 or newer environment for the web application. Such an environment 
does not need a web.xml since it can be written in Java.

Added:
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-396_no-servlet30/

maven/plugins/trunk/maven-war-plugin/src/it/MWAR-396_no-servlet30/invoker.properties
   (with props)
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-396_no-servlet30/pom.xml   
(with props)
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-396_servlet30/
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-396_servlet30/pom.xml   
(with props)
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-396_servlet30/verify.bsh   
(with props)

maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/sample_wars/javax.servlet-api-3.0.1.jar
   (with props)
Modified:
maven/plugins/trunk/maven-war-plugin/pom.xml

maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/WarMojo.java

maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/WarMojoTest.java

maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/JarArtifactStub.java

maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/MavenProjectBasicStub.java

Modified: maven/plugins/trunk/maven-war-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/pom.xml?rev=1760101=1760100=1760101=diff
==
--- maven/plugins/trunk/maven-war-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-war-plugin/pom.xml Fri Sep  9 17:49:34 2016
@@ -215,6 +215,7 @@
 
   
 
${project.build.directory}
+
${project.build.outputDirectory}
   
 
   
@@ -251,6 +252,7 @@
 
   
 
javax.servlet:servlet-api:2.4:jar
+
javax.servlet:javax.servlet-api:3.0.1:jar
 
org.apache.struts:struts-core:1.3.9:jar
 
org.codehaus.plexus:plexus-utils:1.4.7:jar:sources
   

Added: 
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-396_no-servlet30/invoker.properties
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/it/MWAR-396_no-servlet30/invoker.properties?rev=1760101=auto
==
--- 
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-396_no-servlet30/invoker.properties
 (added)
+++ 
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-396_no-servlet30/invoker.properties
 Fri Sep  9 17:49:34 2016
@@ -0,0 +1,18 @@
+# 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.buildResult = failure

Propchange: 
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-396_no-servlet30/invoker.properties
--
svn:eol-style = native

Propchange: 
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-396_no-servlet30/invoker.properties
--
svn:keywords = Author Date Id Revision

Added: maven/plugins/trunk/maven-war-plugin/src/it/MWAR-396_no-servlet30/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/it/MWAR-396_no-servlet30/pom.xml?rev=1760101=auto
==
--- maven/plugins/trunk/maven-war-plugin/src/it/MWAR-396_no-servlet30/pom.xml 
(added)
+++ maven/plugins/trunk/maven-war-plugin/src/it/MWAR-396_no-servlet30/pom.xml 
Fri Sep  9 17:49:34 2016
@@ -0,0 +1,66 @@
+
+
+
+
+
+  4.0.0
+
+  org.apache.ma

svn commit: r1763928 - /maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project/install/internal/DefaultProjectInstaller.java

[gboue]

Author: gboue
Date: Sat Oct  8 18:26:40 2016
New Revision: 1763928

URL: http://svn.apache.org/viewvc?rev=1763928=rev
Log:
[MSHARED-594] NullPointerException is thrown when trying to install a project 
without POM file

Adding null-check for MavenProject.getFile(): it could be the case that there 
is no POM file for the project, when it only has attached artifacts and those 
should get installed.

Modified:

maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project/install/internal/DefaultProjectInstaller.java

Modified: 
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project/install/internal/DefaultProjectInstaller.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project/install/internal/DefaultProjectInstaller.java?rev=1763928=1763927=1763928=diff
==
--- 
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project/install/internal/DefaultProjectInstaller.java
 (original)
+++ 
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project/install/internal/DefaultProjectInstaller.java
 Sat Oct  8 18:26:40 2016
@@ -97,14 +97,21 @@ public class DefaultProjectInstaller
 
 if ( isPomArtifact )
 {
-installer.install( buildingRequest, 
Collections.singletonList( new ProjectArtifact( project ) ) );
-installChecksums( buildingRequest, artifactRepository, artifact, 
createChecksum );
-addMetaDataFilesForArtifact( artifactRepository, artifact, 
metadataFiles, createChecksum );
+if ( pomFile != null )
+{
+installer.install( buildingRequest,
+   Collections.singletonList( new 
ProjectArtifact( project ) ) );
+installChecksums( buildingRequest, artifactRepository, 
artifact, createChecksum );
+addMetaDataFilesForArtifact( artifactRepository, artifact, 
metadataFiles, createChecksum );
+}
 }
 else
 {
-metadata = new ProjectArtifactMetadata( artifact, pomFile );
-artifact.addMetadata( metadata );
+if ( pomFile != null )
+{
+metadata = new ProjectArtifactMetadata( artifact, pomFile );
+artifact.addMetadata( metadata );
+}
 
 File file = artifact.getFile();
 

svn commit: r1763929 - /maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project/install/internal/DefaultProjectInstaller.java

[gboue]

Author: gboue
Date: Sat Oct  8 18:43:58 2016
New Revision: 1763929

URL: http://svn.apache.org/viewvc?rev=1763929=rev
Log:
[MSHARED-595] In DefaultProjectInstaller, the path to the local repository 
should be retrieved from the RepositoryManager

We need to rely on the RepositoryManager to get a hold of the local repository 
base directory.

Modified:

maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project/install/internal/DefaultProjectInstaller.java

Modified: 
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project/install/internal/DefaultProjectInstaller.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project/install/internal/DefaultProjectInstaller.java?rev=1763929=1763928=1763929=diff
==
--- 
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project/install/internal/DefaultProjectInstaller.java
 (original)
+++ 
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project/install/internal/DefaultProjectInstaller.java
 Sat Oct  8 18:43:58 2016
@@ -101,7 +101,7 @@ public class DefaultProjectInstaller
 {
 installer.install( buildingRequest,
Collections.singletonList( new 
ProjectArtifact( project ) ) );
-installChecksums( buildingRequest, artifactRepository, 
artifact, createChecksum );
+installChecksums( buildingRequest, artifact, createChecksum );
 addMetaDataFilesForArtifact( artifactRepository, artifact, 
metadataFiles, createChecksum );
 }
 }
@@ -120,7 +120,7 @@ public class DefaultProjectInstaller
 if ( file != null && file.isFile() )
 {
 installer.install( buildingRequest, 
Collections.singletonList( artifact ) );
-installChecksums( buildingRequest, artifactRepository, 
artifact, createChecksum );
+installChecksums( buildingRequest, artifact, createChecksum );
 addMetaDataFilesForArtifact( artifactRepository, artifact, 
metadataFiles, createChecksum );
 }
 else if ( !attachedArtifacts.isEmpty() )
@@ -139,7 +139,7 @@ public class DefaultProjectInstaller
 for ( Artifact attached : attachedArtifacts )
 {
 installer.install( buildingRequest, Collections.singletonList( 
attached ) );
-installChecksums( buildingRequest, artifactRepository, attached, 
createChecksum );
+installChecksums( buildingRequest, attached, createChecksum );
 addMetaDataFilesForArtifact( artifactRepository, attached, 
metadataFiles, createChecksum );
 }
 
@@ -153,12 +153,12 @@ public class DefaultProjectInstaller
  * the original POM file (cf. MNG-2820). While the plugin currently 
requires Maven 2.0.6, we continue to hash the
  * installed POM for robustness with regard to future changes like 
re-introducing some kind of POM filtering.
  *
+ * @param buildingRequest The project building request, must not be 
null.
  * @param artifact The artifact for which to create checksums, must not be 
null.
  * @param createChecksum {@code true} if checksum should be created, 
otherwise {@code false}.
  * @throws IOException If the checksums could not be installed.
  */
-private void installChecksums( ProjectBuildingRequest buildingRequest, 
ArtifactRepository artifactRepository,
-   Artifact artifact, boolean createChecksum )
+private void installChecksums( ProjectBuildingRequest buildingRequest, 
Artifact artifact, boolean createChecksum )
 throws IOException
 {
 if ( !createChecksum )
@@ -166,7 +166,7 @@ public class DefaultProjectInstaller
 return;
 }
 
-File artifactFile = getLocalRepoFile( buildingRequest, 
artifactRepository, artifact );
+File artifactFile = getLocalRepoFile( buildingRequest, artifact );
 installChecksums( artifactFile );
 }
 
@@ -257,14 +257,14 @@ public class DefaultProjectInstaller
  * Gets the path of the specified artifact within the local repository. 
Note that the returned path need not exist
  * (yet).
  *
+ * @param buildingRequest The project building request, must not be 
null.
  * @param artifact The artifact whose local repo path should be 
determined, must not be null.
  * @return The absolute path to the artifact when installed, never 
null.
  */
-private File getLocalRepoFile( ProjectBuildingRequest buildingRequest, 
ArtifactRepository artifactRepository,
-   Artifact artifact )
+private File getLocalRepoFile( ProjectBuildingRequest buildingRequest, 
Artifact artifact )
 {
 Str

svn commit: r1763933 - in /maven/plugins/trunk/maven-install-plugin: ./ src/it/attach-jar-checksum/ src/it/generate-pom-auto-1/ src/it/jar-sources-javadoc/ src/it/local-repo-override-with-checksum/ sr

[gboue]

Author: gboue
Date: Sat Oct  8 20:06:42 2016
New Revision: 1763933

URL: http://svn.apache.org/viewvc?rev=1763933=rev
Log:
[MINSTALL-128] Replace usage of the deprecated ArtifactFactory

In order to fix the use of deprecated code from ArtifactFactory, the 
install-file Mojo now creates a new MavenProject and attaches to this project 
all artifacts to install.

Added:

maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override-with-checksum/

maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override-with-checksum/invoker.properties
   (with props)

maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override-with-checksum/pom.xml
   (with props)

maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override-with-checksum/setup.bsh
   (with props)

maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override-with-checksum/test.jar
   (with props)

maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override-with-checksum/test.properties
   (with props)

maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override-with-checksum/verify.bsh
   (with props)
Removed:

maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/DualDigester.java

maven/plugins/trunk/maven-install-plugin/src/test/java/org/apache/maven/plugin/install/DualDigesterTest.java

maven/plugins/trunk/maven-install-plugin/src/test/java/org/apache/maven/plugin/install/SimpleDigester.java

maven/plugins/trunk/maven-install-plugin/src/test/java/org/apache/maven/plugin/install/testingharness/

maven/plugins/trunk/maven-install-plugin/src/test/resources/META-INF/plexus/components.xml
Modified:
maven/plugins/trunk/maven-install-plugin/pom.xml

maven/plugins/trunk/maven-install-plugin/src/it/attach-jar-checksum/verify.bsh

maven/plugins/trunk/maven-install-plugin/src/it/generate-pom-auto-1/verify.bsh

maven/plugins/trunk/maven-install-plugin/src/it/jar-sources-javadoc/verify.bsh
maven/plugins/trunk/maven-install-plugin/src/it/pom-checksum/verify.bsh

maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/AbstractInstallMojo.java

maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java

maven/plugins/trunk/maven-install-plugin/src/test/java/org/apache/maven/plugin/install/InstallFileMojoTest.java

maven/plugins/trunk/maven-install-plugin/src/test/java/org/apache/maven/plugin/install/InstallMojoTest.java

maven/plugins/trunk/maven-install-plugin/src/test/java/org/apache/maven/plugin/install/Utils.java

Modified: maven/plugins/trunk/maven-install-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-install-plugin/pom.xml?rev=1763933=1763932=1763933=diff
==
--- maven/plugins/trunk/maven-install-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-install-plugin/pom.xml Sat Oct  8 20:06:42 2016
@@ -110,12 +110,6 @@
   maven-plugin-testing-harness
   2.1
   test
-  
-
-  plexus-container-default
-  org.codehaus.plexus
-
-  
 
  
   org.apache.maven

Modified: 
maven/plugins/trunk/maven-install-plugin/src/it/attach-jar-checksum/verify.bsh
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-install-plugin/src/it/attach-jar-checksum/verify.bsh?rev=1763933=1763932=1763933=diff
==
--- 
maven/plugins/trunk/maven-install-plugin/src/it/attach-jar-checksum/verify.bsh 
(original)
+++ 
maven/plugins/trunk/maven-install-plugin/src/it/attach-jar-checksum/verify.bsh 
Sat Oct  8 20:06:42 2016
@@ -20,7 +20,7 @@
 import java.io.*;
 import java.util.*;
 
-import org.apache.maven.plugin.install.*;
+import org.apache.maven.plugin.install.Utils;
 
 String[] paths =
 {
@@ -34,13 +34,16 @@ String[] paths =
 
"org/apache/maven/its/install/ajc/test/1.0-SNAPSHOT/test-1.0-SNAPSHOT-sources.jar.md5",
 
"org/apache/maven/its/install/ajc/test/1.0-SNAPSHOT/test-1.0-SNAPSHOT-sources.jar.sha1",
 
"org/apache/maven/its/install/ajc/test/1.0-SNAPSHOT/maven-metadata-local.xml",
-//
"org/apache/maven/its/install/ajc/test/1.0-SNAPSHOT/maven-metadata-local.xml.md5",
-//
"org/apache/maven/its/install/ajc/test/1.0-SNAPSHOT/maven-metadata-local.xml.sha1",
 "org/apache/maven/its/install/ajc/test/maven-metadata-local.xml",
-//"org/apache/maven/its/install/ajc/test/maven-metadata-local.xml.md5",
-//"org/apache/maven/its/install/ajc/test/maven-metadata-local.xml.sha1",
 };
 
+Set cksumToCheckPaths = new HashSet( Arrays.asList( new String[]
+{
+"org/apache/maven/its/install/ajc/test/1.0-SNAPSHOT/test-1.0-SNAPSHOT.pom",
+"org/apache/maven/its/install/ajc/test/1.0-SNAPSHOT/test

svn commit: r1763333 - in /maven/plugins/trunk/maven-ear-plugin/src: it/MEAR-243-skinny-wars-provided/ it/MEAR-243-skinny-wars-provided/ear-module/ it/MEAR-243-skinny-wars-provided/war-module/ it/MEAR

[gboue]

Author: gboue
Date: Tue Oct  4 22:47:32 2016
New Revision: 176

URL: http://svn.apache.org/viewvc?rev=176=rev
Log:
[MEAR-243] Skinny WARs - JAR not removed from WAR if scope in EAR is set to 
provided

When creating skinny wars, only JAR runtime modules were considered when 
removing libraries from WEB-INF/lib of an EarModule. If a JAR dependency is 
provided, it should also remove it from WEB-INF/lib.

Added:
maven/plugins/trunk/maven-ear-plugin/src/it/MEAR-243-skinny-wars-provided/

maven/plugins/trunk/maven-ear-plugin/src/it/MEAR-243-skinny-wars-provided/ear-module/

maven/plugins/trunk/maven-ear-plugin/src/it/MEAR-243-skinny-wars-provided/ear-module/pom.xml
   (with props)

maven/plugins/trunk/maven-ear-plugin/src/it/MEAR-243-skinny-wars-provided/pom.xml
   (with props)

maven/plugins/trunk/maven-ear-plugin/src/it/MEAR-243-skinny-wars-provided/verify.bsh
   (with props)

maven/plugins/trunk/maven-ear-plugin/src/it/MEAR-243-skinny-wars-provided/war-module/

maven/plugins/trunk/maven-ear-plugin/src/it/MEAR-243-skinny-wars-provided/war-module/pom.xml
   (with props)

maven/plugins/trunk/maven-ear-plugin/src/it/MEAR-243-skinny-wars-provided/war-module/src/

maven/plugins/trunk/maven-ear-plugin/src/it/MEAR-243-skinny-wars-provided/war-module/src/main/

maven/plugins/trunk/maven-ear-plugin/src/it/MEAR-243-skinny-wars-provided/war-module/src/main/webapp/

maven/plugins/trunk/maven-ear-plugin/src/it/MEAR-243-skinny-wars-provided/war-module/src/main/webapp/WEB-INF/

maven/plugins/trunk/maven-ear-plugin/src/it/MEAR-243-skinny-wars-provided/war-module/src/main/webapp/WEB-INF/web.xml
   (with props)
Modified:

maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugins/ear/AbstractEarMojo.java

maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugins/ear/EarMojo.java

Added: 
maven/plugins/trunk/maven-ear-plugin/src/it/MEAR-243-skinny-wars-provided/ear-module/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/it/MEAR-243-skinny-wars-provided/ear-module/pom.xml?rev=176=auto
==
--- 
maven/plugins/trunk/maven-ear-plugin/src/it/MEAR-243-skinny-wars-provided/ear-module/pom.xml
 (added)
+++ 
maven/plugins/trunk/maven-ear-plugin/src/it/MEAR-243-skinny-wars-provided/ear-module/pom.xml
 Tue Oct  4 22:47:32 2016
@@ -0,0 +1,57 @@
+
+
+
+
+
+  4.0.0
+
+  org.apache.maven.its.ear.skinnywars
+  ear-module
+  1.0
+  ear
+
+  
+
+  commons-lang
+  commons-lang
+  2.5
+  provided
+
+
+  org.apache.maven.its.ear.skinnywars
+  war-module
+  1.0
+  war
+
+  
+
+  
+
+  
+org.apache.maven.plugins
+maven-ear-plugin
+@project.version@
+
+  true
+
+  
+
+  
+

Propchange: 
maven/plugins/trunk/maven-ear-plugin/src/it/MEAR-243-skinny-wars-provided/ear-module/pom.xml
--
svn:eol-style = native

Propchange: 
maven/plugins/trunk/maven-ear-plugin/src/it/MEAR-243-skinny-wars-provided/ear-module/pom.xml
--
svn:keywords = Author Date Id Revision

Added: 
maven/plugins/trunk/maven-ear-plugin/src/it/MEAR-243-skinny-wars-provided/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/it/MEAR-243-skinny-wars-provided/pom.xml?rev=176=auto
==
--- 
maven/plugins/trunk/maven-ear-plugin/src/it/MEAR-243-skinny-wars-provided/pom.xml
 (added)
+++ 
maven/plugins/trunk/maven-ear-plugin/src/it/MEAR-243-skinny-wars-provided/pom.xml
 Tue Oct  4 22:47:32 2016
@@ -0,0 +1,37 @@
+
+
+
+
+
+  4.0.0
+
+  org.apache.maven.its.ear.skinnywars
+  pom
+  1.0
+  pom
+
+  Test that provided JAR dependencies in EAR are removed from 
skinny WAR
+  https://issues.apache.org/jira/browse/MEAR-243
+
+  
+  ear-module
+  war-module
+  
+

Propchange: 
maven/plugins/trunk/maven-ear-plugin/src/it/MEAR-243-skinny-wars-provided/pom.xml
--
svn:eol-style = native

Propchange: 
maven/plugins/trunk/maven-ear-plugin/src/it/MEAR-243-skinny-wars-provided/pom.xml
--
svn:keywords = Author Date Id Revision

Added: 
maven/plugins/trunk/maven-ear-plugin/src/it/MEAR-243-skinny-wars-provided/verify.bsh
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/it/MEAR-243-skinny-wars-provided/verify.bsh?rev=176=auto
==
--- 
maven/plugins/trunk/maven-ear-plugin/src/it/MEAR-243-skinny-wars-provided/verify.bsh
 (added)
+++ 
maven/plugins/trunk/maven-ear-plugin

maven-surefire git commit: Fix M2Eclipse error and consistency.

[gboue]

Repository: maven-surefire
Updated Branches:
  refs/heads/master d60225741 -> ef06e4194


Fix M2Eclipse error and consistency.

Since the whole target/generated-sources was added to the classpath, m2e
considered the package declaration of the HelpMojo (generated inside
target/generated-sources/plugin) to be incorrect -- the fix is to unpack
the logging classes of maven-shared-utils into a dedicated folder.

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

Branch: refs/heads/master
Commit: ef06e41943b5402a2fb640f993b4a20626196627
Parents: d602257
Author: Tunaki 
Authored: Thu Sep 22 00:43:19 2016 +0200
Committer: Tunaki 
Committed: Thu Sep 22 00:43:19 2016 +0200

--
 maven-surefire-report-plugin/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/ef06e419/maven-surefire-report-plugin/pom.xml
--
diff --git a/maven-surefire-report-plugin/pom.xml 
b/maven-surefire-report-plugin/pom.xml
index e911c6e..81e0214 100644
--- a/maven-surefire-report-plugin/pom.xml
+++ b/maven-surefire-report-plugin/pom.xml
@@ -146,7 +146,7 @@
 
 
   
-${project.build.directory}/generated-sources
+
${project.build.directory}/generated-sources/dependency
   
 
   
@@ -162,7 +162,7 @@
   unpack
 
 
-  
${project.build.directory}/generated-sources
+  
${project.build.directory}/generated-sources/dependency
   false
   
org.apache.maven.shared:maven-shared-utils:3.1.0:jar:sources
   org/apache/maven/shared/utils/logging/*.java

svn commit: r1761637 - in /maven/enforcer/trunk: enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/ enforcer-rules/src/site/apt/ enforcer-rules/src/test/java/org/apache/maven/plugins/enfo

[gboue]

Author: gboue
Date: Tue Sep 20 20:40:57 2016
New Revision: 1761637

URL: http://svn.apache.org/viewvc?rev=1761637=rev
Log:
[MENFORCER-204] Add new rule: should be able to make sure that project artifact 
is a Snapshot

Adding a RequireSnapshotVersion rule, which is the opposite of the 
RequireReleaseVersion rule.

Added:

maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireSnapshotVersion.java
   (with props)

maven/enforcer/trunk/enforcer-rules/src/site/apt/requireSnapshotVersion.apt.vm  
 (with props)

maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireSnapshotVersion.java
   (with props)

maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-snapshot-version_failure/

maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-snapshot-version_failure/invoker.properties
   (with props)

maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-snapshot-version_failure/pom.xml
   (with props)

maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-snapshot-version_success/

maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-snapshot-version_success/pom.xml
   (with props)
Modified:
maven/enforcer/trunk/enforcer-rules/src/site/apt/index.apt

Added: 
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireSnapshotVersion.java
URL: 
http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireSnapshotVersion.java?rev=1761637=auto
==
--- 
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireSnapshotVersion.java
 (added)
+++ 
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireSnapshotVersion.java
 Tue Sep 20 20:40:57 2016
@@ -0,0 +1,92 @@
+package org.apache.maven.plugins.enforcer;
+
+/*
+ * 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.artifact.Artifact;
+import org.apache.maven.enforcer.rule.api.EnforcerRuleException;
+import org.apache.maven.enforcer.rule.api.EnforcerRuleHelper;
+import org.apache.maven.project.MavenProject;
+import 
org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException;
+
+/**
+ * This rule checks that the current project is not a release.
+ */
+public class RequireSnapshotVersion
+extends AbstractNonCacheableEnforcerRule
+{
+
+/**
+ * Allows this rule to fail when the parent is defined as a release.
+ */
+private boolean failWhenParentIsRelease = true;
+
+public void execute( EnforcerRuleHelper helper )
+throws EnforcerRuleException
+{
+
+MavenProject project = getProject( helper );
+Artifact artifact = project.getArtifact();
+
+if ( !artifact.isSnapshot() )
+{
+String message = getMessage();
+StringBuilder sb = new StringBuilder();
+if ( message != null )
+{
+sb.append( message ).append( '\n' );
+}
+sb.append( "This project cannot be a release:" ).append( 
artifact.getId() );
+throw new EnforcerRuleException( sb.toString() );
+}
+if ( failWhenParentIsRelease )
+{
+Artifact parentArtifact = project.getParentArtifact();
+if ( parentArtifact != null && !parentArtifact.isSnapshot() )
+{
+throw new EnforcerRuleException( "Parent cannot be a release: 
" + parentArtifact.getId() );
+}
+}
+
+}
+
+private MavenProject getProject( EnforcerRuleHelper helper )
+throws EnforcerRuleException
+{
+try
+{
+return (MavenProject) helper.evaluate( "${project}" );
+}
+catch ( ExpressionEvaluationException eee )
+{
+throw new EnforcerRuleException( "Unable to retrieve the 
MavenProject: ", eee );
+}
+}
+
+public boolean isFailWhenParentIsRelease()
+

svn commit: r1761980 - /maven/site/trunk/content/apt/guides/introduction/introduction-to-profiles.apt

[gboue]

Author: gboue
Date: Thu Sep 22 17:12:53 2016
New Revision: 1761980

URL: http://svn.apache.org/viewvc?rev=1761980=rev
Log:
[MNG-6094] Maven Profile activation (via property) bug (or misleading doc): 
profile active even if property doesn't exist

Clarified documentation as per 
http://mail-archives.apache.org/mod_mbox/maven-dev/201608.mbox/%3cop.yl3cbvr2kdkhrr@desktop-2khsk44%3e.

Modified:

maven/site/trunk/content/apt/guides/introduction/introduction-to-profiles.apt

Modified: 
maven/site/trunk/content/apt/guides/introduction/introduction-to-profiles.apt
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/guides/introduction/introduction-to-profiles.apt?rev=1761980=1761979=1761980=diff
==
--- 
maven/site/trunk/content/apt/guides/introduction/introduction-to-profiles.apt 
(original)
+++ 
maven/site/trunk/content/apt/guides/introduction/introduction-to-profiles.apt 
Thu Sep 22 17:12:53 2016
@@ -208,8 +208,8 @@ mvn groupId:artifactId:goal -P profile-1
 
 +---+
   
-  The following profile will be activated when the system property "debug" is 
defined
-  with a value which is not "true".
+  The following profile will be activated when the system property "debug" is 
not defined, 
+  or is defined with a value which is not "true".
 
 +---+
 
@@ -225,6 +225,13 @@ mvn groupId:artifactId:goal -P profile-1
 
 +---+
 
+  To activate this you would type one of those on the command line:
+
++---+
+mvn groupId:artifactId:goal
+mvn groupId:artifactId:goal -Ddebug=false
++---+
+
   The next example will trigger the profile when the system property
   "environment" is specified with the value "test":
 

svn commit: r1762936 - /maven/plugins/trunk/maven-shade-plugin/src/site/apt/examples/resource-transformers.apt.vm

[gboue]

Author: gboue
Date: Fri Sep 30 17:17:05 2016
New Revision: 1762936

URL: http://svn.apache.org/viewvc?rev=1762936=rev
Log:
Fix a typo: "to" was written twice.

Modified:

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

Modified: 
maven/plugins/trunk/maven-shade-plugin/src/site/apt/examples/resource-transformers.apt.vm
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/site/apt/examples/resource-transformers.apt.vm?rev=1762936=1762935=1762936=diff
==
--- 
maven/plugins/trunk/maven-shade-plugin/src/site/apt/examples/resource-transformers.apt.vm
 (original)
+++ 
maven/plugins/trunk/maven-shade-plugin/src/site/apt/examples/resource-transformers.apt.vm
 Fri Sep 30 17:17:05 2016
@@ -131,8 +131,8 @@ Transformers in <<>> directory that
   maps interfaces to their implementation classes for lookup by the service 
locator.
   To relocate the class names of these implementation classes, and to
-  To merge multiple implementations
-  of the same interface into one service entry, the 
<<>> can be used:
+  merge multiple implementations of the same interface into one service entry,
+  the <<>> can be used:
 
 +-
 

svn commit: r1762963 - in /maven/plugins/trunk/maven-shade-plugin/src: it/services-resource-transformer-with-reloc-includes-excludes/ it/services-resource-transformer-with-reloc-includes-excludes/repo

[gboue]

Author: gboue
Date: Fri Sep 30 20:23:50 2016
New Revision: 1762963

URL: http://svn.apache.org/viewvc?rev=1762963=rev
Log:
[MSHADE-237] ServicesResourceTransformer relocates excluded classes

Exclude pattern specified for relocations were ignored by the 
ServicesResourceTransformer. This could result in fully qualified name of 
implementation classes, present in a file for a given interface, being 
relocated, when the actual class was not.

Added:

maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer-with-reloc-includes-excludes/

maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer-with-reloc-includes-excludes/pom.xml
   (with props)

maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer-with-reloc-includes-excludes/repo/

maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer-with-reloc-includes-excludes/repo/org/

maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer-with-reloc-includes-excludes/repo/org/apache/

maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer-with-reloc-includes-excludes/repo/org/apache/maven/

maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer-with-reloc-includes-excludes/repo/org/apache/maven/its/

maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer-with-reloc-includes-excludes/repo/org/apache/maven/its/shade/

maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer-with-reloc-includes-excludes/repo/org/apache/maven/its/shade/srt/

maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer-with-reloc-includes-excludes/repo/org/apache/maven/its/shade/srt/mshade-237-one/

maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer-with-reloc-includes-excludes/repo/org/apache/maven/its/shade/srt/mshade-237-one/0.1/

maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer-with-reloc-includes-excludes/repo/org/apache/maven/its/shade/srt/mshade-237-one/0.1/mshade-237-one-0.1.jar
   (with props)

maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer-with-reloc-includes-excludes/repo/org/apache/maven/its/shade/srt/mshade-237-one/0.1/mshade-237-one-0.1.pom
   (with props)

maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer-with-reloc-includes-excludes/repo/org/apache/maven/its/shade/srt/mshade-237-two/

maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer-with-reloc-includes-excludes/repo/org/apache/maven/its/shade/srt/mshade-237-two/0.1/

maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer-with-reloc-includes-excludes/repo/org/apache/maven/its/shade/srt/mshade-237-two/0.1/mshade-237-two-0.1.jar
   (with props)

maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer-with-reloc-includes-excludes/repo/org/apache/maven/its/shade/srt/mshade-237-two/0.1/mshade-237-two-0.1.pom
   (with props)

maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer-with-reloc-includes-excludes/verify.bsh
   (with props)
Modified:

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

maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/ServiceResourceTransformerTest.java

Added: 
maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer-with-reloc-includes-excludes/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer-with-reloc-includes-excludes/pom.xml?rev=1762963=auto
==
--- 
maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer-with-reloc-includes-excludes/pom.xml
 (added)
+++ 
maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer-with-reloc-includes-excludes/pom.xml
 Fri Sep 30 20:23:50 2016
@@ -0,0 +1,93 @@
+
+
+
+
+
+  4.0.0
+
+  org.apache.maven.its.shade.srt
+  mshade-237
+  1.0
+  jar
+  MSHADE-237
+  
+Test the merging of META-INF/services/** entries, when relocation 
includes/excludes patterns are specified
+  
+
+  
+
+  shade-it
+  file:///${basedir}/repo
+  
+ignore
+  
+  
+false
+  
+
+  
+
+  
+
+  org.apache.maven.its.shade.srt
+  mshade-237-one
+  0.1
+
+
+  org.apache.maven.its.shade.srt
+  mshade-237-two
+  0.1
+
+  
+
+  
+
+  
+org.apache.maven.plugins
+maven-shade-plugin
+@project.version@
+
+  
+attach-shade
+package
+
+  shade
+
+
+  false

svn commit: r1763092 - /maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java

[gboue]

Author: gboue
Date: Sun Oct  2 18:42:02 2016
New Revision: 1763092

URL: http://svn.apache.org/viewvc?rev=1763092=rev
Log:
[MCHANGES-375] Add stop between issue text and " Fixes issue-number"

When there is a description of the issue and it doesn't end with a period, this 
change adds a period so that the final text is easier to read. This closes #94.

Modified:

maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java

Modified: 
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java?rev=1763092=1763091=1763092=diff
==
--- 
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java
 (original)
+++ 
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java
 Sun Oct  2 18:42:02 2016
@@ -249,18 +249,24 @@ public class ChangesReportGenerator
 
 sink.tableCell();
 
+String actionDescription = action.getAction();
+
 if ( escapeHTML )
 {
-sink.text( action.getAction() );
+sink.text( actionDescription );
 }
 else
 {
-sink.rawText( action.getAction() );
+sink.rawText( actionDescription );
 }
 
 // no null check needed classes from modello return a new ArrayList
 if ( StringUtils.isNotEmpty( action.getIssue() ) || ( 
!action.getFixedIssues().isEmpty() ) )
 {
+if ( StringUtils.isNotBlank( actionDescription ) && 
!actionDescription.endsWith( "." ) )
+{
+sink.text( "." );
+}
 sink.text( " " + bundle.getString( "report.changes.text.fixes" ) + 
" " );
 
 // Try to get the issue management system specified in the 
changes.xml file

svn commit: r1763102 - /maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/RestJiraDownloader.java

[gboue]

Author: gboue
Date: Sun Oct  2 20:45:49 2016
New Revision: 1763102

URL: http://svn.apache.org/viewvc?rev=1763102=rev
Log:
[MCHANGES-373] It is not possible to use "filter" parameter

In the RestJiraDownloader, the "filter" parameter was ignored. This change adds 
it to the list of parameters when building the JQL query. This closes #91.

Modified:

maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/RestJiraDownloader.java

Modified: 
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/RestJiraDownloader.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/RestJiraDownloader.java?rev=1763102=1763101=1763102=diff
==
--- 
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/RestJiraDownloader.java
 (original)
+++ 
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/RestJiraDownloader.java
 Sun Oct  2 20:45:49 2016
@@ -142,7 +142,7 @@ public class RestJiraDownloader
 
 // CHECKSTYLE_OFF: LineLength
 String jqlQuery =
-new JqlQueryBuilder( log ).urlEncode( false ).project( 
jiraProject ).fixVersion( getFixFor() ).fixVersionIds( resolvedFixVersionIds 
).statusIds( resolvedStatusIds ).priorityIds( resolvedPriorityIds 
).resolutionIds( resolvedResolutionIds ).components( resolvedComponentIds 
).typeIds( resolvedTypeIds ).sortColumnNames( sortColumnNames ).build();
+new JqlQueryBuilder( log ).urlEncode( false ).project( 
jiraProject ).fixVersion( getFixFor() ).fixVersionIds( resolvedFixVersionIds 
).statusIds( resolvedStatusIds ).priorityIds( resolvedPriorityIds 
).resolutionIds( resolvedResolutionIds ).components( resolvedComponentIds 
).typeIds( resolvedTypeIds ).sortColumnNames( sortColumnNames ).filter( filter 
).build();
 // CHECKSTYLE_ON: LineLength
 
 StringWriter searchParamStringWriter = new StringWriter();

svn commit: r1762192 - in /maven/shared/trunk: maven-dependency-tree/src/site/apt/index.apt.vm maven-reporting-exec/src/site/apt/index.apt.vm

[gboue]

Author: gboue
Date: Sun Sep 25 11:57:49 2016
New Revision: 1762192

URL: http://svn.apache.org/viewvc?rev=1762192=rev
Log:
Updated broken jira.codehaus.org links to issues.apache.org/jira

Modified:
maven/shared/trunk/maven-dependency-tree/src/site/apt/index.apt.vm
maven/shared/trunk/maven-reporting-exec/src/site/apt/index.apt.vm

Modified: maven/shared/trunk/maven-dependency-tree/src/site/apt/index.apt.vm
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-tree/src/site/apt/index.apt.vm?rev=1762192=1762191=1762192=diff
==
--- maven/shared/trunk/maven-dependency-tree/src/site/apt/index.apt.vm 
(original)
+++ maven/shared/trunk/maven-dependency-tree/src/site/apt/index.apt.vm Sun Sep 
25 11:57:49 2016
@@ -36,4 +36,4 @@ ${project.name}
   Older Maven 2-specific component entry point is
   
<<<{{{./apidocs/org/apache/maven/shared/dependency/tree/DependencyTreeBuilder.html}DependencyTreeBuilder}}>>>,
   which is consistent with Maven 2 even when used with Maven 3, which can 
cause inconsistent results between resolved list (consistent
-  with Maven 3) and resolved tree (consistent with Maven 2): see 
{{{http://jira.codehaus.org/browse/MSHARED-167}MSHARED-167}}.
+  with Maven 3) and resolved tree (consistent with Maven 2): see 
{{{https://issues.apache.org/jira/browse/MSHARED-167}MSHARED-167}}.

Modified: maven/shared/trunk/maven-reporting-exec/src/site/apt/index.apt.vm
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-reporting-exec/src/site/apt/index.apt.vm?rev=1762192=1762191=1762192=diff
==
--- maven/shared/trunk/maven-reporting-exec/src/site/apt/index.apt.vm (original)
+++ maven/shared/trunk/maven-reporting-exec/src/site/apt/index.apt.vm Sun Sep 
25 11:57:49 2016
@@ -58,7 +58,7 @@ ${project.name}
   {{{/ref/current/maven-model/maven.html#class_reporting}<<<\<reporting\>>>> 
section of POM}}:
 
   * without <<<\<inherited\>>>> element: reporting plugins configuration 
inheritance is not supported at this level
-  (see {{{http://jira.codehaus.org/browse/MSITE-484}MSITE-484}}),
+  (see {{{https://issues.apache.org/jira/browse/MSITE-484}MSITE-484}}),
 
   * with additional <<<\<reports\>>>> list outside <<<\<reportSet\>>>> that 
simplifies reports configuration in usual cases,
 

maven-surefire git commit: [SUREFIRE-1280] Replace "http://jira.codehaus.org" with "https://issues.apache.org/jira"

[gboue]

Repository: maven-surefire
Updated Branches:
  refs/heads/master 432231e7e -> 308d941c9


[SUREFIRE-1280] Replace "http://jira.codehaus.org; with
"https://issues.apache.org/jira;

Updated links present in the documentation as well.

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

Branch: refs/heads/master
Commit: 308d941c9b6ebb695aba9630f81fc5b400f21322
Parents: 432231e
Author: Tunaki 
Authored: Sun Sep 25 14:00:49 2016 +0200
Committer: Tunaki 
Committed: Sun Sep 25 14:00:49 2016 +0200

--
 .../site/apt/examples/fork-options-and-parallel-execution.apt.vm   | 2 +-
 maven-surefire-plugin/src/site/markdown/multilineexceptions.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/308d941c/maven-surefire-plugin/src/site/apt/examples/fork-options-and-parallel-execution.apt.vm
--
diff --git 
a/maven-surefire-plugin/src/site/apt/examples/fork-options-and-parallel-execution.apt.vm
 
b/maven-surefire-plugin/src/site/apt/examples/fork-options-and-parallel-execution.apt.vm
index eebe525..2f9429c 100644
--- 
a/maven-surefire-plugin/src/site/apt/examples/fork-options-and-parallel-execution.apt.vm
+++ 
b/maven-surefire-plugin/src/site/apt/examples/fork-options-and-parallel-execution.apt.vm
@@ -323,4 +323,4 @@ Fork Options and Parallel Test Execution
 
  * <<<$\{surefire.forkNumber\}>>> is properly propagated within 
<<>>
  since ${project.artifactId}:2.19, more details in
- {{{https://jira.codehaus.org/browse/SUREFIRE-1136}SUREFIRE-1136}}
+ {{{https://issues.apache.org/jira/browse/SUREFIRE-1136}SUREFIRE-1136}}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/308d941c/maven-surefire-plugin/src/site/markdown/multilineexceptions.md
--
diff --git a/maven-surefire-plugin/src/site/markdown/multilineexceptions.md 
b/maven-surefire-plugin/src/site/markdown/multilineexceptions.md
index 69c70c8..4421d49 100644
--- a/maven-surefire-plugin/src/site/markdown/multilineexceptions.md
+++ b/maven-surefire-plugin/src/site/markdown/multilineexceptions.md
@@ -34,4 +34,4 @@ becomes:
  May not contain whitespace
 
 The plugin supports Groovy assertion output.
-For more information see the issue 
https://jira.codehaus.org/browse/SUREFIRE-986.
+For more information see the issue 
https://issues.apache.org/jira/browse/SUREFIRE-986.

svn commit: r1762213 - in /maven/shared/trunk/maven-shared-jar/src: main/java/org/apache/maven/shared/jar/ main/java/org/apache/maven/shared/jar/classes/ main/java/org/apache/maven/shared/jar/identifi

[gboue]

Author: gboue
Date: Sun Sep 25 14:54:41 2016
New Revision: 1762213

URL: http://svn.apache.org/viewvc?rev=1762213=rev
Log:
Improved code: fixed usage of raw types (except Commons Collections) and 
converted use of Iterator to for-each loop

Modified:

maven/shared/trunk/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/JarAnalyzer.java

maven/shared/trunk/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/JarData.java

maven/shared/trunk/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/classes/ImportVisitor.java

maven/shared/trunk/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/classes/JarClasses.java

maven/shared/trunk/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/classes/JarClassesAnalysis.java

maven/shared/trunk/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/identification/JarIdentification.java

maven/shared/trunk/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/identification/JarIdentificationAnalysis.java

maven/shared/trunk/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/identification/exposers/EmbeddedMavenModelExposer.java

maven/shared/trunk/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/identification/exposers/JarClassesExposer.java

maven/shared/trunk/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/identification/exposers/ManifestExposer.java

maven/shared/trunk/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/identification/exposers/RepositorySearchExposer.java

maven/shared/trunk/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/identification/exposers/StaticMainOutputExposer.java

maven/shared/trunk/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/identification/exposers/TextFileExposer.java

maven/shared/trunk/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/identification/exposers/TimestampExposer.java

maven/shared/trunk/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/identification/hash/JarBytecodeHashAnalyzer.java

maven/shared/trunk/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/identification/repository/EmptyRepositoryHashSearch.java

maven/shared/trunk/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/identification/repository/RepositoryHashSearch.java

maven/shared/trunk/maven-shared-jar/src/test/java/org/apache/maven/shared/jar/AbstractJarAnalyzerTestCase.java

maven/shared/trunk/maven-shared-jar/src/test/java/org/apache/maven/shared/jar/classes/ImportVisitorTest.java

Modified: 
maven/shared/trunk/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/JarAnalyzer.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/JarAnalyzer.java?rev=1762213=1762212=1762213=diff
==
--- 
maven/shared/trunk/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/JarAnalyzer.java
 (original)
+++ 
maven/shared/trunk/maven-shared-jar/src/main/java/org/apache/maven/shared/jar/JarAnalyzer.java
 Sun Sep 25 14:54:41 2016
@@ -25,7 +25,6 @@ import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
-import java.util.Iterator;
 import java.util.List;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
@@ -113,16 +112,13 @@ public class JarAnalyzer
 }
 
 // Obtain entries list.
-List entries = Collections.list( jarFile.entries() );
+List entries = Collections.list( jarFile.entries() );
 
 // Sorting of list is done by name to ensure a bytecode hash is always 
consistent.
-Collections.sort( entries, new Comparator()
+Collections.sort( entries, new Comparator()
 {
-public int compare( Object o1, Object o2 )
+public int compare( JarEntry entry1, JarEntry entry2 )
 {
-JarEntry entry1 = (JarEntry) o1;
-JarEntry entry2 = (JarEntry) o2;
-
 return entry1.getName().compareTo( entry2.getName() );
 }
 } );
@@ -175,15 +171,12 @@ public class JarAnalyzer
  * @param pattern the pattern to filter against
  * @return the list of files found, in {@link java.util.jar.JarEntry} 
elements
  */
-public List filterEntries( Pattern pattern )
+public List filterEntries( Pattern pattern )
 {
-List ret = new ArrayList();
+List ret = new ArrayList();
 
-Iterator it = getEntries().iterator();
-while ( it.hasNext() )
+for ( JarEntry entry : getEntries() )
 {
-JarEntry entry = (JarEntry) it.next();
-
 Matcher mat = pattern.matcher( entry.getName() );
 if ( mat.find() )
 {
@@ -198,7 +191,7 @@ public class JarAnalyzer
  *
  * @return the list of files found, in {@link

svn commit: r1762216 - /maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugins/deploy/AbstractDeployMojo.java

[gboue]

Author: gboue
Date: Sun Sep 25 15:26:55 2016
New Revision: 1762216

URL: http://svn.apache.org/viewvc?rev=1762216=rev
Log:
Removed unused artifactFactory

Modified:

maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugins/deploy/AbstractDeployMojo.java

Modified: 
maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugins/deploy/AbstractDeployMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugins/deploy/AbstractDeployMojo.java?rev=1762216=1762215=1762216=diff
==
--- 
maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugins/deploy/AbstractDeployMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugins/deploy/AbstractDeployMojo.java
 Sun Sep 25 15:26:55 2016
@@ -21,7 +21,6 @@ package org.apache.maven.plugins.deploy;
 
 import java.util.Map;
 
-import org.apache.maven.artifact.factory.ArtifactFactory;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
 import org.apache.maven.artifact.repository.MavenArtifactRepository;
@@ -39,11 +38,6 @@ import org.apache.maven.plugins.annotati
 public abstract class AbstractDeployMojo
 extends AbstractMojo
 {
-/**
- * Component used to create an artifact.
- */
-@Component
-protected ArtifactFactory artifactFactory;
 
 /**
  * Map that contains the layouts.

svn commit: r1763035 - /maven/plugins/trunk/maven-javadoc-plugin/pom.xml

[gboue]

Author: gboue
Date: Sun Oct  2 00:42:44 2016
New Revision: 1763035

URL: http://svn.apache.org/viewvc?rev=1763035=rev
Log:
[MJAVADOC-472] Conflicting dependency of plexus-utils are used

Excluding plexus:plexus-utils from plexus-interactivity-api to resolve conflict 
with the usage of plexus-utils in version 3.0.24.

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

Modified: maven/plugins/trunk/maven-javadoc-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/pom.xml?rev=1763035=1763034=1763035=diff
==
--- maven/plugins/trunk/maven-javadoc-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/pom.xml Sun Oct  2 00:42:44 2016
@@ -229,6 +229,12 @@ under the License.
   org.codehaus.plexus
   plexus-interactivity-api
   1.0-alpha-4
+  
+
+  plexus
+  plexus-utils
+
+  
 
 
 

svn commit: r1763036 - in /maven/plugins/trunk/maven-pmd-plugin/src: main/java/org/apache/maven/plugin/pmd/ test/java/org/apache/maven/plugin/pmd/ test/java/org/apache/maven/plugin/pmd/stubs/

[gboue]

Author: gboue
Date: Sun Oct  2 01:51:45 2016
New Revision: 1763036

URL: http://svn.apache.org/viewvc?rev=1763036=rev
Log:
Improved code to use the try-with-resources construct instead of closing all 
InputStream and Reader manually.

Modified:

maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/ExcludeViolationsFromFile.java

maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdViolationCheckMojo.java

maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/AbstractPmdReportTest.java

maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/CpdReportTest.java

maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/PmdReportTest.java

maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/stubs/DefaultConfigurationMavenProjectStub.java

Modified: 
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/ExcludeViolationsFromFile.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/ExcludeViolationsFromFile.java?rev=1763036=1763035=1763036=diff
==
--- 
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/ExcludeViolationsFromFile.java
 (original)
+++ 
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/ExcludeViolationsFromFile.java
 Sun Oct  2 01:51:45 2016
@@ -32,7 +32,6 @@ import java.util.Set;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.pmd.model.Violation;
-import org.codehaus.plexus.util.IOUtil;
 
 import net.sourceforge.pmd.RuleViolation;
 
@@ -62,22 +61,14 @@ public class ExcludeViolationsFromFile i
 return;
 }
 final Properties props = new Properties();
-FileInputStream fileInputStream = null;
-try
+try ( FileInputStream fileInputStream = new FileInputStream( new File( 
excludeFromFailureFile ) ) )
 {
-fileInputStream = new FileInputStream( new File( 
excludeFromFailureFile ) );
 props.load( fileInputStream );
-fileInputStream.close();
-fileInputStream = null;
 }
 catch ( final IOException e )
 {
 throw new MojoExecutionException( "Cannot load properties file " + 
excludeFromFailureFile, e );
 }
-finally
-{
-IOUtil.close( fileInputStream );
-}
 for ( final Entry<Object, Object> propEntry : props.entrySet() )
 {
 final Set excludedRuleSet = new HashSet<>();

Modified: 
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdViolationCheckMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdViolationCheckMojo.java?rev=1763036=1763035=1763036=diff
==
--- 
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdViolationCheckMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdViolationCheckMojo.java
 Sun Oct  2 01:51:45 2016
@@ -117,8 +117,7 @@ public class PmdViolationCheckMojo
 protected List getErrorDetails( File pmdFile )
 throws XmlPullParserException, IOException
 {
-final FileReader reader1 = new FileReader( pmdFile );
-try
+try ( FileReader reader1 = new FileReader( pmdFile ) )
 {
 PmdXpp3Reader reader = new PmdXpp3Reader();
 PmdErrorDetail details = reader.read( reader1, false );
@@ -136,10 +135,6 @@ public class PmdViolationCheckMojo
 }
 return violations;
 }
-finally
-{
-reader1.close();
-}
 }
 
 @Override

Modified: 
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/AbstractPmdReportTest.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/AbstractPmdReportTest.java?rev=1763036=1763035=1763036=diff
==
--- 
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/AbstractPmdReportTest.java
 (original)
+++ 
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/AbstractPmdReportTest.java
 Sun Oct  2 01:51:45 2016
@@ -29,7 +29,6 @@ import org.apache.maven.doxia.siterender
 import org.apache.maven.doxia.siterenderer.SiteRenderingContext;
 import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink;
 import org.apache.maven.plugin.testing.Abstrac

svn commit: r1763052 - /maven/site/trunk/content/resources/developers/maven-eclipse-codestyle.xml

[gboue]

Author: gboue
Date: Sun Oct  2 11:17:34 2016
New Revision: 1763052

URL: http://svn.apache.org/viewvc?rev=1763052=rev
Log:
[MNGSITE-294] maven-eclipse-codestyle for try-with-resources doesn't match 
maven_checks.xml

Update for the maven-eclipse-codestyle.xml formatter used in Eclipse in order 
to add whitespaces after the opening paren and before the closing paren, as 
required by maven_checks.xml.

Modified:
maven/site/trunk/content/resources/developers/maven-eclipse-codestyle.xml

Modified: 
maven/site/trunk/content/resources/developers/maven-eclipse-codestyle.xml
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/resources/developers/maven-eclipse-codestyle.xml?rev=1763052=1763051=1763052=diff
==
--- maven/site/trunk/content/resources/developers/maven-eclipse-codestyle.xml 
(original)
+++ maven/site/trunk/content/resources/developers/maven-eclipse-codestyle.xml 
Sun Oct  2 11:17:34 2016
@@ -260,5 +260,7 @@
 
 
 
+
+
 
 

svn commit: r1768086 - in /maven/plugins/trunk/maven-compiler-plugin/src: it/MCOMPILER-284/ it/MCOMPILER-284/src/ it/MCOMPILER-284/src/main/ it/MCOMPILER-284/src/main/java/ it/MCOMPILER-284/src/main/j

[gboue]

Author: gboue
Date: Fri Nov  4 19:48:26 2016
New Revision: 1768086

URL: http://svn.apache.org/viewvc?rev=1768086=rev
Log:
[MCOMPILER-284] maven.test.skip doesn't skip test compilation

The tests classes were still compiled, even when setting "skip" to true 
(regression introduced in 2.6.0). Adding unit tests and integration tests for 
this case as well.

Added:
maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-284/
maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-284/pom.xml   
(with props)
maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-284/src/
maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-284/src/main/

maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-284/src/main/java/

maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-284/src/main/java/com/

maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-284/src/main/java/com/foo/

maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-284/src/main/java/com/foo/MyClass.java
   (with props)
maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-284/src/test/

maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-284/src/test/java/

maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-284/src/test/java/com/

maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-284/src/test/java/com/foo/

maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-284/src/test/java/com/foo/MyTest.java
   (with props)
maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-284/verify.bsh   
(with props)

maven/plugins/trunk/maven-compiler-plugin/src/test/resources/unit/compiler-skip-main/

maven/plugins/trunk/maven-compiler-plugin/src/test/resources/unit/compiler-skip-main/plugin-config.xml
   (with props)

maven/plugins/trunk/maven-compiler-plugin/src/test/resources/unit/compiler-skip-main/src/

maven/plugins/trunk/maven-compiler-plugin/src/test/resources/unit/compiler-skip-main/src/main/

maven/plugins/trunk/maven-compiler-plugin/src/test/resources/unit/compiler-skip-main/src/main/java/

maven/plugins/trunk/maven-compiler-plugin/src/test/resources/unit/compiler-skip-main/src/main/java/TestSkipMainCompile0.java
   (with props)

maven/plugins/trunk/maven-compiler-plugin/src/test/resources/unit/compiler-skip-main/src/test/

maven/plugins/trunk/maven-compiler-plugin/src/test/resources/unit/compiler-skip-main/src/test/java/

maven/plugins/trunk/maven-compiler-plugin/src/test/resources/unit/compiler-skip-main/src/test/java/TestSkipMainCompile0Test.java
   (with props)

maven/plugins/trunk/maven-compiler-plugin/src/test/resources/unit/compiler-skip-test/

maven/plugins/trunk/maven-compiler-plugin/src/test/resources/unit/compiler-skip-test/plugin-config.xml
   (with props)

maven/plugins/trunk/maven-compiler-plugin/src/test/resources/unit/compiler-skip-test/src/

maven/plugins/trunk/maven-compiler-plugin/src/test/resources/unit/compiler-skip-test/src/main/

maven/plugins/trunk/maven-compiler-plugin/src/test/resources/unit/compiler-skip-test/src/main/java/

maven/plugins/trunk/maven-compiler-plugin/src/test/resources/unit/compiler-skip-test/src/main/java/TestSkipTestCompile0.java
   (with props)

maven/plugins/trunk/maven-compiler-plugin/src/test/resources/unit/compiler-skip-test/src/test/

maven/plugins/trunk/maven-compiler-plugin/src/test/resources/unit/compiler-skip-test/src/test/java/

maven/plugins/trunk/maven-compiler-plugin/src/test/resources/unit/compiler-skip-test/src/test/java/TestSkipTestCompile0Test.java
   (with props)
Modified:

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

Added: maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-284/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-284/pom.xml?rev=1768086=auto
==
--- maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-284/pom.xml 
(added)
+++ maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-284/pom.xml Fri 
Nov  4 19:48:26 2016
@@ -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.plugins.compiler.it
+  mcompiler284
+  1.0-SNAPSHOT
+
+  https://issues.apache.org/jira/browse/MCOMPILER-284
+
+  
+UTF-8
+  
+
+  
+
+  junit
+  junit
+  3.8.2
+  test
+
+  
+
+  
+
+  
+org.apache.maven.plugins
+maven-compiler-plugin
+@project.version@
+
+   

svn commit: r1768231 - in /maven/plugins/trunk/maven-help-plugin/src: it/evaluate-artifact-with-expression-with-output/ main/java/org/apache/maven/plugins/help/

[gboue]

Author: gboue
Date: Sat Nov  5 15:49:26 2016
New Revision: 1768231

URL: http://svn.apache.org/viewvc?rev=1768231=rev
Log:
[MPH-119] The "artifact" parameter is not taken into account with Maven 3

Starting with Maven 3, PluginParameterExpressionEvaluator ignores the project 
given as parameter in its 6-args constructor, and fetches instead the current 
project from the Maven session. As such, the plugin needs to set the fake 
project created through the "artifact" parameter as the session current 
project, and put back the real one after construction of the evaluator.

Added:

maven/plugins/trunk/maven-help-plugin/src/it/evaluate-artifact-with-expression-with-output/

maven/plugins/trunk/maven-help-plugin/src/it/evaluate-artifact-with-expression-with-output/pom.xml
   (with props)

maven/plugins/trunk/maven-help-plugin/src/it/evaluate-artifact-with-expression-with-output/test.properties
   (with props)

maven/plugins/trunk/maven-help-plugin/src/it/evaluate-artifact-with-expression-with-output/verify.groovy
   (with props)
Modified:

maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EvaluateMojo.java

Added: 
maven/plugins/trunk/maven-help-plugin/src/it/evaluate-artifact-with-expression-with-output/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/it/evaluate-artifact-with-expression-with-output/pom.xml?rev=1768231=auto
==
--- 
maven/plugins/trunk/maven-help-plugin/src/it/evaluate-artifact-with-expression-with-output/pom.xml
 (added)
+++ 
maven/plugins/trunk/maven-help-plugin/src/it/evaluate-artifact-with-expression-with-output/pom.xml
 Sat Nov  5 15:49:26 2016
@@ -0,0 +1,75 @@
+
+
+
+
+
+  4.0.0
+
+  org.apache.maven.its.help
+  test
+  1.0
+  Maven Foo Bar
+  https://issues.apache.org/jira/browse/MPH-114
+
+  
+
+  
+org.apache.maven.plugins
+maven-help-plugin
+@project.version@
+
+  
+its
+
+  evaluate
+
+package
+  
+
+  
+  
+org.apache.maven.plugins
+maven-enforcer-plugin
+1.4.1
+
+  
+enforce-currentproject
+
+  enforce
+
+package
+
+  
+
+  
+  ${session.currentProject.artifactId} == 
test
+
+  
+  true
+
+  
+
+  
+
+  
+

Propchange: 
maven/plugins/trunk/maven-help-plugin/src/it/evaluate-artifact-with-expression-with-output/pom.xml
--
svn:eol-style = native

Propchange: 
maven/plugins/trunk/maven-help-plugin/src/it/evaluate-artifact-with-expression-with-output/pom.xml
--
svn:keywords = Author Date Id Revision

Added: 
maven/plugins/trunk/maven-help-plugin/src/it/evaluate-artifact-with-expression-with-output/test.properties
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/it/evaluate-artifact-with-expression-with-output/test.properties?rev=1768231=auto
==
--- 
maven/plugins/trunk/maven-help-plugin/src/it/evaluate-artifact-with-expression-with-output/test.properties
 (added)
+++ 
maven/plugins/trunk/maven-help-plugin/src/it/evaluate-artifact-with-expression-with-output/test.properties
 Sat Nov  5 15:49:26 2016
@@ -0,0 +1,20 @@
+# 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.
+
+expression = project.name
+output = result.txt
+artifact = org.apache.maven.plugins:maven-help-plugin

Propchange: 
maven/plugins/trunk/maven-help-plugin/src/it/evaluate-artifact-with-expression-with-output/test.properties
--
svn:eol-style = native

Propchange: 
maven/plugins/trunk/maven-help-plugin/src/it/evaluate-artifact-wit

svn commit: r1768232 - /maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EvaluateMojo.java

[gboue]

Author: gboue
Date: Sat Nov  5 15:49:51 2016
New Revision: 1768232

URL: http://svn.apache.org/viewvc?rev=1768232=rev
Log:
[MPH-114] Goal fails with “Unable to get the POM for the artifact”

Clarifying docs: the latest version of the artifact is used when no version is 
specified for the artifact.

Modified:

maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EvaluateMojo.java

Modified: 
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EvaluateMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EvaluateMojo.java?rev=1768232=1768231=1768232=diff
==
--- 
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EvaluateMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EvaluateMojo.java
 Sat Nov  5 15:49:51 2016
@@ -136,7 +136,8 @@ public class EvaluateMojo
 /**
  * An artifact for evaluating Maven expressions.
  * 
- * Note: Should respect the Maven format, i.e. 
groupId:artifactId[:version][:classifier].
+ * Note: Should respect the Maven format, i.e. 
groupId:artifactId[:version][:classifier]. The
+ * latest version of the artifact will be used when no version is 
specified.
  */
 @Parameter( property = "artifact" )
 private String artifact;

svn commit: r1769304 - in /maven/release/trunk/maven-release-plugin: ./ src/it/projects/prepare/MRELEASE-966/ src/main/java/org/apache/maven/plugins/release/

[gboue]

Author: gboue
Date: Fri Nov 11 15:32:18 2016
New Revision: 1769304

URL: http://svn.apache.org/viewvc?rev=1769304=rev
Log:
[MRELEASE-966] release plugin does not respect "mvn -f"

The prepare and perform goals execute goals against the given pomFileName. This 
should default to the name of the POM file of the project being built (it can 
be something else than pom.xml when running Maven with the -f option).

Added:

maven/release/trunk/maven-release-plugin/src/it/projects/prepare/MRELEASE-966/

maven/release/trunk/maven-release-plugin/src/it/projects/prepare/MRELEASE-966/invoker.properties
   (with props)

maven/release/trunk/maven-release-plugin/src/it/projects/prepare/MRELEASE-966/my-pom.xml
   (with props)

maven/release/trunk/maven-release-plugin/src/it/projects/prepare/MRELEASE-966/pom.xml
   (with props)

maven/release/trunk/maven-release-plugin/src/it/projects/prepare/MRELEASE-966/verify.groovy
   (with props)
Modified:
maven/release/trunk/maven-release-plugin/pom.xml

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

Modified: maven/release/trunk/maven-release-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/pom.xml?rev=1769304=1769303=1769304=diff
==
--- maven/release/trunk/maven-release-plugin/pom.xml (original)
+++ maven/release/trunk/maven-release-plugin/pom.xml Fri Nov 11 15:32:18 2016
@@ -220,6 +220,9 @@
 projects/prepare/*/*pom.xml
 
projects/prepare/flat-multi-module/parent-project/pom.xml
   
+  
+
projects/prepare/MRELEASE-966/pom.xml
+  
   
 clean
 
${project.groupId}:${project.artifactId}:${project.version}:clean

Added: 
maven/release/trunk/maven-release-plugin/src/it/projects/prepare/MRELEASE-966/invoker.properties
URL: 
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/it/projects/prepare/MRELEASE-966/invoker.properties?rev=1769304=auto
==
--- 
maven/release/trunk/maven-release-plugin/src/it/projects/prepare/MRELEASE-966/invoker.properties
 (added)
+++ 
maven/release/trunk/maven-release-plugin/src/it/projects/prepare/MRELEASE-966/invoker.properties
 Fri Nov 11 15:32:18 2016
@@ -0,0 +1,18 @@
+# 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.project = my-pom.xml
\ No newline at end of file

Propchange: 
maven/release/trunk/maven-release-plugin/src/it/projects/prepare/MRELEASE-966/invoker.properties
--
svn:eol-style = native

Propchange: 
maven/release/trunk/maven-release-plugin/src/it/projects/prepare/MRELEASE-966/invoker.properties
--
svn:keywords = Author Date Id Revision

Added: 
maven/release/trunk/maven-release-plugin/src/it/projects/prepare/MRELEASE-966/my-pom.xml
URL: 
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/it/projects/prepare/MRELEASE-966/my-pom.xml?rev=1769304=auto
==
--- 
maven/release/trunk/maven-release-plugin/src/it/projects/prepare/MRELEASE-966/my-pom.xml
 (added)
+++ 
maven/release/trunk/maven-release-plugin/src/it/projects/prepare/MRELEASE-966/my-pom.xml
 Fri Nov 11 15:32:18 2016
@@ -0,0 +1,48 @@
+
+
+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.plugin.release.its
+  mrelease-966-my-pom
+  1.0-SNAPSHOT
+
+  
+scm:dummy|nul
+scm:dummy|nul
+  
+
+  
+
+  
+org.apache.maven.plugins
+maven-release-plugin
+@project.version@
+
+  
+org.apache.maven.its.release
+  

svn commit: r1768250 - in /maven/plugins/trunk/maven-help-plugin/src: it/effective-pom-artifact/ main/java/org/apache/maven/plugins/help/

[gboue]

Author: gboue
Date: Sat Nov  5 17:09:51 2016
New Revision: 1768250

URL: http://svn.apache.org/viewvc?rev=1768250=rev
Log:
[MPH-106] add gav parameter to calculate effective pom for any gav, not only 
reactor

Adding an "artifact" parameter to the effective-pom goal. The name is to be 
consistent with the evaluate goal.
-> Refactoring the common code into AbstractHelpMojo

Added:
maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-artifact/

maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-artifact/invoker.properties
   (with props)
maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-artifact/pom.xml 
  (with props)

maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-artifact/test.properties
   (with props)

maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-artifact/verify.groovy
   (with props)
Modified:

maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/AbstractHelpMojo.java

maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EffectivePomMojo.java

maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EvaluateMojo.java

Added: 
maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-artifact/invoker.properties
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-artifact/invoker.properties?rev=1768250=auto
==
--- 
maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-artifact/invoker.properties
 (added)
+++ 
maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-artifact/invoker.properties
 Sat Nov  5 17:09:51 2016
@@ -0,0 +1,18 @@
+# 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 = 
${project.groupId}:${project.artifactId}:${project.version}:effective-pom

Propchange: 
maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-artifact/invoker.properties
--
svn:eol-style = native

Propchange: 
maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-artifact/invoker.properties
--
svn:keywords = Author Date Id Revision

Added: 
maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-artifact/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-artifact/pom.xml?rev=1768250=auto
==
--- maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-artifact/pom.xml 
(added)
+++ maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-artifact/pom.xml 
Sat Nov  5 17:09:51 2016
@@ -0,0 +1,30 @@
+
+
+
+
+
+  4.0.0
+
+  org.apache.maven.its.help
+  mph-106
+  1.0-SNAPSHOT
+  https://issues.apache.org/jira/browse/MPH-106
+
+

Propchange: 
maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-artifact/pom.xml
--
svn:eol-style = native

Propchange: 
maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-artifact/pom.xml
--
svn:keywords = Author Date Id Revision

Added: 
maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-artifact/test.properties
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-artifact/test.properties?rev=1768250=auto
==
--- 
maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-artifact/test.properties
 (added)
+++ 
maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-artifact/test.properties
 Sat Nov  5 17:09:51 2016
@@ -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
+# &quo

svn commit: r1768264 - in /maven/plugins/trunk/maven-help-plugin/src: main/java/org/apache/maven/plugins/help/ test/java/org/apache/maven/plugins/help/

[gboue]

Author: gboue
Date: Sat Nov  5 18:15:28 2016
New Revision: 1768264

URL: http://svn.apache.org/viewvc?rev=1768264=rev
Log:
[MPH-107] Mojos use inconsistent line endings throughout

Using the system line separator instead of hard-coding "\n" in the different 
mojos.

Modified:

maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/ActiveProfilesMojo.java

maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/AllProfilesMojo.java

maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java

maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EffectivePomMojo.java

maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EffectiveSettingsMojo.java

maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EvaluateMojo.java

maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/ExpressionsMojo.java

maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/HelpUtil.java

maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/SystemMojo.java

maven/plugins/trunk/maven-help-plugin/src/test/java/org/apache/maven/plugins/help/DescribeMojoTest.java

maven/plugins/trunk/maven-help-plugin/src/test/java/org/apache/maven/plugins/help/EvaluateMojoTest.java

Modified: 
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/ActiveProfilesMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/ActiveProfilesMojo.java?rev=1768264=1768263=1768264=diff
==
--- 
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/ActiveProfilesMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/ActiveProfilesMojo.java
 Sat Nov  5 18:15:28 2016
@@ -19,6 +19,8 @@ package org.apache.maven.plugins.help;
  * under the License.
  */
 
+import static org.apache.maven.plugins.help.HelpUtil.LS;
+
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -68,15 +70,15 @@ public class ActiveProfilesMojo
 {
 getActiveProfileStatement( project, message );
 
-message.append( "\n\n" );
+message.append( LS ).append( LS );
 }
 
 if ( output != null )
 {
 String formattedDateTime = 
DateFormatUtils.ISO_DATETIME_FORMAT.format( System.currentTimeMillis() );
 StringBuilder sb = new StringBuilder();
-sb.append( "Created by: " ).append( getClass().getName() ).append( 
"\n" );
-sb.append( "Created on: " ).append( formattedDateTime ).append( 
"\n" ).append( "\n" );
+sb.append( "Created by: " ).append( getClass().getName() ).append( 
LS );
+sb.append( "Created on: " ).append( formattedDateTime ).append( LS 
).append( LS );
 sb.append( message.toString() );
 
 try
@@ -138,9 +140,10 @@ public class ActiveProfilesMojo
 }
 
 
-message.append( "\n" );
+message.append( LS );
 
-message.append( "Active Profiles for Project \'" ).append( 
project.getId() ).append( "\': \n\n" );
+message.append( "Active Profiles for Project \'" ).append( 
project.getId() ).append( "\':" );
+message.append( LS ).append( LS );
 
 if ( activeProfileIds.isEmpty() )
 {
@@ -148,19 +151,19 @@ public class ActiveProfilesMojo
 }
 else
 {
-message.append( "The following profiles are active:\n" );
+message.append( "The following profiles are active:" ).append( LS 
);
 
 for ( Map.Entry<String, List> entry : 
activeProfileIds.entrySet() )
 {
 for ( String profileId : entry.getValue() )
 {
-message.append( "\n - " ).append( profileId );
+message.append( LS ).append( " - " ).append( profileId );
 message.append( " (source: " ).append( entry.getKey() 
).append( ")" );
 }
 }
 }
 
-message.append( "\n" );
+message.append( LS );
 }
 
 @SuppressWarnings( "unchecked" )

Modified: 
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/AllProfilesMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/AllProfilesMojo.java?rev=1768264=1768263=1768

svn commit: r1766221 - in /maven/plugins/trunk/maven-compiler-plugin/src/site/apt/examples: compile-using-different-jdk.apt.vm set-compiler-source-and-target.apt.vm

[gboue]

Author: gboue
Date: Sat Oct 22 18:11:12 2016
New Revision: 1766221

URL: http://svn.apache.org/viewvc?rev=1766221=rev
Log:
- Updating the "Setting the -source and -target of the Java Compiler": fixing 
broken link to Mojohaus, adding a note about the usage of "source", linking to 
the page about compiling with a different JDK.
- Updating "Compile using a different JDK" documentation page to reference 
toolchains.

Modified:

maven/plugins/trunk/maven-compiler-plugin/src/site/apt/examples/compile-using-different-jdk.apt.vm

maven/plugins/trunk/maven-compiler-plugin/src/site/apt/examples/set-compiler-source-and-target.apt.vm

Modified: 
maven/plugins/trunk/maven-compiler-plugin/src/site/apt/examples/compile-using-different-jdk.apt.vm
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/site/apt/examples/compile-using-different-jdk.apt.vm?rev=1766221=1766220=1766221=diff
==
--- 
maven/plugins/trunk/maven-compiler-plugin/src/site/apt/examples/compile-using-different-jdk.apt.vm
 (original)
+++ 
maven/plugins/trunk/maven-compiler-plugin/src/site/apt/examples/compile-using-different-jdk.apt.vm
 Sat Oct 22 18:11:12 2016
@@ -28,6 +28,22 @@
 
 Compiling Sources Using A Different JDK
 
+* Using Maven Toolchains
+
+  The preferable way to use a different JDK is to use the toolchains 
mechanism. During the build of a project, Maven, 
+  without toolchains, will use the JDK to perform various steps, like 
compiling the Java sources, generate the Javadoc,
+  run unit tests or sign JARs. Each of those plugins need a tool of the JDK to 
operate: <<>>, <<>>,
+  <<>>, etc. A toolchains is a way to specify the path to the JDK 
to use for all of those plugins in a
+  centralized manner, independant from the one running Maven itself.
+  
+  To set this up, refer to the 
{{{/guides/mini/guide-using-toolchains.html}Guide to Using Toolchains}}, which 
makes use
+  of the {{{/plugins/maven-toolchains-plugin/}Maven Toolchains Plugin}}.
+
+* Configuring the Compiler Plugin
+
+  Outside of a toolchains, it is still possible to tell the Compiler Plugin 
the specific JDK to use during compilation.
+  Note that such configuration will be specific to this plugin, and will not 
affect others.
+  
   The <<>> parameter can be used to specify the version of the
   compiler that the plugin will use. However, you also need to set <<>>
   to <<>> for this to work. For example:

Modified: 
maven/plugins/trunk/maven-compiler-plugin/src/site/apt/examples/set-compiler-source-and-target.apt.vm
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/site/apt/examples/set-compiler-source-and-target.apt.vm?rev=1766221=1766220=1766221=diff
==
--- 
maven/plugins/trunk/maven-compiler-plugin/src/site/apt/examples/set-compiler-source-and-target.apt.vm
 (original)
+++ 
maven/plugins/trunk/maven-compiler-plugin/src/site/apt/examples/set-compiler-source-and-target.apt.vm
 Sat Oct 22 18:11:12 2016
@@ -35,7 +35,20 @@ Setting the <<<-source>>> and <<<-target
 
   For example, if you want to use the Java 8 language features (<<<-source 
1.8>>>)
   and also want the compiled classes to be compatible with JVM 1.8 (<<<-target 
1.8>>>),
-  you can then put:
+  you can either add the two following properties, which are the default 
property names for the plugin parameters:
+
++-
+
+  [...]
+  
+1.8
+1.8
+  
+  [...]
+
++-
+
+  or configure the plugin directly:
 
 +-
 
@@ -63,5 +76,8 @@ Setting the <<<-source>>> and <<<-target
   specified version. The pitfall is unintended usage of APIs that only exist 
in later JREs which would make your code
   fail at runtime with a linkage error. To avoid this issue, you can either 
configure the compiler's boot classpath
   to match the target JRE or use the
-  {{{http://mojo.codehaus.org/animal-sniffer-maven-plugin/}Animal Sniffer 
Maven Plugin}} to verify your code doesn't
-  use unintended APIs.
+  
{{{http://www.mojohaus.org/animal-sniffer/animal-sniffer-maven-plugin/}Animal 
Sniffer Maven Plugin}}
+  to verify your code doesn't use unintended APIs. In the same way, setting 
the <<>> option does not guarantee 
+  that your code actually compiles on a JDK with the specified version. To 
compile your code with a specific JDK 
+  version, different than the one used to launch Maven, refer to the
+  {{{../examples/compile-using-different-jdk.html}Compile Using A Different 
JDK}} example.

svn commit: r1769402 - in /maven/plugins/trunk/maven-help-plugin/src: it/describe-plugin-in-plugin-management/ main/java/org/apache/maven/plugins/help/ test/java/org/apache/maven/plugins/help/

[gboue]

Author: gboue
Date: Sat Nov 12 19:43:02 2016
New Revision: 1769402

URL: http://svn.apache.org/viewvc?rev=1769402=rev
Log:
[MPH-53] mvn help:describe returns the version that is specified in metadata 
instead of the one in the parent pom

Set the POM to use in the plugin version requuest, so that plugin versions 
declared in it are correctly used.

Added:

maven/plugins/trunk/maven-help-plugin/src/it/describe-plugin-in-plugin-management/

maven/plugins/trunk/maven-help-plugin/src/it/describe-plugin-in-plugin-management/invoker.properties
   (with props)

maven/plugins/trunk/maven-help-plugin/src/it/describe-plugin-in-plugin-management/pom.xml
   (with props)

maven/plugins/trunk/maven-help-plugin/src/it/describe-plugin-in-plugin-management/test.properties
   (with props)

maven/plugins/trunk/maven-help-plugin/src/it/describe-plugin-in-plugin-management/verify.groovy
   (with props)
Modified:

maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java

maven/plugins/trunk/maven-help-plugin/src/test/java/org/apache/maven/plugins/help/DescribeMojoTest.java

Added: 
maven/plugins/trunk/maven-help-plugin/src/it/describe-plugin-in-plugin-management/invoker.properties
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/it/describe-plugin-in-plugin-management/invoker.properties?rev=1769402=auto
==
--- 
maven/plugins/trunk/maven-help-plugin/src/it/describe-plugin-in-plugin-management/invoker.properties
 (added)
+++ 
maven/plugins/trunk/maven-help-plugin/src/it/describe-plugin-in-plugin-management/invoker.properties
 Sat Nov 12 19:43:02 2016
@@ -0,0 +1,18 @@
+# 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 = 
${project.groupId}:${project.artifactId}:${project.version}:describe

Propchange: 
maven/plugins/trunk/maven-help-plugin/src/it/describe-plugin-in-plugin-management/invoker.properties
--
svn:eol-style = native

Propchange: 
maven/plugins/trunk/maven-help-plugin/src/it/describe-plugin-in-plugin-management/invoker.properties
--
svn:keywords = Author Date Id Revision

Added: 
maven/plugins/trunk/maven-help-plugin/src/it/describe-plugin-in-plugin-management/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/it/describe-plugin-in-plugin-management/pom.xml?rev=1769402=auto
==
--- 
maven/plugins/trunk/maven-help-plugin/src/it/describe-plugin-in-plugin-management/pom.xml
 (added)
+++ 
maven/plugins/trunk/maven-help-plugin/src/it/describe-plugin-in-plugin-management/pom.xml
 Sat Nov 12 19:43:02 2016
@@ -0,0 +1,43 @@
+
+
+
+
+
+  4.0.0
+
+  org.apache.maven.its.help
+  test
+  1.0
+  https://issues.apache.org/jira/browse/MPH-53
+  
+Tests that the describe goal correctly resolves the version of the plugin 
to describe from the POM, if defined.
+  
+
+  
+
+  
+
+  maven-surefire-plugin
+  2.4.3
+
+  
+
+  
+

Propchange: 
maven/plugins/trunk/maven-help-plugin/src/it/describe-plugin-in-plugin-management/pom.xml
--
svn:eol-style = native

Propchange: 
maven/plugins/trunk/maven-help-plugin/src/it/describe-plugin-in-plugin-management/pom.xml
--
svn:keywords = Author Date Id Revision

Added: 
maven/plugins/trunk/maven-help-plugin/src/it/describe-plugin-in-plugin-management/test.properties
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/it/describe-plugin-in-plugin-management/test.properties?rev=1769402=auto
==
--- 
maven/plugins/trunk/maven-help-plugin/src/it/describe-plugin-in-plugin-management/test.properties
 (added)
+++ 
maven/plugins/trunk/maven-help-plugin/src/it/describe-plugin-in-plugin-management/

svn commit: r1771515 - in /maven/enforcer/trunk: ./ enforcer-rules/ enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/ enforcer-rules/src/site/apt/ enforcer-rules/src/test/java/org/apache

[gboue]

Author: gboue
Date: Sat Nov 26 21:56:24 2016
New Revision: 1771515

URL: http://svn.apache.org/viewvc?rev=1771515=rev
Log:
[MENFORCER-247] Add a "require file checksum" rule
Submitted by: Lyubomyr Shaydariv

New RequireFileChecksum, rule that is non cacheable and inherits from 
AbstractNonCacheableEnforcerRule. This closes #18.

Added:

maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFileChecksum.java
   (with props)
maven/enforcer/trunk/enforcer-rules/src/site/apt/requireFileChecksum.apt.vm 
  (with props)

maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireFileChecksum.java
   (with props)

maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-file-checksum/

maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-file-checksum/LICENSE

maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-file-checksum/pom.xml
   (with props)
Modified:
maven/enforcer/trunk/enforcer-rules/pom.xml
maven/enforcer/trunk/enforcer-rules/src/site/apt/index.apt
maven/enforcer/trunk/pom.xml

Modified: maven/enforcer/trunk/enforcer-rules/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/pom.xml?rev=1771515=1771514=1771515=diff
==
--- maven/enforcer/trunk/enforcer-rules/pom.xml (original)
+++ maven/enforcer/trunk/enforcer-rules/pom.xml Sat Nov 26 21:56:24 2016
@@ -67,6 +67,10 @@
   commons-lang
 
 
+  commons-codec
+  commons-codec
+
+
   org.apache.maven.enforcer
   enforcer-api
 

Added: 
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFileChecksum.java
URL: 
http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFileChecksum.java?rev=1771515=auto
==
--- 
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFileChecksum.java
 (added)
+++ 
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFileChecksum.java
 Sat Nov 26 21:56:24 2016
@@ -0,0 +1,146 @@
+package org.apache.maven.plugins.enforcer;
+
+/*
+ * 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.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.maven.enforcer.rule.api.EnforcerRuleException;
+import org.apache.maven.enforcer.rule.api.EnforcerRuleHelper;
+import org.codehaus.plexus.util.IOUtil;
+
+/**
+ * Rule to validate a file to match the specified checksum.
+ *
+ * @author Edward Samson
+ * @author Lyubomyr Shaydariv
+ */
+public class RequireFileChecksum
+extends AbstractNonCacheableEnforcerRule
+{
+
+private File file;
+
+private String checksum;
+
+private String type;
+
+public void execute( EnforcerRuleHelper helper )
+throws EnforcerRuleException
+{
+if ( this.file == null )
+{
+throw new EnforcerRuleException( "Input file unspecified" );
+}
+
+if ( this.type == null )
+{
+throw new EnforcerRuleException( "Hash type unspecified" );
+}
+
+if ( this.checksum == null )
+{
+throw new EnforcerRuleException( "Checksum unspecified" );
+}
+
+InputStream inputStream = null;
+try
+{
+if ( this.file.isDirectory() || !this.file.canRead() )
+{
+throw new EnforcerRuleException( "Cannot read file: " + 
this.file.getAbsolutePath() );
+}
+
+inputStream = new FileInputStream( this.file );
+String checksum;
+if ( "md5".equals( this.type ) )
+{
+checksum = DigestUtils.md5Hex( inputStream );
+}
+else if ( "sha1".equals( this.type ) )
+{
+

maven-archetype git commit: [ARCHETYPE-513] Files in excludePatterns having a default filtered extension are still included

[gboue]

Repository: maven-archetype
Updated Branches:
  refs/heads/master 4a59126c6 -> 44e7ed632


[ARCHETYPE-513] Files in excludePatterns having a default filtered
extension are still included

If a file having a default filtered extensions was present in a manually
excluded pattern, it still ended up in the generated archetype. The fix
is to propagate the excludePattern to the creation of the archetype
files in (FilesetArchetypeCreator#createArchetypeFiles).

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

Branch: refs/heads/master
Commit: 44e7ed6329320ae6b009bf3415b0e615770a110e
Parents: 4a59126
Author: Guillaume Boué 
Authored: Thu Nov 17 13:27:58 2016 +0100
Committer: Guillaume Boué 
Committed: Thu Nov 17 13:27:58 2016 +0100

--
 .../creator/FilesetArchetypeCreator.java| 18 ++--
 .../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 
 .../creator/DefaultArchetypeCreatorTest.java| 12 +
 .../projects/exclude-patterns-2/.sonar/file.txt |  0
 .../archetype.properties.sample |  9 
 .../exclude-patterns-2/folder/.sonar/file.txt   |  0
 .../projects/exclude-patterns-2/folder/file.txt |  0
 .../projects/exclude-patterns-2/pom.xml.sample  | 34 +++
 21 files changed, 147 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/44e7ed63/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 6af535f..22465fd 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
@@ -211,7 +211,7 @@ public class FilesetArchetypeCreator
 archetypeDescriptor.setFileSets( filesets );
 
 createArchetypeFiles( reverseProperties, filesets, packageName, 
basedir, archetypeFilesDirectory,
-  defaultEncoding );
+  defaultEncoding, excludePatterns );
 getLogger().debug( "Created files for " + 
archetypeDescriptor.getName() );
 
 setParentArtifactId( reverseProperties, 
configurationProperties.getProperty( Constants.ARTIFACT_ID ) );
@@ -805,6 +805,14 @@ public class FilesetArchetypeCreator
 return result;
 }
 
+private List addLists( List list, List other )
+{
+List result = new ArrayList( list.size() + 
other.size() );
+result.addAll( list );
+result.addAll( other );
+return result;
+}
+
 private void copyFiles( File basedir, File archetypeFilesDirectory, String 
directory, List fileSetResources,
 boolean packaged, String packageName )
 throws IOException
@@ -832,7 +840,8 @@ public class FilesetArchetypeCreator
 }
 
 private void createArchetypeFiles( Properties reverseProperties, 
List fileSets, String packageName,
-   File basedir, File 
archetypeFilesDirectory, String defaultEncoding )
+   File basedir, File 
archetypeFilesDirectory, String defaultEncoding,
+   List excludePatterns )
 throws IOException
 {
 getLogger().debug( "Creating Archetype/Module files from " + basedir + 
" to " + archetypeFilesDirectory );
@@ -843,7 +852,8 @@ public class FilesetArchetypeCreator
 scanner.setBasedir( basedir );
 scanner.setIncludes( (String[]) concatenateToList( 
fileSet.getIncludes(), 

svn commit: r1770187 [2/2] - in /maven/site/trunk/content/resources/xsd: assembly-2.0.0.xsd assembly-component-2.0.0.xsd

[gboue]

Added: maven/site/trunk/content/resources/xsd/assembly-component-2.0.0.xsd
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/resources/xsd/assembly-component-2.0.0.xsd?rev=1770187=auto
==
--- maven/site/trunk/content/resources/xsd/assembly-component-2.0.0.xsd (added)
+++ maven/site/trunk/content/resources/xsd/assembly-component-2.0.0.xsd Thu Nov 
17 13:16:25 2016
@@ -0,0 +1,1247 @@
+
+
+
+
+
+http://www.w3.org/2001/XMLSchema; 
elementFormDefault="qualified" 
xmlns="http://maven.apache.org/ASSEMBLY-COMPONENT/2.0.0; 
targetNamespace="http://maven.apache.org/ASSEMBLY-COMPONENT/2.0.0;>
+  
+
+  1.0.0+
+  Describes the component layout 
and packaging.
+
+  
+  
+
+  1.0.0+
+  Describes the component layout 
and packaging.
+
+
+  
+
+  1.1.2+
+  
+
+Specifies which module files to include in the assembly. A 
moduleSet
+is specified by providing one or more of lt;moduleSetgt;
+subelements.
+
+  
+
+
+  
+
+  
+
+  
+  
+
+  1.0.0+
+  
+
+Specifies which groups of files to include in the assembly. A
+fileSet is specified by providing one or more of 
lt;fileSetgt;
+subelements.
+
+  
+
+
+  
+
+  
+
+  
+  
+
+  1.0.0+
+  
+
+Specifies which single files to include in the assembly. A file
+is specified by providing one or more of lt;filegt;
+subelements.
+
+  
+
+
+  
+
+  
+
+  
+  
+
+  1.0.0+
+  
+
+Specifies which dependencies to include in the assembly. A
+dependencySet is specified by providing one or more of
+lt;dependencySetgt; subelements.
+
+  
+
+
+  
+
+  
+
+  
+  
+
+  1.1.0+
+  
+
+Specifies a set of repositories to include in the assembly. A
+repository is specified by providing one or more of
+lt;repositorygt; subelements.
+
+  
+
+
+  
+
+  
+
+  
+  
+
+  1.1.0+
+  
+
+Set of components which filter various container descriptors out of
+the normal archive stream, so they can be aggregated then added.
+
+  
+
+
+  
+
+  
+
+  
+
+  
+  
+
+  1.0.0+
+  
+A file allows individual file inclusion with the option to change
+the destination filename not supported by fileSets.
+  
+
+
+  
+
+  1.0.0+
+  
+Sets the absolute or relative path from the modules directory
+of the file to be included in the assembly.
+  
+
+  
+  
+
+  1.0.0+
+  
+Sets the output directory relative to the root
+of the root directory of the assembly. For example,
+log will put the specified files in the log directory.
+  
+
+  
+  
+
+  1.0.0+
+  
+Sets the destination filename in the outputDirectory.
+Default is the same name as the sources file.
+  
+
+  
+  
+
+  1.0.0+
+  
+
+Similar to a UNIX permission, sets the file mode of the files 
included.
+THIS IS AN OCTAL VALUE.
+Format: (User)(Group)(Other) where each component is a sum of Read 
= 4,
+Write = 2, and Execute = 1.  For example, the value 0644
+translates to User read-write, Group and Other read-only. The 
default value is 0644.
+a 
href=http://www.onlamp.com/pub/a/bsd/2000/09/06/FreeBSD_Basics.html;(more
 on unix-style permissions)/a
+
+  
+
+  
+  
+
+  1.0.0+
+  
+
+Sets the line-endings of the files in this file.
+Valid values are:
+ul
+  libkeep/b - Preserve all 
line endings/li
+  libunix/b - Use Unix-style 
line endings/li
+  liblf/b - Use a single 
line-feed line endings/li
+  libdos/b - Use DOS-style 
line endings/li
+  libcrlf/b - Use 
Carraige-return, line-feed line endings/li
+/ul
+
+  
+
+  
+  
+
+  1.0.0+
+  
+Sets whether to 

svn commit: r1770187 [1/2] - in /maven/site/trunk/content/resources/xsd: assembly-2.0.0.xsd assembly-component-2.0.0.xsd

[gboue]

Author: gboue
Date: Thu Nov 17 13:16:25 2016
New Revision: 1770187

URL: http://svn.apache.org/viewvc?rev=1770187=rev
Log:
[MASSEMBLY-838] Assembly descriptor schemas are missing from web site

Adding 2.0.0 assembly descriptors for the Assembly Plugin to the site with 
regard to the 3.0.0 release of the plugin.

XSD generated by checking out the 3.0.0 tag from SVN on Ubuntu 16.04, running 
"mvn clean package" (Maven 3.3.9) and copying the two generated XSDs by Modello.

Added:
maven/site/trunk/content/resources/xsd/assembly-2.0.0.xsd   (with props)
maven/site/trunk/content/resources/xsd/assembly-component-2.0.0.xsd   (with 
props)

Added: maven/site/trunk/content/resources/xsd/assembly-2.0.0.xsd
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/resources/xsd/assembly-2.0.0.xsd?rev=1770187=auto
==
--- maven/site/trunk/content/resources/xsd/assembly-2.0.0.xsd (added)
+++ maven/site/trunk/content/resources/xsd/assembly-2.0.0.xsd Thu Nov 17 
13:16:25 2016
@@ -0,0 +1,1364 @@
+
+
+
+
+
+http://www.w3.org/2001/XMLSchema; 
elementFormDefault="qualified" xmlns="http://maven.apache.org/ASSEMBLY/2.0.0; 
targetNamespace="http://maven.apache.org/ASSEMBLY/2.0.0;>
+  
+
+  1.0.0+
+  
+
+An assembly defines a collection of files usually distributed in an
+archive format such as zip, tar, or tar.gz that is generated from a
+project.  For example, a project could produce a ZIP assembly which
+contains a projects JAR artifact in the root directory, the
+runtime dependencies in a lib/ directory, and a shell script to launch
+a stand-alone application.
+
+  
+
+  
+  
+
+  1.0.0+
+  
+
+An assembly defines a collection of files usually distributed in an
+archive format such as zip, tar, or tar.gz that is generated from a
+project.  For example, a project could produce a ZIP assembly which
+contains a projects JAR artifact in the root directory, the
+runtime dependencies in a lib/ directory, and a shell script to launch
+a stand-alone application.
+
+  
+
+
+  
+
+  1.0.0+
+  
+Sets the id of this assembly. This is a symbolic name for a
+particular assembly of files from this project. Also, aside from
+being used to distinctly name the assembled package by attaching
+its value to the generated archive, the id is used as your
+artifacts classifier when deploying.
+  
+
+  
+  
+
+  1.0.0+
+  
+
+Specifies the formats of the assembly.
+
+It is often better to specify the formats via the goal parameter 
rather
+than here. For example, that allows different profiles to generate
+different types of archives.
+
+Multiple formats can be
+supplied and the Assembly Plugin will generate an archive for each
+of the desired formats. When deploying your project, all file 
formats
+specified will also be deployed. A format is specified by supplying
+one of the following values in a lt;formatgt; subelement:
+ul
+  libzip/b - Creates a ZIP 
file format/li
+  libtar/b - Creates a TAR 
format/li
+  libtar.gz/b or 
btgz/b - Creates a gzipd TAR format/li
+  libtar.bz2/b or 
btbz2/b - Creates a bzipd TAR 
format/li
+  libjar/b - Creates a JAR 
format/li
+  libdir/b - Creates an 
exploded directory format/li
+  libwar/b - Creates a WAR 
format/li
+/ul
+
+  
+
+
+  
+
+  
+
+  
+  
+
+  0.0.0+
+  
+Includes a base directory in the final archive. For example,
+if you are creating an assembly named your-app, setting
+includeBaseDirectory to true will create an archive that
+includes this base directory. If this option is set to false
+the archive created will unzip its content to the current
+directory.
+  
+
+  
+  
+
+  1.1.0+
+  
+Sets the base directory of the resulting assembly archive. If this 
is not
+set and includeBaseDirectory == true, ${project.build.finalName} 
will be used instead.
+(Since 2.2-beta-1)
+  
+
+  
+  
+
+  0.0.0+
+  
+Includes a site directory in the final archive. The site directory
+location of a project is determined by the siteDirectory parameter
+of the Assembly Plugin.
+  
+
+  
+

svn commit: r1770444 - in /maven/plugins/trunk/maven-install-plugin/src: it/minstall-55/verify.bsh main/java/org/apache/maven/plugin/install/InstallFileMojo.java

[gboue]

Author: gboue
Date: Fri Nov 18 22:35:24 2016
New Revision: 1770444

URL: http://svn.apache.org/viewvc?rev=1770444=rev
Log:
[MINSTALL-110] install-file should also install bundled pom.xml from artifact.

Follow-up: make sure the POM file extracted from the archive is into a 
temporary folder, and that it is correctly deleted after installation.

Modified:
maven/plugins/trunk/maven-install-plugin/src/it/minstall-55/verify.bsh

maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java

Modified: maven/plugins/trunk/maven-install-plugin/src/it/minstall-55/verify.bsh
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-install-plugin/src/it/minstall-55/verify.bsh?rev=1770444=1770443=1770444=diff
==
--- maven/plugins/trunk/maven-install-plugin/src/it/minstall-55/verify.bsh 
(original)
+++ maven/plugins/trunk/maven-install-plugin/src/it/minstall-55/verify.bsh Fri 
Nov 18 22:35:24 2016
@@ -37,4 +37,10 @@ for ( String path : paths )
 }
 }
 
+File file = new File( basedir, "test-0.1.pom" );
+if ( !file.isFile() )
+{
+throw new FileNotFoundException( "Missing: " + file.getAbsolutePath() );
+}
+
 return true;

Modified: 
maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java?rev=1770444=1770443=1770444=diff
==
--- 
maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java
 Fri Nov 18 22:35:24 2016
@@ -213,13 +213,16 @@ public class InstallFileMojo
 getLog().debug( "localRepoPath: " + 
repositoryManager.getLocalRepositoryBasedir( buildingRequest ) );
 }
 
+File temporaryPom = null;
+
 if ( pomFile != null )
 {
 processModel( readModel( pomFile ) );
 }
 else
 {
-readingPomFromJarFile();
+temporaryPom = readingPomFromJarFile();
+pomFile = temporaryPom;
 }
 
 validateArtifactInformation();
@@ -261,8 +264,8 @@ public class InstallFileMojo
 }
 else
 {
-File generatedPomFile = generatePomFile();
-ProjectArtifactMetadata pomMetadata = new 
ProjectArtifactMetadata( artifact, generatedPomFile );
+temporaryPom = generatePomFile();
+ProjectArtifactMetadata pomMetadata = new 
ProjectArtifactMetadata( artifact, temporaryPom );
 if ( Boolean.TRUE.equals( generatePom )
 || ( generatePom == null && !getLocalRepoFile( 
buildingRequest, pomMetadata ).exists() ) )
 {
@@ -273,7 +276,7 @@ public class InstallFileMojo
 }
 else
 {
-project.setFile( generatedPomFile );
+project.setFile( temporaryPom );
 }
 }
 else if ( generatePom == null )
@@ -306,6 +309,14 @@ public class InstallFileMojo
 {
 throw new MojoExecutionException( e.getMessage(), e );
 }
+finally
+{
+if ( temporaryPom != null )
+{
+// noinspection ResultOfMethodCallIgnored
+temporaryPom.delete();
+}
+}
 }
 
 /**
@@ -336,10 +347,10 @@ public class InstallFileMojo
 }
 }
 
-private void readingPomFromJarFile()
+private File readingPomFromJarFile()
 throws MojoExecutionException
 {
-boolean foundPom = false;
+File pomFile = null;
 
 JarFile jarFile = null;
 try
@@ -358,8 +369,6 @@ public class InstallFileMojo
 {
 getLog().debug( "Using " + entry.getName() + " as pomFile" 
);
 
-foundPom = true;
-
 InputStream pomInputStream = null;
 OutputStream pomOutputStream = null;
 
@@ -372,7 +381,7 @@ public class InstallFileMojo
 {
 base = base.substring( 0, base.lastIndexOf( '.' ) 
);
 }
-pomFile = new File( file.getParentFile(), base + 
".pom" );
+pomFile = File.createTempFile( base, ".pom" );
 
 pomOutputStream = new FileOutputStream( pomFile );
 
@@ -396,7 +405,7 @@ public class InstallFileMojo
 

svn commit: r1770497 - in /maven/plugins/trunk: maven-deploy-plugin/src/it/gav-validation/ maven-deploy-plugin/src/main/java/org/apache/maven/plugins/deploy/ maven-install-plugin/src/it/gav-validation

[gboue]

Author: gboue
Date: Sat Nov 19 15:21:30 2016
New Revision: 1770497

URL: http://svn.apache.org/viewvc?rev=1770497=rev
Log:
Migration to Maven 3: because of an API change in ModelProblemCollector between 
3.0.x and 3.1.x, that interface cannot be used as-is for compatibility for both 
in order to determine if the coordinate information passed by the user is 
valid. The plugins are compiled with 3.0 core and are currently linked to a 
specific ModelProblemCollector, but starting with 3.1.0-alpha-1, Maven core 
calls a different method than the one the plugins were compiled with. This 
results in AbstractMethodError at run-time. (this was not detected by the ITs 
because, although they tested that the build failed with missing parameters, it 
didn't test the cause of the failure.)

Since the plugins are now using a new MavenProject instance, and attaching 
things to it in order to deploy or install them, it is possible to rely on the 
validation performed during the building of that project to catch model errors.

Added:

maven/plugins/trunk/maven-deploy-plugin/src/it/gav-validation/test-invalid.properties
  - copied unchanged from r1768278, 
maven/plugins/trunk/maven-deploy-plugin/src/it/gav-validation/test.properties

maven/plugins/trunk/maven-deploy-plugin/src/it/gav-validation/test-missing.properties
   (with props)
maven/plugins/trunk/maven-deploy-plugin/src/it/gav-validation/verify.groovy
  - copied, changed from r1768278, 
maven/plugins/trunk/maven-deploy-plugin/src/it/gav-validation/verify.bsh

maven/plugins/trunk/maven-install-plugin/src/it/gav-validation/test-invalid.properties
  - copied unchanged from r1768278, 
maven/plugins/trunk/maven-install-plugin/src/it/gav-validation/test.properties

maven/plugins/trunk/maven-install-plugin/src/it/gav-validation/test-missing.properties
   (with props)
maven/plugins/trunk/maven-install-plugin/src/it/gav-validation/verify.groovy
  - copied, changed from r1768278, 
maven/plugins/trunk/maven-install-plugin/src/it/gav-validation/verify.bsh
Removed:

maven/plugins/trunk/maven-deploy-plugin/src/it/gav-validation/test.properties
maven/plugins/trunk/maven-deploy-plugin/src/it/gav-validation/verify.bsh

maven/plugins/trunk/maven-install-plugin/src/it/gav-validation/test.properties
maven/plugins/trunk/maven-install-plugin/src/it/gav-validation/verify.bsh
Modified:

maven/plugins/trunk/maven-deploy-plugin/src/it/gav-validation/invoker.properties

maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugins/deploy/DeployFileMojo.java

maven/plugins/trunk/maven-install-plugin/src/it/gav-validation/invoker.properties

maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java

Modified: 
maven/plugins/trunk/maven-deploy-plugin/src/it/gav-validation/invoker.properties
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/it/gav-validation/invoker.properties?rev=1770497=1770496=1770497=diff
==
--- 
maven/plugins/trunk/maven-deploy-plugin/src/it/gav-validation/invoker.properties
 (original)
+++ 
maven/plugins/trunk/maven-deploy-plugin/src/it/gav-validation/invoker.properties
 Sat Nov 19 15:21:30 2016
@@ -17,3 +17,6 @@
 
 invoker.goals = 
org.apache.maven.plugins:maven-deploy-plugin:${project.version}:deploy-file
 invoker.buildResult = failure
+
+invoker.systemPropertiesFile.1 = test-invalid.properties
+invoker.systemPropertiesFile.2 = test-missing.properties

Added: 
maven/plugins/trunk/maven-deploy-plugin/src/it/gav-validation/test-missing.properties
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/it/gav-validation/test-missing.properties?rev=1770497=auto
==
--- 
maven/plugins/trunk/maven-deploy-plugin/src/it/gav-validation/test-missing.properties
 (added)
+++ 
maven/plugins/trunk/maven-deploy-plugin/src/it/gav-validation/test-missing.properties
 Sat Nov 19 15:21:30 2016
@@ -0,0 +1,23 @@
+# 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.
+
+file = test.jar
+url = file:///${

maven git commit: [MNG-5889] .mvn directory should be picked when using --file

[gboue]

Repository: maven
Updated Branches:
  refs/heads/master baf343fcb -> 8ae1a3e92


[MNG-5889] .mvn directory should be picked when using --file

Fixing the ITs on Windows: accessing arguments should be done with "%~1"
to take care of the fact that some parameter already contain quotes
(otherwise, it fails by calling mvn --version -Dtest
-Dmaven.repo.local="C:\test space\repo" -f "C:\test space\pom.xml" for
example).

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

Branch: refs/heads/master
Commit: 8ae1a3e92418fbac59acb07fcbd668d3735c1945
Parents: baf343f
Author: Guillaume Boué 
Authored: Thu Nov 17 16:50:40 2016 +0100
Committer: Guillaume Boué 
Committed: Thu Nov 17 16:50:40 2016 +0100

--
 apache-maven/src/bin/mvn.cmd | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/8ae1a3e9/apache-maven/src/bin/mvn.cmd
--
diff --git a/apache-maven/src/bin/mvn.cmd b/apache-maven/src/bin/mvn.cmd
index 21829fa..6271f17 100644
--- a/apache-maven/src/bin/mvn.cmd
+++ b/apache-maven/src/bin/mvn.cmd
@@ -94,13 +94,13 @@ set WDIR=%EXEC_DIR%
 
 set FILE_ARG=
 :arg_loop
-if "%1" == "-f" (
-  set "FILE_ARG=%2"
+if "%~1" == "-f" (
+  set "FILE_ARG=%~2"
   shift
   goto process_file_arg
 )
-if "%1" == "--file" (
-  set "FILE_ARG=%2"
+if "%~1" == "--file" (
+  set "FILE_ARG=%~2"
   shift
   goto process_file_arg
 )

svn commit: r1770285 - /maven/enforcer/trunk/enforcer-rules/src/site/apt/requireEnvironmentVariable.apt.vm

[gboue]

Author: gboue
Date: Thu Nov 17 22:32:38 2016
New Revision: 1770285

URL: http://svn.apache.org/viewvc?rev=1770285=rev
Log:
Fixing a typo in the documentation of requireEnvironmentVariable.
Submitted by: Jérémie Bresson.

This closes #19.

Modified:

maven/enforcer/trunk/enforcer-rules/src/site/apt/requireEnvironmentVariable.apt.vm

Modified: 
maven/enforcer/trunk/enforcer-rules/src/site/apt/requireEnvironmentVariable.apt.vm
URL: 
http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/site/apt/requireEnvironmentVariable.apt.vm?rev=1770285=1770284=1770285=diff
==
--- 
maven/enforcer/trunk/enforcer-rules/src/site/apt/requireEnvironmentVariable.apt.vm
 (original)
+++ 
maven/enforcer/trunk/enforcer-rules/src/site/apt/requireEnvironmentVariable.apt.vm
 Thu Nov 17 22:32:38 2016
@@ -57,7 +57,7 @@ Require Environment Variable
 
   
 
-  the_name_you_wish_to_be_checked
+  the_name_you_wish_to_be_checked
 
   
   true

svn commit: r1769446 - in /maven/plugins/trunk/maven-help-plugin/src: it/effective-pom-from-lifecycle/ it/effective-pom-from-lifecycle/module/ it/effective-pom-multimodule-unlink-parent/ it/effective-

[gboue]

Author: gboue
Date: Sat Nov 12 23:16:20 2016
New Revision: 1769446

URL: http://svn.apache.org/viewvc?rev=1769446=rev
Log:
[MPH-105] Effective pom aggregation is not triggered

When the plugin is invoked from the command-line, always show all effective 
POMs for all projects in the reactor. When it is invoked from the lifecycle, 
only show all effective POMs for the head project in the reactor (see commit 
497785 and resolution of MPH-21); otherwise, show the effective POM for the 
current project only.

Added:
maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-from-lifecycle/

maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-from-lifecycle/module/

maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-from-lifecycle/module/pom.xml
   (with props)

maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-from-lifecycle/pom.xml
   (with props)

maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-from-lifecycle/verify.groovy
   (with props)
maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-multimodule/

maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-multimodule-unlink-parent/

maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-multimodule-unlink-parent/invoker.properties
   (with props)

maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-multimodule-unlink-parent/module/

maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-multimodule-unlink-parent/module/pom.xml
   (with props)

maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-multimodule-unlink-parent/pom.xml
   (with props)

maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-multimodule-unlink-parent/verify.groovy
   (with props)

maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-multimodule/invoker.properties
   (with props)

maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-multimodule/module/

maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-multimodule/module/pom.xml
   (with props)

maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-multimodule/pom.xml  
 (with props)

maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-multimodule/verify.groovy
   (with props)
Modified:

maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EffectivePomMojo.java

Added: 
maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-from-lifecycle/module/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-from-lifecycle/module/pom.xml?rev=1769446=auto
==
--- 
maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-from-lifecycle/module/pom.xml
 (added)
+++ 
maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-from-lifecycle/module/pom.xml
 Sat Nov 12 23:16:20 2016
@@ -0,0 +1,23 @@
+
+
+
+
+
+  4.0.0
+  
+org.apache.maven.its.help
+test
+1.0
+  
+  pom
+  module
+

Propchange: 
maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-from-lifecycle/module/pom.xml
--
svn:eol-style = native

Propchange: 
maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-from-lifecycle/module/pom.xml
--
svn:keywords = Author Date Id Revision

Added: 
maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-from-lifecycle/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-from-lifecycle/pom.xml?rev=1769446=auto
==
--- 
maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-from-lifecycle/pom.xml
 (added)
+++ 
maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-from-lifecycle/pom.xml
 Sat Nov 12 23:16:20 2016
@@ -0,0 +1,59 @@
+
+
+
+
+
+  4.0.0
+
+  org.apache.maven.its.help
+  test
+  1.0
+  pom
+  https://issues.apache.org/jira/browse/MPH-21
+  
+Tests that the effective POM goal, bound to a phase of the lifecycle in a 
project of a multi-module build, prints 
+all the effective POMs in the reactor for the head project, and only 
prints their effective POM for the other projects.
+  
+  
+module
+  
+
+  
+
+  
+org.apache.maven.plugins
+maven-help-plugin
+@project.version@
+
+  
+print-effective-pom
+package
+
+  effective-pom
+
+
+  result.txt
+
+  
+
+  
+
+  
+

Propchange: 
maven/plugins/trunk/maven-help-plugin/src/it/effective-pom-from-lifecycle/pom.xml
--
svn:eol-style = native

Propchange: 
maven/plugins/trunk/maven-help-plugin/src/it/effective

svn commit: r1769319 [2/3] - in /maven/plugins/trunk/maven-help-plugin: ./ src/it/active-profiles/ src/it/active-profiles_multimodule/ src/it/active-profiles_multimodule/module/ src/it/all-profiles/ s

[gboue]

Modified: 
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java?rev=1769319=1769318=1769319=diff
==
--- 
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java
 Fri Nov 11 17:13:13 2016
@@ -19,8 +19,6 @@ package org.apache.maven.plugins.help;
  * under the License.
  */
 
-import static org.apache.maven.plugins.help.HelpUtil.LS;
-
 import java.io.File;
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
@@ -28,47 +26,39 @@ import java.lang.reflect.Method;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
 import java.util.List;
+import java.util.Map;
 import java.util.StringTokenizer;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.factory.ArtifactFactory;
-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.artifact.versioning.InvalidVersionSpecificationException;
-import org.apache.maven.artifact.versioning.VersionRange;
-import org.apache.maven.execution.MavenSession;
-import org.apache.maven.lifecycle.DefaultLifecycleExecutor;
+import org.apache.maven.lifecycle.DefaultLifecycles;
 import org.apache.maven.lifecycle.Lifecycle;
-import org.apache.maven.lifecycle.LifecycleExecutionException;
-import org.apache.maven.lifecycle.LifecycleExecutor;
+import org.apache.maven.lifecycle.internal.MojoDescriptorCreator;
 import org.apache.maven.lifecycle.mapping.LifecycleMapping;
 import org.apache.maven.model.Plugin;
-import org.apache.maven.plugin.InvalidPluginException;
+import org.apache.maven.model.building.ModelBuildingRequest;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.plugin.PluginManager;
-import org.apache.maven.plugin.PluginManagerException;
-import org.apache.maven.plugin.PluginNotFoundException;
 import org.apache.maven.plugin.descriptor.MojoDescriptor;
 import org.apache.maven.plugin.descriptor.Parameter;
 import org.apache.maven.plugin.descriptor.PluginDescriptor;
-import org.apache.maven.plugin.version.PluginVersionNotFoundException;
+import org.apache.maven.plugin.prefix.NoPluginFoundForPrefixException;
+import org.apache.maven.plugin.version.DefaultPluginVersionRequest;
 import org.apache.maven.plugin.version.PluginVersionResolutionException;
+import org.apache.maven.plugin.version.PluginVersionResolver;
+import org.apache.maven.plugin.version.PluginVersionResult;
 import org.apache.maven.plugins.annotations.Component;
 import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.project.DefaultProjectBuildingRequest;
 import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.MavenProjectBuilder;
-import org.apache.maven.project.ProjectBuildingException;
+import org.apache.maven.project.ProjectBuildingRequest;
 import org.apache.maven.reporting.MavenReport;
+import org.apache.maven.reporting.exec.MavenPluginManagerHelper;
+import org.apache.maven.shared.artifact.ArtifactCoordinate;
+import org.apache.maven.tools.plugin.generator.GeneratorUtils;
 import org.apache.maven.tools.plugin.util.PluginUtils;
-import 
org.codehaus.plexus.component.repository.exception.ComponentLookupException;
 import org.codehaus.plexus.util.StringUtils;
 
 /**
@@ -107,36 +97,36 @@ public class DescribeMojo
 // --
 // Mojo components
 // --
-
+
 /**
- * Maven Artifact Factory component.
- *
- * @since 2.1
+ * Component used to get a plugin descriptor from a given plugin.
  */
 @Component
-private ArtifactFactory artifactFactory;
+private MavenPluginManagerHelper pluginManager;
 
 /**
- * Maven Artifact Resolver component.
- *
- * @since 2.2.1
+ * Component used to get a plugin by its prefix and get mojo descriptors.
  */
 @Component
-private ArtifactResolver artifactResolver;
-
+private MojoDescriptorCreator mojoDescriptorCreator;
+
 /**
- * The Plugin manager instance used to resolve Plugin descriptors.
+ * Component used to resolve the version for a plugin.
  */
-@Component( role = 

svn commit: r1769319 [1/3] - in /maven/plugins/trunk/maven-help-plugin: ./ src/it/active-profiles/ src/it/active-profiles_multimodule/ src/it/active-profiles_multimodule/module/ src/it/all-profiles/ s

[gboue]

Author: gboue
Date: Fri Nov 11 17:13:13 2016
New Revision: 1769319

URL: http://svn.apache.org/viewvc?rev=1769319=rev
Log:
[MPH-120] Migrate plugin to Maven 3.0

Bump Maven requirement to 3.0 and version of the plugin to 3.0.0-SNAPSHOT. 
Replacing deprecated APIs like ArtifactFactory with the use of the shared 
components and removing Maven 2 specific code. The "expressions" goal that was 
Maven 2 specific is removed (it is now covered in the Javadoc of 
PluginParameterExpressionEvaluator).

Added:
maven/plugins/trunk/maven-help-plugin/src/it/active-profiles/verify.groovy  
 (with props)
maven/plugins/trunk/maven-help-plugin/src/it/describe-cmd-invalid/

maven/plugins/trunk/maven-help-plugin/src/it/describe-cmd-invalid/invoker.properties
   (with props)
maven/plugins/trunk/maven-help-plugin/src/it/describe-cmd-invalid/pom.xml   
(with props)

maven/plugins/trunk/maven-help-plugin/src/it/describe-cmd-invalid/test.properties
   (with props)
maven/plugins/trunk/maven-help-plugin/src/it/describe-cmd-with-goal-invalid/

maven/plugins/trunk/maven-help-plugin/src/it/describe-cmd-with-goal-invalid/invoker.properties
   (with props)

maven/plugins/trunk/maven-help-plugin/src/it/describe-cmd-with-goal-invalid/pom.xml
   (with props)

maven/plugins/trunk/maven-help-plugin/src/it/describe-cmd-with-goal-invalid/test.properties
   (with props)

maven/plugins/trunk/maven-help-plugin/src/it/describe-cmd-with-goal/verify.groovy
   (with props)

maven/plugins/trunk/maven-help-plugin/src/it/describe-cmd/test-deploy.properties
  - copied, changed from r1768278, 
maven/plugins/trunk/maven-help-plugin/src/it/describe-cmd/test.properties

maven/plugins/trunk/maven-help-plugin/src/it/describe-cmd/test-site.properties  
 (with props)
maven/plugins/trunk/maven-help-plugin/src/it/describe-cmd/verify.groovy   
(with props)
maven/plugins/trunk/maven-help-plugin/src/it/describe-plugin-without-name/

maven/plugins/trunk/maven-help-plugin/src/it/describe-plugin-without-name/invoker.properties
   (with props)

maven/plugins/trunk/maven-help-plugin/src/it/describe-plugin-without-name/pom.xml
   (with props)

maven/plugins/trunk/maven-help-plugin/src/it/describe-plugin-without-name/test.properties
   (with props)

maven/plugins/trunk/maven-help-plugin/src/it/describe-plugin-without-name/verify.groovy
   (with props)
maven/plugins/trunk/maven-help-plugin/src/it/evaluate-settings-servers/

maven/plugins/trunk/maven-help-plugin/src/it/evaluate-settings-servers/invoker.properties
   (with props)

maven/plugins/trunk/maven-help-plugin/src/it/evaluate-settings-servers/pom.xml  
 (with props)

maven/plugins/trunk/maven-help-plugin/src/it/evaluate-settings-servers/test.properties
   (with props)

maven/plugins/trunk/maven-help-plugin/src/it/evaluate-settings-servers/verify.groovy
   (with props)
maven/plugins/trunk/maven-help-plugin/src/it/evaluate/verify.groovy   (with 
props)

maven/plugins/trunk/maven-help-plugin/src/test/java/org/apache/maven/plugins/help/ActiveProfilesMojoTest.java
   (with props)

maven/plugins/trunk/maven-help-plugin/src/test/java/org/apache/maven/plugins/help/AllProfilesMojoTest.java
   (with props)

maven/plugins/trunk/maven-help-plugin/src/test/resources/unit/active-profiles/

maven/plugins/trunk/maven-help-plugin/src/test/resources/unit/active-profiles/plugin-config.xml
   (with props)
maven/plugins/trunk/maven-help-plugin/src/test/resources/unit/all-profiles/

maven/plugins/trunk/maven-help-plugin/src/test/resources/unit/all-profiles/plugin-config.xml
   (with props)
Removed:
maven/plugins/trunk/maven-help-plugin/src/it/describe-cmd/test.properties
maven/plugins/trunk/maven-help-plugin/src/it/expressions/

maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/ExpressionsMojo.java

maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/HelpUtil.java

maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/LoggerRetriever.java

maven/plugins/trunk/maven-help-plugin/src/test/java/org/apache/maven/plugins/help/ExpressionsMojoTest.java

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

maven/plugins/trunk/maven-help-plugin/src/it/active-profiles_multimodule/module/pom.xml

maven/plugins/trunk/maven-help-plugin/src/it/active-profiles_multimodule/verify.groovy
maven/plugins/trunk/maven-help-plugin/src/it/all-profiles/pom.xml
maven/plugins/trunk/maven-help-plugin/src/it/all-profiles/verify.groovy

maven/plugins/trunk/maven-help-plugin/src/it/describe-cmd-with-goal/test.properties
maven/plugins/trunk/maven-help-plugin/src/it/describe-cmd/invoker.properties

maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/AbstractHel

svn commit: r1769319 [3/3] - in /maven/plugins/trunk/maven-help-plugin: ./ src/it/active-profiles/ src/it/active-profiles_multimodule/ src/it/active-profiles_multimodule/module/ src/it/all-profiles/ s

[gboue]

Added: 
maven/plugins/trunk/maven-help-plugin/src/test/resources/unit/all-profiles/plugin-config.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/test/resources/unit/all-profiles/plugin-config.xml?rev=1769319=auto
==
--- 
maven/plugins/trunk/maven-help-plugin/src/test/resources/unit/all-profiles/plugin-config.xml
 (added)
+++ 
maven/plugins/trunk/maven-help-plugin/src/test/resources/unit/all-profiles/plugin-config.xml
 Fri Nov 11 17:13:13 2016
@@ -0,0 +1,37 @@
+
+
+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.help
+  active-profiles
+  jar
+  1.0-SNAPSHOT
+  http://maven.apache.org
+  
+
+  
+org.apache.maven.plugins
+maven-help-plugin
+
+
+  
+
+  
+

Propchange: 
maven/plugins/trunk/maven-help-plugin/src/test/resources/unit/all-profiles/plugin-config.xml
--
svn:eol-style = native

Propchange: 
maven/plugins/trunk/maven-help-plugin/src/test/resources/unit/all-profiles/plugin-config.xml
--
svn:keywords = Author Date Id Revision

maven git commit: [MNG-6117] ${session.parallel} not correctly set

[gboue]

Repository: maven
Updated Branches:
  refs/heads/master f381cd4f2 -> dfb4a7b7f


[MNG-6117] ${session.parallel} not correctly set

MultiThreadedBuilder must set parallel to true when it's using more than
1 thread to build: i.e. a degree of concurrency greater than 1 (-T) and
more than 1 project to build. Since each ProjectSegment works on a
cloned session instance (see
BuildListCalculator#calculateProjectBuilds), the flag must be also set
on each cloned session.

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

Branch: refs/heads/master
Commit: dfb4a7b7f4225bc32385da139679e189a2aeb79a
Parents: f381cd4
Author: Guillaume Boué 
Authored: Sun Nov 13 22:46:18 2016 +0100
Committer: Guillaume Boué 
Committed: Sun Nov 13 22:46:18 2016 +0100

--
 .../multithreaded/MultiThreadedBuilder.java   | 18 ++
 1 file changed, 14 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/dfb4a7b7/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java
 
b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java
index b24d785..14bf13b 100644
--- 
a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java
+++ 
b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java
@@ -44,7 +44,11 @@ import org.codehaus.plexus.component.annotations.Requirement;
 import org.codehaus.plexus.logging.Logger;
 
 /**
- * Builds the full lifecycle in weave-mode (phase by phase as opposed to 
project-by-project)
+ * Builds the full lifecycle in weave-mode (phase by phase as opposed to 
project-by-project).
+ * 
+ * This builder uses a number of threads equal to the minimum of the degree of 
concurrency (which is the thread count
+ * set with -T on the command-line) and the number of projects to 
build. As such, building a single project
+ * will always result in a sequential build, regardless of the thread count.
  *
  * @since 3.0
  * @author Kristian Rosenvold
@@ -73,9 +77,15 @@ public class MultiThreadedBuilder
List taskSegments, ReactorBuildStatus 
reactorBuildStatus )
 throws ExecutionException, InterruptedException
 {
-ExecutorService executor =
-Executors.newFixedThreadPool( Math.min( 
session.getRequest().getDegreeOfConcurrency(),
-
session.getProjects().size() ), new BuildThreadFactory() );
+int nThreads = Math.min( 
session.getRequest().getDegreeOfConcurrency(), session.getProjects().size() );
+boolean parallel = nThreads >= 2;
+// Propagate the parallel flag to the root session and all of the 
cloned sessions in each project segment
+session.setParallel( parallel );
+for ( ProjectSegment segment : projectBuilds )
+{
+segment.getSession().setParallel( parallel );
+}
+ExecutorService executor = Executors.newFixedThreadPool( nThreads, new 
BuildThreadFactory() );
 CompletionService service = new 
ExecutorCompletionService<>( executor );
 ConcurrencyDependencyGraph analyzer =
 new ConcurrencyDependencyGraph( projectBuilds, 
session.getProjectDependencyGraph() );

svn commit: r1770586 - in /maven/plugins/trunk/maven-install-plugin/src: it/attach-jar-checksum/ it/generate-pom-auto-1/ it/jar-sources-javadoc/ it/local-repo-override-with-checksum-generatePom/ it/lo

[gboue]

Author: gboue
Date: Sun Nov 20 20:51:17 2016
New Revision: 1770586

URL: http://svn.apache.org/viewvc?rev=1770586=rev
Log:
[MINSTALL-131] Rename package to org.apache.maven.plugins

With the migration to Maven 3, the main package should be 
"org.apache.maven.plugins" instead of the current "org.apache.maven.plugin".

Added:

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

maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugins/install/
  - copied from r1768278, 
maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/

maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugins/install/InstallFileMojo.java
  - copied, changed from r1770497, 
maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java

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

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

maven/plugins/trunk/maven-install-plugin/src/test/java/org/apache/maven/plugins/install/InstallFileMojoTest.java
  - copied, changed from r1768278, 
maven/plugins/trunk/maven-install-plugin/src/test/java/org/apache/maven/plugin/install/InstallFileMojoTest.java

maven/plugins/trunk/maven-install-plugin/src/test/java/org/apache/maven/plugins/install/InstallMojoTest.java
  - copied, changed from r1768278, 
maven/plugins/trunk/maven-install-plugin/src/test/java/org/apache/maven/plugin/install/InstallMojoTest.java

maven/plugins/trunk/maven-install-plugin/src/test/java/org/apache/maven/plugins/install/Utils.java
  - copied, changed from r1768278, 
maven/plugins/trunk/maven-install-plugin/src/test/java/org/apache/maven/plugin/install/Utils.java

maven/plugins/trunk/maven-install-plugin/src/test/java/org/apache/maven/plugins/install/stubs/
  - copied from r1770585, 
maven/plugins/trunk/maven-install-plugin/src/test/java/org/apache/maven/plugin/install/stubs/
Removed:

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

maven/plugins/trunk/maven-install-plugin/src/test/java/org/apache/maven/plugin/
Modified:

maven/plugins/trunk/maven-install-plugin/src/it/attach-jar-checksum/verify.bsh

maven/plugins/trunk/maven-install-plugin/src/it/generate-pom-auto-1/verify.bsh

maven/plugins/trunk/maven-install-plugin/src/it/jar-sources-javadoc/verify.bsh

maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override-with-checksum-generatePom/verify.bsh

maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override-with-checksum/verify.bsh
maven/plugins/trunk/maven-install-plugin/src/it/pom-checksum/verify.bsh

maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugins/install/AbstractInstallMojo.java

maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugins/install/InstallMojo.java

maven/plugins/trunk/maven-install-plugin/src/test/java/org/apache/maven/plugins/install/stubs/AttachedArtifactStub0.java

maven/plugins/trunk/maven-install-plugin/src/test/java/org/apache/maven/plugins/install/stubs/AttachedArtifactStub1.java

maven/plugins/trunk/maven-install-plugin/src/test/java/org/apache/maven/plugins/install/stubs/InstallArtifactStub.java

maven/plugins/trunk/maven-install-plugin/src/test/resources/unit/basic-install-checksum/plugin-config.xml

maven/plugins/trunk/maven-install-plugin/src/test/resources/unit/basic-install-test-packaging-pom/plugin-config.xml

maven/plugins/trunk/maven-install-plugin/src/test/resources/unit/basic-install-test-with-attached-artifacts/plugin-config.xml

maven/plugins/trunk/maven-install-plugin/src/test/resources/unit/basic-install-test/plugin-config.xml

maven/plugins/trunk/maven-install-plugin/src/test/resources/unit/configured-install-test/plugin-config.xml

Modified: 
maven/plugins/trunk/maven-install-plugin/src/it/attach-jar-checksum/verify.bsh
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-install-plugin/src/it/attach-jar-checksum/verify.bsh?rev=1770586=1770585=1770586=diff
==
--- 
maven/plugins/trunk/maven-install-plugin/src/it/attach-jar-checksum/verify.bsh 
(original)
+++ 
maven/plugins/trunk/maven-install-plugin/src/it/attach-jar-checksum/verify.bsh 
Sun Nov 20 20:51:17 2016
@@ -20,7 +20,7 @@
 import java.io.*;
 import java.util.*;
 
-import org.apache.maven.plugin.install.Utils;
+import org.apache.maven.plugins.install.Utils;
 
 String[] paths =
 {

Modified: 
maven/plugins/trunk/maven-install-plugin/src/it/generate-pom-auto-1/verify.bsh
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-install-plugin/src/it/generate-pom-auto-1/verify.bsh?rev=1770586=

svn commit: r1770564 - in /maven/plugins/trunk/maven-checkstyle-plugin/src: it/MCHECKSTYLE-332_cache-checker/ it/MCHECKSTYLE-332_cache-checker/src/ it/MCHECKSTYLE-332_cache-checker/src/main/ it/MCHECK

[gboue]

Author: gboue
Date: Sun Nov 20 15:04:12 2016
New Revision: 1770564

URL: http://svn.apache.org/viewvc?rev=1770564=rev
Log:
[MCHECKSTYLE-332] maven plugin not using cache property

Starting with Checkstyle 6.16, the cache configuration was moved from the 
TreeWalker module to the Checker module, as per 
https://github.com/checkstyle/checkstyle/issues/569. To detect this change, we 
can rely on the presence of the public API method "setCacheFile(String)" in the 
Checker class.

Added:

maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-332_cache-checker/

maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-332_cache-checker/invoker.properties
   (with props)

maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-332_cache-checker/pom.xml
   (with props)

maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-332_cache-checker/src/

maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-332_cache-checker/src/main/

maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-332_cache-checker/src/main/java/

maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-332_cache-checker/src/main/java/org/

maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-332_cache-checker/src/main/java/org/MyClass.java
   (with props)

maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-332_cache-checker/verify.groovy
   (with props)

maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-332_cache-treewalker/

maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-332_cache-treewalker/invoker.properties
   (with props)

maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-332_cache-treewalker/pom.xml
   (with props)

maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-332_cache-treewalker/src/

maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-332_cache-treewalker/src/main/

maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-332_cache-treewalker/src/main/java/

maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-332_cache-treewalker/src/main/java/org/

maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-332_cache-treewalker/src/main/java/org/MyClass.java
   (with props)

maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-332_cache-treewalker/verify.groovy
   (with props)
Modified:

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

Added: 
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-332_cache-checker/invoker.properties
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-332_cache-checker/invoker.properties?rev=1770564=auto
==
--- 
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-332_cache-checker/invoker.properties
 (added)
+++ 
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-332_cache-checker/invoker.properties
 Sun Nov 20 15:04:12 2016
@@ -0,0 +1,18 @@
+# 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 checkstyle:checkstyle

Propchange: 
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-332_cache-checker/invoker.properties
--
svn:eol-style = native

Propchange: 
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-332_cache-checker/invoker.properties
--
svn:keywords = Author Date Id Revision

Added: 
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-332_cache-checker/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-332_cache-checker/pom.xml?rev=1770564=auto
==
--- 
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-332_cache-checker/pom.xml
 (added)
+++ 
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKS

svn commit: r1770507 - /maven/plugins/trunk/maven-install-plugin/src/it/non-changed-artifact/invoker.properties

[gboue]

Author: gboue
Date: Sat Nov 19 16:52:31 2016
New Revision: 1770507

URL: http://svn.apache.org/viewvc?rev=1770507=rev
Log:
Fixing IT that will break when Jar Plugin is updated to 3.0.0 (indirectly 
through a Maven update): running install twice in the same build would call the 
plugin twice and attach the main artifact twice - which is now disallowed.

Modified:

maven/plugins/trunk/maven-install-plugin/src/it/non-changed-artifact/invoker.properties

Modified: 
maven/plugins/trunk/maven-install-plugin/src/it/non-changed-artifact/invoker.properties
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-install-plugin/src/it/non-changed-artifact/invoker.properties?rev=1770507=1770506=1770507=diff
==
--- 
maven/plugins/trunk/maven-install-plugin/src/it/non-changed-artifact/invoker.properties
 (original)
+++ 
maven/plugins/trunk/maven-install-plugin/src/it/non-changed-artifact/invoker.properties
 Sat Nov 19 16:52:31 2016
@@ -15,5 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-invoker.goals = install install
+# install called in two different Maven invocations, otherwise the build would 
fail with the Jar Plugin (MJAR-198)
+invoker.goals.1 = install
+invoker.goals.2 = install
 invoker.maven.version = 2.2.2+, !3.0-alpha-1, !3.0-alpha-2

svn commit: r1769339 - in /maven/plugins/trunk/maven-deploy-plugin/src: it/MDEPLOY-169_deploy-at-end-multithread/ it/MDEPLOY-170_deploy-at-end-configperproject/ it/MDEPLOY-202_deployfile-with-multiple

[gboue]

Author: gboue
Date: Fri Nov 11 20:36:18 2016
New Revision: 1769339

URL: http://svn.apache.org/viewvc?rev=1769339=rev
Log:
[MDEPLOY-211] uniqueVersion broken (if not supported, should be removed from 
doc, and warning printed)

The parameter uniqueVersion in the deploy-file goal isn't supported since Maven 
3, so it is removed from the code base and from the documentation of the 
plugin. A check is made to fail the build if it is still used, and the index 
page mentions the removal.

Modified:

maven/plugins/trunk/maven-deploy-plugin/src/it/MDEPLOY-169_deploy-at-end-multithread/pom.xml

maven/plugins/trunk/maven-deploy-plugin/src/it/MDEPLOY-170_deploy-at-end-configperproject/pom.xml

maven/plugins/trunk/maven-deploy-plugin/src/it/MDEPLOY-202_deployfile-with-multiple-executions/pom.xml
maven/plugins/trunk/maven-deploy-plugin/src/it/MDEPLOY-213/pom.xml
maven/plugins/trunk/maven-deploy-plugin/src/it/attach-release-jar/pom.xml
maven/plugins/trunk/maven-deploy-plugin/src/it/deploy-at-end-fail/pom.xml
maven/plugins/trunk/maven-deploy-plugin/src/it/deploy-at-end-pass/pom.xml
maven/plugins/trunk/maven-deploy-plugin/src/it/offline/pom.xml
maven/plugins/trunk/maven-deploy-plugin/src/it/release-jar/pom.xml
maven/plugins/trunk/maven-deploy-plugin/src/it/release-pom/pom.xml

maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugins/deploy/AbstractDeployMojo.java

maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugins/deploy/DeployFileMojo.java

maven/plugins/trunk/maven-deploy-plugin/src/main/java/org/apache/maven/plugins/deploy/DeployMojo.java
maven/plugins/trunk/maven-deploy-plugin/src/site/apt/file-deployment.apt
maven/plugins/trunk/maven-deploy-plugin/src/site/apt/index.apt.vm
maven/plugins/trunk/maven-deploy-plugin/src/site/apt/usage.apt

maven/plugins/trunk/maven-deploy-plugin/src/test/java/org/apache/maven/plugins/deploy/DeployMojoTest.java

maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/deploy-file-artifact-not-jar/plugin-config.xml

maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/deploy-file-classifier/plugin-config.xml

maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/deploy-file-legacy-repository-layout/plugin-config.xml

maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/deploy-file-pom-file/plugin-config.xml

maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/deploy-file-test/plugin-config.xml

Modified: 
maven/plugins/trunk/maven-deploy-plugin/src/it/MDEPLOY-169_deploy-at-end-multithread/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/it/MDEPLOY-169_deploy-at-end-multithread/pom.xml?rev=1769339=1769338=1769339=diff
==
--- 
maven/plugins/trunk/maven-deploy-plugin/src/it/MDEPLOY-169_deploy-at-end-multithread/pom.xml
 (original)
+++ 
maven/plugins/trunk/maven-deploy-plugin/src/it/MDEPLOY-169_deploy-at-end-multithread/pom.xml
 Fri Nov 11 20:36:18 2016
@@ -39,7 +39,6 @@ under the License.
 
   it
   file:///${basedir}/target/repo
-  false
 
   
 

Modified: 
maven/plugins/trunk/maven-deploy-plugin/src/it/MDEPLOY-170_deploy-at-end-configperproject/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/it/MDEPLOY-170_deploy-at-end-configperproject/pom.xml?rev=1769339=1769338=1769339=diff
==
--- 
maven/plugins/trunk/maven-deploy-plugin/src/it/MDEPLOY-170_deploy-at-end-configperproject/pom.xml
 (original)
+++ 
maven/plugins/trunk/maven-deploy-plugin/src/it/MDEPLOY-170_deploy-at-end-configperproject/pom.xml
 Fri Nov 11 20:36:18 2016
@@ -39,7 +39,6 @@ under the License.
 
   it
   file:///${basedir}/target/repo
-  false
 
   
 

Modified: 
maven/plugins/trunk/maven-deploy-plugin/src/it/MDEPLOY-202_deployfile-with-multiple-executions/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/it/MDEPLOY-202_deployfile-with-multiple-executions/pom.xml?rev=1769339=1769338=1769339=diff
==
--- 
maven/plugins/trunk/maven-deploy-plugin/src/it/MDEPLOY-202_deployfile-with-multiple-executions/pom.xml
 (original)
+++ 
maven/plugins/trunk/maven-deploy-plugin/src/it/MDEPLOY-202_deployfile-with-multiple-executions/pom.xml
 Fri Nov 11 20:36:18 2016
@@ -38,7 +38,6 @@
 
   it
   file:///${basedir}/target/repo
-  false
 
   
 

Modified: maven/plugins/trunk/maven-deploy-plugin/src/it/MDEPLOY-213/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/it/MDEPLOY-213/pom.xml?rev=1769339=1769338=1769339=diff
==
--- maven/plugins/trunk/maven-deploy

svn commit: r1767178 - in /maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project/install: ProjectInstaller.java internal/DefaultProjectInstaller.java

[gboue]

Author: gboue
Date: Sun Oct 30 19:25:53 2016
New Revision: 1767178

URL: http://svn.apache.org/viewvc?rev=1767178=rev
Log:
[MSHARED-598] Simplify ProjectInstaller by not requiring an ArtifactRepository

Part 2 - Removing the "install" overload taking the ArtifactRepository

Modified:

maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project/install/ProjectInstaller.java

maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project/install/internal/DefaultProjectInstaller.java

Modified: 
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project/install/ProjectInstaller.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project/install/ProjectInstaller.java?rev=1767178=1767177=1767178=diff
==
--- 
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project/install/ProjectInstaller.java
 (original)
+++ 
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project/install/ProjectInstaller.java
 Sun Oct 30 19:25:53 2016
@@ -21,7 +21,6 @@ package org.apache.maven.shared.project.
 
 import java.io.IOException;
 
-import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.project.ProjectBuildingRequest;
 import org.apache.maven.shared.artifact.install.ArtifactInstallerException;
 import org.apache.maven.shared.project.NoFileAssignedException;
@@ -75,9 +74,4 @@ public interface ProjectInstaller
 void install( ProjectBuildingRequest projectBuildingRequest, 
ProjectInstallerRequest projectInstallerRequest )
 throws IOException, ArtifactInstallerException, 
NoFileAssignedException;
 
-// to be removed
-void install( ProjectBuildingRequest projectBuildingRequest, 
ProjectInstallerRequest projectInstallerRequest,
-  ArtifactRepository artifactRepository )
-throws IOException, ArtifactInstallerException, 
NoFileAssignedException;
-
 }

Modified: 
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project/install/internal/DefaultProjectInstaller.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project/install/internal/DefaultProjectInstaller.java?rev=1767178=1767177=1767178=diff
==
--- 
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project/install/internal/DefaultProjectInstaller.java
 (original)
+++ 
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project/install/internal/DefaultProjectInstaller.java
 Sun Oct 30 19:25:53 2016
@@ -28,7 +28,6 @@ import java.util.List;
 
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.metadata.ArtifactMetadata;
-import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.ProjectBuildingRequest;
 import org.apache.maven.project.artifact.ProjectArtifact;
@@ -65,16 +64,10 @@ public class DefaultProjectInstaller
 
 private final DualDigester digester = new DualDigester();
 
-public void install( ProjectBuildingRequest buildingRequest, 
ProjectInstallerRequest request,
- ArtifactRepository artifactRepository )
-throws IOException, ArtifactInstallerException, NoFileAssignedException
-{
-install( buildingRequest, request );
-}
-
 /**
  * {@inheritDoc}
  */
+@Override
 public void install( ProjectBuildingRequest buildingRequest, 
ProjectInstallerRequest request )
 throws IOException, ArtifactInstallerException, NoFileAssignedException
 {

svn commit: r1767762 - /maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/purging-local-repository.apt.vm

[gboue]

Author: gboue
Date: Wed Nov  2 18:53:47 2016
New Revision: 1767762

URL: http://svn.apache.org/viewvc?rev=1767762=rev
Log:
[MDEP-386] Split purge-local-repository into manual and transitive

Keeping the documentation in sync: the manual-purge-local-repository goal was 
reintegrated into the purge-local-repository goal, but the doc still mentioned 
it.

Modified:

maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/purging-local-repository.apt.vm

Modified: 
maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/purging-local-repository.apt.vm
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/purging-local-repository.apt.vm?rev=1767762=1767761=1767762=diff
==
--- 
maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/purging-local-repository.apt.vm
 (original)
+++ 
maven/plugins/trunk/maven-dependency-plugin/src/site/apt/examples/purging-local-repository.apt.vm
 Wed Nov  2 18:53:47 2016
@@ -108,12 +108,12 @@ mvn dependency:purge-local-repository -D
 * Manual purge
 
   Specific dependencies which are not part of the current project dependency 
tree 
-  can be purged by using the 
-  
{{{../manual-purge-local-repository-mojo.html}manual-purge-local-repository}} 
+  can also be purged by using the 
+  {{{../purge-local-repository-mojo.html}purge-local-repository}} 
   goal and setting the "manualIncludes" or "manualInclude" parameters.  Any 
manually 
   included purge artifacts will be removed from the local repository and will 
   not be re-resolved until they are needed.  This can be useful for 
-  example to refresh the parent pom, an imported pom, or a maven plugin.
+  example to refresh the parent pom, an imported pom, or a Maven plugin.
   
   Warning, using this goal during the normal build process can be risky
   if dependencies are removed from the local repo, but are needed later in
@@ -126,7 +126,7 @@ mvn dependency:purge-local-repository -D
   or during the clean process.
 
 +---+
-mvn dependency:manual-purge-local-repository -Dinclude=org.apache:apache
+mvn dependency:purge-local-repository -DmanualInclude=org.apache:apache
 +---+
 
 

svn commit: r1767164 - in /maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/repository: ./ internal/

[gboue]

Author: gboue
Date: Sun Oct 30 15:00:30 2016
New Revision: 1767164

URL: http://svn.apache.org/viewvc?rev=1767164=rev
Log:
[MSHARED-596] Support for getting local metadata for RepositoryManager

Adding method "getPathForLocalMetadata" in RepositoryManager delegating to 
Sonatype or Eclipse Aether depending on the Maven version.

Modified:

maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/repository/RepositoryManager.java

maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/repository/internal/DefaultRepositoryManager.java

maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/repository/internal/Maven30RepositoryManager.java

maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/repository/internal/Maven31RepositoryManager.java

Modified: 
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/repository/RepositoryManager.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/repository/RepositoryManager.java?rev=1767164=1767163=1767164=diff
==
--- 
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/repository/RepositoryManager.java
 (original)
+++ 
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/repository/RepositoryManager.java
 Sun Oct 30 15:00:30 2016
@@ -22,6 +22,7 @@ package org.apache.maven.shared.reposito
 import java.io.File;
 
 import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.metadata.ArtifactMetadata;
 import org.apache.maven.project.ProjectBuildingRequest;
 import org.apache.maven.shared.artifact.ArtifactCoordinate;
 
@@ -44,6 +45,13 @@ public interface RepositoryManager
  * @return the path for the local artifact.
  */
 String getPathForLocalArtifact( ProjectBuildingRequest buildingRequest, 
ArtifactCoordinate coordinate );
+
+/**
+ * @param buildingRequest {@link ProjectBuildingRequest}
+ * @param metadata {@link ArtifactMetadata}
+ * @return the path of the local metadata.
+ */
+String getPathForLocalMetadata( ProjectBuildingRequest buildingRequest, 
ArtifactMetadata metadata );
 
 /**
  * Create a new {@code ProjectBuildingRequest} with an adjusted repository 
session.

Modified: 
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/repository/internal/DefaultRepositoryManager.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/repository/internal/DefaultRepositoryManager.java?rev=1767164=1767163=1767164=diff
==
--- 
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/repository/internal/DefaultRepositoryManager.java
 (original)
+++ 
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/repository/internal/DefaultRepositoryManager.java
 Sun Oct 30 15:00:30 2016
@@ -22,8 +22,11 @@ package org.apache.maven.shared.reposito
 import java.io.File;
 
 import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.metadata.ArtifactMetadata;
 import org.apache.maven.project.ProjectBuildingRequest;
+import org.apache.maven.project.artifact.ProjectArtifactMetadata;
 import org.apache.maven.shared.artifact.ArtifactCoordinate;
+import org.apache.maven.shared.artifact.DefaultArtifactCoordinate;
 import org.apache.maven.shared.repository.RepositoryManager;
 import org.codehaus.plexus.PlexusConstants;
 import org.codehaus.plexus.PlexusContainer;
@@ -72,6 +75,34 @@ public class DefaultRepositoryManager
 }
 catch ( ComponentLookupException e )
 {
+throw new IllegalStateException( e.getMessage(), e );
+}
+}
+
+@Override
+public String getPathForLocalMetadata( ProjectBuildingRequest 
buildingRequest, ArtifactMetadata metadata )
+{
+if ( metadata instanceof ProjectArtifactMetadata )
+{
+DefaultArtifactCoordinate pomCoordinate = new 
DefaultArtifactCoordinate();
+pomCoordinate.setGroupId( metadata.getGroupId() );
+pomCoordinate.setArtifactId( metadata.getArtifactId() );
+pomCoordinate.setVersion( metadata.getBaseVersion() );
+pomCoordinate.setExtension( "pom" );
+return getPathForLocalArtifact( buildingRequest, pomCoordinate );
+}
+
+try
+{
+
+String hint = isMaven31() ? "maven31" : "maven3";
+
+RepositoryManager effectiveRepositoryManager = container.lookup( 
RepositoryManager.class, hint );
+
+return effectiveRepositoryManager.getPathForL

svn commit: r1767174 - in /maven/plugins/trunk/maven-install-plugin: ./ src/it/local-repo-override-with-checksum-generatePom/ src/it/local-repo-override-with-checksum/ src/main/java/org/apache/maven/p

[gboue]

Author: gboue
Date: Sun Oct 30 18:07:25 2016
New Revision: 1767174

URL: http://svn.apache.org/viewvc?rev=1767174=rev
Log:
- Using latest Maven Artifact Transfer (re-versioned to 0.9.0-SNAPSHOT).
- Adding ITs for the manual installation of files with POM and generating 
checksums in a overridden local repository

Added:

maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override-with-checksum-generatePom/

maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override-with-checksum-generatePom/invoker.properties
   (with props)

maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override-with-checksum-generatePom/pom.xml
   (with props)

maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override-with-checksum-generatePom/setup.bsh
   (with props)

maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override-with-checksum-generatePom/test.jar
   (with props)

maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override-with-checksum-generatePom/test.properties
   (with props)

maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override-with-checksum-generatePom/verify.bsh
   (with props)
Modified:
maven/plugins/trunk/maven-install-plugin/pom.xml

maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override-with-checksum/verify.bsh

maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/AbstractInstallMojo.java

maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java

maven/plugins/trunk/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallMojo.java

maven/plugins/trunk/maven-install-plugin/src/test/java/org/apache/maven/plugin/install/InstallMojoTest.java

maven/plugins/trunk/maven-install-plugin/src/test/resources/unit/basic-install-checksum/plugin-config.xml

maven/plugins/trunk/maven-install-plugin/src/test/resources/unit/basic-install-test-packaging-pom/plugin-config.xml

maven/plugins/trunk/maven-install-plugin/src/test/resources/unit/basic-install-test-with-attached-artifacts/plugin-config.xml

maven/plugins/trunk/maven-install-plugin/src/test/resources/unit/basic-install-test/plugin-config.xml

maven/plugins/trunk/maven-install-plugin/src/test/resources/unit/configured-install-test/plugin-config.xml

maven/plugins/trunk/maven-install-plugin/src/test/resources/unit/install-file-basic-test/plugin-config.xml

maven/plugins/trunk/maven-install-plugin/src/test/resources/unit/install-file-test-generatePom/plugin-config.xml

maven/plugins/trunk/maven-install-plugin/src/test/resources/unit/install-file-with-checksum/plugin-config.xml

maven/plugins/trunk/maven-install-plugin/src/test/resources/unit/install-file-with-classifier/plugin-config.xml

maven/plugins/trunk/maven-install-plugin/src/test/resources/unit/install-file-with-pom-as-packaging/plugin-config.xml

maven/plugins/trunk/maven-install-plugin/src/test/resources/unit/install-file-with-pomFile-test/plugin-config.xml

Modified: maven/plugins/trunk/maven-install-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-install-plugin/pom.xml?rev=1767174=1767173=1767174=diff
==
--- maven/plugins/trunk/maven-install-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-install-plugin/pom.xml Sun Oct 30 18:07:25 2016
@@ -83,7 +83,7 @@
 
   org.apache.maven.shared
   maven-artifact-transfer
-  3.0.0-SNAPSHOT
+  0.9.0-SNAPSHOT
 
 
 

Added: 
maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override-with-checksum-generatePom/invoker.properties
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override-with-checksum-generatePom/invoker.properties?rev=1767174=auto
==
--- 
maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override-with-checksum-generatePom/invoker.properties
 (added)
+++ 
maven/plugins/trunk/maven-install-plugin/src/it/local-repo-override-with-checksum-generatePom/invoker.properties
 Sun Oct 30 18:07:25 2016
@@ -0,0 +1,18 @@
+# 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 impli

svn commit: r1767593 - in /maven/plugins/trunk/maven-help-plugin/src: it/describe-cmd-with-goal-report/ main/java/org/apache/maven/plugins/help/

[gboue]

Author: gboue
Date: Wed Nov  2 00:43:39 2016
New Revision: 1767593

URL: http://svn.apache.org/viewvc?rev=1767593=rev
Log:
[MPH-116] Printout the information if a goal is a report goal or not

Adding the information in the describe goal: the plugin and all of its 
dependencies are resolved to determine whether the Java class of the goal 
implements MavenReport.

Added:
maven/plugins/trunk/maven-help-plugin/src/it/describe-cmd-with-goal-report/

maven/plugins/trunk/maven-help-plugin/src/it/describe-cmd-with-goal-report/invoker.properties
   (with props)

maven/plugins/trunk/maven-help-plugin/src/it/describe-cmd-with-goal-report/pom.xml
   (with props)

maven/plugins/trunk/maven-help-plugin/src/it/describe-cmd-with-goal-report/verify.groovy
   (with props)
Modified:

maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java

Added: 
maven/plugins/trunk/maven-help-plugin/src/it/describe-cmd-with-goal-report/invoker.properties
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/it/describe-cmd-with-goal-report/invoker.properties?rev=1767593=auto
==
--- 
maven/plugins/trunk/maven-help-plugin/src/it/describe-cmd-with-goal-report/invoker.properties
 (added)
+++ 
maven/plugins/trunk/maven-help-plugin/src/it/describe-cmd-with-goal-report/invoker.properties
 Wed Nov  2 00:43:39 2016
@@ -0,0 +1,20 @@
+# 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.1 = -l changes.log 
${project.groupId}:${project.artifactId}:${project.version}:describe 
-Dcmd=changes:jira-report
+invoker.goals.2 = -l javadoc.log 
${project.groupId}:${project.artifactId}:${project.version}:describe 
-Dcmd=javadoc:javadoc
+invoker.goals.3 = -l assembly.log 
${project.groupId}:${project.artifactId}:${project.version}:describe 
-Dcmd=assembly:single

Propchange: 
maven/plugins/trunk/maven-help-plugin/src/it/describe-cmd-with-goal-report/invoker.properties
--
svn:eol-style = native

Propchange: 
maven/plugins/trunk/maven-help-plugin/src/it/describe-cmd-with-goal-report/invoker.properties
--
svn:keywords = Author Date Id Revision

Added: 
maven/plugins/trunk/maven-help-plugin/src/it/describe-cmd-with-goal-report/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/it/describe-cmd-with-goal-report/pom.xml?rev=1767593=auto
==
--- 
maven/plugins/trunk/maven-help-plugin/src/it/describe-cmd-with-goal-report/pom.xml
 (added)
+++ 
maven/plugins/trunk/maven-help-plugin/src/it/describe-cmd-with-goal-report/pom.xml
 Wed Nov  2 00:43:39 2016
@@ -0,0 +1,36 @@
+
+
+
+
+
+  4.0.0
+
+  org.apache.maven.its.help
+  test
+  1.0
+  
+  https://issues.apache.org/jira/browse/MPH-116
+  Tests that describe outputs whether the configured goal is a 
report goal or not
+
+  
+
+
+  
+

Propchange: 
maven/plugins/trunk/maven-help-plugin/src/it/describe-cmd-with-goal-report/pom.xml
--
svn:eol-style = native

Propchange: 
maven/plugins/trunk/maven-help-plugin/src/it/describe-cmd-with-goal-report/pom.xml
--
svn:keywords = Author Date Id Revision

Added: 
maven/plugins/trunk/maven-help-plugin/src/it/describe-cmd-with-goal-report/verify.groovy
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/it/describe-cmd-with-goal-report/verify.groovy?rev=1767593=auto
==
--- 
maven/plugins/trunk/maven-help-plugin/src/it/describe-cmd-with-goal-report/verify.groovy
 (added)
+++ 
maven/plugins/trunk/maven-help-plugin/src/it/describe-cmd-with-goal-report/verify.groovy
 Wed Nov  2 00:43:39 2016
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE 

svn commit: r1764759 - in /maven/plugins/trunk/maven-site-plugin/src: it/MSITE-705-debug/ it/MSITE-705-no-debug/ main/java/org/apache/maven/plugins/site/deploy/

[gboue]

Author: gboue
Date: Thu Oct 13 19:03:08 2016
New Revision: 1764759

URL: http://svn.apache.org/viewvc?rev=1764759=rev
Log:
[MSITE-705] Too much information in maven logs during site:deploy in sftp...

The debug listener on the Wagon instance is only added if we're running Maven 
in debug mode. This closes #95.

Added:
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-705-debug/

maven/plugins/trunk/maven-site-plugin/src/it/MSITE-705-debug/invoker.properties 
  (with props)
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-705-debug/pom.xml   
(with props)
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-705-debug/verify.groovy  
 (with props)
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-705-no-debug/

maven/plugins/trunk/maven-site-plugin/src/it/MSITE-705-no-debug/invoker.properties
   (with props)
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-705-no-debug/pom.xml   
(with props)

maven/plugins/trunk/maven-site-plugin/src/it/MSITE-705-no-debug/verify.groovy   
(with props)
Modified:

maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/deploy/AbstractDeployMojo.java

Added: 
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-705-debug/invoker.properties
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-705-debug/invoker.properties?rev=1764759=auto
==
--- 
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-705-debug/invoker.properties 
(added)
+++ 
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-705-debug/invoker.properties 
Thu Oct 13 19:03:08 2016
@@ -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 site:site site:deploy 
+invoker.debug = true

Propchange: 
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-705-debug/invoker.properties
--
svn:eol-style = native

Propchange: 
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-705-debug/invoker.properties
--
svn:keywords = Author Date Id Revision

Added: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-705-debug/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-705-debug/pom.xml?rev=1764759=auto
==
--- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-705-debug/pom.xml (added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-705-debug/pom.xml Thu 
Oct 13 19:03:08 2016
@@ -0,0 +1,50 @@
+
+
+
+
+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.its.site
+  msite-705-debug
+  1.0-SNAPSHOT
+  
+Tests that Wagon debug logs (session/transfer) are only displayed if debug 
mode is activated
+  
+  
+UTF-8
+UTF-8
+  
+  
+
+  
+org.apache.maven.plugins
+maven-site-plugin
+@project.version@
+  
+
+  
+  
+
+  MSITE-705
+  Test publish
+  
file://@project.build.directory@/it/MSITE-705/deploy/MSITE-705/junk/
+
+  
+

Propchange: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-705-debug/pom.xml
--
svn:eol-style = native

Propchange: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-705-debug/pom.xml
--
svn:keywords = Author Date Id Revision

Added: 
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-705-debug/verify.groovy
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-705-debug/verify.groovy?rev=1764759=auto
==
--- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-705-debug/verify.groovy 
(added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-705-debug/v

svn commit: r1764765 - /maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java

[gboue]

Author: gboue
Date: Thu Oct 13 19:21:45 2016
New Revision: 1764765

URL: http://svn.apache.org/viewvc?rev=1764765=rev
Log:
[MSITE-785] Documentation of saveProcessedContent parameter is empty

Escaping the '<' and '>' inside Javadoc with '' and '', so that the 
documentation of the parameter is correctly present in the generated site.

Modified:

maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java

Modified: 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java?rev=1764765=1764764=1764765=diff
==
--- 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java
 Thu Oct 13 19:21:45 2016
@@ -200,7 +200,7 @@ public abstract class AbstractSiteRender
 }
 
 /**
- * Whether to save Velocity processed Doxia content 
(*..vm)
+ * Whether to save Velocity processed Doxia content 
(*.ext.vm)
  * to ${generatedSiteDirectory}/processed.
  *
  * @since 3.5

maven git commit: [MNG-6105] properties.internal.SystemProperties.addSystemProperties() is not really thread-safe

[gboue]

Repository: maven
Updated Branches:
  refs/heads/master 8fe10c341 -> d8e3585e0


[MNG-6105] properties.internal.SystemProperties.addSystemProperties() is
not really thread-safe

If a property is concurrently removed from System.getProperties(), we
shouldn't try to insert 'null' since this is not allowed by Properties:
adding a null-check.

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

Branch: refs/heads/master
Commit: d8e3585e051db0293ddd41c781b39e0bf9ce350b
Parents: 8fe10c3
Author: Guillaume Boué 
Authored: Thu Oct 13 23:28:16 2016 +0200
Committer: Guillaume Boué 
Committed: Thu Oct 13 23:28:16 2016 +0200

--
 .../apache/maven/properties/internal/SystemProperties.java| 7 ++-
 .../settings/building/DefaultSettingsBuildingRequest.java | 7 ++-
 2 files changed, 12 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/d8e3585e/maven-core/src/main/java/org/apache/maven/properties/internal/SystemProperties.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/properties/internal/SystemProperties.java
 
b/maven-core/src/main/java/org/apache/maven/properties/internal/SystemProperties.java
index 0372558..0a77376 100644
--- 
a/maven-core/src/main/java/org/apache/maven/properties/internal/SystemProperties.java
+++ 
b/maven-core/src/main/java/org/apache/maven/properties/internal/SystemProperties.java
@@ -35,7 +35,12 @@ public class SystemProperties
 {
 for ( String key : System.getProperties().stringPropertyNames() )
 {
-props.put( key, System.getProperty( key ) );
+String value = System.getProperty( key );
+// could be null if another thread concurrently removed this key 
(MNG-6105)
+if ( value != null )
+{
+props.put( key, value );
+}
 }
 }
 

http://git-wip-us.apache.org/repos/asf/maven/blob/d8e3585e/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuildingRequest.java
--
diff --git 
a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuildingRequest.java
 
b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuildingRequest.java
index 5a4824e..d917a9c 100644
--- 
a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuildingRequest.java
+++ 
b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuildingRequest.java
@@ -119,7 +119,12 @@ public class DefaultSettingsBuildingRequest
 // MNG-5670 guard against ConcurrentModificationException
 for ( String key : System.getProperties().stringPropertyNames() )
 {
-this.systemProperties.put( key, System.getProperty( key ) );
+String value = System.getProperty( key );
+// could be null if another thread concurrently removed this 
key (MNG-6105)
+if ( value != null )
+{
+this.systemProperties.put( key, value );
+}
 }
 }
 else

maven git commit: [MNG-6105] properties.internal.SystemProperties.addSystemProperties() is not really thread-safe

[gboue]

Repository: maven
Updated Branches:
  refs/heads/master f7c1359cf -> ace448158


[MNG-6105] properties.internal.SystemProperties.addSystemProperties() is
not really thread-safe

Refactoring the current code setting system properties to synchronize
correctly on the given ones: avoids ConcurrentModificationException and
NullPointerException if the properties is modified by another thread.

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

Branch: refs/heads/master
Commit: ace448158131285e5ef8fb54b96dfb3d8d05f37e
Parents: f7c1359
Author: Guillaume Boué 
Authored: Sun Oct 16 01:40:46 2016 +0200
Committer: Guillaume Boué 
Committed: Sun Oct 16 01:40:46 2016 +0200

--
 .../internal/MavenRepositorySystemUtils.java| 21 +++-
 .../execution/DefaultMavenExecutionRequest.java |  4 +--
 .../project/DefaultProjectBuildingRequest.java  |  7 ++--
 .../properties/internal/SystemProperties.java   | 35 
 .../building/DefaultModelBuildingRequest.java   |  5 ++-
 .../DefaultSettingsBuildingRequest.java | 12 ++-
 6 files changed, 38 insertions(+), 46 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/ace44815/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java
--
diff --git 
a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java
 
b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java
index 877c277..645fd1c 100644
--- 
a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java
+++ 
b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java
@@ -19,9 +19,6 @@ package org.apache.maven.repository.internal;
  * under the License.
  */
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
 import java.util.Properties;
 
 import org.eclipse.aether.DefaultRepositorySystemSession;
@@ -130,22 +127,14 @@ public final class MavenRepositorySystemUtils
 
 session.setArtifactDescriptorPolicy( new 
SimpleArtifactDescriptorPolicy( true, true ) );
 
+final Properties systemProperties = new Properties();
+
 // MNG-5670 guard against ConcurrentModificationException
 // MNG-6053 guard against key without value
-final Properties systemProperties = new Properties();
-// This relies on the fact that load/store are synchronized internally.
-try ( final ByteArrayOutputStream out = new ByteArrayOutputStream() )
-{
-System.getProperties().store( out, null );
-
-try ( final ByteArrayInputStream in = new ByteArrayInputStream( 
out.toByteArray() ) )
-{
-systemProperties.load( in );
-}
-}
-catch ( final IOException e )
+Properties sysProp = System.getProperties();
+synchronized ( sysProp )
 {
-throw new AssertionError( "Unexpected IO error copying system 
properties.", e );
+systemProperties.putAll( sysProp );
 }
 
 session.setSystemProperties( systemProperties );

http://git-wip-us.apache.org/repos/asf/maven/blob/ace44815/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
 
b/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
index 71a6894..d67061f 100644
--- 
a/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
+++ 
b/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
@@ -33,6 +33,7 @@ import org.apache.maven.eventspy.internal.EventSpyDispatcher;
 import org.apache.maven.model.Profile;
 import org.apache.maven.project.DefaultProjectBuildingRequest;
 import org.apache.maven.project.ProjectBuildingRequest;
+import org.apache.maven.properties.internal.SystemProperties;
 import org.apache.maven.settings.Mirror;
 import org.apache.maven.settings.Proxy;
 import org.apache.maven.settings.Server;
@@ -535,8 +536,7 @@ public class DefaultMavenExecutionRequest
 {
 if ( properties != null )
 {
-this.systemProperties = new Properties();
-this.systemProperties.putAll( properties );
+

svn commit: r1765156 - in /maven/plugins/trunk/maven-changes-plugin/src: it/announce-generate-inconsistent-issue-management/ it/announce-generate-inconsistent-issue-management/src/ it/announce-generat

[gboue]

Author: gboue
Date: Sun Oct 16 13:54:35 2016
New Revision: 1765156

URL: http://svn.apache.org/viewvc?rev=1765156=rev
Log:
[MCHANGES-376] Improve log messages on issue management misconfiguration

During site generation, the inability to generate a report is logged as WARNING 
instead of ERROR since it doesn't fail the build. For the announcement 
generation, an error is still raised. Adding ITs to test for the various errors 
during announcement generation, and that no errors are raised during site 
generation. This closes #20.

Added:

maven/plugins/trunk/maven-changes-plugin/src/it/announce-generate-inconsistent-issue-management/

maven/plugins/trunk/maven-changes-plugin/src/it/announce-generate-inconsistent-issue-management/invoker.properties
   (with props)

maven/plugins/trunk/maven-changes-plugin/src/it/announce-generate-inconsistent-issue-management/pom.xml
   (with props)

maven/plugins/trunk/maven-changes-plugin/src/it/announce-generate-inconsistent-issue-management/src/

maven/plugins/trunk/maven-changes-plugin/src/it/announce-generate-inconsistent-issue-management/src/changes/

maven/plugins/trunk/maven-changes-plugin/src/it/announce-generate-inconsistent-issue-management/src/changes/changes.xml
   (with props)

maven/plugins/trunk/maven-changes-plugin/src/it/announce-generate-no-issue-management/

maven/plugins/trunk/maven-changes-plugin/src/it/announce-generate-no-issue-management/invoker.properties
   (with props)

maven/plugins/trunk/maven-changes-plugin/src/it/announce-generate-no-issue-management/pom.xml
   (with props)

maven/plugins/trunk/maven-changes-plugin/src/it/announce-generate-no-issue-management/src/

maven/plugins/trunk/maven-changes-plugin/src/it/announce-generate-no-issue-management/src/changes/

maven/plugins/trunk/maven-changes-plugin/src/it/announce-generate-no-issue-management/src/changes/changes.xml
   (with props)
maven/plugins/trunk/maven-changes-plugin/src/it/announce-generate-no-url/

maven/plugins/trunk/maven-changes-plugin/src/it/announce-generate-no-url/invoker.properties
   (with props)

maven/plugins/trunk/maven-changes-plugin/src/it/announce-generate-no-url/pom.xml
   (with props)

maven/plugins/trunk/maven-changes-plugin/src/it/announce-generate-no-url/src/

maven/plugins/trunk/maven-changes-plugin/src/it/announce-generate-no-url/src/changes/

maven/plugins/trunk/maven-changes-plugin/src/it/announce-generate-no-url/src/changes/changes.xml
   (with props)

maven/plugins/trunk/maven-changes-plugin/src/it/report-jira-invalid-issuemanagement/

maven/plugins/trunk/maven-changes-plugin/src/it/report-jira-invalid-issuemanagement/pom.xml
   (with props)

maven/plugins/trunk/maven-changes-plugin/src/it/report-jira-invalid-issuemanagement/src/

maven/plugins/trunk/maven-changes-plugin/src/it/report-jira-invalid-issuemanagement/src/changes/

maven/plugins/trunk/maven-changes-plugin/src/it/report-jira-invalid-issuemanagement/src/changes/changes.xml
   (with props)

maven/plugins/trunk/maven-changes-plugin/src/it/report-jira-invalid-issuemanagement/verify.groovy
   (with props)
Modified:

maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java

maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ProjectUtils.java

maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/github/GitHubMojo.java

maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraMojo.java

maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/trac/TracMojo.java

Added: 
maven/plugins/trunk/maven-changes-plugin/src/it/announce-generate-inconsistent-issue-management/invoker.properties
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/it/announce-generate-inconsistent-issue-management/invoker.properties?rev=1765156=auto
==
--- 
maven/plugins/trunk/maven-changes-plugin/src/it/announce-generate-inconsistent-issue-management/invoker.properties
 (added)
+++ 
maven/plugins/trunk/maven-changes-plugin/src/it/announce-generate-inconsistent-issue-management/invoker.properties
 Sun Oct 16 13:54:35 2016
@@ -0,0 +1,20 @@
+# 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
+# &qu

svn commit: r1765191 - in /maven/plugins/trunk/maven-help-plugin: ./ src/it/evaluate-with-expression-with-output/ src/main/java/org/apache/maven/plugins/help/ src/test/java/org/apache/maven/plugins/he

[gboue]

Author: gboue
Date: Sun Oct 16 20:58:58 2016
New Revision: 1765191

URL: http://svn.apache.org/viewvc?rev=1765191=rev
Log:
[MPH-99] Evaluate has no output in quiet mode

Adding the 'output' parameter to the evaluate Mojo. When used, along with an 
expression, the goal will write the result to the specified file instead of 
logging to the console. If no expression is specified, 'output' will be ignored 
(since the plugin will prompt for the expression, it is intended that the 
result is written to the console). The 'quiet' mode is documented to only 
output error messages, so having the result in quiet mode would break the usage 
of this parameter. This closes #17.

Added:

maven/plugins/trunk/maven-help-plugin/src/it/evaluate-with-expression-with-output/

maven/plugins/trunk/maven-help-plugin/src/it/evaluate-with-expression-with-output/invoker.properties
   (with props)

maven/plugins/trunk/maven-help-plugin/src/it/evaluate-with-expression-with-output/pom.xml
   (with props)

maven/plugins/trunk/maven-help-plugin/src/it/evaluate-with-expression-with-output/test.properties
   (with props)

maven/plugins/trunk/maven-help-plugin/src/it/evaluate-with-expression-with-output/verify.groovy
   (with props)

maven/plugins/trunk/maven-help-plugin/src/test/java/org/apache/maven/plugins/help/EvaluateMojoTest.java
   (with props)
maven/plugins/trunk/maven-help-plugin/src/test/resources/unit/evaluate/

maven/plugins/trunk/maven-help-plugin/src/test/resources/unit/evaluate/plugin-config-output.xml
   (with props)

maven/plugins/trunk/maven-help-plugin/src/test/resources/unit/evaluate/plugin-config.xml
   (with props)
Modified:
maven/plugins/trunk/maven-help-plugin/pom.xml

maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EvaluateMojo.java

Modified: maven/plugins/trunk/maven-help-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/pom.xml?rev=1765191=1765190=1765191=diff
==
--- maven/plugins/trunk/maven-help-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-help-plugin/pom.xml Sun Oct 16 20:58:58 2016
@@ -185,6 +185,12 @@ under the License.
   1.4
   test
 
+
+  org.mockito
+  mockito-core
+  1.9.5
+  test
+
   
 
   

Added: 
maven/plugins/trunk/maven-help-plugin/src/it/evaluate-with-expression-with-output/invoker.properties
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/it/evaluate-with-expression-with-output/invoker.properties?rev=1765191=auto
==
--- 
maven/plugins/trunk/maven-help-plugin/src/it/evaluate-with-expression-with-output/invoker.properties
 (added)
+++ 
maven/plugins/trunk/maven-help-plugin/src/it/evaluate-with-expression-with-output/invoker.properties
 Sun Oct 16 20:58:58 2016
@@ -0,0 +1,18 @@
+# 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 = 
${project.groupId}:${project.artifactId}:${project.version}:evaluate

Propchange: 
maven/plugins/trunk/maven-help-plugin/src/it/evaluate-with-expression-with-output/invoker.properties
--
svn:eol-style = native

Propchange: 
maven/plugins/trunk/maven-help-plugin/src/it/evaluate-with-expression-with-output/invoker.properties
--
svn:keywords = Author Date Id Revision

Added: 
maven/plugins/trunk/maven-help-plugin/src/it/evaluate-with-expression-with-output/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/it/evaluate-with-expression-with-output/pom.xml?rev=1765191=auto
==
--- 
maven/plugins/trunk/maven-help-plugin/src/it/evaluate-with-expression-with-output/pom.xml
 (added)
+++ 
maven/plugins/trunk/maven-help-plugin/src/it/evaluate-with-expression-with-output/pom.xml
 Sun Oct 16 20:58:58 2016
@@ -0,0 +1,35 @@
+
+
+
+
+
+  4.0.0
+
+  org.apache.maven.its.help
+  test
+  1.0
+  Maven Foo Bar
+  https

svn commit: r1765195 - /maven/plugins/trunk/maven-compiler-plugin/src/site/apt/examples/set-compiler-source-and-target.apt.vm

[gboue]

Author: gboue
Date: Sun Oct 16 22:38:01 2016
New Revision: 1765195

URL: http://svn.apache.org/viewvc?rev=1765195=rev
Log:
Updating the "Setting the -source and -target of the Java Compiler" 
documentation page by referencing Java 8 features instead of Java 4. This 
closes #69.

Modified:

maven/plugins/trunk/maven-compiler-plugin/src/site/apt/examples/set-compiler-source-and-target.apt.vm

Modified: 
maven/plugins/trunk/maven-compiler-plugin/src/site/apt/examples/set-compiler-source-and-target.apt.vm
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/site/apt/examples/set-compiler-source-and-target.apt.vm?rev=1765195=1765194=1765195=diff
==
--- 
maven/plugins/trunk/maven-compiler-plugin/src/site/apt/examples/set-compiler-source-and-target.apt.vm
 (original)
+++ 
maven/plugins/trunk/maven-compiler-plugin/src/site/apt/examples/set-compiler-source-and-target.apt.vm
 Sun Oct 16 22:38:01 2016
@@ -33,9 +33,9 @@ Setting the <<<-source>>> and <<<-target
   such command using <<<-source>>> and <<<-target>>>.  The Compiler Plugin
   can also be configured to provide these options during compilation.
 
-  For example, if you want to enable assertions (<<<-source 1.4>>>) and also 
want the
-  compiled classes to be compatible with JVM 1.4 (<<<-target 1.4>>>), you can 
then
-  put:
+  For example, if you want to use the Java 8 language features (<<<-source 
1.8>>>)
+  and also want the compiled classes to be compatible with JVM 1.8 (<<<-target 
1.8>>>),
+  you can then put:
 
 +-
 
@@ -48,8 +48,8 @@ Setting the <<<-source>>> and <<<-target
 maven-compiler-plugin
 ${project.version}
 
-  1.4
-  1.4
+  1.8
+  1.8
 
   
 

svn commit: r1771979 - in /maven/enforcer/trunk/enforcer-rules/src/site/apt: banDuplicatePomDependencyVersions.apt.vm index.apt

[gboue]

Author: gboue
Date: Tue Nov 29 23:31:33 2016
New Revision: 1771979

URL: http://svn.apache.org/viewvc?rev=1771979=rev
Log:
[MENFORCER-259] The rule BanDuplicatePomDependencyVersions is not documented

Adding banDuplicatePomDependencyVersions, introduced in MENFORCER-152, to the 
documentation.

Added:

maven/enforcer/trunk/enforcer-rules/src/site/apt/banDuplicatePomDependencyVersions.apt.vm
   (with props)
Modified:
maven/enforcer/trunk/enforcer-rules/src/site/apt/index.apt

Added: 
maven/enforcer/trunk/enforcer-rules/src/site/apt/banDuplicatePomDependencyVersions.apt.vm
URL: 
http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/site/apt/banDuplicatePomDependencyVersions.apt.vm?rev=1771979=auto
==
--- 
maven/enforcer/trunk/enforcer-rules/src/site/apt/banDuplicatePomDependencyVersions.apt.vm
 (added)
+++ 
maven/enforcer/trunk/enforcer-rules/src/site/apt/banDuplicatePomDependencyVersions.apt.vm
 Tue Nov 29 23:31:33 2016
@@ -0,0 +1,67 @@
+~~ 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.
+ 
+  --
+  Ban Duplicate Pom Dependency Versions
+  --
+  Guillaume Boue
+  --
+  November 2016
+  --
+
+Ban Duplicate Pom Dependency Versions
+
+  This rule checks that there are no duplicate dependencies declared in the 
POM of the project.
+  Duplicate dependencies are dependencies which have the same group id, 
artifact id, type and classifier.
+
+  The following parameters are supported by this rule:
+   
+  * message - an optional supplemental message to the user if the rule fails.
+
+   []
+
+   
+  Sample Plugin Configuration:
+  
++--+
+
+  [...]
+  
+
+  
+org.apache.maven.plugins
+maven-enforcer-plugin
+${project.version}
+
+  
+no-duplicate-declared-dependencies
+
+  enforce
+
+
+  
+
+  
+
+  
+
+  
+
+  
+  [...]
+
++---+

Propchange: 
maven/enforcer/trunk/enforcer-rules/src/site/apt/banDuplicatePomDependencyVersions.apt.vm
--
svn:eol-style = native

Propchange: 
maven/enforcer/trunk/enforcer-rules/src/site/apt/banDuplicatePomDependencyVersions.apt.vm
--
svn:keywords = Author Date Id Revision

Modified: maven/enforcer/trunk/enforcer-rules/src/site/apt/index.apt
URL: 
http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/site/apt/index.apt?rev=1771979=1771978=1771979=diff
==
--- maven/enforcer/trunk/enforcer-rules/src/site/apt/index.apt (original)
+++ maven/enforcer/trunk/enforcer-rules/src/site/apt/index.apt Tue Nov 29 
23:31:33 2016
@@ -32,7 +32,9 @@ Standard Rules
   * {{{./alwaysPass.html}alwaysPass}} - Always passes... used to test plugin 
configuration.
   
   * {{{./banDistributionManagement.html}banDistributionManagement}} - enforces 
that project doesn't have distributionManagement.
-
+  
+  * 
{{{./banDuplicatePomDependencyVersions.html}banDuplicatePomDependencyVersions}} 
- enforces that the project doesn't have duplicate declared dependencies.
+  
   * {{{./bannedDependencies.html}bannedDependencies}} - enforces that excluded 
dependencies aren't included.
   
   * {{{./bannedPlugins.html}bannedPlugins}} - enforces that specific plugins 
aren't included in the build.

svn commit: r1774329 - /maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java

[gboue]

Author: gboue
Date: Wed Dec 14 19:38:57 2016
New Revision: 1774329

URL: http://svn.apache.org/viewvc?rev=1774329=rev
Log:
Fixing Checkstyle issue, by refactoring the default issue link URL to a 
constant, and re-using the %ISSUE% constant.

Modified:

maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java

Modified: 
maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java?rev=1774329=1774328=1774329=diff
==
--- 
maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java
 (original)
+++ 
maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java
 Wed Dec 14 19:38:57 2016
@@ -118,6 +118,8 @@ public class ChangeLogReport
 
 public static final String DEFAULT_ISSUE_ID_REGEX_PATTERN = 
"[a-zA-Z]{2,}-\\d+";
 
+private static final String DEFAULT_ISSUE_LINK_URL = 
"https://issues.apache.org/jira/browse/; + ISSUE_TOKEN;
+
 /**
  * Used to specify the format to use for the dates in the headings of the
  * report.
@@ -337,7 +339,7 @@ public class ChangeLogReport
  *
  * @since 2.2
  */
-@Parameter( property = "issueLinkUrl", defaultValue = 
"https://issues.apache.org/jira/browse/%ISSUE%;, required = true )
+@Parameter( property = "issueLinkUrl", defaultValue = 
DEFAULT_ISSUE_LINK_URL, required = true )
 private String issueLinkUrl;
 
 /**

svn commit: r1774310 - in /maven/plugins/trunk/maven-ear-plugin: ./ src/it/ src/it/skinny-wars-timestamp/ src/it/skinny-wars-timestamp/ear-module/ src/it/skinny-wars-timestamp/war-module/ src/it/skinn

[gboue]

Author: gboue
Date: Wed Dec 14 18:57:02 2016
New Revision: 1774310

URL: http://svn.apache.org/viewvc?rev=1774310=rev
Log:
[MEAR-217] Snapshot dependencies are not deleted from skinny WARs
Submitted by: Fabian Schlier

Applied after adding the JAR file attached to the JIRA issue. This closes #100.

Added:
maven/plugins/trunk/maven-ear-plugin/src/it/skinny-wars-timestamp/

maven/plugins/trunk/maven-ear-plugin/src/it/skinny-wars-timestamp/ear-module/

maven/plugins/trunk/maven-ear-plugin/src/it/skinny-wars-timestamp/ear-module/pom.xml
   (with props)
maven/plugins/trunk/maven-ear-plugin/src/it/skinny-wars-timestamp/pom.xml   
(with props)

maven/plugins/trunk/maven-ear-plugin/src/it/skinny-wars-timestamp/verify.bsh   
(with props)

maven/plugins/trunk/maven-ear-plugin/src/it/skinny-wars-timestamp/war-module/

maven/plugins/trunk/maven-ear-plugin/src/it/skinny-wars-timestamp/war-module/pom.xml
   (with props)

maven/plugins/trunk/maven-ear-plugin/src/it/skinny-wars-timestamp/war-module/src/

maven/plugins/trunk/maven-ear-plugin/src/it/skinny-wars-timestamp/war-module/src/main/

maven/plugins/trunk/maven-ear-plugin/src/it/skinny-wars-timestamp/war-module/src/main/webapp/

maven/plugins/trunk/maven-ear-plugin/src/it/skinny-wars-timestamp/war-module/src/main/webapp/WEB-INF/

maven/plugins/trunk/maven-ear-plugin/src/it/skinny-wars-timestamp/war-module/src/main/webapp/WEB-INF/web.xml
   (with props)
maven/plugins/trunk/maven-ear-plugin/src/test/resources/m2snapshots/
maven/plugins/trunk/maven-ear-plugin/src/test/resources/m2snapshots/eartest/

maven/plugins/trunk/maven-ear-plugin/src/test/resources/m2snapshots/eartest/jar-sample-one/

maven/plugins/trunk/maven-ear-plugin/src/test/resources/m2snapshots/eartest/jar-sample-one/1.0-SNAPSHOT/

maven/plugins/trunk/maven-ear-plugin/src/test/resources/m2snapshots/eartest/jar-sample-one/1.0-SNAPSHOT/jar-sample-one-1.0-20150825.210557-91.jar
   (with props)

maven/plugins/trunk/maven-ear-plugin/src/test/resources/m2snapshots/eartest/jar-sample-one/1.0-SNAPSHOT/jar-sample-one-1.0-20150825.210557-91.jar.sha1

maven/plugins/trunk/maven-ear-plugin/src/test/resources/m2snapshots/eartest/jar-sample-one/1.0-SNAPSHOT/jar-sample-one-1.0-20150825.210557-91.pom
   (with props)

maven/plugins/trunk/maven-ear-plugin/src/test/resources/m2snapshots/eartest/jar-sample-one/1.0-SNAPSHOT/jar-sample-one-1.0-20150825.210557-91.pom.sha1

maven/plugins/trunk/maven-ear-plugin/src/test/resources/m2snapshots/eartest/jar-sample-one/1.0-SNAPSHOT/maven-metadata.xml
   (with props)
Modified:
maven/plugins/trunk/maven-ear-plugin/pom.xml
maven/plugins/trunk/maven-ear-plugin/src/it/settings.xml

maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugins/ear/EarMojo.java

Modified: maven/plugins/trunk/maven-ear-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/pom.xml?rev=1774310=1774309=1774310=diff
==
--- maven/plugins/trunk/maven-ear-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-ear-plugin/pom.xml Wed Dec 14 18:57:02 2016
@@ -180,6 +180,11 @@
   src/test/resources/dtd/jboss-app_4_0.dtd
   src/test/resources/dtd/jboss-app_4_2.dtd
   src/test/resources/dtd/jboss-app_5_0.dtd
+  
+  
src/test/resources/m2snapshots/eartest/jar-sample-one/1.0-SNAPSHOT/jar-sample-one-1.0-20150825.210557-91.jar.sha1
+  
src/test/resources/m2snapshots/eartest/jar-sample-one/1.0-SNAPSHOT/jar-sample-one-1.0-20150825.210557-91.pom.sha1
 
   
 
@@ -193,6 +198,7 @@
   run-its
   
 
${project.build.testOutputDirectory}/m2repo
+
${project.build.testOutputDirectory}/m2snapshots
   
   
 

Modified: maven/plugins/trunk/maven-ear-plugin/src/it/settings.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/it/settings.xml?rev=1774310=1774309=1774310=diff
==
--- maven/plugins/trunk/maven-ear-plugin/src/it/settings.xml (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/it/settings.xml Wed Dec 14 
18:57:02 2016
@@ -37,6 +37,16 @@ under the License.
 true
   
 
+
+  local.snapshot
+  file://@localSnapshotRepositoryPath@
+  
+false
+  
+  
+true
+  
+
   
   
 

Added: 
maven/plugins/trunk/maven-ear-plugin/src/it/skinny-wars-timestamp/ear-module/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/it/skinny-wars-timestamp/ear-module/pom.xml?rev=1774310=auto
==
--- 
maven/plugins/trunk/maven-ear-plugin/src/it/skinny-wars-timestamp/ear

svn commit: r1774759 - /maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependencies/collect/internal/Maven30DependencyCollector.java

[gboue]

Author: gboue
Date: Sat Dec 17 13:20:19 2016
New Revision: 1774759

URL: http://svn.apache.org/viewvc?rev=1774759=rev
Log:
[MSHARED-602] NoSuchMethodException using DependencyCollector with Maven 3.0

Looking for the method toDependency inside RepositoryUtils taking the correct 
org.apache.maven.model.Dependency instead of 
org.sonatype.aether.graph.Dependency.

Modified:

maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependencies/collect/internal/Maven30DependencyCollector.java

Modified: 
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependencies/collect/internal/Maven30DependencyCollector.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependencies/collect/internal/Maven30DependencyCollector.java?rev=1774759=1774758=1774759=diff
==
--- 
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependencies/collect/internal/Maven30DependencyCollector.java
 (original)
+++ 
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/dependencies/collect/internal/Maven30DependencyCollector.java
 Sat Dec 17 13:20:19 2016
@@ -159,10 +159,10 @@ public class Maven30DependencyCollector
 ArtifactTypeRegistry typeRegistry )
 throws DependencyCollectorException
 {
-Class[] argClasses = new Class[] { Dependency.class, 
ArtifactTypeRegistry.class };
+Class[] argClasses = new Class[] { 
org.apache.maven.model.Dependency.class, ArtifactTypeRegistry.class };
 
 Object[] args = new Object[] { mavenDependency, typeRegistry };
 
 return (Dependency) Invoker.invoke( RepositoryUtils.class, 
"toDependency", argClasses, args );
-}
+}
 }

svn commit: r1774770 - in /maven/plugins/trunk/maven-dependency-plugin/src: it/mrm/repository/ it/projects/get-artifact-maven-plugin/ it/projects/get-artifact-no-transitive/ it/projects/get-artifact/

[gboue]

Author: gboue
Date: Sat Dec 17 15:03:53 2016
New Revision: 1774770

URL: http://svn.apache.org/viewvc?rev=1774770=rev
Log:
[MDEP-548] The get Mojo doesn't resolve the artifact when setting transitive to 
false

When transitive is set to false, the ArtifactResolver needs to be used to 
resolve just the specified artifact, without its transitive dependencies.

Added:

maven/plugins/trunk/maven-dependency-plugin/src/it/mrm/repository/get-artifact-1.0.jar
   (with props)

maven/plugins/trunk/maven-dependency-plugin/src/it/mrm/repository/get-artifact-1.0.pom
   (with props)

maven/plugins/trunk/maven-dependency-plugin/src/it/mrm/repository/get-artifact-maven-plugin-1.0.jar
   (with props)

maven/plugins/trunk/maven-dependency-plugin/src/it/mrm/repository/get-artifact-maven-plugin-1.0.pom
   (with props)

maven/plugins/trunk/maven-dependency-plugin/src/it/mrm/repository/get-artifact-transitive-1.0.jar
   (with props)

maven/plugins/trunk/maven-dependency-plugin/src/it/mrm/repository/get-artifact-transitive-1.0.pom
   (with props)
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/get-artifact/

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/get-artifact-maven-plugin/

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/get-artifact-maven-plugin/invoker.properties
   (with props)

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/get-artifact-maven-plugin/pom.xml
   (with props)

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/get-artifact-maven-plugin/setup.bsh
   (with props)

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/get-artifact-maven-plugin/test.properties
   (with props)

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/get-artifact-maven-plugin/verify.bsh
   (with props)

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/get-artifact-no-transitive/

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/get-artifact-no-transitive/invoker.properties
   (with props)

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/get-artifact-no-transitive/pom.xml
   (with props)

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/get-artifact-no-transitive/setup.bsh
   (with props)

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/get-artifact-no-transitive/test.properties
   (with props)

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/get-artifact-no-transitive/verify.bsh
   (with props)

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/get-artifact/invoker.properties
   (with props)

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/get-artifact/pom.xml
   (with props)

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/get-artifact/setup.bsh
   (with props)

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/get-artifact/test.properties
   (with props)

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/get-artifact/verify.bsh
   (with props)
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/get-gav/

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/get-gav/invoker.properties
   (with props)
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/get-gav/pom.xml 
  (with props)

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/get-gav/setup.bsh   
(with props)

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/get-gav/test.properties
   (with props)

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/get-gav/verify.bsh  
 (with props)
Modified:

maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/GetMojo.java

Added: 
maven/plugins/trunk/maven-dependency-plugin/src/it/mrm/repository/get-artifact-1.0.jar
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/it/mrm/repository/get-artifact-1.0.jar?rev=1774770=auto
==
Binary file - no diff available.

Propchange: 
maven/plugins/trunk/maven-dependency-plugin/src/it/mrm/repository/get-artifact-1.0.jar
--
svn:mime-type = application/octet-stream

Added: 
maven/plugins/trunk/maven-dependency-plugin/src/it/mrm/repository/get-artifact-1.0.pom
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/it/mrm/repository/get-artifact-1.0.pom?rev=1774770=auto
==
--- 
maven/plugins/trunk/maven-dependency-plugin/src/it/mrm/repository/get-artifact-1.0.pom
 (added)
+++ 
maven/plugins/trunk/maven-dependency-plugin/src/it/mrm/repository/get-artifact-1.0.pom
 Sat Dec 17 15:03:53 2016
@@ -0,0 +1,42 @@
+
+
+
+http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-ins

svn commit: r1774769 - in /maven/plugins/trunk/maven-dependency-plugin/src/it/projects: copy-from-remote-repository/verify.groovy unpack-from-remote-repository/verify.groovy

[gboue]

Author: gboue
Date: Sat Dec 17 15:03:29 2016
New Revision: 1774769

URL: http://svn.apache.org/viewvc?rev=1774769=rev
Log:
Updating the tests so that they pass with Maven 3.0.x also

Modified:

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-remote-repository/verify.groovy

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/unpack-from-remote-repository/verify.groovy

Modified: 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-remote-repository/verify.groovy
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-remote-repository/verify.groovy?rev=1774769=1774768=1774769=diff
==
--- 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-remote-repository/verify.groovy
 (original)
+++ 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-remote-repository/verify.groovy
 Sat Dec 17 15:03:29 2016
@@ -21,8 +21,8 @@ import java.io.*;
 
 File buildLog = new File( basedir, 'build.log' )
 assert buildLog.exists()
-assert buildLog.text.contains( "[INFO] Downloading: file:///" + basedir + 
"/repo/org/apache/maven/its/dependency/fake-remote-copy/1.0/fake-remote-copy-1.0.jar"
 )
-assert buildLog.text.contains( "[INFO] Downloaded: file:///" + basedir + 
"/repo/org/apache/maven/its/dependency/fake-remote-copy/1.0/fake-remote-copy-1.0.jar"
 )
+assert buildLog.text.contains( "Downloading: file:///" + basedir + 
"/repo/org/apache/maven/its/dependency/fake-remote-copy/1.0/fake-remote-copy-1.0.jar"
 )
+assert buildLog.text.contains( "Downloaded: file:///" + basedir + 
"/repo/org/apache/maven/its/dependency/fake-remote-copy/1.0/fake-remote-copy-1.0.jar"
 )
 
 File copied = new File( basedir, 'target/dependency/fake-remote-copy-1.0.jar' )
 assert copied.exists()

Modified: 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/unpack-from-remote-repository/verify.groovy
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/it/projects/unpack-from-remote-repository/verify.groovy?rev=1774769=1774768=1774769=diff
==
--- 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/unpack-from-remote-repository/verify.groovy
 (original)
+++ 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/unpack-from-remote-repository/verify.groovy
 Sat Dec 17 15:03:29 2016
@@ -21,8 +21,8 @@ import java.io.*;
 
 File buildLog = new File( basedir, 'build.log' )
 assert buildLog.exists()
-assert buildLog.text.contains( "[INFO] Downloading: file:///" + basedir + 
"/repo/org/apache/maven/its/dependency/fake-remote-unpack/1.0/fake-remote-unpack-1.0.jar"
 )
-assert buildLog.text.contains( "[INFO] Downloaded: file:///" + basedir + 
"/repo/org/apache/maven/its/dependency/fake-remote-unpack/1.0/fake-remote-unpack-1.0.jar"
 )
+assert buildLog.text.contains( "Downloading: file:///" + basedir + 
"/repo/org/apache/maven/its/dependency/fake-remote-unpack/1.0/fake-remote-unpack-1.0.jar"
 )
+assert buildLog.text.contains( "Downloaded: file:///" + basedir + 
"/repo/org/apache/maven/its/dependency/fake-remote-unpack/1.0/fake-remote-unpack-1.0.jar"
 )
 
 File unpacked = new File( basedir, 'target/dependency/META-INF/MANIFEST.MF' )
 assert unpacked.exists()

svn commit: r1774803 - in /maven/plugins/trunk/maven-dependency-plugin/src: it/projects/build-classpath-output-file-and-property/ main/java/org/apache/maven/plugins/dependency/fromDependencies/

[gboue]

Author: gboue
Date: Sat Dec 17 20:40:08 2016
New Revision: 1774803

URL: http://svn.apache.org/viewvc?rev=1774803=rev
Log:
[MDEP-482] Can't use both outputProperty and outputFile in build-classpath mojo
Submitted by: Dagan Sandler

Make sure outputFile and outputProperty can both be used at the same time. 
Applied patch after adding an IT.

Added:

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/build-classpath-output-file-and-property/

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/build-classpath-output-file-and-property/invoker.properties
   (with props)

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/build-classpath-output-file-and-property/pom.xml
   (with props)

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/build-classpath-output-file-and-property/test.properties
   (with props)

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/build-classpath-output-file-and-property/verify.bsh
   (with props)
Modified:

maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/BuildClasspathMojo.java

Added: 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/build-classpath-output-file-and-property/invoker.properties
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/it/projects/build-classpath-output-file-and-property/invoker.properties?rev=1774803=auto
==
--- 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/build-classpath-output-file-and-property/invoker.properties
 (added)
+++ 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/build-classpath-output-file-and-property/invoker.properties
 Sat Dec 17 20:40:08 2016
@@ -0,0 +1,18 @@
+# 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 package

Propchange: 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/build-classpath-output-file-and-property/invoker.properties
--
svn:eol-style = native

Propchange: 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/build-classpath-output-file-and-property/invoker.properties
--
svn:keywords = Author Date Id Revision

Added: 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/build-classpath-output-file-and-property/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/it/projects/build-classpath-output-file-and-property/pom.xml?rev=1774803=auto
==
--- 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/build-classpath-output-file-and-property/pom.xml
 (added)
+++ 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/build-classpath-output-file-and-property/pom.xml
 Sat Dec 17 20:40:08 2016
@@ -0,0 +1,89 @@
+
+
+
+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.its.dependency
+  test
+  1.0-SNAPSHOT
+  https://issues.apache.org/jira/browse/MDEP-482
+  
+Test dependency:build-classpath when setting both an output file and an 
output property
+  
+
+  
+UTF-8
+  
+
+  
+
+  org.apache.maven.its.dependency
+  get-artifact
+  1.0
+
+  
+  
+  
+
+  
+org.apache.maven.plugins
+maven-dependency-plugin
+@project.version@
+
+  
+its
+
+  build-classpath
+
+package
+  
+
+  
+  
+org.apache.maven.plugins
+maven-enforcer-plugin
+1.4.1
+
+  
+enforce-property
+
+  enforce
+
+package
+
+  
+
+  
+  
+"${classpath.proper

maven git commit: [MNG-6117] ${session.parallel} not correctly set

[gboue]

Repository: maven
Updated Branches:
  refs/heads/MNG-6117 [created] bd98ae6a3


[MNG-6117] ${session.parallel} not correctly set

MultiThreadedBuilder must set parallel to true when it's using more than
1 thread to build: i.e. a degree of concurrency greater than 1 (-T) and
more than 1 project to build. Since each ProjectSegment works on a
cloned session instance (see
BuildListCalculator#calculateProjectBuilds), the flag must be also set
on each cloned session.

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

Branch: refs/heads/MNG-6117
Commit: bd98ae6a3de8d443f5b3d2f895f2348c2912ae05
Parents: e51fc87
Author: Guillaume Boué 
Authored: Sun Nov 13 22:46:18 2016 +0100
Committer: Guillaume Boué 
Committed: Mon Jan 9 21:50:07 2017 +0100

--
 .../multithreaded/MultiThreadedBuilder.java   | 18 ++
 1 file changed, 14 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/bd98ae6a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java
 
b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java
index b3e35e0..f0fa2ac 100644
--- 
a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java
+++ 
b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java
@@ -44,7 +44,11 @@ import org.codehaus.plexus.component.annotations.Requirement;
 import org.codehaus.plexus.logging.Logger;
 
 /**
- * Builds the full lifecycle in weave-mode (phase by phase as opposed to 
project-by-project)
+ * Builds the full lifecycle in weave-mode (phase by phase as opposed to 
project-by-project).
+ * 
+ * This builder uses a number of threads equal to the minimum of the degree of 
concurrency (which is the thread count
+ * set with -T on the command-line) and the number of projects to 
build. As such, building a single project
+ * will always result in a sequential build, regardless of the thread count.
  *
  * @since 3.0
  * @author Kristian Rosenvold
@@ -73,9 +77,15 @@ public class MultiThreadedBuilder
List taskSegments, ReactorBuildStatus 
reactorBuildStatus )
 throws ExecutionException, InterruptedException
 {
-ExecutorService executor =
-Executors.newFixedThreadPool( Math.min( 
session.getRequest().getDegreeOfConcurrency(),
-
session.getProjects().size() ), new BuildThreadFactory() );
+int nThreads = Math.min( 
session.getRequest().getDegreeOfConcurrency(), session.getProjects().size() );
+boolean parallel = nThreads >= 2;
+// Propagate the parallel flag to the root session and all of the 
cloned sessions in each project segment
+session.setParallel( parallel );
+for ( ProjectSegment segment : projectBuilds )
+{
+segment.getSession().setParallel( parallel );
+}
+ExecutorService executor = Executors.newFixedThreadPool( nThreads, new 
BuildThreadFactory() );
 CompletionService service = new 
ExecutorCompletionService<>( executor );
 ConcurrencyDependencyGraph analyzer =
 new ConcurrencyDependencyGraph( projectBuilds, 
session.getProjectDependencyGraph() );

svn commit: r1778912 - in /maven/plugin-tools/trunk/maven-plugin-tools-java/src/test: java/org/apache/maven/tools/plugin/extractor/javadoc/ resources/MPLUGIN-290/

[gboue]

Author: gboue
Date: Sun Jan 15 13:08:04 2017
New Revision: 1778912

URL: http://svn.apache.org/viewvc?rev=1778912=rev
Log:
[MPLUGIN-290] Version 3.4 fails to parse enums with Regex patterns

Already fixed by the upgrade of QDox to 2.0-M5 done in r1778362. Test added to 
prevent regressions.

Added:

maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/resources/MPLUGIN-290/

maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/resources/MPLUGIN-290/Test.java
   (with props)

maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/resources/MPLUGIN-290/plugin-expected.xml
   (with props)
Modified:

maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/java/org/apache/maven/tools/plugin/extractor/javadoc/JavaMojoDescriptorExtractorTest.java

Modified: 
maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/java/org/apache/maven/tools/plugin/extractor/javadoc/JavaMojoDescriptorExtractorTest.java
URL: 
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/java/org/apache/maven/tools/plugin/extractor/javadoc/JavaMojoDescriptorExtractorTest.java?rev=1778912=1778911=1778912=diff
==
--- 
maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/java/org/apache/maven/tools/plugin/extractor/javadoc/JavaMojoDescriptorExtractorTest.java
 (original)
+++ 
maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/java/org/apache/maven/tools/plugin/extractor/javadoc/JavaMojoDescriptorExtractorTest.java
 Sun Jan 15 13:08:04 2017
@@ -249,4 +249,12 @@ public class JavaMojoDescriptorExtractor
 assertNull( results );
 }
 
+public void testEnumWithRegexPattern()
+throws Exception
+{
+List results = extract( "MPLUGIN-290" );
+
+assertNull( results );
+}
+
 }

Added: 
maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/resources/MPLUGIN-290/Test.java
URL: 
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/resources/MPLUGIN-290/Test.java?rev=1778912=auto
==
--- 
maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/resources/MPLUGIN-290/Test.java
 (added)
+++ 
maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/resources/MPLUGIN-290/Test.java
 Sun Jan 15 13:08:04 2017
@@ -0,0 +1,32 @@
+/*
+ * 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.regex.Pattern;
+
+public enum Test
+{
+
+Test( Pattern.compile( "a" ) );
+
+private Test( Pattern p )
+{
+
+}
+
+}

Propchange: 
maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/resources/MPLUGIN-290/Test.java
--
svn:eol-style = native

Propchange: 
maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/resources/MPLUGIN-290/Test.java
--
svn:keywords = Author Date Id Revision

Added: 
maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/resources/MPLUGIN-290/plugin-expected.xml
URL: 
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/resources/MPLUGIN-290/plugin-expected.xml?rev=1778912=auto
==
--- 
maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/resources/MPLUGIN-290/plugin-expected.xml
 (added)
+++ 
maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/resources/MPLUGIN-290/plugin-expected.xml
 Sun Jan 15 13:08:04 2017
@@ -0,0 +1,33 @@
+
+
+
+
+
+  
+  
+  
+  
+  
+  test
+  false
+  true
+  
+  
+
\ No newline at end of file

Propchange: 
maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/resources/MPLUGIN-290/plugin-expected.xml
--
svn:eol-style = native

Propchange: 
maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/resources/MPLUGIN-290/plugin-expected.xml
--
svn:keywords = Author Date Id Revision

svn commit: r1778908 - in /maven/plugin-tools/trunk: ./ maven-plugin-annotations/ maven-plugin-plugin/ maven-plugin-tools-annotations/ maven-plugin-tools-api/ maven-plugin-tools-generators/ maven-plug

[gboue]

Author: gboue
Date: Sun Jan 15 12:19:50 2017
New Revision: 1778908

URL: http://svn.apache.org/viewvc?rev=1778908=rev
Log:
Updating the version from 3.6-SNAPSHOT to 3.5.1-SNAPSHOT as per 
http://mail-archives.apache.org/mod_mbox/maven-dev/201701.mbox/%3Cop.ytya62tukdkhrr%40desktop-2khsk44%3E.

Modified:
maven/plugin-tools/trunk/maven-plugin-annotations/pom.xml
maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml
maven/plugin-tools/trunk/maven-plugin-tools-annotations/pom.xml
maven/plugin-tools/trunk/maven-plugin-tools-api/pom.xml
maven/plugin-tools/trunk/maven-plugin-tools-generators/pom.xml
maven/plugin-tools/trunk/maven-plugin-tools-java/pom.xml
maven/plugin-tools/trunk/maven-plugin-tools-javadoc/pom.xml
maven/plugin-tools/trunk/maven-script/maven-plugin-tools-ant/pom.xml
maven/plugin-tools/trunk/maven-script/maven-plugin-tools-beanshell/pom.xml
maven/plugin-tools/trunk/maven-script/maven-plugin-tools-model/pom.xml
maven/plugin-tools/trunk/maven-script/maven-script-ant/pom.xml
maven/plugin-tools/trunk/maven-script/maven-script-beanshell/pom.xml
maven/plugin-tools/trunk/maven-script/pom.xml
maven/plugin-tools/trunk/pom.xml

Modified: maven/plugin-tools/trunk/maven-plugin-annotations/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-annotations/pom.xml?rev=1778908=1778907=1778908=diff
==
--- maven/plugin-tools/trunk/maven-plugin-annotations/pom.xml (original)
+++ maven/plugin-tools/trunk/maven-plugin-annotations/pom.xml Sun Jan 15 
12:19:50 2017
@@ -23,7 +23,7 @@
   
 maven-plugin-tools
 org.apache.maven.plugin-tools
-3.6-SNAPSHOT
+3.5.1-SNAPSHOT
   
 
   maven-plugin-annotations

Modified: maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml?rev=1778908=1778907=1778908=diff
==
--- maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml (original)
+++ maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml Sun Jan 15 12:19:50 
2017
@@ -23,7 +23,7 @@
   
 maven-plugin-tools
 org.apache.maven.plugin-tools
-3.6-SNAPSHOT
+3.5.1-SNAPSHOT
   
 
   org.apache.maven.plugins

Modified: maven/plugin-tools/trunk/maven-plugin-tools-annotations/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-annotations/pom.xml?rev=1778908=1778907=1778908=diff
==
--- maven/plugin-tools/trunk/maven-plugin-tools-annotations/pom.xml (original)
+++ maven/plugin-tools/trunk/maven-plugin-tools-annotations/pom.xml Sun Jan 15 
12:19:50 2017
@@ -22,7 +22,7 @@
   
 org.apache.maven.plugin-tools
 maven-plugin-tools
-3.6-SNAPSHOT
+3.5.1-SNAPSHOT
   
 
   maven-plugin-tools-annotations

Modified: maven/plugin-tools/trunk/maven-plugin-tools-api/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-api/pom.xml?rev=1778908=1778907=1778908=diff
==
--- maven/plugin-tools/trunk/maven-plugin-tools-api/pom.xml (original)
+++ maven/plugin-tools/trunk/maven-plugin-tools-api/pom.xml Sun Jan 15 12:19:50 
2017
@@ -25,7 +25,7 @@
   
 org.apache.maven.plugin-tools
 maven-plugin-tools
-3.6-SNAPSHOT
+3.5.1-SNAPSHOT
   
 
   maven-plugin-tools-api

Modified: maven/plugin-tools/trunk/maven-plugin-tools-generators/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-generators/pom.xml?rev=1778908=1778907=1778908=diff
==
--- maven/plugin-tools/trunk/maven-plugin-tools-generators/pom.xml (original)
+++ maven/plugin-tools/trunk/maven-plugin-tools-generators/pom.xml Sun Jan 15 
12:19:50 2017
@@ -25,7 +25,7 @@
   
 org.apache.maven.plugin-tools
 maven-plugin-tools
-3.6-SNAPSHOT
+3.5.1-SNAPSHOT
   
 
   maven-plugin-tools-generators

Modified: maven/plugin-tools/trunk/maven-plugin-tools-java/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-java/pom.xml?rev=1778908=1778907=1778908=diff
==
--- maven/plugin-tools/trunk/maven-plugin-tools-java/pom.xml (original)
+++ maven/plugin-tools/trunk/maven-plugin-tools-java/pom.xml Sun Jan 15 
12:19:50 2017
@@ -25,7 +25,7 @@
   
 org.apache.maven.plugin-tools
 maven-plugin-tools
-3.6-SNAPSHOT
+3.5.1-SNAPSHOT
   
 
   maven-plugin-tools-java

Modified: maven/plugin-tools/trunk/maven-plugin-tools-javadoc/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-javadoc/pom.xml?rev=1778908=1778907=1778908=diff

svn commit: r1778362 - in /maven/plugin-tools/trunk: ./ maven-plugin-tools-java/src/test/java/org/apache/maven/tools/plugin/extractor/javadoc/ maven-plugin-tools-java/src/test/resources/MPLUGIN-314/ m

[gboue]

Author: gboue
Date: Thu Jan 12 00:07:08 2017
New Revision: 1778362

URL: http://svn.apache.org/viewvc?rev=1778362=rev
Log:
[MPLUGIN-314] invalid requirement role generated in plugin.xml
[MPLUGIN-320] JavaJavadocMojoDescriptorExtractor fails with Java 8 lambdas.

Updating QDox to 2.0-M5, containing the fixes for both of those issues (see 
QDOX-13 and QDOX-15).

Added:

maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/resources/MPLUGIN-314/

maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/resources/MPLUGIN-314/MyMojo.java
   (with props)

maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/resources/MPLUGIN-314/plugin-expected.xml
   (with props)

maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/resources/MPLUGIN-320/

maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/resources/MPLUGIN-320/Exceptions.java
   (with props)

maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/resources/MPLUGIN-320/plugin-expected.xml
   (with props)
Modified:

maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/java/org/apache/maven/tools/plugin/extractor/javadoc/JavaMojoDescriptorExtractorTest.java
maven/plugin-tools/trunk/pom.xml

Modified: 
maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/java/org/apache/maven/tools/plugin/extractor/javadoc/JavaMojoDescriptorExtractorTest.java
URL: 
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/java/org/apache/maven/tools/plugin/extractor/javadoc/JavaMojoDescriptorExtractorTest.java?rev=1778362=1778361=1778362=diff
==
--- 
maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/java/org/apache/maven/tools/plugin/extractor/javadoc/JavaMojoDescriptorExtractorTest.java
 (original)
+++ 
maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/java/org/apache/maven/tools/plugin/extractor/javadoc/JavaMojoDescriptorExtractorTest.java
 Thu Jan 12 00:07:08 2017
@@ -233,4 +233,20 @@ public class JavaMojoDescriptorExtractor
 assertEquals( 1, results.size() );
 }
 
+public void testSingleTypeImportWithFullyQualifiedClassName()
+throws Exception
+{
+List results = extract( "MPLUGIN-314" );
+
+assertEquals( 1, results.size() );
+}
+
+public void testMethodReferenceInEnumConstructor()
+throws Exception
+{
+List results = extract( "MPLUGIN-320" );
+
+assertNull( results );
+}
+
 }

Added: 
maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/resources/MPLUGIN-314/MyMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/resources/MPLUGIN-314/MyMojo.java?rev=1778362=auto
==
--- 
maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/resources/MPLUGIN-314/MyMojo.java
 (added)
+++ 
maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/resources/MPLUGIN-314/MyMojo.java
 Thu Jan 12 00:07:08 2017
@@ -0,0 +1,41 @@
+/*
+ * 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.artifact.resolver.ArtifactResolver;
+import org.apache.maven.plugin.AbstractMojo;
+
+/**
+ * Tests that using an import and the same fully qualified class name results 
in a correct requirement role generated.
+ * 
+ * @goal test
+ */
+public class MyMojo
+extends AbstractMojo
+{
+
+/**
+ * @component
+ */
+private org.apache.maven.artifact.resolver.ArtifactResolver resolver;
+
+public void execute()
+{
+}
+
+}

Propchange: 
maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/resources/MPLUGIN-314/MyMojo.java
--
svn:eol-style = native

Propchange: 
maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/resources/MPLUGIN-314/MyMojo.java
--
svn:keywords = Author Date Id Revision

Added: 
maven/plugin-tools/trunk/maven-plugin-tools-java/src/test/resources/MPLUGIN-314/plugin-expected.xml
URL: 
http://svn.ap

svn commit: r1778360 - /maven/plugin-tools/trunk/maven-plugin-plugin/src/it/mplugin-319_report-since/invoker.properties

[gboue]

Author: gboue
Date: Thu Jan 12 00:06:37 2017
New Revision: 1778360

URL: http://svn.apache.org/viewvc?rev=1778360=rev
Log:
[MPLUGIN-319] @since values ignored in report

The IT relies on reading the generated HTML site for the test mojo in English, 
but the report is written in the default locale of the JVM. As such, it fails 
when run on machines with a locale different than English. Therefore, the 
locale needs to be forced to English in the MAVEN_OPTS.

Modified:

maven/plugin-tools/trunk/maven-plugin-plugin/src/it/mplugin-319_report-since/invoker.properties

Modified: 
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/mplugin-319_report-since/invoker.properties
URL: 
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/src/it/mplugin-319_report-since/invoker.properties?rev=1778360=1778359=1778360=diff
==
--- 
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/mplugin-319_report-since/invoker.properties
 (original)
+++ 
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/mplugin-319_report-since/invoker.properties
 Thu Jan 12 00:06:37 2017
@@ -16,3 +16,4 @@
 # under the License.
 
 invoker.goals = clean plugin:report
+invoker.mavenOpts = -Duser.language=en -Duser.country=US -Duser.variant=US

svn commit: r1778361 - in /maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations: TestAnnotationsReader.java scanner/DefaultMojoAnno

[gboue]

Author: gboue
Date: Thu Jan 12 00:06:50 2017
New Revision: 1778361

URL: http://svn.apache.org/viewvc?rev=1778361=rev
Log:
Updating the unit tests so that they can be run successfully directly inside 
Eclipse: this means fixing the location of the basedir by extending from 
PlexusTestCase and using the getBasedir() method.

Modified:

maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/TestAnnotationsReader.java

maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/scanner/DefaultMojoAnnotationsScannerTest.java

Modified: 
maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/TestAnnotationsReader.java
URL: 
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/TestAnnotationsReader.java?rev=1778361=1778360=1778361=diff
==
--- 
maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/TestAnnotationsReader.java
 (original)
+++ 
maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/TestAnnotationsReader.java
 Thu Jan 12 00:06:50 2017
@@ -50,7 +50,7 @@ public class TestAnnotationsReader
 MojoAnnotationsScanner mojoAnnotationsScanner = 
(MojoAnnotationsScanner) lookup( MojoAnnotationsScanner.ROLE );
 
 MojoAnnotationsScannerRequest request = new 
MojoAnnotationsScannerRequest();
-request.setClassesDirectories( Collections.singletonList( new File( 
"target/test-classes" ) ) );
+request.setClassesDirectories( Collections.singletonList( new File( 
getBasedir(), "target/test-classes" ) ) );
 request.setIncludePatterns( Arrays.asList( "**/FooMojo.class" ) );
 request.setProject( new MavenProject() );
 

Modified: 
maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/scanner/DefaultMojoAnnotationsScannerTest.java
URL: 
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/scanner/DefaultMojoAnnotationsScannerTest.java?rev=1778361=1778360=1778361=diff
==
--- 
maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/scanner/DefaultMojoAnnotationsScannerTest.java
 (original)
+++ 
maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/scanner/DefaultMojoAnnotationsScannerTest.java
 Thu Jan 12 00:06:50 2017
@@ -23,17 +23,17 @@ import static org.easymock.EasyMock.*;
 
 import java.io.File;
 
+import org.codehaus.plexus.PlexusTestCase;
 import org.codehaus.plexus.logging.Logger;
-import junit.framework.TestCase;
 
 public class DefaultMojoAnnotationsScannerTest
-extends TestCase
+extends PlexusTestCase
 {
 private DefaultMojoAnnotationsScanner scanner = new 
DefaultMojoAnnotationsScanner();
 
 public void testSkipModuleInfoClassInArchive() throws Exception
 {
-scanner.scanArchive( new File( "src/test/resources/java9-module.jar"), 
null, false );
+scanner.scanArchive( new File( getBasedir(), 
"target/test-classes/java9-module.jar"), null, false );
 }
 
 public void testJava8Annotations() throws Exception
@@ -42,7 +42,7 @@ public class DefaultMojoAnnotationsScann
 expect( logger.isDebugEnabled() ).andReturn( false );
 replay( logger );
 scanner.enableLogging( logger );
-scanner.scanArchive( new File( 
"src/test/resources/java8-annotations.jar"), null, false );
+scanner.scanArchive( new File( getBasedir(), 
"target/test-classes/java8-annotations.jar"), null, false );
 }
 
 }

svn commit: r1771943 - in /maven/plugins/trunk/maven-shade-plugin/src: main/java/org/apache/maven/plugins/shade/resource/GroovyResourceTransformer.java test/java/org/apache/maven/plugins/shade/resourc

[gboue]

Author: gboue
Date: Tue Nov 29 19:05:13 2016
New Revision: 1771943

URL: http://svn.apache.org/viewvc?rev=1771943=rev
Log:
Fixed compilation errors. The variables extModuleName and extModuleVersion in 
the GroovyResourceTransformer need setters to be changed properly in tests, 
instead of having reflection hacks.

Modified:

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

maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/GroovyResourceTransformerTest.java

Modified: 
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/GroovyResourceTransformer.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/GroovyResourceTransformer.java?rev=1771943=1771942=1771943=diff
==
--- 
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/GroovyResourceTransformer.java
 (original)
+++ 
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/GroovyResourceTransformer.java
 Tue Nov 29 19:05:13 2016
@@ -134,4 +134,14 @@ public class GroovyResourceTransformer
 return buff.toString();
 }
 }
+
+public void setExtModuleName( String extModuleName )
+{
+this.extModuleName = extModuleName;
+}
+
+public void setExtModuleVersion( String extModuleVersion )
+{
+this.extModuleVersion = extModuleVersion;
+}
 }

Modified: 
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/GroovyResourceTransformerTest.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/GroovyResourceTransformerTest.java?rev=1771943=1771942=1771943=diff
==
--- 
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/GroovyResourceTransformerTest.java
 (original)
+++ 
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/GroovyResourceTransformerTest.java
 Tue Nov 29 19:05:13 2016
@@ -78,13 +78,20 @@ public class GroovyResourceTransformerTe
 JarOutputStream jaos = new JarOutputStream( fos );
 transformer.modifyOutputStream( jaos );
 jaos.close();
-JarFile jar = new JarFile( tempJar );
 Properties desc = null;
-ZipEntry entry = jar.getEntry( 
GroovyResourceTransformer.EXT_MODULE_NAME );
-if ( entry != null )
+JarFile jar = new JarFile( tempJar );
+try
+{
+ZipEntry entry = jar.getEntry( 
GroovyResourceTransformer.EXT_MODULE_NAME );
+if ( entry != null )
+{
+desc = new Properties();
+desc.load( jar.getInputStream( entry ) );
+}
+}
+finally
 {
-desc = new Properties();
-desc.load( jar.getInputStream( entry ) );
+jar.close();
 }
 return desc;
 }
@@ -110,8 +117,8 @@ public class GroovyResourceTransformerTe
 throws Exception
 {
 GroovyResourceTransformer transformer = new 
GroovyResourceTransformer();
-transformer.extModuleName = "the-module-name";
-transformer.extModuleVersion = "2.0";
+transformer.setExtModuleName( "the-module-name" );
+transformer.setExtModuleVersion( "2.0" );
 transformer.processResource( GroovyResourceTransformer.EXT_MODULE_NAME,
  module( "mod1", "1.0", "some.ext", 
"some.staticExt" ),
  Collections.emptyList() );

svn commit: r1776610 - in /maven/plugins/trunk/maven-dependency-plugin/src/it/projects: copy-from-remote-repository/ unpack-from-remote-repository/

[gboue]

Author: gboue
Date: Fri Dec 30 17:13:57 2016
New Revision: 1776610

URL: http://svn.apache.org/viewvc?rev=1776610=rev
Log:
Updating the tests so that they no longer rely on reading the logs, making them 
more robust: a setup script first deletes from the local repository the 
artifact that should be downloaded, then it is verified that they are present 
in the local repository after the build (thus verifying that they were 
correctly downloaded).

Added:

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-remote-repository/setup.bsh
   (with props)

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-remote-repository/verify.bsh
  - copied, changed from r1776513, 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-remote-repository/verify.groovy

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/unpack-from-remote-repository/setup.bsh
   (with props)

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/unpack-from-remote-repository/verify.bsh
  - copied, changed from r1776513, 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/unpack-from-remote-repository/verify.groovy
Removed:

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-remote-repository/verify.groovy

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/unpack-from-remote-repository/verify.groovy

Added: 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-remote-repository/setup.bsh
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-remote-repository/setup.bsh?rev=1776610=auto
==
--- 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-remote-repository/setup.bsh
 (added)
+++ 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-remote-repository/setup.bsh
 Fri Dec 30 17:13:57 2016
@@ -0,0 +1,41 @@
+/*
+ * 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.*;
+
+import org.codehaus.plexus.util.*;
+
+String[] foldersToDelete = {
+"org/apache/maven/its/dependency/fake-remote-copy"
+};
+
+try
+{
+for ( String folderToDelete : foldersToDelete )
+{
+FileUtils.deleteDirectory( new File( localRepositoryPath, 
folderToDelete ) );
+}
+}
+catch ( IOException e )
+{
+e.printStackTrace();
+return false;
+}
+
+return true;

Propchange: 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-remote-repository/setup.bsh
--
svn:eol-style = native

Propchange: 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-remote-repository/setup.bsh
--
svn:keywords = Author Date Id Revision

Copied: 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-remote-repository/verify.bsh
 (from r1776513, 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-remote-repository/verify.groovy)
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-remote-repository/verify.bsh?p2=maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-remote-repository/verify.bsh=maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-remote-repository/verify.groovy=1776513=1776610=1776610=diff
==
--- 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-remote-repository/verify.groovy
 (original)
+++ 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/copy-from-remote-repository/verify.bsh
 Fri Dec 30 17:13:57 2016
@@ -16,19 +16,27 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
+ 
 import java.io.*;
 
-File buildLog = new File( basedir, 'build.log' )
-assert buildLog.exists()
-String expectedDownloadingPattern = "Downloading.*: file:/

maven-wagon git commit: Adding timestamps to wagon-http Surefire logs

[gboue]

Repository: maven-wagon
Updated Branches:
  refs/heads/jetty-8 df0af51bc -> 05d04b298


Adding timestamps to wagon-http Surefire logs

* Be able to measure how long it takes to download the 4Go test file
(and write the downloaded data to disk) in HugeFileDownloadTest.
* Adding log lines before/after the creation of the test file and
download, to measure how much time this actually takes.

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

Branch: refs/heads/jetty-8
Commit: 05d04b298137b9d072fd284f34ade504ec163c9f
Parents: df0af51
Author: Guillaume Boué 
Authored: Sat Dec 31 18:33:32 2016 +0100
Committer: Guillaume Boué 
Committed: Sat Dec 31 18:33:32 2016 +0100

--
 wagon-providers/wagon-http/pom.xml |  2 ++
 .../wagon/providers/http/HugeFileDownloadTest.java | 13 ++---
 2 files changed, 12 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/05d04b29/wagon-providers/wagon-http/pom.xml
--
diff --git a/wagon-providers/wagon-http/pom.xml 
b/wagon-providers/wagon-http/pom.xml
index e32cfcc..27554b9 100644
--- a/wagon-providers/wagon-http/pom.xml
+++ b/wagon-providers/wagon-http/pom.xml
@@ -163,6 +163,8 @@ under the License.
   
 true
 
true
+
true
+
-MM-dd'T'HH:mm:ss.SSS
   
 
   

http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/05d04b29/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HugeFileDownloadTest.java
--
diff --git 
a/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HugeFileDownloadTest.java
 
b/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HugeFileDownloadTest.java
index fba63c4..4489b6b 100644
--- 
a/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HugeFileDownloadTest.java
+++ 
b/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HugeFileDownloadTest.java
@@ -29,6 +29,8 @@ import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.servlet.DefaultServlet;
 import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.servlet.ServletHolder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
@@ -46,6 +48,8 @@ public class HugeFileDownloadTest
 extends PlexusTestCase
 {
 
+private static final Logger LOGGER = LoggerFactory.getLogger( 
HugeFileDownloadTest.class );
+
 private static long HUGE_FILE_SIZE =
 Integer.valueOf( Integer.MAX_VALUE ).longValue() + Integer.valueOf( 
Integer.MAX_VALUE ).longValue();
 
@@ -78,9 +82,11 @@ public class HugeFileDownloadTest
 
 dest = File.createTempFile( "huge", "txt" );
 
+LOGGER.info( "Fetching 'hugefile.txt' with content length" );
 wagon.get( "hugefile.txt", dest );
 
 Assert.assertTrue( dest.length() >= HUGE_FILE_SIZE );
+LOGGER.info( "The file was successfully fetched" );
 
 wagon.disconnect();
 }
@@ -91,7 +97,6 @@ public class HugeFileDownloadTest
 hugeFile.delete();
 }
 
-
 }
 
 public void testDownloadHugeFileWithChunked()
@@ -137,9 +142,11 @@ public class HugeFileDownloadTest
 
 dest = File.createTempFile( "huge", "txt" );
 
+LOGGER.info( "Fetching 'hugefile.txt' in chunks" );
 wagon.get( "hugefile.txt", dest );
 
 Assert.assertTrue( dest.length() >= HUGE_FILE_SIZE );
+LOGGER.info( "The file was successfully fetched" );
 
 wagon.disconnect();
 }
@@ -150,10 +157,8 @@ public class HugeFileDownloadTest
 hugeFile.delete();
 }
 
-
 }
 
-
 protected Wagon getWagon()
 throws Exception
 {
@@ -169,6 +174,7 @@ public class HugeFileDownloadTest
 private void makeHugeFile( File hugeFile )
 throws Exception
 {
+LOGGER.info( "Creating test file" );
 if ( Os.isFamily( Os.FAMILY_WINDOWS ) )
 {
 Process p = new ProcessBuilder( "fsutil", "file", "createnew", 
hugeFile.getAbsolutePath(),
@@ -183,6 +189,7 @@ public class HugeFileDownloadTest
 ra.write( 1 );
 ra.close();
 }
+LOGGER.info( "Test file created" );
 }
 
 }