svn commit: r1013454 - in /websites/production/maven/components/maven-indexer-archives/maven-indexer-LATEST: ./ apidocs/ apidocs/org/apache/maven/index/ apidocs/org/apache/maven/index/archetype/ apido

[hboutemy]

Author: hboutemy
Date: Sun Jun  4 23:06:47 2017
New Revision: 1013454

Log:
Site checkin for project Maven-Indexer


[This commit notification would consist of 141 parts, 
which exceeds the limit of 50 ones, so it was shortened to the summary.]

svn commit: r1797615 - in /maven/plugins/trunk/maven-dependency-plugin/src/it/projects: analyze-report/ analyze/ used-dependencies/ used-dependencies/annotation/ used-dependencies/annotation/src/ used

[gboue]

Author: gboue
Date: Sun Jun  4 23:06:33 2017
New Revision: 1797615

URL: http://svn.apache.org/viewvc?rev=1797615=rev
Log:
Fixing the 'analyze' and 'analyze-report' ITs under JDK 8: they must not force 
the declaration of maven-artifact as a used dependency, because JDK 8 now 
writes bytecode entries for constants and maven-dependency-analyzer fails the 
build in that case. This commit also adds a specific IT for the 
'usedDependencies' parameter, leveraging a source retention annotation.

Added:

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/used-dependencies/

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/used-dependencies/annotation/

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/used-dependencies/annotation/pom.xml
   (with props)

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/used-dependencies/annotation/src/

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/used-dependencies/annotation/src/main/

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/used-dependencies/annotation/src/main/java/

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/used-dependencies/annotation/src/main/java/org/

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/used-dependencies/annotation/src/main/java/org/apache/

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/used-dependencies/annotation/src/main/java/org/apache/maven/

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/used-dependencies/annotation/src/main/java/org/apache/maven/plugins/

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/used-dependencies/annotation/src/main/java/org/apache/maven/plugins/dependency/

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/used-dependencies/annotation/src/main/java/org/apache/maven/plugins/dependency/MySourceRetentionAnnotation.java
   (with props)

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/used-dependencies/invoker.properties
   (with props)

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/used-dependencies/module/

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/used-dependencies/module/pom.xml
   (with props)

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/used-dependencies/module/src/

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/used-dependencies/module/src/main/

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/used-dependencies/module/src/main/java/

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/used-dependencies/module/src/main/java/test/

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/used-dependencies/module/src/main/java/test/Main.java
   (with props)

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/used-dependencies/pom.xml
   (with props)
Modified:

maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-report/pom.xml
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze/pom.xml

Modified: 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-report/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-report/pom.xml?rev=1797615=1797614=1797615=diff
==
--- 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-report/pom.xml
 (original)
+++ 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-report/pom.xml
 Sun Jun  4 23:06:33 2017
@@ -60,9 +60,6 @@
 
   maven-dependency-plugin
   
-
-  org.apache.maven:maven-artifact
-
true
true
true

Modified: 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze/pom.xml?rev=1797615=1797614=1797615=diff
==
--- maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze/pom.xml 
(original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze/pom.xml 
Sun Jun  4 23:06:33 2017
@@ -60,9 +60,6 @@
 
   maven-dependency-plugin
   
-
-  org.apache.maven:maven-artifact
-
true
true
true

Added: 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/used-dependencies/annotation/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/it/projects/used-dependencies/annotation/pom.xml?rev=1797615=auto
==
--- 
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/used-dependencies/annotation/pom.xml
 (added)
+++ 

[2/2] maven-indexer git commit: improved introduction

[hboutemy]

improved introduction

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

Branch: refs/heads/master
Commit: 130bdc99c6d43ab8f65c9d4b7bcbc9eb99e579a3
Parents: 5eff0fb
Author: Hervé Boutemy 
Authored: Mon Jun 5 01:00:15 2017 +0200
Committer: Hervé Boutemy 
Committed: Mon Jun 5 01:00:15 2017 +0200

--
 indexer-cli/src/site/apt/index.apt.vm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/130bdc99/indexer-cli/src/site/apt/index.apt.vm
--
diff --git a/indexer-cli/src/site/apt/index.apt.vm 
b/indexer-cli/src/site/apt/index.apt.vm
index 558db8b..6b08ed2 100644
--- a/indexer-cli/src/site/apt/index.apt.vm
+++ b/indexer-cli/src/site/apt/index.apt.vm
@@ -29,6 +29,6 @@ ${project.name}
 
 * CLI Options Reference
 
-%{snippet|file=${project.basedir}/target/test-classes/options.html|verbatim=false}
+  Use either <> (<<<-u,--unpack>>>) or <> (<<<-i,--index>>> and 
<<<-r,--repository>>>) options.
 
-  Either unpack (<<<-u,--unpack>>>) or index (<<<-i,--index>>> and 
<<<-r,--repository>>>) must be used.
+%{snippet|file=${project.basedir}/target/test-classes/options.html|verbatim=false}

[1/2] maven-indexer git commit: simplified pom

[hboutemy]

Repository: maven-indexer
Updated Branches:
  refs/heads/master 532ea64ee -> 130bdc99c


simplified pom

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

Branch: refs/heads/master
Commit: 5eff0fbb173263f3cdda14796f982380adcbb0a0
Parents: 532ea64
Author: Hervé Boutemy 
Authored: Mon Jun 5 01:00:06 2017 +0200
Committer: Hervé Boutemy 
Committed: Mon Jun 5 01:00:06 2017 +0200

--
 pom.xml | 64 +---
 1 file changed, 5 insertions(+), 59 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/5eff0fbb/pom.xml
--
diff --git a/pom.xml b/pom.xml
index bf5e15e..17b6fa6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,7 @@ under the License.
 of Maven repositories. The Indexes are produced and consumed by all major 
tools in the ecosystem.
   
 
-  http://maven.apache.org/maven-indexer/
+  https://maven.apache.org/maven-indexer/
 
   
 
@@ -83,9 +83,7 @@ under the License.
   
 
   
-UTF-8
-1.7
-1.7
+7
 
 0.2.1
 3.2.2
@@ -402,13 +400,13 @@ under the License.
 
   
 org.codehaus.mojo.signature
-java17
+java1${javaVersion}
 1.0
   
 
 
   
-check-java-1.7-compat
+check-java-compat
 process-classes
 
   check
@@ -416,26 +414,6 @@ under the License.
   
 
   
-  
-org.apache.maven.plugins
-maven-enforcer-plugin
-
-  
-enforce-bytecode-version
-
-  enforce
-
-
-  
-
-  ${maven.compiler.target}
-
-  
-  true
-
-  
-
-  
   
 org.apache.rat
 apache-rat-plugin
@@ -447,7 +425,7 @@ under the License.
   check
 
 
-  
+  
 README.md
 .gitignore
 NOTICE
@@ -474,7 +452,6 @@ under the License.
   
 org.apache.maven.plugins
 maven-checkstyle-plugin
-2.15
 
   
 
@@ -540,7 +487,6 @@ under the License.
   
 org.apache.maven.plugins
 maven-javadoc-plugin
-2.10.3
 
   
 

svn commit: r1797613 - in /maven/plugins/trunk/maven-invoker-plugin: pom.xml src/it/local-repo-url/verify.groovy

[hboutemy]

Author: hboutemy
Date: Sun Jun  4 22:14:41 2017
New Revision: 1797613

URL: http://svn.apache.org/viewvc?rev=1797613=rev
Log:
[MINVOKER-221] improved "run script" message with description of which script

Modified:
maven/plugins/trunk/maven-invoker-plugin/pom.xml
maven/plugins/trunk/maven-invoker-plugin/src/it/local-repo-url/verify.groovy

Modified: maven/plugins/trunk/maven-invoker-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/pom.xml?rev=1797613=1797612=1797613=diff
==
--- maven/plugins/trunk/maven-invoker-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-invoker-plugin/pom.xml Sun Jun  4 22:14:41 2017
@@ -128,7 +128,7 @@ under the License.
 
   org.apache.maven.shared
   maven-script-interpreter
-  1.1
+  1.2-SNAPSHOT
   
 
 

Modified: 
maven/plugins/trunk/maven-invoker-plugin/src/it/local-repo-url/verify.groovy
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/it/local-repo-url/verify.groovy?rev=1797613=1797612=1797613=diff
==
--- 
maven/plugins/trunk/maven-invoker-plugin/src/it/local-repo-url/verify.groovy 
(original)
+++ 
maven/plugins/trunk/maven-invoker-plugin/src/it/local-repo-url/verify.groovy 
Sun Jun  4 22:14:41 2017
@@ -17,4 +17,4 @@
  * under the License.
  */
 File buildLog = new File( basedir, 'build.log' )
-assert buildLog.text.contains( '[INFO] run script postbuild.groovy' ) 
\ No newline at end of file
+assert buildLog.text.contains( '[INFO] run post-build script postbuild.groovy' 
) 
\ No newline at end of file

maven-surefire git commit: [SUREFIRE-1381] Refactoring in AbstractCommandStream and MasterProcessCommand

[tibordigana]

Repository: maven-surefire
Updated Branches:
  refs/heads/master f1f3b6fab -> 9c77aa40d


[SUREFIRE-1381] Refactoring in AbstractCommandStream and MasterProcessCommand


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

Branch: refs/heads/master
Commit: 9c77aa40d1d4fc3455f6059d06a21341ba593c99
Parents: f1f3b6f
Author: Tibor17 
Authored: Sun Jun 4 23:42:27 2017 +0200
Committer: Tibor17 
Committed: Sun Jun 4 23:42:27 2017 +0200

--
 .../lazytestprovider/AbstractCommandStream.java | 21 ++--
 .../surefire/booter/MasterProcessCommand.java   | 13 +++-
 2 files changed, 14 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/9c77aa40/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/AbstractCommandStream.java
--
diff --git 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/AbstractCommandStream.java
 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/AbstractCommandStream.java
index 075d92e..31b56c4 100644
--- 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/AbstractCommandStream.java
+++ 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/AbstractCommandStream.java
@@ -36,7 +36,6 @@ public abstract class AbstractCommandStream
 {
 private byte[] currentBuffer;
 private int currentPos;
-private volatile MasterProcessCommand lastCommand;
 
 protected abstract boolean isClosed();
 
@@ -71,12 +70,6 @@ public abstract class AbstractCommandStream
 currentPos = 0;
 }
 
-@Deprecated
-protected final MasterProcessCommand getLastCommand()
-{
-return lastCommand;
-}
-
 /**
  * Used by single thread in StreamFeeder class.
  *
@@ -94,8 +87,7 @@ public abstract class AbstractCommandStream
 return -1;
 }
 
-byte[] buffer = currentBuffer;
-if ( buffer == null )
+if ( currentBuffer == null )
 {
 tryFlush();
 
@@ -113,17 +105,16 @@ public abstract class AbstractCommandStream
 }
 
 Command cmd = nextCommand();
-lastCommand = cmd.getCommandType();
-buffer = lastCommand.hasDataType() ? lastCommand.encode( 
cmd.getData() ) : lastCommand.encode();
+MasterProcessCommand cmdType = cmd.getCommandType();
+currentBuffer = cmdType.hasDataType() ? cmdType.encode( 
cmd.getData() ) : cmdType.encode();
 }
 
-int b =  buffer[currentPos++] & 0xff;
-if ( currentPos == buffer.length )
+int b =  currentBuffer[currentPos++] & 0xff;
+if ( currentPos == currentBuffer.length )
 {
-buffer = null;
+currentBuffer = null;
 currentPos = 0;
 }
-currentBuffer = buffer;
 return b;
 }
 }

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/9c77aa40/surefire-api/src/main/java/org/apache/maven/surefire/booter/MasterProcessCommand.java
--
diff --git 
a/surefire-api/src/main/java/org/apache/maven/surefire/booter/MasterProcessCommand.java
 
b/surefire-api/src/main/java/org/apache/maven/surefire/booter/MasterProcessCommand.java
index c82c798..5d47212 100644
--- 
a/surefire-api/src/main/java/org/apache/maven/surefire/booter/MasterProcessCommand.java
+++ 
b/surefire-api/src/main/java/org/apache/maven/surefire/booter/MasterProcessCommand.java
@@ -84,12 +84,15 @@ public enum MasterProcessCommand
 throw new IllegalArgumentException( "Data type can be only " + 
String.class );
 }
 
-byte[] dataBytes = fromDataType( data );
-byte[] encoded = new byte[8 + dataBytes.length];
-int command = getId();
-int len = dataBytes.length;
+final byte[] dataBytes = fromDataType( data );
+final int len = dataBytes.length;
+
+final byte[] encoded = new byte[8 + len];
+
+final int command = getId();
 setCommandAndDataLength( command, len, encoded );
-System.arraycopy( dataBytes, 0, encoded, 8, dataBytes.length );
+System.arraycopy( dataBytes, 0, encoded, 8, len );
+
 return encoded;
 }
 

maven-surefire git commit: [SUREFIRE-1380] AbstractCommandStream should flush data if another Thread marks the stream closed, empty shared buffer.

[tibordigana]

Repository: maven-surefire
Updated Branches:
  refs/heads/master 59c065f5d -> f1f3b6fab


[SUREFIRE-1380] AbstractCommandStream should flush data if another Thread marks 
the stream closed, empty shared buffer.


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

Branch: refs/heads/master
Commit: f1f3b6fab9e6179a9faa7537be49354fa58e7685
Parents: 59c065f
Author: Tibor17 
Authored: Sat Jun 3 13:40:12 2017 +0200
Committer: Tibor17 
Committed: Sat Jun 3 13:40:12 2017 +0200

--
 .../booterclient/lazytestprovider/AbstractCommandStream.java| 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/f1f3b6fa/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/AbstractCommandStream.java
--
diff --git 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/AbstractCommandStream.java
 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/AbstractCommandStream.java
index 0bc2036..075d92e 100644
--- 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/AbstractCommandStream.java
+++ 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/AbstractCommandStream.java
@@ -90,6 +90,7 @@ public abstract class AbstractCommandStream
 {
 if ( isClosed() )
 {
+tryFlush();
 return -1;
 }
 

svn commit: r1797601 - in /maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle: ./ exec/ rss/

[gboue]

Author: gboue
Date: Sun Jun  4 19:01:48 2017
New Revision: 1797601

URL: http://svn.apache.org/viewvc?rev=1797601=rev
Log:
Fixing Javadoc issues when building with JDK 8:
 - Self closing elements like  are disallowed, just a single  is needed 
to create a new paragraph.
 - Documenting @param and @return for methods.
 - Escaping > with .

Modified:

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

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

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

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

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

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

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

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

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

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

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

Modified: 
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/AbstractCheckstyleReport.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/AbstractCheckstyleReport.java?rev=1797601=1797600=1797601=diff
==
--- 
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/AbstractCheckstyleReport.java
 (original)
+++ 
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/AbstractCheckstyleReport.java
 Sun Jun  4 19:01:48 2017
@@ -82,26 +82,19 @@ public abstract class AbstractCheckstyle
 /**
  * 
  * Specifies the location of the XML configuration to use.
- * 
- * 
  * 
  * Potential values are a filesystem path, a URL, or a classpath resource.
  * This parameter expects that the contents of the location conform to the
  * xml format (Checkstyle http://checkstyle.sourceforge.net/config.html#Modules;>Checker
  * module) configuration of rulesets.
- * 
- * 
  * 
  * This parameter is resolved as resource, URL, then file. If successfully
  * resolved, the contents of the configuration is copied into the
  * ${project.build.directory}/checkstyle-configuration.xml
  * file before being passed to Checkstyle as a configuration.
- * 
- * 
  * 
  * There are 2 predefined rulesets included in Maven Checkstyle Plugin:
- * 
  * 
  * sun_checks.xml: Sun Checks.
  * google_checks.xml: Google Checks.
@@ -137,21 +130,16 @@ public abstract class AbstractCheckstyle
  * Specifies the location of the License file (a.k.a. the header file) that
  * can be used by Checkstyle to verify that source code has the correct
  * license header.
- * 
  * 
- * You need to use ${checkstyle.header.file} in your Checkstyle xml
+ * You need to use ${checkstyle.header.file} in your 
Checkstyle xml
  * configuration to reference the name of this header file.
- * 
  * 
  * For instance:
- * 
- * 
- * 
- * module name="RegexpHeader">
- * property name="headerFile" value="${checkstyle.header.file}"/>
- * /module>
- * 
- * 
+ * 
+ * module name="RegexpHeader"
+ *   property name="headerFile" value="${checkstyle.header.file}"/
+ * /module
+ * 
  *
  * @since 2.0-beta-2
  */
@@ -177,21 +165,16 @@ public abstract class AbstractCheckstyle
 /**
  * 
  * Specifies the location of the properties file.
- * 
- * 
  * 
  * This parameter is resolved as URL, File then resource. If successfully
  * resolved, the contents of the properties location is copied into the
  * ${project.build.directory}/checkstyle-checker.properties
  * file before being passed to Checkstyle for loading.
- * 
- * 
  * 
  * The contents of the propertiesLocation will be made
  * available to Checkstyle for specifying values for parameters within the
  * xml configuration (specified in the configLocation
  

svn commit: r1797598 - /maven/shared/trunk/maven-script-interpreter/src/main/java/org/apache/maven/shared/scriptinterpreter/ScriptRunner.java

[hboutemy]

Author: hboutemy
Date: Sun Jun  4 18:41:18 2017
New Revision: 1797598

URL: http://svn.apache.org/viewvc?rev=1797598=rev
Log:
[MSHARED-638] use script description instead of hardcoded "script" in messages

Modified:

maven/shared/trunk/maven-script-interpreter/src/main/java/org/apache/maven/shared/scriptinterpreter/ScriptRunner.java

Modified: 
maven/shared/trunk/maven-script-interpreter/src/main/java/org/apache/maven/shared/scriptinterpreter/ScriptRunner.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-script-interpreter/src/main/java/org/apache/maven/shared/scriptinterpreter/ScriptRunner.java?rev=1797598=1797597=1797598=diff
==
--- 
maven/shared/trunk/maven-script-interpreter/src/main/java/org/apache/maven/shared/scriptinterpreter/ScriptRunner.java
 (original)
+++ 
maven/shared/trunk/maven-script-interpreter/src/main/java/org/apache/maven/shared/scriptinterpreter/ScriptRunner.java
 Sun Jun  4 18:41:18 2017
@@ -138,12 +138,12 @@ public class ScriptRunner
 }
 
 /**
- * Runs the specified hook script.
+ * Runs the specified hook script (after resolution).
  *
  * @param scriptDescription The description of the script to use for 
logging, must not be null.
  * @param basedir The base directory of the project, must not be 
null.
  * @param relativeScriptPath The path to the script relative to the 
project base directory, may be null
- *to skip the script execution.
+ *to skip the script execution and may not have extensions 
(resolution will search).
  * @param context The key-value storage used to share information between 
hook scripts, may be null.
  * @param logger The logger to redirect the script output to, may be 
null to use stdout/stderr.
  * @param stage The stage of the build job the script is invoked in, must 
not be null. This is for
@@ -161,7 +161,7 @@ public class ScriptRunner
 {
 if ( relativeScriptPath == null )
 {
-getLog().debug( "relativeScriptPath is null: not executing script" 
);
+getLog().debug( scriptDescription + ": relativeScriptPath is null, 
not executing script" );
 return;
 }
 
@@ -169,12 +169,13 @@ public class ScriptRunner
 
 if ( !scriptFile.exists() )
 {
-getLog().debug( "no script found in directory: " + 
basedir.getAbsolutePath() );
+getLog().debug( scriptDescription + ": no script '" + 
relativeScriptPath + "' found in directory "
++ basedir.getAbsolutePath() );
 return;
 }
 
-String path = scriptFile.getAbsolutePath();
-getLog().info( "run script " + relativeScriptPath + path.substring( 
path.lastIndexOf( '.' ) ) );
+getLog().info( "run " + scriptDescription + ' ' + relativeScriptPath + 
'.'
++ FileUtils.extension( scriptFile.getAbsolutePath() ) );
 
 executeRun( scriptDescription, scriptFile, context, logger, stage, 
failOnException );
 }
@@ -201,11 +202,12 @@ public class ScriptRunner
 
 if ( !scriptFile.exists() )
 {
-getLog().debug( "scriptFile not found in directory: " + 
scriptFile.getAbsolutePath() );
+getLog().debug( scriptDescription + ": script file not found in 
directory "
++ scriptFile.getAbsolutePath() );
 return;
 }
 
-getLog().info( "run script " + scriptFile.getAbsolutePath() );
+getLog().info( "run " + scriptDescription + ' ' + 
scriptFile.getAbsolutePath() );
 
 executeRun( scriptDescription, scriptFile, context, logger, stage, 
failOnException );
 }

maven git commit: [MNG-6206] display deprecation build warning in case when dependencies use metaversions (LATEST or RELEASE)

[khmarbaise]

Repository: maven
Updated Branches:
  refs/heads/MNG-6206 [created] eb6b212b5


[MNG-6206] display deprecation build warning in case when dependencies
use metaversions (LATEST or RELEASE)

Signed-off-by: Karl Heinz Marbaise 


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

Branch: refs/heads/MNG-6206
Commit: eb6b212b567c287734a2dbbef3c113fe650f1def
Parents: a7dddcb
Author: dejan2609 
Authored: Sat May 20 16:57:55 2017 +0200
Committer: Karl Heinz Marbaise 
Committed: Sun Jun 4 20:23:02 2017 +0200

--
 .../model/validation/DefaultModelValidator.java |  6 
 .../validation/DefaultModelValidatorTest.java   | 12 +++
 ...pendency-metaversions-latest-and-release.xml | 38 
 3 files changed, 56 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/eb6b212b/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
--
diff --git 
a/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
 
b/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
index e790f21..f46be0e 100644
--- 
a/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
+++ 
b/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
@@ -485,6 +485,12 @@ public class DefaultModelValidator
 }
 }
 
+if ( equals( "LATEST", dependency.getVersion() ) || equals( 
"RELEASE", dependency.getVersion() ) )
+{
+addViolation( problems, Severity.WARNING, Version.BASE, prefix 
+ ".version", key,
+"is either LATEST or RELEASE (both of them are being 
deprecated)", dependency );
+}
+
 Dependency existing = index.get( key );
 
 if ( existing != null )

http://git-wip-us.apache.org/repos/asf/maven/blob/eb6b212b/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java
--
diff --git 
a/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java
 
b/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java
index 8525476..bb99be9 100644
--- 
a/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java
+++ 
b/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java
@@ -676,4 +676,16 @@ public class DefaultModelValidatorTest
 assertViolations( result, 0, 0, 0 );
 }
 
+public void testDeprecatedDependencyMetaversionsLatestAndRelease()
+throws Exception
+{
+SimpleProblemCollector result = validateRaw( 
"deprecated-dependency-metaversions-latest-and-release.xml" );
+
+assertViolations( result, 0, 0, 2 );
+
+assertContains( result.getWarnings().get( 0 ),
+   "'dependencies.dependency.version' for test:a:jar is either 
LATEST or RELEASE (both of them are being deprecated)" );
+assertContains( result.getWarnings().get( 1 ),
+"'dependencies.dependency.version' for test:b:jar is either 
LATEST or RELEASE (both of them are being deprecated)" );
+}
 }

http://git-wip-us.apache.org/repos/asf/maven/blob/eb6b212b/maven-model-builder/src/test/resources/poms/validation/deprecated-dependency-metaversions-latest-and-release.xml
--
diff --git 
a/maven-model-builder/src/test/resources/poms/validation/deprecated-dependency-metaversions-latest-and-release.xml
 
b/maven-model-builder/src/test/resources/poms/validation/deprecated-dependency-metaversions-latest-and-release.xml
new file mode 100644
index 000..eba532b
--- /dev/null
+++ 
b/maven-model-builder/src/test/resources/poms/validation/deprecated-dependency-metaversions-latest-and-release.xml
@@ -0,0 +1,38 @@
+
+
+
+  4.0.0
+  gid
+  aid
+  0.1
+
+
+  
+test
+a
+LATEST
+  
+  
+test
+b
+RELEASE
+
+
+

[34/50] maven git commit: Improve Javadoc of ComparableVersion#main()

[khmarbaise]

Improve Javadoc of ComparableVersion#main()

This closes #108


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

Branch: refs/heads/mvn-3.5.1/MNG-6174
Commit: 6a93bbea23e362c9cea7d710a37556258c2dbd47
Parents: 08f3c76 10a18cf
Author: Lubomir Varga 
Authored: Tue Apr 11 16:00:42 2017 +0200
Committer: Michael Osipov 
Committed: Tue Apr 11 16:02:21 2017 +0200

--
 .../maven/artifact/versioning/ComparableVersion.java   | 13 -
 1 file changed, 12 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/6a93bbea/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
--
diff --cc 
maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
index 5222871,0ae4acb..e1fc5f0
--- 
a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
+++ 
b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
@@@ -472,8 -472,19 +472,19 @@@ public class ComparableVersio
  
  /**
   * Main to test version parsing and comparison.
+  * 
 - * To check how "1.2.7" compares to "1.2-SNAPSHOT" for example, you can 
issue
 - * java -cp 
~/.m2/repository/org/apache/maven/maven-artifact/3.3.9/maven-artifact-3.3.9.jar 
org.apache.maven.artifact.versioning.ComparableVersion "1.2.7" 
"1.2-SNAPSHOT"
 - * command to commandline. Result of given command will be something like 
this:
 - * java -cp 
${maven.repo.local}/org/apache/maven/maven-artifact/${maven.version}/maven-artifact-${maven.version}.jar
 org.apache.maven.artifact.versioning.ComparableVersion "1.2.7" 
"1.2-SNAPSHOT"
++ * command to command line. Result of given command will be something 
like this:
++ * 
+  * Display parameters as parsed by Maven (in canonical form) and 
comparison result:
+  * 1. 1.2.7 == 1.2.7
 - *1.2.7 > 1.2-SNAPSHOT
++ *1.2.7  1.2-SNAPSHOT
+  * 2. 1.2-SNAPSHOT == 1.2-snapshot
+  * 
   *
-  * @param args the version strings to parse and compare
+  * @param args the version strings to parse and compare. You can pass 
arbitrary number of version strings and always
+  * two adjacent will be compared
   */
  public static void main( String... args )
  {

[10/50] maven git commit: Merge remote-tracking branch 'origin/MNG-6182'

[khmarbaise]

Merge remote-tracking branch 'origin/MNG-6182'


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

Branch: refs/heads/mvn-3.5.1/MNG-6174
Commit: abca6ab6e2508860fb30d6e51b668c6c513e3d9e
Parents: fea81d8 f1ccecd
Author: Stephen Connolly 
Authored: Sun Mar 19 17:18:53 2017 +
Committer: Stephen Connolly 
Committed: Sun Mar 19 17:18:53 2017 +

--
 .../maven/project/ProjectModelResolverTest.java | 246 +++
 .../internal/DefaultModelResolverTest.java  | 222 +
 2 files changed, 468 insertions(+)
--

[16/50] maven git commit: [MNG-6112] Central repository in the 4.0.0 super POM should declare update policy 'never'.

[khmarbaise]

[MNG-6112] Central repository in the 4.0.0 super POM should declare update 
policy 'never'.


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

Branch: refs/heads/mvn-3.5.1/MNG-6174
Commit: 13adc1bc2b6d9fc3a62ec2389996726c2edce4d8
Parents: d54e6f9
Author: Christian Schulte 
Authored: Tue Mar 21 00:30:28 2017 +0100
Committer: Christian Schulte 
Committed: Tue Mar 21 00:30:28 2017 +0100

--
 .../main/java/org/apache/maven/bridge/MavenRepositorySystem.java | 4 ++--
 .../src/main/resources/org/apache/maven/model/pom-4.0.0.xml  | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/13adc1bc/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java 
b/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java
index 9331710..509f302 100644
--- 
a/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java
+++ 
b/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java
@@ -573,8 +573,8 @@ public class MavenRepositorySystem
 throws Exception
 {
 return createRepository( RepositorySystem.DEFAULT_REMOTE_REPO_URL, 
RepositorySystem.DEFAULT_REMOTE_REPO_ID,
- true, 
ArtifactRepositoryPolicy.UPDATE_POLICY_DAILY, false,
- ArtifactRepositoryPolicy.UPDATE_POLICY_DAILY,
+ true, 
ArtifactRepositoryPolicy.UPDATE_POLICY_NEVER, false,
+ ArtifactRepositoryPolicy.UPDATE_POLICY_NEVER,
  ArtifactRepositoryPolicy.CHECKSUM_POLICY_WARN 
);
 }
 

http://git-wip-us.apache.org/repos/asf/maven/blob/13adc1bc/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
--
diff --git 
a/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml 
b/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
index 91492a9..9487a9a 100644
--- 
a/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
+++ 
b/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
@@ -32,6 +32,9 @@ under the License.
   
 false
   
+  
+never
+  
 
   
 

[22/50] maven git commit: trying to make Jenkinsfile easier to understand

[khmarbaise]

trying to make Jenkinsfile easier to understand

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

Branch: refs/heads/mvn-3.5.1/MNG-6174
Commit: 16805f50ea1715c42ad59312f3e64ab70af3acfe
Parents: 33c8d8e
Author: Hervé Boutemy 
Authored: Fri Mar 24 03:25:17 2017 +0100
Committer: Hervé Boutemy 
Committed: Tue Mar 28 08:03:44 2017 +0200

--
 Jenkinsfile | 41 +++--
 1 file changed, 27 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/16805f50/Jenkinsfile
--
diff --git a/Jenkinsfile b/Jenkinsfile
index 123a246..cc9bd92 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -22,24 +22,32 @@ properties([buildDiscarder(logRotator(artifactNumToKeepStr: 
'5', numToKeepStr: e
 def tests
 
 try {
+
 node('ubuntu') {
-stage 'Checkout'
-def MAVEN_BUILD=tool name: 'Maven 3.3.9', type: 
'hudson.tasks.Maven$MavenInstallation'
-echo "Driving build and unit tests using Maven $MAVEN_BUILD"
-def JAVA7_HOME=tool name: 'JDK 1.7 (latest)', type: 'hudson.model.JDK'
-echo "Running build and unit tests with Java $JAVA7_HOME"
 dir('build') {
-checkout scm
-def WORK_DIR=pwd()
-stage 'Build / Unit Test'
-withEnv(["PATH+MAVEN=$MAVEN_BUILD/bin","PATH+JDK=$JAVA7_HOME/bin"]) {
-sh "mvn clean verify -B -U -e -fae -V 
-Dmaven.test.failure.ignore=true -Dmaven.repo.local=$WORK_DIR/.repository"
+stage('Checkout') {
+checkout scm
 }
-dir ('apache-maven/target') {
-sh "mv apache-maven-*-bin.zip apache-maven-dist.zip"
-stash includes: 'apache-maven-dist.zip', name: 'dist'
+
+def WORK_DIR=pwd()
+
+stage('Build / Unit Test') {
+def MAVEN_BUILD=tool name: 'Maven 3.3.9', type: 
'hudson.tasks.Maven$MavenInstallation'
+echo "Driving build and unit tests using Maven $MAVEN_BUILD"
+def JAVA7_HOME=tool name: 'JDK 1.7 (latest)', type: 
'hudson.model.JDK'
+echo "Running build and unit tests with Java $JAVA7_HOME"
+
+
withEnv(["PATH+MAVEN=$MAVEN_BUILD/bin","PATH+JDK=$JAVA7_HOME/bin"]) {
+sh "mvn clean verify -B -U -e -fae -V 
-Dmaven.test.failure.ignore=true -Dmaven.repo.local=$WORK_DIR/.repository"
+}
+
+dir ('apache-maven/target') {
+sh "mv apache-maven-*-bin.zip apache-maven-dist.zip"
+stash includes: 'apache-maven-dist.zip', name: 'dist'
+}
+junit allowEmptyResults: true, 
testResults:'**/target/*-reports/*.xml'
 }
-junit allowEmptyResults: true, testResults:'**/target/*-reports/*.xml'
+
 tests = resolveScm source: [$class: 'GitSCMSource', credentialsId: '', 
excludes: '', gitTool: 'Default', id: '_', ignoreOnPushNotifications: false, 
includes: '*', remote: 
'https://git-wip-us.apache.org/repos/asf/maven-integration-testing.git'], 
targets: [BRANCH_NAME, 'master']
 }
 }
@@ -51,6 +59,7 @@ parallel linuxJava7:{
 echo "Driving integration tests using Maven $MAVEN_NIX_J7"
 def JAVA_NIX_J7=tool name: 'JDK 1.7 (latest)', type: 
'hudson.model.JDK'
 echo "Running integration tests with Java $JAVA_NIX_J7"
+
 dir('test') {
 def WORK_DIR=pwd()
 checkout tests
@@ -69,6 +78,7 @@ parallel linuxJava7:{
 echo "Driving integration tests using Maven $MAVEN_NIX_J8"
 def JAVA_NIX_J8=tool name: 'JDK 1.8 (latest)', type: 
'hudson.model.JDK'
 echo "Running integration tests with Java $JAVA_NIX_J8"
+
 dir('test') {
 def WORK_DIR=pwd()
 checkout tests
@@ -93,6 +103,7 @@ parallel linuxJava7:{
 JAVA_WIN_J7=pwd()
 }
 echo "Running integration tests with Java $JAVA_WIN_J7"
+
 // need a short path or we hit 256 character limit for paths
 // using EXECUTOR_NUMBER guarantees that concurrent builds on same 
agent
 // will not trample each other
@@ -122,6 +133,7 @@ parallel linuxJava7:{
 JAVA_WIN_J8=pwd()
 }
 echo "Running integration tests with Java $JAVA_WIN_J8"
+
 // need a short path or we hit 256 character limit for paths
 // using EXECUTOR_NUMBER guarantees that concurrent builds on same 
agent
 // will not trample each other
@@ -140,6 +152,7 @@ parallel linuxJava7:{
 }
 }
 }
+
 } finally {
 node('ubuntu') {
 

[25/50] maven git commit: use new "Maven 3 (latest)" and "JDK 1.x (latest)" Ubuntu+win aliases

[khmarbaise]

use new "Maven 3 (latest)" and "JDK 1.x (latest)" Ubuntu+win aliases

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

Branch: refs/heads/mvn-3.5.1/MNG-6174
Commit: 0baa42345283f4fea3938a8ccd7c8e12b34203b1
Parents: 94c3b60
Author: Hervé Boutemy 
Authored: Sun Mar 26 10:27:59 2017 +0200
Committer: Hervé Boutemy 
Committed: Tue Mar 28 08:05:56 2017 +0200

--
 Jenkinsfile | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/0baa4234/Jenkinsfile
--
diff --git a/Jenkinsfile b/Jenkinsfile
index be4485c..b6c7e19 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -56,7 +56,7 @@ node('ubuntu') {
 stage 'Integration Test'
 parallel linuxJava7:{
 node('ubuntu') {
-def MAVEN_NIX_J7=tool name: 'Maven 3.3.9', type: 
'hudson.tasks.Maven$MavenInstallation'
+def MAVEN_NIX_J7=tool name: 'Maven 3 (latest)', type: 
'hudson.tasks.Maven$MavenInstallation'
 echo "Driving integration tests using Maven $MAVEN_NIX_J7"
 def JAVA_NIX_J7=tool name: 'JDK 1.7 (latest)', type: 
'hudson.model.JDK'
 echo "Running integration tests with Java $JAVA_NIX_J7"
@@ -75,7 +75,7 @@ parallel linuxJava7:{
 }
 },linuxJava8: {
 node('ubuntu') {
-def MAVEN_NIX_J8=tool name: 'Maven 3.3.9', type: 
'hudson.tasks.Maven$MavenInstallation'
+def MAVEN_NIX_J8=tool name: 'Maven 3 (latest)', type: 
'hudson.tasks.Maven$MavenInstallation'
 echo "Driving integration tests using Maven $MAVEN_NIX_J8"
 def JAVA_NIX_J8=tool name: 'JDK 1.8 (latest)', type: 
'hudson.model.JDK'
 echo "Running integration tests with Java $JAVA_NIX_J8"
@@ -94,12 +94,12 @@ parallel linuxJava7:{
 }
 }, winJava7: {
 node('Windows') {
-def MAVEN_WIN_J7=tool name: 'Maven 3.3.9 (Windows)', type: 
'hudson.tasks.Maven$MavenInstallation'
+def MAVEN_WIN_J7=tool name: 'Maven 3 (latest)', type: 
'hudson.tasks.Maven$MavenInstallation'
 dir(MAVEN_WIN_J7) {
 MAVEN_WIN_J7=pwd()
 }
 echo "Driving integration tests using Maven $MAVEN_WIN_J7"
-def JAVA_WIN_J7=tool name: 'JDK 1.7 (unlimited security) 64-bit 
Windows only', type: 'hudson.model.JDK'
+def JAVA_WIN_J7=tool name: 'JDK 1.7 (latest)', type: 
'hudson.model.JDK'
 dir(JAVA_WIN_J7) {
 JAVA_WIN_J7=pwd()
 }
@@ -124,12 +124,12 @@ parallel linuxJava7:{
 }
 }, winJava8: {
 node('Windows') {
-def MAVEN_WIN_J8=tool name: 'Maven 3.3.9 (Windows)', type: 
'hudson.tasks.Maven$MavenInstallation'
+def MAVEN_WIN_J8=tool name: 'Maven 3 (latest)', type: 
'hudson.tasks.Maven$MavenInstallation'
 dir(MAVEN_WIN_J8) {
 MAVEN_WIN_J8=pwd()
 }
 echo "Driving integration tests using Maven $MAVEN_WIN_J8"
-def JAVA_WIN_J8=tool name: 'JDK 1.8.0_121 (unlimited security) 
64-bit Windows only', type: 'hudson.model.JDK'
+def JAVA_WIN_J8=tool name: 'JDK 1.8 (latest)', type: 
'hudson.model.JDK'
 dir(JAVA_WIN_J8) {
 JAVA_WIN_J8=pwd()
 }

[39/50] maven git commit: [MNG-6149] MetadataResolutionResult#getGraph() never resolves request type 'test'

[khmarbaise]

[MNG-6149] MetadataResolutionResult#getGraph() never resolves request type 
'test'


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

Branch: refs/heads/mvn-3.5.1/MNG-6174
Commit: f7d4bce23324cd4a318486d8715a128cf7436c3a
Parents: 3938817
Author: Michael Osipov 
Authored: Fri Apr 21 22:57:53 2017 +0200
Committer: Michael Osipov 
Committed: Fri Apr 21 22:57:53 2017 +0200

--
 .../apache/maven/repository/metadata/MetadataResolutionResult.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/f7d4bce2/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java
--
diff --git 
a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java
 
b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java
index 814b66c..74a3427 100644
--- 
a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java
+++ 
b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java
@@ -115,7 +115,7 @@ public class MetadataResolutionResult
 {
 return conflictResolver.resolveConflicts( getGraph(), 
ArtifactScopeEnum.runtime );
 }
-else if ( requestType.equals( 
MetadataResolutionRequestTypeEnum.classpathRuntime ) )
+else if ( requestType.equals( 
MetadataResolutionRequestTypeEnum.classpathTest ) )
 {
 return conflictResolver.resolveConflicts( getGraph(), 
ArtifactScopeEnum.test );
 }

[13/50] maven git commit: [maven-release-plugin] prepare release maven-3.5.0-beta-1

[khmarbaise]

[maven-release-plugin] prepare release maven-3.5.0-beta-1


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

Branch: refs/heads/mvn-3.5.1/MNG-6174
Commit: 214540c2ae5431645bb927d6dc5498ebafc27359
Parents: 68e38e50
Author: Stephen Connolly 
Authored: Mon Mar 20 16:55:36 2017 +
Committer: Stephen Connolly 
Committed: Mon Mar 20 16:55:36 2017 +

--
 apache-maven/pom.xml  | 2 +-
 maven-artifact/pom.xml| 2 +-
 maven-builder-support/pom.xml | 2 +-
 maven-compat/pom.xml  | 2 +-
 maven-core/pom.xml| 2 +-
 maven-embedder/pom.xml| 2 +-
 maven-model-builder/pom.xml   | 2 +-
 maven-model/pom.xml   | 2 +-
 maven-plugin-api/pom.xml  | 2 +-
 maven-repository-metadata/pom.xml | 2 +-
 maven-resolver-provider/pom.xml   | 2 +-
 maven-settings-builder/pom.xml| 2 +-
 maven-settings/pom.xml| 2 +-
 maven-slf4j-provider/pom.xml  | 2 +-
 pom.xml   | 4 ++--
 15 files changed, 16 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/214540c2/apache-maven/pom.xml
--
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index a528ddb..7bf2dd2 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -25,7 +25,7 @@ under the License.
   
 org.apache.maven
 maven
-3.5.0-SNAPSHOT
+3.5.0-beta-1
   
 
   apache-maven

http://git-wip-us.apache.org/repos/asf/maven/blob/214540c2/maven-artifact/pom.xml
--
diff --git a/maven-artifact/pom.xml b/maven-artifact/pom.xml
index e3943c9..0d07e98 100644
--- a/maven-artifact/pom.xml
+++ b/maven-artifact/pom.xml
@@ -25,7 +25,7 @@ under the License.
   
 org.apache.maven
 maven
-3.5.0-SNAPSHOT
+3.5.0-beta-1
   
 
   maven-artifact

http://git-wip-us.apache.org/repos/asf/maven/blob/214540c2/maven-builder-support/pom.xml
--
diff --git a/maven-builder-support/pom.xml b/maven-builder-support/pom.xml
index 39eb161..c303646 100644
--- a/maven-builder-support/pom.xml
+++ b/maven-builder-support/pom.xml
@@ -25,7 +25,7 @@ under the License.
   
 org.apache.maven
 maven
-3.5.0-SNAPSHOT
+3.5.0-beta-1
   
 
   maven-builder-support

http://git-wip-us.apache.org/repos/asf/maven/blob/214540c2/maven-compat/pom.xml
--
diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml
index bfd2b47..fd0a307 100644
--- a/maven-compat/pom.xml
+++ b/maven-compat/pom.xml
@@ -25,7 +25,7 @@ under the License.
   
 org.apache.maven
 maven
-3.5.0-SNAPSHOT
+3.5.0-beta-1
   
 
   maven-compat

http://git-wip-us.apache.org/repos/asf/maven/blob/214540c2/maven-core/pom.xml
--
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index 0e20235..beb8a16 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -25,7 +25,7 @@ under the License.
   
 org.apache.maven
 maven
-3.5.0-SNAPSHOT
+3.5.0-beta-1
   
 
   maven-core

http://git-wip-us.apache.org/repos/asf/maven/blob/214540c2/maven-embedder/pom.xml
--
diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml
index 30ad2ce..21531a3 100644
--- a/maven-embedder/pom.xml
+++ b/maven-embedder/pom.xml
@@ -25,7 +25,7 @@ under the License.
   
 org.apache.maven
 maven
-3.5.0-SNAPSHOT
+3.5.0-beta-1
   
 
   maven-embedder

http://git-wip-us.apache.org/repos/asf/maven/blob/214540c2/maven-model-builder/pom.xml
--
diff --git a/maven-model-builder/pom.xml b/maven-model-builder/pom.xml
index 0dd08ac..c8ede97 100644
--- a/maven-model-builder/pom.xml
+++ b/maven-model-builder/pom.xml
@@ -25,7 +25,7 @@ under the License.
   
 org.apache.maven
 maven
-3.5.0-SNAPSHOT
+3.5.0-beta-1
   
 
   maven-model-builder

http://git-wip-us.apache.org/repos/asf/maven/blob/214540c2/maven-model/pom.xml
--
diff --git a/maven-model/pom.xml b/maven-model/pom.xml
index 41cf168..a3ed1c5 100644
--- a/maven-model/pom.xml
+++ b/maven-model/pom.xml
@@ -25,7 +25,7 @@ under the License.
   
 org.apache.maven
 maven
-3.5.0-SNAPSHOT
+3.5.0-beta-1
   
 
   maven-model

[21/50] maven git commit: INFRA have been changing JDK labels again

[khmarbaise]

INFRA have been changing JDK labels again


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

Branch: refs/heads/mvn-3.5.1/MNG-6174
Commit: 33c8d8efe9410e134080bd979a7df82de80bcf74
Parents: 8400984
Author: Stephen Connolly 
Authored: Mon Mar 27 16:22:29 2017 +0100
Committer: Stephen Connolly 
Committed: Mon Mar 27 16:22:29 2017 +0100

--
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/33c8d8ef/Jenkinsfile
--
diff --git a/Jenkinsfile b/Jenkinsfile
index 2ac2644..123a246 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -117,7 +117,7 @@ parallel linuxJava7:{
 MAVEN_WIN_J8=pwd()
 }
 echo "Driving integration tests using Maven $MAVEN_WIN_J8"
-def JAVA_WIN_J8=tool name: 'JDK 1.8 (unlimited security) 64-bit 
Windows only', type: 'hudson.model.JDK'
+def JAVA_WIN_J8=tool name: 'JDK 1.8.0_121 (unlimited security) 
64-bit Windows only', type: 'hudson.model.JDK'
 dir(JAVA_WIN_J8) {
 JAVA_WIN_J8=pwd()
 }

[46/50] maven git commit: [MNG-6167] Clean up dependency mess (reported by dependency:analyze)

[khmarbaise]

[MNG-6167] Clean up dependency mess (reported by dependency:analyze)

Clean up compile and runtime dependencies. Test dependencies have not been
touched because their seem to be false positives due to DI.


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

Branch: refs/heads/mvn-3.5.1/MNG-6174
Commit: ecef59f1cb822e48c63215fa7dd0c8f4fd54d6af
Parents: f4ede96
Author: Michael Osipov 
Authored: Tue May 16 15:27:22 2017 +0200
Committer: Michael Osipov 
Committed: Tue May 16 15:27:22 2017 +0200

--
 maven-builder-support/pom.xml   |  4 
 maven-compat/pom.xml| 10 +-
 maven-core/pom.xml  | 22 +++---
 maven-embedder/pom.xml  | 30 +-
 maven-model-builder/pom.xml |  1 +
 maven-plugin-api/pom.xml|  8 
 maven-resolver-provider/pom.xml |  8 
 pom.xml | 10 ++
 8 files changed, 76 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/ecef59f1/maven-builder-support/pom.xml
--
diff --git a/maven-builder-support/pom.xml b/maven-builder-support/pom.xml
index 5eb7903..9557731 100644
--- a/maven-builder-support/pom.xml
+++ b/maven-builder-support/pom.xml
@@ -35,10 +35,6 @@ under the License.
 
   
 
-  org.codehaus.plexus
-  plexus-utils
-
-
   org.apache.commons
   commons-lang3
 

http://git-wip-us.apache.org/repos/asf/maven/blob/ecef59f1/maven-compat/pom.xml
--
diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml
index 8392dca..b3cf039 100644
--- a/maven-compat/pom.xml
+++ b/maven-compat/pom.xml
@@ -52,6 +52,10 @@ under the License.
 
 
   org.apache.maven
+  maven-settings-builder
+
+
+  org.apache.maven
   maven-artifact
 
 
@@ -63,6 +67,10 @@ under the License.
   maven-resolver-provider
 
 
+  org.apache.maven
+  maven-repository-metadata
+
+
   org.apache.maven.resolver
   maven-resolver-api
 
@@ -131,5 +139,5 @@ under the License.
   
 
   
-  
+
 

http://git-wip-us.apache.org/repos/asf/maven/blob/ecef59f1/maven-core/pom.xml
--
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index 71f09c0..717e2a5 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -54,6 +54,10 @@ under the License.
 
 
   org.apache.maven
+  maven-builder-support
+
+
+  org.apache.maven
   maven-repository-metadata
 
 
@@ -92,20 +96,28 @@ under the License.
   org.apache.maven.shared
   maven-shared-utils
 
-
 
   org.eclipse.sisu
   org.eclipse.sisu.plexus
 
 
+  org.eclipse.sisu
+  org.eclipse.sisu.inject
+
+
   com.google.inject
   guice
   no_aop
 
 
-  org.codehaus.plexus
-  plexus-interpolation
+  com.google.guava
+  guava
+
+
+  javax.inject
+  javax.inject
 
+
 
   org.codehaus.plexus
   plexus-utils
@@ -119,10 +131,6 @@ under the License.
   plexus-component-annotations
 
 
-  org.sonatype.plexus
-  plexus-sec-dispatcher
-
-
   org.apache.commons
   commons-lang3
 

http://git-wip-us.apache.org/repos/asf/maven/blob/ecef59f1/maven-embedder/pom.xml
--
diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml
index 66e09a3..52e9c82 100644
--- a/maven-embedder/pom.xml
+++ b/maven-embedder/pom.xml
@@ -40,6 +40,10 @@ under the License.
 
 
   org.apache.maven
+  maven-settings-builder
+
+
+  org.apache.maven
   maven-core
 
 
@@ -48,9 +52,17 @@ under the License.
 
 
   org.apache.maven
+  maven-model
+
+
+  org.apache.maven
   maven-model-builder
 
 
+  org.apache.maven
+  maven-builder-support
+
+
   org.apache.maven.resolver
   maven-resolver-api
 
@@ -59,15 +71,23 @@ under the License.
   maven-resolver-util
 
 
-  org.apache.maven
-  maven-compat
-  runtime
-
-
   org.apache.maven.shared
   maven-shared-utils
 
 
+   com.google.inject
+   guice
+   no_aop
+ 
+ 
+  com.google.guava
+  guava
+
+
+  javax.inject
+  javax.inject
+
+
   org.codehaus.plexus
   plexus-utils
  

[26/50] maven git commit: Squashed commit of the following:

[khmarbaise]

Squashed commit of the following:

commit 049228ce76927a6740500e1b750f0e8f201f2478
Author: rfscholte 
Date:   Mon Mar 27 20:22:46 2017 +0200

[MNG-6185] Replace doclettag explanation with annotations in AbstractMojo 
javadoc

Fix by Checkstyle reported issues

commit 63796a649e6e3b25a58fb567d354ca1849f48819
Author: rfscholte 
Date:   Sat Mar 25 23:15:00 2017 +0100

[MNG-6185] Replace doclettag explanation with annotations in AbstractMojo 
javadoc


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

Branch: refs/heads/mvn-3.5.1/MNG-6174
Commit: 00c82b7e234c6ed33f76ba48a236130c5511ab3a
Parents: 0baa423
Author: rfscholte 
Authored: Wed Mar 29 19:50:15 2017 +0200
Committer: rfscholte 
Committed: Wed Mar 29 19:50:15 2017 +0200

--
 .../org/apache/maven/plugin/AbstractMojo.java   | 37 +---
 1 file changed, 17 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/00c82b7e/maven-plugin-api/src/main/java/org/apache/maven/plugin/AbstractMojo.java
--
diff --git 
a/maven-plugin-api/src/main/java/org/apache/maven/plugin/AbstractMojo.java 
b/maven-plugin-api/src/main/java/org/apache/maven/plugin/AbstractMojo.java
index f85e7f3..6292116 100644
--- a/maven-plugin-api/src/main/java/org/apache/maven/plugin/AbstractMojo.java
+++ b/maven-plugin-api/src/main/java/org/apache/maven/plugin/AbstractMojo.java
@@ -27,17 +27,15 @@ import org.apache.maven.plugin.logging.SystemStreamLog;
 /**
  * Abstract class to provide most of the infrastructure required to implement 
a Mojo except for
  * the execute method.
- * The implementation should have a goal annotation in the 
class-level javadoc annotation:
+ * The implementation should have a Mojo annotation with the name 
of the goal:
  * 
- * 
- *   goal goalName
- *  
+ *   Mojo( name = "goal-name" )
  * 
  * 
- * There are also a number of class-level javadoc annotations which can be 
used to control how and when the
+ * There are also a number of attributes which can be used to control how and 
when the
  * Mojo is executed:
  * 
- * 
+ * 
  *  
  *  Descriptor Element
  *  Annotation
@@ -46,7 +44,7 @@ import org.apache.maven.plugin.logging.SystemStreamLog;
  *  
  *  
  *  goal
- *  @goal goalName
+ *  name = "goal-name"
  *  Yes
  *  The name for the Mojo that users will reference from the command 
line to execute the Mojo directly,
  *  or inside a POM in order to provide Mojo-specific configuration.
@@ -65,7 +63,7 @@ import org.apache.maven.plugin.logging.SystemStreamLog;
  *  
  *  
  *  configurator
- *  @configurator roleHint
+ *  configurator = "role-hint"
  *  No
  *  The configurator type to use when injecting parameter values into 
this Mojo. The value is normally
  *  deduced from the Mojo's implementation language, but can be 
specified to allow a custom
@@ -77,7 +75,7 @@ import org.apache.maven.plugin.logging.SystemStreamLog;
  *   
  *   
  *  phase
- *  @phase phaseName
+ *  defaultPhase = LifecyclePhase.phase
  *  No
  *  Binds this Mojo to a particular phase of the standard build 
lifecycle, if specified.
  *  
@@ -86,7 +84,8 @@ import org.apache.maven.plugin.logging.SystemStreamLog;
  *   
  *   
  *  execute
- *  @execute [phase=phaseName|goal=goalName] 
[lifecycle=lifecycleId]
+ *  @Execute
+ *   ( phase=LifecyclePhase.phase, goal= "goal-name", 
lifecycle="lifecycle-id" )
  *  No
  *  When this goal is invoked, it will first invoke a parallel 
lifecycle, ending at the given phase.
  *  If a goal is provided instead of a phase, that goal will be 
executed in isolation.
@@ -99,7 +98,7 @@ import org.apache.maven.plugin.logging.SystemStreamLog;
  *   
  *   
  *  requiresDependencyResolution
- *  @requiresDependencyResolution requiredScope
+ *  requiresDependencyResolution = ResolutionScope.scope
  *  No
  *  Flags this Mojo as requiring the dependencies in the specified 
scope (or an implied scope) to be
  *  resolved before it can execute.
@@ -128,6 +127,9 @@ import org.apache.maven.plugin.logging.SystemStreamLog;
  *  
  *   
  * 
+ * This is only a small set of all the options. A complete list can be 
found at 
+ * https://maven.apache.org/components/plugin-tools/maven-plugin-tools-annotations/index.html;
 target="_blank">
+ * Maven Plugin Tool for Annotations. 
  *
  * @see https://maven.apache.org/guides/plugin/guide-java-plugin-development.html;
 

[02/50] maven git commit: [MNG-6176] Javadoc errors prevent release with Java 8

[khmarbaise]

[MNG-6176] Javadoc errors prevent release with Java 8

Upgrade to modello-1.9.1
Fix javadoc errors in tests


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

Branch: refs/heads/mvn-3.5.1/MNG-6174
Commit: 0e7e3eeb597b92f1394b24e33d5933e995ee8104
Parents: da03d6b
Author: rfscholte 
Authored: Sat Mar 18 12:35:18 2017 +0100
Committer: rfscholte 
Committed: Sat Mar 18 12:55:05 2017 +0100

--
 .../versioning/ComparableVersionTest.java   |  2 +-
 maven-compat/pom.xml| 35 +---
 .../LifecycleExecutionPlanCalculatorTest.java   |  2 +-
 .../LifecycleExecutionPlanCalculatorStub.java   |  2 +-
 .../stub/ProjectDependencyGraphStub.java|  5 +--
 .../org/apache/maven/cli/CleanArgumentTest.java |  2 +-
 .../DefaultInheritanceAssemblerTest.java|  2 +-
 .../AbstractModelInterpolatorTest.java  |  2 +-
 pom.xml |  6 +++-
 9 files changed, 37 insertions(+), 21 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/0e7e3eeb/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java
--
diff --git 
a/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java
 
b/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java
index aea98dd..875b43e 100644
--- 
a/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java
+++ 
b/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java
@@ -185,7 +185,7 @@ public class ComparableVersionTest
 
 /**
  * Test https://issues.apache.org/jira/browse/MNG-5568;>MNG-5568 edge case
- * which was showing transitive inconsistency: since A > B and B > C then 
we should have A > C
+ * which was showing transitive inconsistency: since A  B and B  C 
then we should have A  C
  * otherwise sorting a list of ComparableVersions() will in some cases 
throw runtime exception;
  * see Netbeans issues https://netbeans.org/bugzilla/show_bug.cgi?id=240845;>240845 and
  * https://netbeans.org/bugzilla/show_bug.cgi?id=226100;>226100

http://git-wip-us.apache.org/repos/asf/maven/blob/0e7e3eeb/maven-compat/pom.xml
--
diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml
index 2d0ecad..7af138d 100644
--- a/maven-compat/pom.xml
+++ b/maven-compat/pom.xml
@@ -113,18 +113,6 @@ under the License.
   
 
   
-
-  
-
-  org.apache.maven.plugins
-  maven-javadoc-plugin
-  
-
--Xdoclint:none
-  
-
-  
-
 
   
 org.codehaus.plexus
@@ -143,4 +131,27 @@ under the License.
   
 
   
+  
+  
+
+  javadoc8
+  
+!1.7
+  
+  
+
+  
+
+  org.apache.maven.plugins
+  maven-javadoc-plugin
+  
+
+-Xdoclint:none
+  
+
+  
+
+  
+
+  
 

http://git-wip-us.apache.org/repos/asf/maven/blob/0e7e3eeb/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculatorTest.java
--
diff --git 
a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculatorTest.java
 
b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculatorTest.java
index a9af566..0e1c3c7 100644
--- 
a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculatorTest.java
+++ 
b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculatorTest.java
@@ -25,7 +25,7 @@ import 
org.apache.maven.lifecycle.internal.stub.PluginVersionResolverStub;
 import org.apache.maven.lifecycle.internal.stub.ProjectDependencyGraphStub;
 
 /**
- * @author Kristian Rosenvold>
+ * @author Kristian Rosenvold
  */
 public class LifecycleExecutionPlanCalculatorTest
 extends AbstractCoreMavenComponentTestCase

http://git-wip-us.apache.org/repos/asf/maven/blob/0e7e3eeb/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/LifecycleExecutionPlanCalculatorStub.java
--
diff --git 
a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/LifecycleExecutionPlanCalculatorStub.java
 

[44/50] maven git commit: [MNG-6228] Optionality not displayed in dependency tree when run in debug mode

[khmarbaise]

[MNG-6228] Optionality not displayed in dependency tree when run in debug mode

Log message in DefaultProjectDependenciesResolver has been extended with
"(optional)" if dependency is marked as optional (direct or transitive).


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

Branch: refs/heads/mvn-3.5.1/MNG-6174
Commit: fd988e78e95a53c3a39ec944869ba62b0c7fc0f0
Parents: 6182a20
Author: Michael Osipov 
Authored: Tue May 9 22:15:21 2017 +0200
Committer: Michael Osipov 
Committed: Tue May 9 22:15:21 2017 +0200

--
 .../maven/project/DefaultProjectDependenciesResolver.java   | 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/fd988e78/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
 
b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
index 5a803af..4e26de2 100644
--- 
a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
+++ 
b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
@@ -295,6 +295,11 @@ public class DefaultProjectDependenciesResolver
 //  The resolver 1.0.x releases do not record 
premanaged state of properties.
 buffer.append( " (properties managed)" );
 }
+
+if ( dep.isOptional() )
+{
+buffer.append( " (optional)" );
+}
 }
 else
 {

[17/50] maven git commit: [MNG-6190] maven-resolver-provider's DefaultArtifactDescriptorReader has mismatched constructor and initService methods

[khmarbaise]

[MNG-6190] maven-resolver-provider's DefaultArtifactDescriptorReader has 
mismatched constructor and initService methods


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

Branch: refs/heads/mvn-3.5.1/MNG-6174
Commit: 27ab7503a7196a40b5ed1007181c82cdcf11e03c
Parents: 13adc1b
Author: Christian Schulte 
Authored: Tue Mar 21 04:06:02 2017 +0100
Committer: Christian Schulte 
Committed: Tue Mar 21 19:16:44 2017 +0100

--
 .../internal/DefaultArtifactDescriptorReader.java   | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/27ab7503/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
--
diff --git 
a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
 
b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
index 1df1c12..82e1284 100644
--- 
a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
+++ 
b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
@@ -111,8 +111,9 @@ public class DefaultArtifactDescriptorReader
 
 @Inject
 DefaultArtifactDescriptorReader( RemoteRepositoryManager 
remoteRepositoryManager, VersionResolver versionResolver,
- ArtifactResolver artifactResolver, 
ModelBuilder modelBuilder,
- RepositoryEventDispatcher 
repositoryEventDispatcher, LoggerFactory loggerFactory )
+ VersionRangeResolver 
versionRangeResolver, ArtifactResolver artifactResolver,
+ ModelBuilder modelBuilder, 
RepositoryEventDispatcher repositoryEventDispatcher,
+ LoggerFactory loggerFactory )
 {
 setRemoteRepositoryManager( remoteRepositoryManager );
 setVersionResolver( versionResolver );
@@ -124,17 +125,17 @@ public class DefaultArtifactDescriptorReader
 
 public void initService( ServiceLocator locator )
 {
-setLoggerFactory( locator.getService( LoggerFactory.class ) );
 setRemoteRepositoryManager( locator.getService( 
RemoteRepositoryManager.class ) );
 setVersionResolver( locator.getService( VersionResolver.class ) );
 setVersionRangeResolver( locator.getService( 
VersionRangeResolver.class ) );
 setArtifactResolver( locator.getService( ArtifactResolver.class ) );
-setRepositoryEventDispatcher( locator.getService( 
RepositoryEventDispatcher.class ) );
 modelBuilder = locator.getService( ModelBuilder.class );
 if ( modelBuilder == null )
 {
 setModelBuilder( new DefaultModelBuilderFactory().newInstance() );
 }
+setRepositoryEventDispatcher( locator.getService( 
RepositoryEventDispatcher.class ) );
+setLoggerFactory( locator.getService( LoggerFactory.class ) );
 }
 
 public DefaultArtifactDescriptorReader setLoggerFactory( LoggerFactory 
loggerFactory )

[42/50] maven git commit: [MNG-6205] upgraded JAnsi to 1.16 for console encoding fix

[khmarbaise]

[MNG-6205] upgraded JAnsi to 1.16 for console encoding fix

also fixes MNG-6218 MinGW bash detection fixed by JAnsi 1.14

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

Branch: refs/heads/mvn-3.5.1/MNG-6174
Commit: 2a79d1e71edc0ddd0c0ba1612ce520f43961eef2
Parents: 2d44015
Author: Hervé Boutemy 
Authored: Sat May 6 18:25:36 2017 +0200
Committer: Hervé Boutemy 
Committed: Tue May 9 21:08:04 2017 +0200

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/2a79d1e7/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 2962487..e16d93b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -277,7 +277,7 @@ under the License.
   
 org.fusesource.jansi
 jansi
-1.13
+1.16
   
   
 org.slf4j

[01/50] maven git commit: [MNG-6183] Dependency management debug message corrections. [Forced Update!]

[khmarbaise]

Repository: maven
Updated Branches:
  refs/heads/mvn-3.5.1/MNG-6174 a12f8edb3 -> 9e926317f (forced update)


[MNG-6183] Dependency management debug message corrections.


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

Branch: refs/heads/mvn-3.5.1/MNG-6174
Commit: da03d6b03192399237750c15f96fa021977dd83b
Parents: 51cc76c
Author: Christian Schulte 
Authored: Tue Mar 14 19:20:47 2017 +0100
Committer: Christian Schulte 
Committed: Tue Mar 14 19:20:47 2017 +0100

--
 .../DefaultProjectDependenciesResolver.java | 83 
 1 file changed, 31 insertions(+), 52 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/da03d6b0/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
 
b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
index 21dfaa2..5a803af 100644
--- 
a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
+++ 
b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
@@ -29,8 +29,6 @@ import org.apache.maven.artifact.Artifact;
 import org.apache.maven.model.Dependency;
 import org.apache.maven.model.DependencyManagement;
 import org.apache.maven.model.Exclusion;
-import org.apache.maven.model.InputLocation;
-import org.apache.maven.model.InputSource;
 import org.codehaus.plexus.component.annotations.Component;
 import org.codehaus.plexus.component.annotations.Requirement;
 import org.codehaus.plexus.logging.Logger;
@@ -39,7 +37,6 @@ import org.eclipse.aether.DefaultRepositorySystemSession;
 import org.eclipse.aether.RepositorySystem;
 import org.eclipse.aether.RepositorySystemSession;
 import org.eclipse.aether.RequestTrace;
-import org.eclipse.aether.artifact.ArtifactProperties;
 import org.eclipse.aether.artifact.ArtifactType;
 import org.eclipse.aether.artifact.ArtifactTypeRegistry;
 import org.eclipse.aether.collection.CollectRequest;
@@ -239,8 +236,6 @@ public class DefaultProjectDependenciesResolver
 
 private String indent = "";
 
-private Map managed;
-
 public GraphLogger( MavenProject project )
 {
 this.project = project;
@@ -258,29 +253,48 @@ public class DefaultProjectDependenciesResolver
 buffer.append( art );
 buffer.append( ':' ).append( dep.getScope() );
 
-String premanagedScope = 
DependencyManagerUtils.getPremanagedScope( node );
-if ( premanagedScope != null && !premanagedScope.equals( 
dep.getScope() ) )
+// TODO We currently cannot tell which  
section contained the management
+//  information. When resolver 1.1 provides this 
information, these log messages should be updated
+//  to contain it.
+if ( ( node.getManagedBits() & DependencyNode.MANAGED_SCOPE ) 
== DependencyNode.MANAGED_SCOPE )
 {
-buffer.append( " (scope managed from " ).append( 
premanagedScope );
-appendManagementSource( buffer, art, "scope" );
+final String premanagedScope = 
DependencyManagerUtils.getPremanagedScope( node );
+buffer.append( " (scope managed from " );
+buffer.append( StringUtils.defaultString( premanagedScope, 
"default" ) );
 buffer.append( ')' );
 }
 
-String premanagedVersion = 
DependencyManagerUtils.getPremanagedVersion( node );
-if ( premanagedVersion != null && !premanagedVersion.equals( 
art.getVersion() ) )
+if ( ( node.getManagedBits() & DependencyNode.MANAGED_VERSION 
) == DependencyNode.MANAGED_VERSION )
 {
-buffer.append( " (version managed from " ).append( 
premanagedVersion );
-appendManagementSource( buffer, art, "version" );
+final String premanagedVersion = 
DependencyManagerUtils.getPremanagedVersion( node );
+buffer.append( " (version managed from " );
+buffer.append( StringUtils.defaultString( 
premanagedVersion, "default" ) );
 buffer.append( ')' );
 }
 
-Boolean premanagedOptional = 
DependencyManagerUtils.getPremanagedOptional( node );
-if ( premanagedOptional != null && 

[30/50] maven git commit: [maven-release-plugin] prepare for next development iteration

[khmarbaise]

[maven-release-plugin] prepare for next development iteration


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

Branch: refs/heads/mvn-3.5.1/MNG-6174
Commit: a4b0b63b62533399878c9de0656f88f100a46aa0
Parents: ff8f5e7
Author: Stephen Connolly 
Authored: Mon Apr 3 20:35:47 2017 +0100
Committer: Stephen Connolly 
Committed: Mon Apr 3 20:35:47 2017 +0100

--
 apache-maven/pom.xml  | 2 +-
 maven-artifact/pom.xml| 2 +-
 maven-builder-support/pom.xml | 2 +-
 maven-compat/pom.xml  | 2 +-
 maven-core/pom.xml| 2 +-
 maven-embedder/pom.xml| 2 +-
 maven-model-builder/pom.xml   | 2 +-
 maven-model/pom.xml   | 2 +-
 maven-plugin-api/pom.xml  | 2 +-
 maven-repository-metadata/pom.xml | 2 +-
 maven-resolver-provider/pom.xml   | 2 +-
 maven-settings-builder/pom.xml| 2 +-
 maven-settings/pom.xml| 2 +-
 maven-slf4j-provider/pom.xml  | 2 +-
 pom.xml   | 4 ++--
 15 files changed, 16 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/a4b0b63b/apache-maven/pom.xml
--
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index 8a72146..b286f74 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -25,7 +25,7 @@ under the License.
   
 org.apache.maven
 maven
-3.5.0
+3.5.1-SNAPSHOT
   
 
   apache-maven

http://git-wip-us.apache.org/repos/asf/maven/blob/a4b0b63b/maven-artifact/pom.xml
--
diff --git a/maven-artifact/pom.xml b/maven-artifact/pom.xml
index 977fd34..b13482b 100644
--- a/maven-artifact/pom.xml
+++ b/maven-artifact/pom.xml
@@ -25,7 +25,7 @@ under the License.
   
 org.apache.maven
 maven
-3.5.0
+3.5.1-SNAPSHOT
   
 
   maven-artifact

http://git-wip-us.apache.org/repos/asf/maven/blob/a4b0b63b/maven-builder-support/pom.xml
--
diff --git a/maven-builder-support/pom.xml b/maven-builder-support/pom.xml
index 7457a4c..5eb7903 100644
--- a/maven-builder-support/pom.xml
+++ b/maven-builder-support/pom.xml
@@ -25,7 +25,7 @@ under the License.
   
 org.apache.maven
 maven
-3.5.0
+3.5.1-SNAPSHOT
   
 
   maven-builder-support

http://git-wip-us.apache.org/repos/asf/maven/blob/a4b0b63b/maven-compat/pom.xml
--
diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml
index 9552803..8392dca 100644
--- a/maven-compat/pom.xml
+++ b/maven-compat/pom.xml
@@ -25,7 +25,7 @@ under the License.
   
 org.apache.maven
 maven
-3.5.0
+3.5.1-SNAPSHOT
   
 
   maven-compat

http://git-wip-us.apache.org/repos/asf/maven/blob/a4b0b63b/maven-core/pom.xml
--
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index 4fb86a3..71f09c0 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -25,7 +25,7 @@ under the License.
   
 org.apache.maven
 maven
-3.5.0
+3.5.1-SNAPSHOT
   
 
   maven-core

http://git-wip-us.apache.org/repos/asf/maven/blob/a4b0b63b/maven-embedder/pom.xml
--
diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml
index 3e778b3..66e09a3 100644
--- a/maven-embedder/pom.xml
+++ b/maven-embedder/pom.xml
@@ -25,7 +25,7 @@ under the License.
   
 org.apache.maven
 maven
-3.5.0
+3.5.1-SNAPSHOT
   
 
   maven-embedder

http://git-wip-us.apache.org/repos/asf/maven/blob/a4b0b63b/maven-model-builder/pom.xml
--
diff --git a/maven-model-builder/pom.xml b/maven-model-builder/pom.xml
index 3aefbc7..859f0b3 100644
--- a/maven-model-builder/pom.xml
+++ b/maven-model-builder/pom.xml
@@ -25,7 +25,7 @@ under the License.
   
 org.apache.maven
 maven
-3.5.0
+3.5.1-SNAPSHOT
   
 
   maven-model-builder

http://git-wip-us.apache.org/repos/asf/maven/blob/a4b0b63b/maven-model/pom.xml
--
diff --git a/maven-model/pom.xml b/maven-model/pom.xml
index 1ec4f89..aabb25d 100644
--- a/maven-model/pom.xml
+++ b/maven-model/pom.xml
@@ -25,7 +25,7 @@ under the License.
   
 org.apache.maven
 maven
-3.5.0
+3.5.1-SNAPSHOT
   
 
   maven-model

[15/50] maven git commit: s/@since 3.5.0-alpha-2/@since 3.5.0/g

[khmarbaise]

s/@since 3.5.0-alpha-2/@since 3.5.0/g


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

Branch: refs/heads/mvn-3.5.1/MNG-6174
Commit: d54e6f91a8652cdda61a20f051f97f11d4c3c982
Parents: fd29dde
Author: Christian Schulte 
Authored: Tue Mar 21 00:21:43 2017 +0100
Committer: Christian Schulte 
Committed: Tue Mar 21 00:21:43 2017 +0100

--
 .../java/org/apache/maven/execution/ProjectDependencyGraph.java  | 2 +-
 .../org/apache/maven/graph/DefaultProjectDependencyGraph.java| 4 ++--
 .../org/apache/maven/graph/FilteredProjectDependencyGraph.java   | 2 +-
 .../java/org/apache/maven/project/ProjectModelResolverTest.java  | 2 +-
 .../java/org/apache/maven/model/resolution/ModelResolver.java| 2 +-
 .../maven/repository/internal/DefaultModelResolverTest.java  | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/d54e6f91/maven-core/src/main/java/org/apache/maven/execution/ProjectDependencyGraph.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/execution/ProjectDependencyGraph.java
 
b/maven-core/src/main/java/org/apache/maven/execution/ProjectDependencyGraph.java
index d206d73..bbc8272 100644
--- 
a/maven-core/src/main/java/org/apache/maven/execution/ProjectDependencyGraph.java
+++ 
b/maven-core/src/main/java/org/apache/maven/execution/ProjectDependencyGraph.java
@@ -37,7 +37,7 @@ public interface ProjectDependencyGraph
  *
  * @return All collected projects.
  *
- * @since 3.5.0-alpha-2
+ * @since 3.5.0
  */
 List getAllProjects();
 

http://git-wip-us.apache.org/repos/asf/maven/blob/d54e6f91/maven-core/src/main/java/org/apache/maven/graph/DefaultProjectDependencyGraph.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/graph/DefaultProjectDependencyGraph.java
 
b/maven-core/src/main/java/org/apache/maven/graph/DefaultProjectDependencyGraph.java
index effab0b..73cadf6 100644
--- 
a/maven-core/src/main/java/org/apache/maven/graph/DefaultProjectDependencyGraph.java
+++ 
b/maven-core/src/main/java/org/apache/maven/graph/DefaultProjectDependencyGraph.java
@@ -69,7 +69,7 @@ public class DefaultProjectDependencyGraph
  *
  * @throws DuplicateProjectException
  * @throws CycleDetectedException
- * @since 3.5.0-alpha-2
+ * @since 3.5.0
  */
 public DefaultProjectDependencyGraph( final List allProjects,
   final Collection 
projects )
@@ -81,7 +81,7 @@ public class DefaultProjectDependencyGraph
 }
 
 /**
- * @since 3.5.0-alpha-2
+ * @since 3.5.0
  */
 public List getAllProjects()
 {

http://git-wip-us.apache.org/repos/asf/maven/blob/d54e6f91/maven-core/src/main/java/org/apache/maven/graph/FilteredProjectDependencyGraph.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/graph/FilteredProjectDependencyGraph.java
 
b/maven-core/src/main/java/org/apache/maven/graph/FilteredProjectDependencyGraph.java
index ad3910d..c4f8e1a 100644
--- 
a/maven-core/src/main/java/org/apache/maven/graph/FilteredProjectDependencyGraph.java
+++ 
b/maven-core/src/main/java/org/apache/maven/graph/FilteredProjectDependencyGraph.java
@@ -65,7 +65,7 @@ class FilteredProjectDependencyGraph
 }
 
 /**
- * @since 3.5.0-alpha-2
+ * @since 3.5.0
  */
 public List getAllProjects()
 {

http://git-wip-us.apache.org/repos/asf/maven/blob/d54e6f91/maven-core/src/test/java/org/apache/maven/project/ProjectModelResolverTest.java
--
diff --git 
a/maven-core/src/test/java/org/apache/maven/project/ProjectModelResolverTest.java
 
b/maven-core/src/test/java/org/apache/maven/project/ProjectModelResolverTest.java
index c21796b..6302a82 100644
--- 
a/maven-core/src/test/java/org/apache/maven/project/ProjectModelResolverTest.java
+++ 
b/maven-core/src/test/java/org/apache/maven/project/ProjectModelResolverTest.java
@@ -44,7 +44,7 @@ import static org.codehaus.plexus.PlexusTestCase.getBasedir;
  * Test cases for the project {@code ModelResolver} implementation.
  *
  * @author Christian Schulte
- * @since 3.5.0-alpha-2
+ * @since 3.5.0
  */
 public class ProjectModelResolverTest extends AbstractMavenProjectTestCase
 {

http://git-wip-us.apache.org/repos/asf/maven/blob/d54e6f91/maven-model-builder/src/main/java/org/apache/maven/model/resolution/ModelResolver.java

[04/50] maven git commit: [MNG-6078] Confirm commons-cli 1.4-SNAPSHOT before official release

[khmarbaise]

[MNG-6078] Confirm commons-cli 1.4-SNAPSHOT before official release


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

Branch: refs/heads/mvn-3.5.1/MNG-6174
Commit: f661fc298e80208911838f5acce9840ea1a97e3f
Parents: 0e7e3ee
Author: rfscholte 
Authored: Wed Mar 8 21:38:08 2017 +0100
Committer: rfscholte 
Committed: Sat Mar 18 12:59:51 2017 +0100

--
 .../java/org/apache/maven/cli/MavenCli.java | 42 ++-
 .../org/apache/maven/cli/MergedCommandLine.java | 75 
 pom.xml |  2 +-
 3 files changed, 42 insertions(+), 77 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/f661fc29/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
--
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java 
b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
index 350fa61..004cf4e 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
@@ -23,6 +23,7 @@ import com.google.common.base.Charsets;
 import com.google.common.io.Files;
 import com.google.inject.AbstractModule;
 import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Option;
 import org.apache.commons.cli.ParseException;
 import org.apache.commons.cli.UnrecognizedOptionException;
 import org.apache.maven.BuildAbort;
@@ -463,7 +464,7 @@ public class MavenCli
 }
 else
 {
-cliRequest.commandLine = new MergedCommandLine( 
cliManager.parse( cliRequest.args ), mavenConfig );
+cliRequest.commandLine = cliMerge( cliManager.parse( 
cliRequest.args ), mavenConfig );
 }
 }
 catch ( ParseException e )
@@ -486,6 +487,45 @@ public class MavenCli
 }
 }
 
+private CommandLine cliMerge( CommandLine mavenArgs, CommandLine 
mavenConfig )
+{
+CommandLine.Builder commandLineBuilder = new CommandLine.Builder();
+
+// the args are easy, cli first then config file
+for ( String arg : mavenArgs.getArgs() )
+{
+commandLineBuilder.addArg( arg );
+}
+for ( String arg : mavenConfig.getArgs() )
+{
+commandLineBuilder.addArg( arg );
+}
+
+// now add all options, except for -D with cli first then config file
+List setPropertyOptions = new ArrayList<>();
+for ( Option opt : mavenArgs.getOptions() )
+{
+if ( String.valueOf( CLIManager.SET_SYSTEM_PROPERTY ).equals( 
opt.getOpt() ) )
+{
+setPropertyOptions.add( opt );
+}
+else
+{
+commandLineBuilder.addOption( opt );
+}
+}
+for ( Option opt : mavenConfig.getOptions() )
+{
+commandLineBuilder.addOption( opt );
+}
+// finally add the CLI system properties
+for ( Option opt : setPropertyOptions )
+{
+commandLineBuilder.addOption( opt );
+}
+return commandLineBuilder.build();
+}
+
 /**
  * configure logging
  */

http://git-wip-us.apache.org/repos/asf/maven/blob/f661fc29/maven-embedder/src/main/java/org/apache/maven/cli/MergedCommandLine.java
--
diff --git 
a/maven-embedder/src/main/java/org/apache/maven/cli/MergedCommandLine.java 
b/maven-embedder/src/main/java/org/apache/maven/cli/MergedCommandLine.java
deleted file mode 100644
index cb0a587..000
--- a/maven-embedder/src/main/java/org/apache/maven/cli/MergedCommandLine.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package org.apache.maven.cli;
-
-/*
- * 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 

[40/50] maven git commit: Add a ProjectArtifactsCache similar to PluginArtifactsCache

[khmarbaise]

Add a ProjectArtifactsCache similar to PluginArtifactsCache

Signed-off-by: Jason van Zyl 

closes #82


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

Branch: refs/heads/mvn-3.5.1/MNG-6174
Commit: be223808939d75152d7157db33d45f230114555e
Parents: f7d4bce
Author: Anton Tanasenko 
Authored: Wed May 18 18:40:28 2016 +0300
Committer: Karl Heinz Marbaise 
Committed: Fri May 5 22:08:16 2017 +0200

--
 .../internal/LifecycleDependencyResolver.java   |  34 ++-
 .../plugin/DefaultProjectArtifactsCache.java| 256 +++
 .../maven/plugin/ProjectArtifactsCache.java |  90 +++
 3 files changed, 377 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/be223808/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java
 
b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java
index 0d42aeb..504274f 100644
--- 
a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java
+++ 
b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java
@@ -37,6 +37,7 @@ import org.apache.maven.artifact.ArtifactUtils;
 import org.apache.maven.eventspy.internal.EventSpyDispatcher;
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.lifecycle.LifecycleExecutionException;
+import org.apache.maven.plugin.ProjectArtifactsCache;
 import org.apache.maven.project.DefaultDependencyResolutionRequest;
 import org.apache.maven.project.DependencyResolutionException;
 import org.apache.maven.project.DependencyResolutionResult;
@@ -75,6 +76,9 @@ public class LifecycleDependencyResolver
 
 @Inject
 private EventSpyDispatcher eventSpyDispatcher;
+
+@Inject
+private ProjectArtifactsCache projectArtifactsCache;
 
 public LifecycleDependencyResolver()
 {
@@ -123,9 +127,33 @@ public class LifecycleDependencyResolver
 throw new LifecycleExecutionException( e );
 }
 }
-
-Set artifacts =
-getDependencies( project, scopesToCollect, scopesToResolve, 
session, aggregating, projectArtifacts );
+
+Set artifacts;
+ProjectArtifactsCache.Key cacheKey = 
projectArtifactsCache.createKey( project,  scopesToCollect, 
+scopesToResolve, aggregating, session.getRepositorySession() );
+ProjectArtifactsCache.CacheRecord recordArtifacts;
+recordArtifacts = projectArtifactsCache.get( cacheKey );
+
+if ( recordArtifacts != null )
+{
+artifacts = recordArtifacts.artifacts;
+}
+else
+{
+try
+{
+artifacts = getDependencies( project, scopesToCollect, 
scopesToResolve, session, aggregating, 
+projectArtifacts );
+recordArtifacts = projectArtifactsCache.put( cacheKey, 
artifacts );
+}
+catch ( LifecycleExecutionException e )
+{
+  projectArtifactsCache.put( cacheKey, e );
+  projectArtifactsCache.register( project, cacheKey, 
recordArtifacts );
+throw e;
+}
+}
+projectArtifactsCache.register( project, cacheKey, recordArtifacts 
);
 
 project.setResolvedArtifacts( artifacts );
 

http://git-wip-us.apache.org/repos/asf/maven/blob/be223808/maven-core/src/main/java/org/apache/maven/plugin/DefaultProjectArtifactsCache.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/plugin/DefaultProjectArtifactsCache.java
 
b/maven-core/src/main/java/org/apache/maven/plugin/DefaultProjectArtifactsCache.java
new file mode 100644
index 000..1eaa627
--- /dev/null
+++ 
b/maven-core/src/main/java/org/apache/maven/plugin/DefaultProjectArtifactsCache.java
@@ -0,0 +1,256 @@
+package org.apache.maven.plugin;
+
+/*
+ * 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
+ * 

[41/50] maven git commit: [MNG-6223] support -f path/to/dir when detecting .mvn

[khmarbaise]

[MNG-6223] support -f path/to/dir when detecting .mvn

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

Branch: refs/heads/mvn-3.5.1/MNG-6174
Commit: 2d4401557c3c870409e8b1c65d2dcc9a68281cae
Parents: be22380
Author: Hervé Boutemy 
Authored: Sat May 6 18:15:42 2017 +0200
Committer: Hervé Boutemy 
Committed: Tue May 9 21:07:41 2017 +0200

--
 apache-maven/src/bin/mvn | 4 +++-
 apache-maven/src/bin/mvn.cmd | 6 +-
 2 files changed, 8 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/2d440155/apache-maven/src/bin/mvn
--
diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn
index 623b5f2..eedd344 100755
--- a/apache-maven/src/bin/mvn
+++ b/apache-maven/src/bin/mvn
@@ -141,7 +141,9 @@ find_file_argument_basedir() {
   found_file_switch=0
   for arg in "$@"; do
 if [ ${found_file_switch} -eq 1 ]; then
-  if [ -f "${arg}" ]; then
+  if [ -d "${arg}" ]; then
+basedir=`cd "${arg}" && pwd -P`
+  elif [ -f "${arg}" ]; then
 basedir=`dirname "${arg}"`
 basedir=`cd "${basedir}" && pwd -P`
 if [ ! -d "${basedir}" ]; then

http://git-wip-us.apache.org/repos/asf/maven/blob/2d440155/apache-maven/src/bin/mvn.cmd
--
diff --git a/apache-maven/src/bin/mvn.cmd b/apache-maven/src/bin/mvn.cmd
index 9d92279..bfcc1b5 100644
--- a/apache-maven/src/bin/mvn.cmd
+++ b/apache-maven/src/bin/mvn.cmd
@@ -120,7 +120,11 @@ if not exist "%FILE_ARG%" (
   echo POM file %FILE_ARG% specified the -f/--file command-line argument does 
not exist >&2
   goto error
 )
-call :get_directory_from_file "%FILE_ARG%"
+if exist "%FILE_ARG%\*" (
+  set "POM_DIR=%FILE_ARG%"
+) else (
+  call :get_directory_from_file "%FILE_ARG%"
+)
 if not exist "%POM_DIR%" (
   echo Directory %POM_DIR% extracted from the -f/--file command-line argument 
%FILE_ARG% does not exist >&2
   goto error

[27/50] maven git commit: [MNG-6198] Use the directory specified by -f for searching with 'mvn'

[khmarbaise]

[MNG-6198] Use the directory specified by -f for searching with 'mvn'


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

Branch: refs/heads/mvn-3.5.1/MNG-6174
Commit: 87cf1eeb7d2506e192da77f7d5b286fae2b20314
Parents: 96543b7
Author: Stephen Connolly 
Authored: Mon Mar 27 21:07:01 2017 +0100
Committer: Stephen Connolly 
Committed: Sat Apr 1 11:29:09 2017 +0100

--
 apache-maven/src/bin/mvn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/87cf1eeb/apache-maven/src/bin/mvn
--
diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn
index e569633..623b5f2 100755
--- a/apache-maven/src/bin/mvn
+++ b/apache-maven/src/bin/mvn
@@ -122,7 +122,7 @@ fi
 find_maven_basedir() {
 (
   basedir=`find_file_argument_basedir "$@"`
-  wdir=`pwd`
+  wdir="${basedir}"
   while [ "$wdir" != '/' ] ; do
 if [ -d "$wdir"/.mvn ] ; then
   basedir=$wdir

[14/50] maven git commit: [maven-release-plugin] prepare for next development iteration

[khmarbaise]

[maven-release-plugin] prepare for next development iteration


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

Branch: refs/heads/mvn-3.5.1/MNG-6174
Commit: fd29ddebf980b895ca3a1665aec49b3c7d17eeaf
Parents: 214540c
Author: Stephen Connolly 
Authored: Mon Mar 20 16:55:53 2017 +
Committer: Stephen Connolly 
Committed: Mon Mar 20 16:55:53 2017 +

--
 apache-maven/pom.xml  | 2 +-
 maven-artifact/pom.xml| 2 +-
 maven-builder-support/pom.xml | 2 +-
 maven-compat/pom.xml  | 2 +-
 maven-core/pom.xml| 2 +-
 maven-embedder/pom.xml| 2 +-
 maven-model-builder/pom.xml   | 2 +-
 maven-model/pom.xml   | 2 +-
 maven-plugin-api/pom.xml  | 2 +-
 maven-repository-metadata/pom.xml | 2 +-
 maven-resolver-provider/pom.xml   | 2 +-
 maven-settings-builder/pom.xml| 2 +-
 maven-settings/pom.xml| 2 +-
 maven-slf4j-provider/pom.xml  | 2 +-
 pom.xml   | 4 ++--
 15 files changed, 16 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/fd29ddeb/apache-maven/pom.xml
--
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index 7bf2dd2..a528ddb 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -25,7 +25,7 @@ under the License.
   
 org.apache.maven
 maven
-3.5.0-beta-1
+3.5.0-SNAPSHOT
   
 
   apache-maven

http://git-wip-us.apache.org/repos/asf/maven/blob/fd29ddeb/maven-artifact/pom.xml
--
diff --git a/maven-artifact/pom.xml b/maven-artifact/pom.xml
index 0d07e98..e3943c9 100644
--- a/maven-artifact/pom.xml
+++ b/maven-artifact/pom.xml
@@ -25,7 +25,7 @@ under the License.
   
 org.apache.maven
 maven
-3.5.0-beta-1
+3.5.0-SNAPSHOT
   
 
   maven-artifact

http://git-wip-us.apache.org/repos/asf/maven/blob/fd29ddeb/maven-builder-support/pom.xml
--
diff --git a/maven-builder-support/pom.xml b/maven-builder-support/pom.xml
index c303646..39eb161 100644
--- a/maven-builder-support/pom.xml
+++ b/maven-builder-support/pom.xml
@@ -25,7 +25,7 @@ under the License.
   
 org.apache.maven
 maven
-3.5.0-beta-1
+3.5.0-SNAPSHOT
   
 
   maven-builder-support

http://git-wip-us.apache.org/repos/asf/maven/blob/fd29ddeb/maven-compat/pom.xml
--
diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml
index fd0a307..bfd2b47 100644
--- a/maven-compat/pom.xml
+++ b/maven-compat/pom.xml
@@ -25,7 +25,7 @@ under the License.
   
 org.apache.maven
 maven
-3.5.0-beta-1
+3.5.0-SNAPSHOT
   
 
   maven-compat

http://git-wip-us.apache.org/repos/asf/maven/blob/fd29ddeb/maven-core/pom.xml
--
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index beb8a16..0e20235 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -25,7 +25,7 @@ under the License.
   
 org.apache.maven
 maven
-3.5.0-beta-1
+3.5.0-SNAPSHOT
   
 
   maven-core

http://git-wip-us.apache.org/repos/asf/maven/blob/fd29ddeb/maven-embedder/pom.xml
--
diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml
index 21531a3..30ad2ce 100644
--- a/maven-embedder/pom.xml
+++ b/maven-embedder/pom.xml
@@ -25,7 +25,7 @@ under the License.
   
 org.apache.maven
 maven
-3.5.0-beta-1
+3.5.0-SNAPSHOT
   
 
   maven-embedder

http://git-wip-us.apache.org/repos/asf/maven/blob/fd29ddeb/maven-model-builder/pom.xml
--
diff --git a/maven-model-builder/pom.xml b/maven-model-builder/pom.xml
index c8ede97..0dd08ac 100644
--- a/maven-model-builder/pom.xml
+++ b/maven-model-builder/pom.xml
@@ -25,7 +25,7 @@ under the License.
   
 org.apache.maven
 maven
-3.5.0-beta-1
+3.5.0-SNAPSHOT
   
 
   maven-model-builder

http://git-wip-us.apache.org/repos/asf/maven/blob/fd29ddeb/maven-model/pom.xml
--
diff --git a/maven-model/pom.xml b/maven-model/pom.xml
index a3ed1c5..41cf168 100644
--- a/maven-model/pom.xml
+++ b/maven-model/pom.xml
@@ -25,7 +25,7 @@ under the License.
   
 org.apache.maven
 maven
-3.5.0-beta-1
+3.5.0-SNAPSHOT
   
 
   maven-model

[38/50] maven git commit: Doc improvement in simplelogger.properties

[khmarbaise]

Doc improvement in simplelogger.properties


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

Branch: refs/heads/mvn-3.5.1/MNG-6174
Commit: 3938817fd3e0ad62efe335307406e70bff876834
Parents: c2c6259
Author: Michael Osipov 
Authored: Fri Apr 21 22:50:11 2017 +0200
Committer: Michael Osipov 
Committed: Fri Apr 21 22:50:11 2017 +0200

--
 apache-maven/src/conf/logging/simplelogger.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/3938817f/apache-maven/src/conf/logging/simplelogger.properties
--
diff --git a/apache-maven/src/conf/logging/simplelogger.properties 
b/apache-maven/src/conf/logging/simplelogger.properties
index eb3d049..8dea717 100644
--- a/apache-maven/src/conf/logging/simplelogger.properties
+++ b/apache-maven/src/conf/logging/simplelogger.properties
@@ -24,8 +24,8 @@ org.slf4j.simpleLogger.levelInBrackets=true
 org.slf4j.simpleLogger.log.Sisu=info
 org.slf4j.simpleLogger.warnLevelString=WARNING
 
-# MNG-6181: mvn -X also prints all debug logging from http-client
+# MNG-6181: mvn -X also prints all debug logging from HttpClient
 # Be aware that the shaded packages are used
 # org.apache.http -> org.apache.maven.wagon.providers.http.httpclient
 org.slf4j.simpleLogger.log.org.apache.maven.wagon.providers.http.httpclient=off
-org.slf4j.simpleLogger.log.org.apache.maven.wagon.providers.http.httpclient.wire=off
\ No newline at end of file
+org.slf4j.simpleLogger.log.org.apache.maven.wagon.providers.http.httpclient.wire=off

[47/50] maven git commit: improved modello and animal sniffer's execution ids

[khmarbaise]

improved modello and animal sniffer's execution ids

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

Branch: refs/heads/mvn-3.5.1/MNG-6174
Commit: 44634982a103a696d18619346756b1adaf3dbfd9
Parents: ecef59f
Author: Hervé Boutemy 
Authored: Sun May 21 19:14:54 2017 +0200
Committer: Hervé Boutemy 
Committed: Sun May 21 19:14:54 2017 +0200

--
 maven-core/pom.xml   | 2 +-
 maven-model/pom.xml  | 2 +-
 maven-plugin-api/pom.xml | 2 +-
 pom.xml  | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/44634982/maven-core/pom.xml
--
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index 717e2a5..6cd8d85 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -214,7 +214,7 @@ under the License.
 
 
   
-plugin-site-doc
+modello-site-doc
 pre-site
 
   xdoc

http://git-wip-us.apache.org/repos/asf/maven/blob/44634982/maven-model/pom.xml
--
diff --git a/maven-model/pom.xml b/maven-model/pom.xml
index aabb25d..581e927 100644
--- a/maven-model/pom.xml
+++ b/maven-model/pom.xml
@@ -61,7 +61,7 @@ under the License.
 
 
   
-standard
+modello
 
   java
   xpp3-reader

http://git-wip-us.apache.org/repos/asf/maven/blob/44634982/maven-plugin-api/pom.xml
--
diff --git a/maven-plugin-api/pom.xml b/maven-plugin-api/pom.xml
index cf7e0ef..271404f 100644
--- a/maven-plugin-api/pom.xml
+++ b/maven-plugin-api/pom.xml
@@ -75,7 +75,7 @@ under the License.
 
 
   
-plugin-site-doc
+modello-site-doc
 pre-site
 
   xdoc

http://git-wip-us.apache.org/repos/asf/maven/blob/44634982/pom.xml
--
diff --git a/pom.xml b/pom.xml
index ce84168..5e12e36 100644
--- a/pom.xml
+++ b/pom.xml
@@ -465,7 +465,7 @@ under the License.
   ${modelloVersion}
   
 
-  site-docs
+  modello-site-docs
   pre-site
   
 xdoc
@@ -473,7 +473,7 @@ under the License.
   
 
 
-  standard
+  modello
   
 java
 xpp3-reader
@@ -567,7 +567,7 @@ under the License.
 
 
   
-check-java-1.6-compat
+check-java-compat
 process-classes
 
   check

[06/50] maven git commit: [MNG-6176] Fix javadoc *errors* in maven-compat

[khmarbaise]

[MNG-6176] Fix javadoc *errors* in maven-compat


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

Branch: refs/heads/mvn-3.5.1/MNG-6174
Commit: b12905ce02ec0e58b475bbc1d920a6801224c02f
Parents: 52eecc4
Author: Stephen Connolly 
Authored: Sat Mar 18 12:04:38 2017 +
Committer: Stephen Connolly 
Committed: Sat Mar 18 12:34:45 2017 +

--
 maven-compat/pom.xml| 22 
 .../maven/artifact/ArtifactScopeEnum.java   |  2 +-
 .../resolver/ResolutionListenerForDepMgmt.java  |  4 ++--
 .../org/apache/maven/project/ModelUtils.java| 15 ++---
 .../AbstractStringBasedModelInterpolator.java   |  8 ++-
 .../ModelInterpolationException.java|  4 +---
 .../interpolation/ModelInterpolator.java|  2 --
 .../repository/MetadataResolutionResult.java|  2 +-
 .../repository/metadata/MetadataGraph.java  |  4 ++--
 .../apache/maven/project/ModelUtilsTest.java| 18 +---
 .../inheritance/t09/ProjectInheritanceTest.java |  8 +++
 .../repository/LegacyRepositorySystemTest.java  |  1 +
 .../conflict/FarthestConflictResolverTest.java  |  4 ++--
 .../conflict/NearestConflictResolverTest.java   |  4 ++--
 .../conflict/NewestConflictResolverTest.java|  4 ++--
 .../conflict/OldestConflictResolverTest.java|  4 ++--
 pom.xml |  4 
 17 files changed, 41 insertions(+), 69 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/b12905ce/maven-compat/pom.xml
--
diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml
index 7af138d..bfd2b47 100644
--- a/maven-compat/pom.xml
+++ b/maven-compat/pom.xml
@@ -132,26 +132,4 @@ under the License.
 
   
   
-  
-
-  javadoc8
-  
-!1.7
-  
-  
-
-  
-
-  org.apache.maven.plugins
-  maven-javadoc-plugin
-  
-
--Xdoclint:none
-  
-
-  
-
-  
-
-  
 

http://git-wip-us.apache.org/repos/asf/maven/blob/b12905ce/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactScopeEnum.java
--
diff --git 
a/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactScopeEnum.java 
b/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactScopeEnum.java
index 4460a07..83edd2b 100644
--- 
a/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactScopeEnum.java
+++ 
b/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactScopeEnum.java
@@ -20,7 +20,7 @@ package org.apache.maven.artifact;
  */
 
 /**
- * Type safe reincarnation of Artifact scope. Also supplies the 
DEFAULT_SCOPE as well
+ * Type safe reincarnation of Artifact scope. Also supplies the {@code 
DEFAULT_SCOPE} as well
  * as convenience method to deal with scope relationships.
  *
  * @author Oleg Gusakov

http://git-wip-us.apache.org/repos/asf/maven/blob/b12905ce/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionListenerForDepMgmt.java
--
diff --git 
a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionListenerForDepMgmt.java
 
b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionListenerForDepMgmt.java
index 6ca4fe7..6cf06b1 100644
--- 
a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionListenerForDepMgmt.java
+++ 
b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionListenerForDepMgmt.java
@@ -23,7 +23,7 @@ import org.apache.maven.artifact.Artifact;
 
 /**
  * Do not use!
- * 
+ * 
  * Should only be implemented by DebugResolutionListener.  Remove this
  * when the ResolutionListener interface deprecation of the manageArtifact
  * method (and the [yet to be done] addition of these methods to that
@@ -40,4 +40,4 @@ public interface ResolutionListenerForDepMgmt
 
 void manageArtifactSystemPath( Artifact artifact,
Artifact replacement );
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/maven/blob/b12905ce/maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java
--
diff --git 
a/maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java 
b/maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java
index faf224b..fb99593 

[07/50] maven git commit: [MNG-6182] ModelResolver interface enhancements.

[khmarbaise]

[MNG-6182] ModelResolver interface enhancements.

o Added unit tests for the 'ModelResolver' interface.


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

Branch: refs/heads/mvn-3.5.1/MNG-6174
Commit: f1ccecdd893eea0a320634a49bc6e56b776fb213
Parents: 55eeb32
Author: Christian Schulte 
Authored: Sun Mar 19 03:46:29 2017 +0100
Committer: Christian Schulte 
Committed: Sun Mar 19 04:01:34 2017 +0100

--
 .../maven/project/ProjectModelResolverTest.java | 246 +++
 .../internal/DefaultModelResolverTest.java  | 222 +
 2 files changed, 468 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/f1ccecdd/maven-core/src/test/java/org/apache/maven/project/ProjectModelResolverTest.java
--
diff --git 
a/maven-core/src/test/java/org/apache/maven/project/ProjectModelResolverTest.java
 
b/maven-core/src/test/java/org/apache/maven/project/ProjectModelResolverTest.java
new file mode 100644
index 000..c21796b
--- /dev/null
+++ 
b/maven-core/src/test/java/org/apache/maven/project/ProjectModelResolverTest.java
@@ -0,0 +1,246 @@
+package org.apache.maven.project;
+
+/*
+ * 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.util.Collections;
+import java.util.List;
+
+import org.apache.maven.artifact.InvalidRepositoryException;
+import org.apache.maven.model.Dependency;
+import org.apache.maven.model.Parent;
+import org.apache.maven.model.resolution.ModelResolver;
+import org.apache.maven.model.resolution.UnresolvableModelException;
+import org.apache.maven.repository.internal.MavenRepositorySystemUtils;
+import org.eclipse.aether.DefaultRepositorySystemSession;
+import org.eclipse.aether.RepositorySystem;
+import org.eclipse.aether.impl.RemoteRepositoryManager;
+import org.eclipse.aether.repository.RemoteRepository;
+
+import static junit.framework.TestCase.assertEquals;
+import static junit.framework.TestCase.assertNotNull;
+import static junit.framework.TestCase.assertTrue;
+import static junit.framework.TestCase.fail;
+import static org.codehaus.plexus.PlexusTestCase.getBasedir;
+
+/**
+ * Test cases for the project {@code ModelResolver} implementation.
+ *
+ * @author Christian Schulte
+ * @since 3.5.0-alpha-2
+ */
+public class ProjectModelResolverTest extends AbstractMavenProjectTestCase
+{
+
+/**
+ * Creates a new {@code ProjectModelResolverTest} instance.
+ */
+public ProjectModelResolverTest()
+{
+super();
+}
+
+public void 
testResolveParentThrowsUnresolvableModelExceptionWhenNotFound() throws Exception
+{
+final Parent parent = new Parent();
+parent.setGroupId( "org.apache" );
+parent.setArtifactId( "apache" );
+parent.setVersion( "0" );
+
+try
+{
+this.newModelResolver().resolveModel( parent );
+fail( "Expected 'UnresolvableModelException' not thrown." );
+}
+catch ( final UnresolvableModelException e )
+{
+assertNotNull( e.getMessage() );
+assertTrue( e.getMessage().startsWith( "Could not find artifact 
org.apache:apache:pom:0 in central" ) );
+}
+}
+
+public void 
testResolveParentThrowsUnresolvableModelExceptionWhenNoMatchingVersionFound() 
throws Exception
+{
+final Parent parent = new Parent();
+parent.setGroupId( "org.apache" );
+parent.setArtifactId( "apache" );
+parent.setVersion( "[2.0,2.1)" );
+
+try
+{
+this.newModelResolver().resolveModel( parent );
+fail( "Expected 'UnresolvableModelException' not thrown." );
+}
+catch ( final UnresolvableModelException e )
+{
+assertEquals( "No versions matched the requested parent version 
range 

[28/50] maven git commit: [MNG-6195] Tidy up quoting and command substitution

[khmarbaise]

[MNG-6195] Tidy up quoting and command substitution


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

Branch: refs/heads/mvn-3.5.1/MNG-6174
Commit: 96543b7c6ea52ad7ba3bcd559c38b159f8aa4c0d
Parents: 00c82b7
Author: Stephen Connolly 
Authored: Sun Mar 26 22:41:24 2017 +0100
Committer: Stephen Connolly 
Committed: Sat Apr 1 11:29:09 2017 +0100

--
 apache-maven/src/bin/mvn | 15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/96543b7c/apache-maven/src/bin/mvn
--
diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn
index df62f68..e569633 100755
--- a/apache-maven/src/bin/mvn
+++ b/apache-maven/src/bin/mvn
@@ -83,14 +83,14 @@ fi
 # For MinGW, ensure paths are in Unix format before anything is touched
 if $mingw ; then
   [ -n "$MAVEN_HOME" ] &&
-MAVEN_HOME="`(cd "$MAVEN_HOME"; pwd)`"
+MAVEN_HOME=`(cd "$MAVEN_HOME"; pwd)`
   [ -n "$JAVA_HOME" ] &&
-JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
+JAVA_HOME=`(cd "$JAVA_HOME"; pwd)`
   # TODO classpath?
 fi
 
 if [ -z "$JAVA_HOME" ] ; then
-  JAVACMD="`which java`"
+  JAVACMD=`which java`
 else
   JAVACMD="$JAVA_HOME/bin/java"
 fi
@@ -122,13 +122,13 @@ fi
 find_maven_basedir() {
 (
   basedir=`find_file_argument_basedir "$@"`
-  wdir="`pwd`"
+  wdir=`pwd`
   while [ "$wdir" != '/' ] ; do
 if [ -d "$wdir"/.mvn ] ; then
   basedir=$wdir
   break
 fi
-wdir="`cd "$wdir/.."; pwd`"
+wdir=`cd "$wdir/.."; pwd`
   done
   echo "${basedir}"
 )
@@ -136,13 +136,14 @@ find_maven_basedir() {
 
 find_file_argument_basedir() {
 (
-  basedir="`pwd`"
+  basedir=`pwd`
 
   found_file_switch=0
   for arg in "$@"; do
 if [ ${found_file_switch} -eq 1 ]; then
   if [ -f "${arg}" ]; then
-basedir=$(dirname "$(readlink -f "${arg}")")
+basedir=`dirname "${arg}"`
+basedir=`cd "${basedir}" && pwd -P`
 if [ ! -d "${basedir}" ]; then
   echo "Directory ${basedir} extracted from the -f/--file command-line 
argument ${arg} does not exist" >&2
   exit 1

[49/50] maven git commit: [MNG-6084] Support JSR 250 annotations

[khmarbaise]

[MNG-6084] Support JSR 250 annotations


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

Branch: refs/heads/mvn-3.5.1/MNG-6174
Commit: a7dddcb87626fec256f1b8ccbe957f94cdf401e4
Parents: 66fc74d
Author: Dan Tran 
Authored: Sun Sep 11 21:07:39 2016 -0700
Committer: Michael Osipov 
Committed: Thu May 25 20:05:35 2017 +0200

--
 maven-core/src/main/resources/META-INF/maven/extension.xml| 3 +++
 maven-embedder/pom.xml| 4 
 .../src/main/java/org/apache/maven/cli/MavenCli.java  | 7 ---
 pom.xml   | 5 +
 4 files changed, 16 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/a7dddcb8/maven-core/src/main/resources/META-INF/maven/extension.xml
--
diff --git a/maven-core/src/main/resources/META-INF/maven/extension.xml 
b/maven-core/src/main/resources/META-INF/maven/extension.xml
index 1d24d92..1f0b95f 100644
--- a/maven-core/src/main/resources/META-INF/maven/extension.xml
+++ b/maven-core/src/main/resources/META-INF/maven/extension.xml
@@ -98,6 +98,8 @@ under the License.
 javax.enterprise.util.*
 javax.enterprise.inject.*
 
+
+javax.annotation.*
 
 

[31/50] maven git commit: Minor cleanup in MavenCli.java

[khmarbaise]

Minor cleanup in MavenCli.java

There is some unnecessary code in the MavenCli.java from line #1465 to #1474.
The functionality has been moved to line #1215.

Signed-off-by: Karl Heinz Marbaise 


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

Branch: refs/heads/mvn-3.5.1/MNG-6174
Commit: 4c6d3a3462783507921d1a0100e3fa22ef8a98e4
Parents: a4b0b63
Author: Stefan Eicher 
Authored: Wed Apr 5 20:52:01 2017 +0200
Committer: Karl Heinz Marbaise 
Committed: Wed Apr 5 23:51:26 2017 +0200

--
 .../src/main/java/org/apache/maven/cli/MavenCli.java | 11 ---
 1 file changed, 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/4c6d3a34/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
--
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java 
b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
index 004cf4e..877b88b 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
@@ -1462,17 +1462,6 @@ public class MavenCli
 alternatePomFile = commandLine.getOptionValue( 
CLIManager.ALTERNATE_POM_FILE );
 }
 
-File userToolchainsFile;
-if ( commandLine.hasOption( CLIManager.ALTERNATE_USER_TOOLCHAINS ) )
-{
-userToolchainsFile = new File( commandLine.getOptionValue( 
CLIManager.ALTERNATE_USER_TOOLCHAINS ) );
-userToolchainsFile = resolveFile( userToolchainsFile, 
workingDirectory );
-}
-else
-{
-userToolchainsFile = MavenCli.DEFAULT_USER_TOOLCHAINS_FILE;
-}
-
 request.setBaseDirectory( baseDirectory ).setGoals( goals 
).setSystemProperties(
 cliRequest.systemProperties ).setUserProperties( 
cliRequest.userProperties ).setReactorFailureBehavior(
 reactorFailureBehaviour ) // default: fail fast

[48/50] maven git commit: MNG-6233 don't mix plexus and jsr330 annotations in aether-provider

[khmarbaise]

MNG-6233 don't mix plexus and jsr330 annotations in aether-provider

Signed-off-by: Igor Fedorenko 


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

Branch: refs/heads/mvn-3.5.1/MNG-6174
Commit: 66fc74d6296ea0a33f8a9712dc5ed5eb3affd529
Parents: 4463498
Author: Igor Fedorenko 
Authored: Tue Mar 28 08:41:38 2017 -0400
Committer: Igor Fedorenko 
Committed: Wed May 24 15:33:04 2017 -0400

--
 maven-resolver-provider/pom.xml|  8 ++--
 .../internal/DefaultArtifactDescriptorReader.java  | 13 +++--
 .../internal/DefaultVersionRangeResolver.java  |  9 ++---
 .../repository/internal/DefaultVersionResolver.java|  9 ++---
 .../internal/SnapshotMetadataGeneratorFactory.java |  7 +--
 .../internal/VersionsMetadataGeneratorFactory.java |  7 +--
 6 files changed, 19 insertions(+), 34 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/66fc74d6/maven-resolver-provider/pom.xml
--
diff --git a/maven-resolver-provider/pom.xml b/maven-resolver-provider/pom.xml
index 0d1b481..53e67e5 100644
--- a/maven-resolver-provider/pom.xml
+++ b/maven-resolver-provider/pom.xml
@@ -64,10 +64,6 @@ under the License.
 
 
   org.codehaus.plexus
-  plexus-component-annotations
-
-
-  org.codehaus.plexus
   plexus-utils
 
 
@@ -125,8 +121,8 @@ under the License.
   
 
   
-org.codehaus.plexus
-plexus-component-metadata
+org.eclipse.sisu
+sisu-maven-plugin
   
 
   

http://git-wip-us.apache.org/repos/asf/maven/blob/66fc74d6/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
--
diff --git 
a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
 
b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
index 82e1284..7ccdc05 100644
--- 
a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
+++ 
b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
@@ -26,6 +26,7 @@ import java.util.Set;
 
 import javax.inject.Inject;
 import javax.inject.Named;
+import javax.inject.Singleton;
 
 import org.apache.commons.lang3.Validate;
 import org.apache.maven.model.DistributionManagement;
@@ -39,8 +40,6 @@ import org.apache.maven.model.building.ModelBuildingException;
 import org.apache.maven.model.building.ModelBuildingRequest;
 import org.apache.maven.model.building.ModelProblem;
 import org.apache.maven.model.resolution.UnresolvableModelException;
-import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.component.annotations.Requirement;
 import org.eclipse.aether.RepositoryEvent;
 import org.eclipse.aether.RepositoryEvent.EventType;
 import org.eclipse.aether.RepositoryException;
@@ -77,31 +76,24 @@ import 
org.eclipse.aether.transfer.ArtifactNotFoundException;
  * @author Benjamin Bentmann
  */
 @Named
-@Component( role = ArtifactDescriptorReader.class )
+@Singleton
 public class DefaultArtifactDescriptorReader
 implements ArtifactDescriptorReader, Service
 {
 
 @SuppressWarnings( "unused" )
-@Requirement( role = LoggerFactory.class )
 private Logger logger = NullLoggerFactory.LOGGER;
 
-@Requirement
 private RemoteRepositoryManager remoteRepositoryManager;
 
-@Requirement
 private VersionResolver versionResolver;
 
-@Requirement
 private VersionRangeResolver versionRangeResolver;
 
-@Requirement
 private ArtifactResolver artifactResolver;
 
-@Requirement
 private RepositoryEventDispatcher repositoryEventDispatcher;
 
-@Requirement
 private ModelBuilder modelBuilder;
 
 public DefaultArtifactDescriptorReader()
@@ -117,6 +109,7 @@ public class DefaultArtifactDescriptorReader
 {
 setRemoteRepositoryManager( remoteRepositoryManager );
 setVersionResolver( versionResolver );
+setVersionRangeResolver( versionRangeResolver );
 setArtifactResolver( artifactResolver );
 setModelBuilder( modelBuilder );
 setLoggerFactory( loggerFactory );

http://git-wip-us.apache.org/repos/asf/maven/blob/66fc74d6/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java

[09/50] maven git commit: fixed site generation: downgraded parent pom, upgraded m-assembly-p

[khmarbaise]

fixed site generation: downgraded parent pom, upgraded m-assembly-p

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

Branch: refs/heads/mvn-3.5.1/MNG-6174
Commit: fea81d8a2710350c3517f0046e820893abd6cc77
Parents: a415742
Author: Hervé Boutemy 
Authored: Sun Mar 19 14:44:33 2017 +0100
Committer: Hervé Boutemy 
Committed: Sun Mar 19 14:44:33 2017 +0100

--
 pom.xml | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/fea81d8a/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 1d34ffe..a3d5f67 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@ under the License.
   
 org.apache.maven
 maven-parent
-30
+27
 ../pom/maven/pom.xml
   
 
@@ -536,6 +536,11 @@ under the License.
   findbugs-maven-plugin
   3.0.4
 
+
+  org.apache.maven.plugins
+  maven-assembly-plugin
+  2.6
+
   
 
 

[18/50] maven git commit: [MNG-6192] upgraded m-assembly-p to get ordered entries in zip

[khmarbaise]

[MNG-6192] upgraded m-assembly-p to get ordered entries in zip

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

Branch: refs/heads/mvn-3.5.1/MNG-6174
Commit: f0535a40e2dba47f00c5469941d3edad2a8effef
Parents: 27ab750
Author: Hervé Boutemy 
Authored: Thu Mar 23 05:11:12 2017 +0100
Committer: Hervé Boutemy 
Committed: Thu Mar 23 05:11:12 2017 +0100

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/f0535a40/pom.xml
--
diff --git a/pom.xml b/pom.xml
index a3d5f67..857ce07 100644
--- a/pom.xml
+++ b/pom.xml
@@ -539,7 +539,7 @@ under the License.
 
   org.apache.maven.plugins
   maven-assembly-plugin
-  2.6
+  3.0.0
 
   
 

[45/50] maven git commit: [MNG-5935] Optional true getting lost in managed dependencies when transitive

[khmarbaise]

[MNG-5935] Optional true getting lost in managed dependencies when transitive

Updated to correctly map the optional flag of Maven model dependencies to
Aether dependencies. Prior to this change all managed dependencies implicitly
had the optional flag set to 'false' leading to Aether managing that flag to
'false' on all managed dependencies when transitive.


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

Branch: refs/heads/mvn-3.5.1/MNG-6174
Commit: f4ede96fd06c8d3e1e2b2fb679baec058cce30e1
Parents: fd988e7
Author: Christian Schulte 
Authored: Thu Feb 11 08:45:19 2016 +0100
Committer: Michael Osipov 
Committed: Wed May 10 10:36:19 2017 +0200

--
 .../src/main/java/org/apache/maven/RepositoryUtils.java   | 7 ++-
 .../repository/internal/ArtifactDescriptorReaderDelegate.java | 6 +-
 2 files changed, 11 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/f4ede96f/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
--
diff --git a/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java 
b/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
index 86eab4e..52442b7 100644
--- a/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
+++ b/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
@@ -316,7 +316,12 @@ public class RepositoryUtils
 exclusions.add( toExclusion( exclusion ) );
 }
 
-Dependency result = new Dependency( artifact, dependency.getScope(), 
dependency.isOptional(), exclusions );
+Dependency result = new Dependency( artifact,
+dependency.getScope(),
+dependency.getOptional() != null
+? dependency.isOptional()
+: null,
+exclusions );
 
 return result;
 }

http://git-wip-us.apache.org/repos/asf/maven/blob/f4ede96f/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java
--
diff --git 
a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java
 
b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java
index 42060b4..8219205 100644
--- 
a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java
+++ 
b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java
@@ -124,7 +124,11 @@ public class ArtifactDescriptorReaderDelegate
 exclusions.add( convert( exclusion ) );
 }
 
-Dependency result = new Dependency( artifact, dependency.getScope(), 
dependency.isOptional(), exclusions );
+Dependency result = new Dependency( artifact, dependency.getScope(),
+dependency.getOptional() != null
+? dependency.isOptional()
+: null,
+exclusions );
 
 return result;
 }

[05/50] maven git commit: [MNG-6176] Upgrade findbugs to 3.0.4 so that the site can be built with Java 7 and 8

[khmarbaise]

[MNG-6176] Upgrade findbugs to 3.0.4 so that the site can be built with Java 7 
and 8


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

Branch: refs/heads/mvn-3.5.1/MNG-6174
Commit: 55eeb325cd0ddb2a093196f4804e232d45bcc54a
Parents: b12905c
Author: Stephen Connolly 
Authored: Sat Mar 18 12:32:06 2017 +
Committer: Stephen Connolly 
Committed: Sat Mar 18 12:34:45 2017 +

--
 pom.xml | 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/55eeb325/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 8a64bae..bb95b7d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -531,6 +531,11 @@ under the License.
 
   
 
+
+  org.codehaus.mojo
+  findbugs-maven-plugin
+  3.0.4
+
   
 
 

[32/50] maven git commit: Update the DOAP to include the 3.5.0 release

[khmarbaise]

Update the DOAP to include the 3.5.0 release


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

Branch: refs/heads/mvn-3.5.1/MNG-6174
Commit: 70eabfe0f2bc5fe85b666ca511ec35574b23d32f
Parents: 4c6d3a3
Author: Stephen Connolly 
Authored: Fri Apr 7 09:11:26 2017 +0100
Committer: Stephen Connolly 
Committed: Fri Apr 7 09:11:30 2017 +0100

--
 doap_Maven.rdf | 11 +++
 1 file changed, 11 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/70eabfe0/doap_Maven.rdf
--
diff --git a/doap_Maven.rdf b/doap_Maven.rdf
index 86fbd1d..7b671d7 100644
--- a/doap_Maven.rdf
+++ b/doap_Maven.rdf
@@ -33,6 +33,17 @@ under the License.
 
   
 Latest stable release
+2017-04-07
+3.5.0
+
http://archive.apache.org/dist/maven/maven-3/3.5.0/binaries/apache-maven-3.5.0-bin.zip
+
http://archive.apache.org/dist/maven/maven-3/3.5.0/binaries/apache-maven-3.5.0-bin.tar.gz
+
http://archive.apache.org/dist/maven/maven-3/3.5.0/source/apache-maven-3.5.0-src.zip
+
http://archive.apache.org/dist/maven/maven-3/3.5.0/source/apache-maven-3.5.0-src.tar.gz
+  
+
+
+  
+Apache Maven 3.3.9
 2015-11-14
 3.3.9
 
http://archive.apache.org/dist/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.zip

[03/50] maven git commit: MNG-6078: commons-cli 1.4 released

[khmarbaise]

MNG-6078: commons-cli 1.4 released


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

Branch: refs/heads/mvn-3.5.1/MNG-6174
Commit: 52eecc406fdf37c1aec46ea31ab00978ed290a57
Parents: f661fc2
Author: rfscholte 
Authored: Mon Mar 13 23:27:35 2017 +0100
Committer: rfscholte 
Committed: Sat Mar 18 12:59:51 2017 +0100

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/52eecc40/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 653471b..4ce8a79 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,7 +50,7 @@ under the License.
 1.7
 1.7
 2.5.2
-1.4-SNAPSHOT
+1.4
 3.5
 4.12
 1.10.19

[24/50] maven git commit: switch to embedded core ITs run for faster result

[khmarbaise]

switch to embedded core ITs run for faster result

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

Branch: refs/heads/mvn-3.5.1/MNG-6174
Commit: 94c3b600ec3290cda98a66c108ff021b7c4c482e
Parents: ad514f5
Author: Hervé Boutemy 
Authored: Fri Mar 24 03:28:59 2017 +0100
Committer: Hervé Boutemy 
Committed: Tue Mar 28 08:04:16 2017 +0200

--
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/94c3b600/Jenkinsfile
--
diff --git a/Jenkinsfile b/Jenkinsfile
index 0dae3a3..be4485c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -20,7 +20,7 @@
 properties([buildDiscarder(logRotator(artifactNumToKeepStr: '5', numToKeepStr: 
env.BRANCH_NAME=='master'?'10':'5'))])
 
 def tests
-def CORE_IT_PROFILES='run-its'
+def CORE_IT_PROFILES='run-its,embedded'
 
 try {
 

[29/50] maven git commit: [maven-release-plugin] prepare release maven-3.5.0

[khmarbaise]

[maven-release-plugin] prepare release maven-3.5.0


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

Branch: refs/heads/mvn-3.5.1/MNG-6174
Commit: ff8f5e7444045639af65f6095c62210b5713f426
Parents: 87cf1ee
Author: Stephen Connolly 
Authored: Mon Apr 3 20:35:30 2017 +0100
Committer: Stephen Connolly 
Committed: Mon Apr 3 20:35:30 2017 +0100

--
 apache-maven/pom.xml  | 2 +-
 maven-artifact/pom.xml| 2 +-
 maven-builder-support/pom.xml | 2 +-
 maven-compat/pom.xml  | 2 +-
 maven-core/pom.xml| 2 +-
 maven-embedder/pom.xml| 2 +-
 maven-model-builder/pom.xml   | 2 +-
 maven-model/pom.xml   | 2 +-
 maven-plugin-api/pom.xml  | 2 +-
 maven-repository-metadata/pom.xml | 2 +-
 maven-resolver-provider/pom.xml   | 2 +-
 maven-settings-builder/pom.xml| 2 +-
 maven-settings/pom.xml| 2 +-
 maven-slf4j-provider/pom.xml  | 2 +-
 pom.xml   | 4 ++--
 15 files changed, 16 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/ff8f5e74/apache-maven/pom.xml
--
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index a528ddb..8a72146 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -25,7 +25,7 @@ under the License.
   
 org.apache.maven
 maven
-3.5.0-SNAPSHOT
+3.5.0
   
 
   apache-maven

http://git-wip-us.apache.org/repos/asf/maven/blob/ff8f5e74/maven-artifact/pom.xml
--
diff --git a/maven-artifact/pom.xml b/maven-artifact/pom.xml
index e3943c9..977fd34 100644
--- a/maven-artifact/pom.xml
+++ b/maven-artifact/pom.xml
@@ -25,7 +25,7 @@ under the License.
   
 org.apache.maven
 maven
-3.5.0-SNAPSHOT
+3.5.0
   
 
   maven-artifact

http://git-wip-us.apache.org/repos/asf/maven/blob/ff8f5e74/maven-builder-support/pom.xml
--
diff --git a/maven-builder-support/pom.xml b/maven-builder-support/pom.xml
index 39eb161..7457a4c 100644
--- a/maven-builder-support/pom.xml
+++ b/maven-builder-support/pom.xml
@@ -25,7 +25,7 @@ under the License.
   
 org.apache.maven
 maven
-3.5.0-SNAPSHOT
+3.5.0
   
 
   maven-builder-support

http://git-wip-us.apache.org/repos/asf/maven/blob/ff8f5e74/maven-compat/pom.xml
--
diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml
index bfd2b47..9552803 100644
--- a/maven-compat/pom.xml
+++ b/maven-compat/pom.xml
@@ -25,7 +25,7 @@ under the License.
   
 org.apache.maven
 maven
-3.5.0-SNAPSHOT
+3.5.0
   
 
   maven-compat

http://git-wip-us.apache.org/repos/asf/maven/blob/ff8f5e74/maven-core/pom.xml
--
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index 0e20235..4fb86a3 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -25,7 +25,7 @@ under the License.
   
 org.apache.maven
 maven
-3.5.0-SNAPSHOT
+3.5.0
   
 
   maven-core

http://git-wip-us.apache.org/repos/asf/maven/blob/ff8f5e74/maven-embedder/pom.xml
--
diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml
index 30ad2ce..3e778b3 100644
--- a/maven-embedder/pom.xml
+++ b/maven-embedder/pom.xml
@@ -25,7 +25,7 @@ under the License.
   
 org.apache.maven
 maven
-3.5.0-SNAPSHOT
+3.5.0
   
 
   maven-embedder

http://git-wip-us.apache.org/repos/asf/maven/blob/ff8f5e74/maven-model-builder/pom.xml
--
diff --git a/maven-model-builder/pom.xml b/maven-model-builder/pom.xml
index 0dd08ac..3aefbc7 100644
--- a/maven-model-builder/pom.xml
+++ b/maven-model-builder/pom.xml
@@ -25,7 +25,7 @@ under the License.
   
 org.apache.maven
 maven
-3.5.0-SNAPSHOT
+3.5.0
   
 
   maven-model-builder

http://git-wip-us.apache.org/repos/asf/maven/blob/ff8f5e74/maven-model/pom.xml
--
diff --git a/maven-model/pom.xml b/maven-model/pom.xml
index 41cf168..1ec4f89 100644
--- a/maven-model/pom.xml
+++ b/maven-model/pom.xml
@@ -25,7 +25,7 @@ under the License.
   
 org.apache.maven
 maven
-3.5.0-SNAPSHOT
+3.5.0
   
 
   maven-model

http://git-wip-us.apache.org/repos/asf/maven/blob/ff8f5e74/maven-plugin-api/pom.xml

[20/50] maven git commit: [MNG-6112] Central repository in the 4.0.0 super POM should declare update policy 'never'.

[khmarbaise]

[MNG-6112] Central repository in the 4.0.0 super POM should declare update 
policy 'never'.

This reverts commit 13adc1bc2b6d9fc3a62ec2389996726c2edce4d8 *not changing
anything* just because someone did not react in time when this issue had been
lying around on a branch. If we would set pace for the industrie, everyone would
still be using 5.25" floppy disks and 8 bit hardware and we would tell them
that upgrading to be able to use new software would be too risky and they
better keep theire broken assembly routines until the machine goes up in
smoke.


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

Branch: refs/heads/mvn-3.5.1/MNG-6174
Commit: 8400984ac5201ae6bf06bfa88ade8a8468c76634
Parents: 0931bb2
Author: Christian Schulte 
Authored: Sat Mar 25 20:40:05 2017 +0100
Committer: Christian Schulte 
Committed: Sat Mar 25 20:53:06 2017 +0100

--
 .../main/java/org/apache/maven/bridge/MavenRepositorySystem.java | 4 ++--
 .../src/main/resources/org/apache/maven/model/pom-4.0.0.xml  | 3 ---
 2 files changed, 2 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/8400984a/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java 
b/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java
index 509f302..9331710 100644
--- 
a/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java
+++ 
b/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java
@@ -573,8 +573,8 @@ public class MavenRepositorySystem
 throws Exception
 {
 return createRepository( RepositorySystem.DEFAULT_REMOTE_REPO_URL, 
RepositorySystem.DEFAULT_REMOTE_REPO_ID,
- true, 
ArtifactRepositoryPolicy.UPDATE_POLICY_NEVER, false,
- ArtifactRepositoryPolicy.UPDATE_POLICY_NEVER,
+ true, 
ArtifactRepositoryPolicy.UPDATE_POLICY_DAILY, false,
+ ArtifactRepositoryPolicy.UPDATE_POLICY_DAILY,
  ArtifactRepositoryPolicy.CHECKSUM_POLICY_WARN 
);
 }
 

http://git-wip-us.apache.org/repos/asf/maven/blob/8400984a/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
--
diff --git 
a/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml 
b/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
index 9487a9a..91492a9 100644
--- 
a/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
+++ 
b/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
@@ -32,9 +32,6 @@ under the License.
   
 false
   
-  
-never
-  
 
   
 

[19/50] maven git commit: [MNG-6168] Fix unclosed streams

[khmarbaise]

[MNG-6168] Fix unclosed streams


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

Branch: refs/heads/mvn-3.5.1/MNG-6174
Commit: 0931bb2cc7630cc79adb98407db13315b4a709ee
Parents: f0535a4
Author: Christian Schulte 
Authored: Fri Mar 24 22:04:37 2017 +0100
Committer: Christian Schulte 
Committed: Fri Mar 24 22:04:37 2017 +0100

--
 .../metadata/io/DefaultMetadataReader.java  | 19 ++---
 .../toolchain/io/DefaultToolchainsReader.java   | 19 ++---
 .../maven/model/io/DefaultModelReader.java  | 18 +++--
 .../maven/model/io/DefaultModelWriter.java  | 27 +
 .../internal/DefaultVersionRangeResolver.java   | 18 +++--
 .../internal/DefaultVersionResolver.java| 42 
 .../settings/io/DefaultSettingsReader.java  | 19 ++---
 .../settings/io/DefaultSettingsWriter.java  | 27 +
 8 files changed, 58 insertions(+), 131 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/0931bb2c/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java
 
b/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java
index c769f89..51a2849 100644
--- 
a/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java
+++ 
b/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java
@@ -29,7 +29,6 @@ import org.apache.commons.lang3.Validate;
 import org.apache.maven.artifact.repository.metadata.Metadata;
 import 
org.apache.maven.artifact.repository.metadata.io.xpp3.MetadataXpp3Reader;
 import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.util.IOUtil;
 import org.codehaus.plexus.util.ReaderFactory;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 
@@ -58,19 +57,14 @@ public class DefaultMetadataReader
 {
 Validate.notNull( input, "input cannot be null" );
 
-try
+try ( final Reader in = input )
 {
-MetadataXpp3Reader r = new MetadataXpp3Reader();
-return r.read( input, isStrict( options ) );
+return new MetadataXpp3Reader().read( in, isStrict( options ) );
 }
 catch ( XmlPullParserException e )
 {
 throw new MetadataParseException( e.getMessage(), 
e.getLineNumber(), e.getColumnNumber(), e );
 }
-finally
-{
-IOUtil.close( input );
-}
 }
 
 public Metadata read( InputStream input, Map options )
@@ -78,19 +72,14 @@ public class DefaultMetadataReader
 {
 Validate.notNull( input, "input cannot be null" );
 
-try
+try ( final InputStream in = input )
 {
-MetadataXpp3Reader r = new MetadataXpp3Reader();
-return r.read( input, isStrict( options ) );
+return new MetadataXpp3Reader().read( in, isStrict( options ) );
 }
 catch ( XmlPullParserException e )
 {
 throw new MetadataParseException( e.getMessage(), 
e.getLineNumber(), e.getColumnNumber(), e );
 }
-finally
-{
-IOUtil.close( input );
-}
 }
 
 private boolean isStrict( Map options )

http://git-wip-us.apache.org/repos/asf/maven/blob/0931bb2c/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java
 
b/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java
index 9b5bdd7..86a1784 100644
--- 
a/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java
+++ 
b/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java
@@ -31,7 +31,6 @@ import javax.inject.Singleton;
 import org.apache.commons.lang3.Validate;
 import org.apache.maven.toolchain.model.PersistedToolchains;
 import org.apache.maven.toolchain.model.io.xpp3.MavenToolchainsXpp3Reader;
-import org.codehaus.plexus.util.IOUtil;
 import org.codehaus.plexus.util.ReaderFactory;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 
@@ -62,19 +61,14 @@ public class DefaultToolchainsReader
 {
 Validate.notNull( input, "input cannot be null" );
 

[43/50] maven git commit: [MNG-6186] use enhanced HawtJNI library loading (remove previous hack)

[khmarbaise]

[MNG-6186] use enhanced HawtJNI library loading (remove previous hack)

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

Branch: refs/heads/mvn-3.5.1/MNG-6174
Commit: 6182a2083fdb9964ccb5250fb85223e38485bf04
Parents: 2a79d1e
Author: Hervé Boutemy 
Authored: Sat May 6 18:28:04 2017 +0200
Committer: Hervé Boutemy 
Committed: Tue May 9 21:08:13 2017 +0200

--
 apache-maven/src/bin/mvn|  4 +-
 apache-maven/src/bin/mvn.cmd|  1 +
 .../java/org/apache/maven/cli/MavenCli.java | 59 
 3 files changed, 4 insertions(+), 60 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/6182a208/apache-maven/src/bin/mvn
--
diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn
index eedd344..525b2ef 100755
--- a/apache-maven/src/bin/mvn
+++ b/apache-maven/src/bin/mvn
@@ -193,5 +193,7 @@ exec "$JAVACMD" \
   $MAVEN_DEBUG_OPTS \
   -classpath "${CLASSWORLDS_JAR}" \
   "-Dclassworlds.conf=${MAVEN_HOME}/bin/m2.conf" \
-  "-Dmaven.home=${MAVEN_HOME}" 
"-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+  "-Dmaven.home=${MAVEN_HOME}" \
+  "-Dlibrary.jansi.path=${MAVEN_HOME}/jansi-native" \
+  "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
   ${CLASSWORLDS_LAUNCHER} "$@"

http://git-wip-us.apache.org/repos/asf/maven/blob/6182a208/apache-maven/src/bin/mvn.cmd
--
diff --git a/apache-maven/src/bin/mvn.cmd b/apache-maven/src/bin/mvn.cmd
index bfcc1b5..ba61f80 100644
--- a/apache-maven/src/bin/mvn.cmd
+++ b/apache-maven/src/bin/mvn.cmd
@@ -181,6 +181,7 @@ set 
CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
   -classpath %CLASSWORLDS_JAR% ^
   "-Dclassworlds.conf=%MAVEN_HOME%\bin\m2.conf" ^
   "-Dmaven.home=%MAVEN_HOME%" ^
+  "-Dlibrary.jansi.path=%MAVEN_HOME%\jansi-native" ^
   "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^
   %CLASSWORLDS_LAUNCHER% %MAVEN_CMD_LINE_ARGS%
 if ERRORLEVEL 1 goto error

http://git-wip-us.apache.org/repos/asf/maven/blob/6182a208/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
--
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java 
b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
index 79ab45d..e1e58c8 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
@@ -188,7 +188,6 @@ public class MavenCli
 {
 MavenCli cli = new MavenCli();
 
-prepareJansiNative();
 MessageUtils.systemInstall();
 int result = cli.doMain( new CliRequest( args, classWorld ) );
 MessageUtils.systemUninstall();
@@ -196,64 +195,6 @@ public class MavenCli
 return result;
 }
 
-/**
- * temporary method while improvement reported to JAnsi+HawtJNI and 
integrated:
- * library.jansi.path should point to lib/jansi-native and HawtJNI should 
be able to detect
- * the platform instead of forcing the user having to point 
library.jansi.path to
- * lib/jansi-native/[platform]
- */
-private static void prepareJansiNative()
-{
-if ( System.getProperty( "library.jansi.path" ) == null )
-{
-String mavenHome = System.getProperty( "maven.home" );
-
-if ( mavenHome != null )
-{
-File jansiNative = new File( mavenHome, "lib/jansi-native/" + 
hawtJNIgetPlatform() );
-System.setProperty( "library.jansi.path", 
jansiNative.getAbsolutePath() );
-}
-}
-}
-
-private static String hawtJNIgetOperatingSystem()
-{
-String name = System.getProperty( "os.name" ).toLowerCase().trim();
-if ( name.startsWith( "linux" ) )
-{
-return "linux";
-}
-if ( name.startsWith( "mac os x" ) )
-{
-return "osx";
-}
-if ( name.startsWith( "win" ) )
-{
-return "windows";
-}
-return name.replaceAll( "\\W+", "_" );
-
-}
-
-private static String hawtJNIgetPlatform()
-{
-return hawtJNIgetOperatingSystem() + hawtJNIgetBitModel();
-}
-
-private static int hawtJNIgetBitModel()
-{
-String prop = System.getProperty( "sun.arch.data.model" );
-if ( prop == null )
-{
-prop = System.getProperty( "com.ibm.vm.bitmode" );
-   

[12/50] maven git commit: Make it possible to run unit tests from an IDE

[khmarbaise]

Make it possible to run unit tests from an IDE


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

Branch: refs/heads/mvn-3.5.1/MNG-6174
Commit: 68e38e5086d0978c61391b7cdc4514fdf96e64d7
Parents: 1638280
Author: Stephen Connolly 
Authored: Sun Mar 19 21:54:31 2017 +
Committer: Stephen Connolly 
Committed: Sun Mar 19 21:55:46 2017 +

--
 .../src/main/java/org/apache/maven/cli/CLIReportingUtils.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/68e38e50/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
--
diff --git 
a/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java 
b/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
index c5faef5..52f2053 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
@@ -28,6 +28,7 @@ import java.util.Date;
 import java.util.Locale;
 import java.util.Properties;
 
+import org.apache.commons.lang3.StringUtils;
 import org.codehaus.plexus.util.Os;
 import org.slf4j.Logger;
 
@@ -94,7 +95,7 @@ public final class CLIReportingUtils
 {
 msg += " (";
 msg += ( rev != null ? rev : "" );
-if ( timestamp != null )
+if ( StringUtils.isNotBlank( timestamp ) )
 {
 String ts = formatTimestamp( Long.valueOf( timestamp ) );
 msg += ( rev != null ? "; " : "" ) + ts;

[50/50] maven git commit: [MNG-6174] Clean Up Maven Model

[khmarbaise]

[MNG-6174] Clean Up Maven Model


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

Branch: refs/heads/mvn-3.5.1/MNG-6174
Commit: 9e926317fde023049da706ce8af9f97acf95aabe
Parents: a7dddcb
Author: Karl Heinz Marbaise 
Authored: Sun Feb 19 21:17:31 2017 +0100
Committer: Karl Heinz Marbaise 
Committed: Sun Jun 4 20:06:23 2017 +0200

--
 maven-model/src/main/mdo/maven.mdo | 667 
 1 file changed, 667 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/9e926317/maven-model/src/main/mdo/maven.mdo
--
diff --git a/maven-model/src/main/mdo/maven.mdo 
b/maven-model/src/main/mdo/maven.mdo
index de800d9..7ba6106 100644
--- a/maven-model/src/main/mdo/maven.mdo
+++ b/maven-model/src/main/mdo/maven.mdo
@@ -83,18 +83,6 @@
 
 
 
-  pomVersion
-  3.0.0
-  true
-  String
-  
-
-  
-
-
   modelVersion
   4.0.0+
   true
@@ -107,20 +95,6 @@
 
 
 
-  extend
-  3.0.0
-  
-
-  
-  String
-
-
   parent
   4.0.0+
   The location of the parent project, if one exists. 
Values from the parent
@@ -159,25 +133,6 @@
   String
 
 
-  id
-  3.0.0
-  true
-  
-
-  
-  String
-
-
-  currentVersion
-  The current version of the artifact produced by this 
project.
-  3.0.0
-  true
-  String
-
-
   version
   4.0.0+
   true
@@ -185,15 +140,6 @@
   String
 
 
-  versions
-  3.0.0
-  Contains information on previous versions of the 
project.
-  
-Version
-*
-  
-
-
   packaging
   4.0.0+
   
@@ -223,13 +169,6 @@
   String
 
 
-  shortDescription
-  3.0.0
-  A short description of the project. The short 
description should be limited
-to a single line.
-  String
-
-
   description
   3.0.0+
   A detailed description of the project, used by Maven 
whenever it needs to
@@ -251,20 +190,6 @@
   String
 
 
-  siteAddress
-  3.0.0
-  The hostname of the web server that hosts the project's 
web site. This is
-used when the web site is deployed.
-  String
-
-
-  siteDirectory
-  3.0.0
-  The directory on the web server where the public web 
site for this project
-resides. This is used when the web site is deployed.
-  String
-
-
   inceptionYear
   3.0.0+
   true
@@ -273,20 +198,6 @@
   String
 
 
-  logo
-  3.0.0
-  
-
-  
-  String
-
-
   organization
   3.0.0+
   This element describes various attributes of the 
organization to which the
@@ -361,27 +272,6 @@
 
 
 
-
-  branches
-  3.0.0
-  
-
-  
-  
-Branch
-*
-  
-
-
-  repository
-  3.0.0
-  Specification for the SCM used by the project, such as 
CVS, Subversion, etc.
-  
-Repository
-  
-
 
   scm
   4.0.0+
@@ -395,12 +285,6 @@
 
 
 
-
-  issueTrackingUrl
-  3.0.0
-  The URL of the project's issue tracking 
system.
-  String
-
 
   issueManagement
   4.0.0+
@@ -415,12 +299,6 @@
 
 
 
-  gumpRepositoryId
-  3.0.0
-  This is the repository identifier in Gump that this 
project is part of.
-  String
-
-
   ciManagement
   4.0.0+
   The project's continuous integration 
information.
@@ -430,83 +308,6 @@
 
 
 
-
-
-
-
-  distributionSite
-  3.0.0
-  
-
-  
-  String
-
-
-  distributionDirectory
-  3.0.0
-  The directory on the web server where the final 
distributions will be
-

[08/50] maven git commit: updated parent pom: fixes issue with m-assembly-p bug

[khmarbaise]

updated parent pom: fixes issue with m-assembly-p bug

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

Branch: refs/heads/mvn-3.5.1/MNG-6174
Commit: a4157428d756e2189cddaddf0690ff070bb74d52
Parents: 55eeb32
Author: Hervé Boutemy 
Authored: Sun Mar 19 10:38:18 2017 +0100
Committer: Hervé Boutemy 
Committed: Sun Mar 19 10:38:18 2017 +0100

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/a4157428/pom.xml
--
diff --git a/pom.xml b/pom.xml
index bb95b7d..1d34ffe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@ under the License.
   
 org.apache.maven
 maven-parent
-27
+30
 ../pom/maven/pom.xml
   
 

[36/50] maven git commit: MNG-6209 better executeMojo thread context classloader

[khmarbaise]

MNG-6209 better executeMojo thread context classloader

Signed-off-by: Igor Fedorenko 


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

Branch: refs/heads/mvn-3.5.1/MNG-6174
Commit: ec629f7d511eb910b4e80112a9fbe85ed8786f10
Parents: 567af0d
Author: Igor Fedorenko 
Authored: Tue Apr 11 07:59:34 2017 -0700
Committer: Igor Fedorenko 
Committed: Thu Apr 13 14:12:23 2017 -0700

--
 .../java/org/apache/maven/plugin/DefaultBuildPluginManager.java | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/ec629f7d/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java
 
b/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java
index b4f7a4d..3af1125 100644
--- 
a/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java
+++ 
b/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java
@@ -106,8 +106,11 @@ public class DefaultBuildPluginManager
 throw new PluginExecutionException( mojoExecution, project, e );
 }
 
+// use project realm as thread context classloader to enable 
components from all extensions=true plugins
+ClassRealm tccl = mojoExecution.getPlugin().isExtensions() ? 
project.getClassRealm() : pluginRealm;
+
 ClassLoader oldClassLoader = 
Thread.currentThread().getContextClassLoader();
-Thread.currentThread().setContextClassLoader( pluginRealm );
+Thread.currentThread().setContextClassLoader( tccl );
 
 MavenSession oldSession = legacySupport.getSession();
 

[23/50] maven git commit: added CORE_IT_PROFILES parameter

[khmarbaise]

added CORE_IT_PROFILES parameter

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

Branch: refs/heads/mvn-3.5.1/MNG-6174
Commit: ad514f5cb55d16ca116c5c529ad48dd32d5bac61
Parents: 16805f5
Author: Hervé Boutemy 
Authored: Fri Mar 24 03:28:26 2017 +0100
Committer: Hervé Boutemy 
Committed: Tue Mar 28 08:04:07 2017 +0200

--
 Jenkinsfile | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/ad514f5c/Jenkinsfile
--
diff --git a/Jenkinsfile b/Jenkinsfile
index cc9bd92..0dae3a3 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -20,6 +20,7 @@
 properties([buildDiscarder(logRotator(artifactNumToKeepStr: '5', numToKeepStr: 
env.BRANCH_NAME=='master'?'10':'5'))])
 
 def tests
+def CORE_IT_PROFILES='run-its'
 
 try {
 
@@ -66,7 +67,7 @@ parallel linuxJava7:{
 sh "rm -rvf $WORK_DIR/apache-maven-dist.zip 
$WORK_DIR/it-local-repo"
 unstash 'dist'
 
withEnv(["PATH+MAVEN=$MAVEN_NIX_J7/bin","PATH+JDK=$JAVA_NIX_J7/bin"]) {
-sh "mvn clean install -Prun-its -B -U -V 
-Dmaven.test.failure.ignore=true -Dmaven.repo.local=$WORK_DIR/it-local-repo 
-DmavenDistro=$WORK_DIR/apache-maven-dist.zip"
+sh "mvn clean install -P$CORE_IT_PROFILES -B -U -V 
-Dmaven.test.failure.ignore=true -Dmaven.repo.local=$WORK_DIR/it-local-repo 
-DmavenDistro=$WORK_DIR/apache-maven-dist.zip"
 }
 junit allowEmptyResults: true, 
testResults:'core-it-support/**/target/*-reports/*.xml,core-it-suite/target/*-reports/*.xml'
 deleteDir() // clean up after ourselves to reduce disk space
@@ -85,7 +86,7 @@ parallel linuxJava7:{
 sh "rm -rvf $WORK_DIR/apache-maven-dist.zip 
$WORK_DIR/it-local-repo"
 unstash 'dist'
 
withEnv(["PATH+MAVEN=$MAVEN_NIX_J8/bin","PATH+JDK=$JAVA_NIX_J8/bin"]) {
-sh "mvn clean install -Prun-its -B -U -V 
-Dmaven.test.failure.ignore=true -Dmaven.repo.local=$WORK_DIR/it-local-repo 
-DmavenDistro=$WORK_DIR/apache-maven-dist.zip"
+sh "mvn clean install -P$CORE_IT_PROFILES -B -U -V 
-Dmaven.test.failure.ignore=true -Dmaven.repo.local=$WORK_DIR/it-local-repo 
-DmavenDistro=$WORK_DIR/apache-maven-dist.zip"
 }
 junit allowEmptyResults: true, 
testResults:'core-it-support/**/target/*-reports/*.xml,core-it-suite/target/*-reports/*.xml'
 deleteDir() // clean up after ourselves to reduce disk space
@@ -115,7 +116,7 @@ parallel linuxJava7:{
 
withEnv(["Path+MAVEN=$MAVEN_WIN_J7\\bin","Path+JDK=$JAVA_WIN_J7\\bin","JAVA_HOME=$JAVA_WIN_J7"])
 {
 bat "set"
 unstash 'dist'
-bat "mvn clean install -Prun-its -B -U -V 
-Dmaven.test.failure.ignore=true -Dmaven.repo.local=$WORK_DIR/it-local-repo 
-DmavenDistro=$WORK_DIR/apache-maven-dist.zip"
+bat "mvn clean install -P$CORE_IT_PROFILES -B -U -V 
-Dmaven.test.failure.ignore=true -Dmaven.repo.local=$WORK_DIR/it-local-repo 
-DmavenDistro=$WORK_DIR/apache-maven-dist.zip"
 }
 junit allowEmptyResults: true, 
testResults:'core-it-support/**/target/*-reports/*.xml,core-it-suite/target/*-reports/*.xml'
 deleteDir() // clean up after ourselves to reduce disk space
@@ -145,7 +146,7 @@ parallel linuxJava7:{
 
withEnv(["Path+MAVEN=$MAVEN_WIN_J8\\bin","Path+JDK=$JAVA_WIN_J8\\bin","JAVA_HOME=$JAVA_WIN_J8"])
 {
 bat "set"
 unstash 'dist'
-bat "mvn clean install -Prun-its -B -U -V 
-Dmaven.test.failure.ignore=true -Dmaven.repo.local=$WORK_DIR/it-local-repo 
-DmavenDistro=$WORK_DIR/apache-maven-dist.zip"
+bat "mvn clean install -P$CORE_IT_PROFILES -B -U -V 
-Dmaven.test.failure.ignore=true -Dmaven.repo.local=$WORK_DIR/it-local-repo 
-DmavenDistro=$WORK_DIR/apache-maven-dist.zip"
 }
 junit allowEmptyResults: true, 
testResults:'core-it-support/**/target/*-reports/*.xml,core-it-suite/target/*-reports/*.xml'
 deleteDir() // clean up after ourselves to reduce disk space

[33/50] maven git commit: improved description of styled message API

[khmarbaise]

improved description of styled message API

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

Branch: refs/heads/mvn-3.5.1/MNG-6174
Commit: 08f3c76a09601d85503c35743458d977a92e492d
Parents: 70eabfe
Author: Hervé Boutemy 
Authored: Sat Apr 8 08:50:55 2017 +0200
Committer: Hervé Boutemy 
Committed: Sat Apr 8 08:50:55 2017 +0200

--
 maven-embedder/src/site/apt/index.apt.vm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/08f3c76a/maven-embedder/src/site/apt/index.apt.vm
--
diff --git a/maven-embedder/src/site/apt/index.apt.vm 
b/maven-embedder/src/site/apt/index.apt.vm
index e820765..d327717 100644
--- a/maven-embedder/src/site/apt/index.apt.vm
+++ b/maven-embedder/src/site/apt/index.apt.vm
@@ -44,5 +44,6 @@ ${project.name}
 
  * since 3.5.0, output is colorized by default, with color disabled in batch 
mode: see

{{{/shared/maven-shared-utils/apidocs/org/apache/maven/shared/utils/logging/package-summary.html}styled
 message API}}
-   for more details.
+   for more details on adding color to a plugin output or customizing colors.
+ 

\ No newline at end of file

[11/50] maven git commit: [MNG-6189] warn if maven-site-plugin reportPlugins is configured

[khmarbaise]

[MNG-6189] warn if maven-site-plugin reportPlugins is configured

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

Branch: refs/heads/mvn-3.5.1/MNG-6174
Commit: 16382802611939a8876fe553208e8b0f4da606a6
Parents: abca6ab
Author: Hervé Boutemy 
Authored: Sun Mar 19 17:04:04 2017 +0100
Committer: Hervé Boutemy 
Committed: Sun Mar 19 21:51:53 2017 +0100

--
 .../maven/model/plugin/DefaultReportingConverter.java  | 13 +++--
 .../apache/maven/model/plugin/ReportingConverter.java  |  5 +++--
 2 files changed, 14 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/16382802/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportingConverter.java
--
diff --git 
a/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportingConverter.java
 
b/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportingConverter.java
index d918d9e..8bfa580 100644
--- 
a/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportingConverter.java
+++ 
b/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportingConverter.java
@@ -28,12 +28,16 @@ import org.apache.maven.model.ReportSet;
 import org.apache.maven.model.Reporting;
 import org.apache.maven.model.building.ModelBuildingRequest;
 import org.apache.maven.model.building.ModelProblemCollector;
+import org.apache.maven.model.building.ModelProblemCollectorRequest;
+import org.apache.maven.model.building.ModelProblem.Severity;
+import org.apache.maven.model.building.ModelProblem.Version;
 import org.codehaus.plexus.component.annotations.Component;
 import org.codehaus.plexus.util.StringUtils;
 import org.codehaus.plexus.util.xml.Xpp3Dom;
 
 /**
- * Handles conversion of the legacy reporting section into the configuration 
of the new Maven Site Plugin.
+ * Handles conversion of the reporting section into the 
configuration of Maven Site Plugin 3.x,
+ * i.e. reportPlugins and outputDirectory parameters.
  *
  * @author Benjamin Bentmann
  */
@@ -87,7 +91,12 @@ public class DefaultReportingConverter
 
 if ( reportPlugins != null )
 {
-// new-style report configuration already present, assume user 
handled entire conversion
+// new-style report configuration already present: warn since this 
new style has been deprecated
+// in favor of classical reporting section MSITE-647 / MSITE-684
+problems.add( new ModelProblemCollectorRequest( Severity.WARNING, 
Version.BASE )
+.setMessage( "Reporting configuration should be done in 
 section, "
+  + "not in maven-site-plugin  as 
reportPlugins parameter." )
+.setLocation( sitePlugin.getLocation( "configuration" ) ) 
);
 return;
 }
 

http://git-wip-us.apache.org/repos/asf/maven/blob/16382802/maven-model-builder/src/main/java/org/apache/maven/model/plugin/ReportingConverter.java
--
diff --git 
a/maven-model-builder/src/main/java/org/apache/maven/model/plugin/ReportingConverter.java
 
b/maven-model-builder/src/main/java/org/apache/maven/model/plugin/ReportingConverter.java
index c5ea338..e6d8898 100644
--- 
a/maven-model-builder/src/main/java/org/apache/maven/model/plugin/ReportingConverter.java
+++ 
b/maven-model-builder/src/main/java/org/apache/maven/model/plugin/ReportingConverter.java
@@ -24,7 +24,8 @@ import org.apache.maven.model.building.ModelBuildingRequest;
 import org.apache.maven.model.building.ModelProblemCollector;
 
 /**
- * Handles conversion of the legacy reporting section into the configuration 
of the new Maven Site Plugin.
+ * Handles conversion of the reporting section into the 
configuration of Maven Site Plugin 3.x,
+ * i.e. reportPlugins and outputDirectory parameters.
  *
  * @author Benjamin Bentmann
  */
@@ -32,7 +33,7 @@ public interface ReportingConverter
 {
 
 /**
- * Converts values from model's reporting section into the configuration 
for the new Maven Site Plugin.
+ * Converts values from model's reporting section into the configuration 
for Maven Site Plugin 3.x.
  *
  * @param model The model whose reporting section should be converted, 
must not be null.
  * @param request The model building request that holds further settings, 
must not be {@code null}.

[37/50] maven git commit: MNG-6210 allow maven custom guice scopes in .mvn/extensions

[khmarbaise]

MNG-6210 allow maven custom guice scopes in .mvn/extensions

Signed-off-by: Igor Fedorenko 


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

Branch: refs/heads/mvn-3.5.1/MNG-6174
Commit: c2c6259de6f1262d9b31509b8c30844a386a4f29
Parents: ec629f7
Author: Igor Fedorenko 
Authored: Thu Apr 13 12:58:29 2017 -0700
Committer: Igor Fedorenko 
Committed: Fri Apr 14 10:38:45 2017 -0700

--
 .../src/main/java/org/apache/maven/cli/MavenCli.java | 8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/c2c6259d/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
--
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java 
b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
index 877b88b..79ab45d 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
@@ -56,6 +56,7 @@ import org.apache.maven.execution.MavenExecutionRequest;
 import org.apache.maven.execution.MavenExecutionRequestPopulationException;
 import org.apache.maven.execution.MavenExecutionRequestPopulator;
 import org.apache.maven.execution.MavenExecutionResult;
+import org.apache.maven.execution.scope.internal.MojoExecutionScopeModule;
 import org.apache.maven.extension.internal.CoreExports;
 import org.apache.maven.extension.internal.CoreExtensionEntry;
 import org.apache.maven.lifecycle.LifecycleExecutionException;
@@ -63,6 +64,7 @@ import org.apache.maven.model.building.ModelProcessor;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.properties.internal.EnvironmentUtils;
 import org.apache.maven.properties.internal.SystemProperties;
+import org.apache.maven.session.scope.internal.SessionScopeModule;
 import org.apache.maven.shared.utils.logging.MessageBuilder;
 import org.apache.maven.shared.utils.logging.MessageUtils;
 import org.apache.maven.toolchain.building.DefaultToolchainsBuildingRequest;
@@ -684,20 +686,20 @@ public class MavenCli
 
 // NOTE: To avoid inconsistencies, we'll use the TCCL exclusively for 
lookups
 container.setLookupRealm( null );
+Thread.currentThread().setContextClassLoader( 
container.getContainerRealm() );
 
 container.setLoggerManager( plexusLoggerManager );
 
 for ( CoreExtensionEntry extension : extensions )
 {
-container.discoverComponents( extension.getClassRealm() );
+container.discoverComponents( extension.getClassRealm(), new 
SessionScopeModule( container ),
+  new MojoExecutionScopeModule( 
container ) );
 }
 
 customizeContainer( container );
 
 container.getLoggerManager().setThresholds( 
cliRequest.request.getLoggingLevel() );
 
-Thread.currentThread().setContextClassLoader( 
container.getContainerRealm() );
-
 eventSpyDispatcher = container.lookup( EventSpyDispatcher.class );
 
 DefaultEventSpyContext eventSpyContext = new DefaultEventSpyContext();

[35/50] maven git commit: use "java -jar" command

[khmarbaise]

use "java -jar" command

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

Branch: refs/heads/mvn-3.5.1/MNG-6174
Commit: 567af0d964cf823b275300aa4671b84a28da5baa
Parents: 6a93bbe
Author: Hervé Boutemy 
Authored: Wed Apr 12 03:59:44 2017 +0200
Committer: Hervé Boutemy 
Committed: Wed Apr 12 03:59:44 2017 +0200

--
 .../apache/maven/artifact/versioning/ComparableVersion.java| 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/567af0d9/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
--
diff --git 
a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
 
b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
index e1fc5f0..105d9b5 100644
--- 
a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
+++ 
b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
@@ -470,11 +470,12 @@ public class ComparableVersion
 return canonical.hashCode();
 }
 
+// CHECKSTYLE_OFF: LineLength
 /**
  * Main to test version parsing and comparison.
  * 
- * Checks how "1.2.7" compares to "1.2-SNAPSHOT", for example, you can 
issue
- * java -cp 
${maven.repo.local}/org/apache/maven/maven-artifact/${maven.version}/maven-artifact-${maven.version}.jar
 org.apache.maven.artifact.versioning.ComparableVersion "1.2.7" 
"1.2-SNAPSHOT"
+ * To check how "1.2.7" compares to "1.2-SNAPSHOT", for example, you can 
issue
+ * java -jar 
${maven.repo.local}/org/apache/maven/maven-artifact/${maven.version}/maven-artifact-${maven.version}.jar
 "1.2.7" "1.2-SNAPSHOT"
  * command to command line. Result of given command will be something like 
this:
  * 
  * Display parameters as parsed by Maven (in canonical form) and 
comparison result:
@@ -486,6 +487,7 @@ public class ComparableVersion
  * @param args the version strings to parse and compare. You can pass 
arbitrary number of version strings and always
  * two adjacent will be compared
  */
+// CHECKSTYLE_ON: LineLength
 public static void main( String... args )
 {
 System.out.println( "Display parameters as parsed by Maven (in 
canonical form) and comparison result:" );

[01/18] maven git commit: Added some javadoc [Forced Update!]

[khmarbaise]

Repository: maven
Updated Branches:
  refs/heads/MNG-6123-detect-self-references 4992690ed -> 5194216e2 (forced 
update)


Added some javadoc

Added javadoc help for making easier to compare two versions in command line.

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

Branch: refs/heads/MNG-6123-detect-self-references
Commit: 10a18cfee7a981a41c1f571ef3c60138d40e839e
Parents: 181b021
Author: LuboVarga 
Authored: Mon Mar 13 13:23:04 2017 +0100
Committer: GitHub 
Committed: Mon Mar 13 13:23:04 2017 +0100

--
 .../maven/artifact/versioning/ComparableVersion.java   | 13 -
 1 file changed, 12 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/10a18cfe/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
--
diff --git 
a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
 
b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
index 5222871..0ae4acb 100644
--- 
a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
+++ 
b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
@@ -472,8 +472,19 @@ public class ComparableVersion
 
 /**
  * Main to test version parsing and comparison.
+ * 
+ * To check how "1.2.7" compares to "1.2-SNAPSHOT" for example, you can 
issue
+ * java -cp 
~/.m2/repository/org/apache/maven/maven-artifact/3.3.9/maven-artifact-3.3.9.jar 
org.apache.maven.artifact.versioning.ComparableVersion "1.2.7" 
"1.2-SNAPSHOT"
+ * command to commandline. Result of given command will be something like 
this:
+ *  1.2-SNAPSHOT
+ * 2. 1.2-SNAPSHOT == 1.2-snapshot
+ * 
  *
- * @param args the version strings to parse and compare
+ * @param args the version strings to parse and compare. You can pass 
arbitrary number of version strings and always
+ * two adjacent will be compared
  */
 public static void main( String... args )
 {

[07/18] maven git commit: [MNG-6149] MetadataResolutionResult#getGraph() never resolves request type 'test'

[khmarbaise]

[MNG-6149] MetadataResolutionResult#getGraph() never resolves request type 
'test'


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

Branch: refs/heads/MNG-6123-detect-self-references
Commit: f7d4bce23324cd4a318486d8715a128cf7436c3a
Parents: 3938817
Author: Michael Osipov 
Authored: Fri Apr 21 22:57:53 2017 +0200
Committer: Michael Osipov 
Committed: Fri Apr 21 22:57:53 2017 +0200

--
 .../apache/maven/repository/metadata/MetadataResolutionResult.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/f7d4bce2/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java
--
diff --git 
a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java
 
b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java
index 814b66c..74a3427 100644
--- 
a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java
+++ 
b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java
@@ -115,7 +115,7 @@ public class MetadataResolutionResult
 {
 return conflictResolver.resolveConflicts( getGraph(), 
ArtifactScopeEnum.runtime );
 }
-else if ( requestType.equals( 
MetadataResolutionRequestTypeEnum.classpathRuntime ) )
+else if ( requestType.equals( 
MetadataResolutionRequestTypeEnum.classpathTest ) )
 {
 return conflictResolver.resolveConflicts( getGraph(), 
ArtifactScopeEnum.test );
 }

[05/18] maven git commit: MNG-6210 allow maven custom guice scopes in .mvn/extensions

[khmarbaise]

MNG-6210 allow maven custom guice scopes in .mvn/extensions

Signed-off-by: Igor Fedorenko 


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

Branch: refs/heads/MNG-6123-detect-self-references
Commit: c2c6259de6f1262d9b31509b8c30844a386a4f29
Parents: ec629f7
Author: Igor Fedorenko 
Authored: Thu Apr 13 12:58:29 2017 -0700
Committer: Igor Fedorenko 
Committed: Fri Apr 14 10:38:45 2017 -0700

--
 .../src/main/java/org/apache/maven/cli/MavenCli.java | 8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/c2c6259d/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
--
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java 
b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
index 877b88b..79ab45d 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
@@ -56,6 +56,7 @@ import org.apache.maven.execution.MavenExecutionRequest;
 import org.apache.maven.execution.MavenExecutionRequestPopulationException;
 import org.apache.maven.execution.MavenExecutionRequestPopulator;
 import org.apache.maven.execution.MavenExecutionResult;
+import org.apache.maven.execution.scope.internal.MojoExecutionScopeModule;
 import org.apache.maven.extension.internal.CoreExports;
 import org.apache.maven.extension.internal.CoreExtensionEntry;
 import org.apache.maven.lifecycle.LifecycleExecutionException;
@@ -63,6 +64,7 @@ import org.apache.maven.model.building.ModelProcessor;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.properties.internal.EnvironmentUtils;
 import org.apache.maven.properties.internal.SystemProperties;
+import org.apache.maven.session.scope.internal.SessionScopeModule;
 import org.apache.maven.shared.utils.logging.MessageBuilder;
 import org.apache.maven.shared.utils.logging.MessageUtils;
 import org.apache.maven.toolchain.building.DefaultToolchainsBuildingRequest;
@@ -684,20 +686,20 @@ public class MavenCli
 
 // NOTE: To avoid inconsistencies, we'll use the TCCL exclusively for 
lookups
 container.setLookupRealm( null );
+Thread.currentThread().setContextClassLoader( 
container.getContainerRealm() );
 
 container.setLoggerManager( plexusLoggerManager );
 
 for ( CoreExtensionEntry extension : extensions )
 {
-container.discoverComponents( extension.getClassRealm() );
+container.discoverComponents( extension.getClassRealm(), new 
SessionScopeModule( container ),
+  new MojoExecutionScopeModule( 
container ) );
 }
 
 customizeContainer( container );
 
 container.getLoggerManager().setThresholds( 
cliRequest.request.getLoggingLevel() );
 
-Thread.currentThread().setContextClassLoader( 
container.getContainerRealm() );
-
 eventSpyDispatcher = container.lookup( EventSpyDispatcher.class );
 
 DefaultEventSpyContext eventSpyContext = new DefaultEventSpyContext();

[06/18] maven git commit: Doc improvement in simplelogger.properties

[khmarbaise]

Doc improvement in simplelogger.properties


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

Branch: refs/heads/MNG-6123-detect-self-references
Commit: 3938817fd3e0ad62efe335307406e70bff876834
Parents: c2c6259
Author: Michael Osipov 
Authored: Fri Apr 21 22:50:11 2017 +0200
Committer: Michael Osipov 
Committed: Fri Apr 21 22:50:11 2017 +0200

--
 apache-maven/src/conf/logging/simplelogger.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/3938817f/apache-maven/src/conf/logging/simplelogger.properties
--
diff --git a/apache-maven/src/conf/logging/simplelogger.properties 
b/apache-maven/src/conf/logging/simplelogger.properties
index eb3d049..8dea717 100644
--- a/apache-maven/src/conf/logging/simplelogger.properties
+++ b/apache-maven/src/conf/logging/simplelogger.properties
@@ -24,8 +24,8 @@ org.slf4j.simpleLogger.levelInBrackets=true
 org.slf4j.simpleLogger.log.Sisu=info
 org.slf4j.simpleLogger.warnLevelString=WARNING
 
-# MNG-6181: mvn -X also prints all debug logging from http-client
+# MNG-6181: mvn -X also prints all debug logging from HttpClient
 # Be aware that the shaded packages are used
 # org.apache.http -> org.apache.maven.wagon.providers.http.httpclient
 org.slf4j.simpleLogger.log.org.apache.maven.wagon.providers.http.httpclient=off
-org.slf4j.simpleLogger.log.org.apache.maven.wagon.providers.http.httpclient.wire=off
\ No newline at end of file
+org.slf4j.simpleLogger.log.org.apache.maven.wagon.providers.http.httpclient.wire=off

[13/18] maven git commit: [MNG-5935] Optional true getting lost in managed dependencies when transitive

[khmarbaise]

[MNG-5935] Optional true getting lost in managed dependencies when transitive

Updated to correctly map the optional flag of Maven model dependencies to
Aether dependencies. Prior to this change all managed dependencies implicitly
had the optional flag set to 'false' leading to Aether managing that flag to
'false' on all managed dependencies when transitive.


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

Branch: refs/heads/MNG-6123-detect-self-references
Commit: f4ede96fd06c8d3e1e2b2fb679baec058cce30e1
Parents: fd988e7
Author: Christian Schulte 
Authored: Thu Feb 11 08:45:19 2016 +0100
Committer: Michael Osipov 
Committed: Wed May 10 10:36:19 2017 +0200

--
 .../src/main/java/org/apache/maven/RepositoryUtils.java   | 7 ++-
 .../repository/internal/ArtifactDescriptorReaderDelegate.java | 6 +-
 2 files changed, 11 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/f4ede96f/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
--
diff --git a/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java 
b/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
index 86eab4e..52442b7 100644
--- a/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
+++ b/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
@@ -316,7 +316,12 @@ public class RepositoryUtils
 exclusions.add( toExclusion( exclusion ) );
 }
 
-Dependency result = new Dependency( artifact, dependency.getScope(), 
dependency.isOptional(), exclusions );
+Dependency result = new Dependency( artifact,
+dependency.getScope(),
+dependency.getOptional() != null
+? dependency.isOptional()
+: null,
+exclusions );
 
 return result;
 }

http://git-wip-us.apache.org/repos/asf/maven/blob/f4ede96f/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java
--
diff --git 
a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java
 
b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java
index 42060b4..8219205 100644
--- 
a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java
+++ 
b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java
@@ -124,7 +124,11 @@ public class ArtifactDescriptorReaderDelegate
 exclusions.add( convert( exclusion ) );
 }
 
-Dependency result = new Dependency( artifact, dependency.getScope(), 
dependency.isOptional(), exclusions );
+Dependency result = new Dependency( artifact, dependency.getScope(),
+dependency.getOptional() != null
+? dependency.isOptional()
+: null,
+exclusions );
 
 return result;
 }

[04/18] maven git commit: MNG-6209 better executeMojo thread context classloader

[khmarbaise]

MNG-6209 better executeMojo thread context classloader

Signed-off-by: Igor Fedorenko 


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

Branch: refs/heads/MNG-6123-detect-self-references
Commit: ec629f7d511eb910b4e80112a9fbe85ed8786f10
Parents: 567af0d
Author: Igor Fedorenko 
Authored: Tue Apr 11 07:59:34 2017 -0700
Committer: Igor Fedorenko 
Committed: Thu Apr 13 14:12:23 2017 -0700

--
 .../java/org/apache/maven/plugin/DefaultBuildPluginManager.java | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/ec629f7d/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java
 
b/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java
index b4f7a4d..3af1125 100644
--- 
a/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java
+++ 
b/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java
@@ -106,8 +106,11 @@ public class DefaultBuildPluginManager
 throw new PluginExecutionException( mojoExecution, project, e );
 }
 
+// use project realm as thread context classloader to enable 
components from all extensions=true plugins
+ClassRealm tccl = mojoExecution.getPlugin().isExtensions() ? 
project.getClassRealm() : pluginRealm;
+
 ClassLoader oldClassLoader = 
Thread.currentThread().getContextClassLoader();
-Thread.currentThread().setContextClassLoader( pluginRealm );
+Thread.currentThread().setContextClassLoader( tccl );
 
 MavenSession oldSession = legacySupport.getSession();
 

[11/18] maven git commit: [MNG-6186] use enhanced HawtJNI library loading (remove previous hack)

[khmarbaise]

[MNG-6186] use enhanced HawtJNI library loading (remove previous hack)

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

Branch: refs/heads/MNG-6123-detect-self-references
Commit: 6182a2083fdb9964ccb5250fb85223e38485bf04
Parents: 2a79d1e
Author: Hervé Boutemy 
Authored: Sat May 6 18:28:04 2017 +0200
Committer: Hervé Boutemy 
Committed: Tue May 9 21:08:13 2017 +0200

--
 apache-maven/src/bin/mvn|  4 +-
 apache-maven/src/bin/mvn.cmd|  1 +
 .../java/org/apache/maven/cli/MavenCli.java | 59 
 3 files changed, 4 insertions(+), 60 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/6182a208/apache-maven/src/bin/mvn
--
diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn
index eedd344..525b2ef 100755
--- a/apache-maven/src/bin/mvn
+++ b/apache-maven/src/bin/mvn
@@ -193,5 +193,7 @@ exec "$JAVACMD" \
   $MAVEN_DEBUG_OPTS \
   -classpath "${CLASSWORLDS_JAR}" \
   "-Dclassworlds.conf=${MAVEN_HOME}/bin/m2.conf" \
-  "-Dmaven.home=${MAVEN_HOME}" 
"-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+  "-Dmaven.home=${MAVEN_HOME}" \
+  "-Dlibrary.jansi.path=${MAVEN_HOME}/jansi-native" \
+  "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
   ${CLASSWORLDS_LAUNCHER} "$@"

http://git-wip-us.apache.org/repos/asf/maven/blob/6182a208/apache-maven/src/bin/mvn.cmd
--
diff --git a/apache-maven/src/bin/mvn.cmd b/apache-maven/src/bin/mvn.cmd
index bfcc1b5..ba61f80 100644
--- a/apache-maven/src/bin/mvn.cmd
+++ b/apache-maven/src/bin/mvn.cmd
@@ -181,6 +181,7 @@ set 
CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
   -classpath %CLASSWORLDS_JAR% ^
   "-Dclassworlds.conf=%MAVEN_HOME%\bin\m2.conf" ^
   "-Dmaven.home=%MAVEN_HOME%" ^
+  "-Dlibrary.jansi.path=%MAVEN_HOME%\jansi-native" ^
   "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^
   %CLASSWORLDS_LAUNCHER% %MAVEN_CMD_LINE_ARGS%
 if ERRORLEVEL 1 goto error

http://git-wip-us.apache.org/repos/asf/maven/blob/6182a208/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
--
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java 
b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
index 79ab45d..e1e58c8 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
@@ -188,7 +188,6 @@ public class MavenCli
 {
 MavenCli cli = new MavenCli();
 
-prepareJansiNative();
 MessageUtils.systemInstall();
 int result = cli.doMain( new CliRequest( args, classWorld ) );
 MessageUtils.systemUninstall();
@@ -196,64 +195,6 @@ public class MavenCli
 return result;
 }
 
-/**
- * temporary method while improvement reported to JAnsi+HawtJNI and 
integrated:
- * library.jansi.path should point to lib/jansi-native and HawtJNI should 
be able to detect
- * the platform instead of forcing the user having to point 
library.jansi.path to
- * lib/jansi-native/[platform]
- */
-private static void prepareJansiNative()
-{
-if ( System.getProperty( "library.jansi.path" ) == null )
-{
-String mavenHome = System.getProperty( "maven.home" );
-
-if ( mavenHome != null )
-{
-File jansiNative = new File( mavenHome, "lib/jansi-native/" + 
hawtJNIgetPlatform() );
-System.setProperty( "library.jansi.path", 
jansiNative.getAbsolutePath() );
-}
-}
-}
-
-private static String hawtJNIgetOperatingSystem()
-{
-String name = System.getProperty( "os.name" ).toLowerCase().trim();
-if ( name.startsWith( "linux" ) )
-{
-return "linux";
-}
-if ( name.startsWith( "mac os x" ) )
-{
-return "osx";
-}
-if ( name.startsWith( "win" ) )
-{
-return "windows";
-}
-return name.replaceAll( "\\W+", "_" );
-
-}
-
-private static String hawtJNIgetPlatform()
-{
-return hawtJNIgetOperatingSystem() + hawtJNIgetBitModel();
-}
-
-private static int hawtJNIgetBitModel()
-{
-String prop = System.getProperty( "sun.arch.data.model" );
-if ( prop == null )
-{
-prop = System.getProperty( 

[16/18] maven git commit: MNG-6233 don't mix plexus and jsr330 annotations in aether-provider

[khmarbaise]

MNG-6233 don't mix plexus and jsr330 annotations in aether-provider

Signed-off-by: Igor Fedorenko 


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

Branch: refs/heads/MNG-6123-detect-self-references
Commit: 66fc74d6296ea0a33f8a9712dc5ed5eb3affd529
Parents: 4463498
Author: Igor Fedorenko 
Authored: Tue Mar 28 08:41:38 2017 -0400
Committer: Igor Fedorenko 
Committed: Wed May 24 15:33:04 2017 -0400

--
 maven-resolver-provider/pom.xml|  8 ++--
 .../internal/DefaultArtifactDescriptorReader.java  | 13 +++--
 .../internal/DefaultVersionRangeResolver.java  |  9 ++---
 .../repository/internal/DefaultVersionResolver.java|  9 ++---
 .../internal/SnapshotMetadataGeneratorFactory.java |  7 +--
 .../internal/VersionsMetadataGeneratorFactory.java |  7 +--
 6 files changed, 19 insertions(+), 34 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/66fc74d6/maven-resolver-provider/pom.xml
--
diff --git a/maven-resolver-provider/pom.xml b/maven-resolver-provider/pom.xml
index 0d1b481..53e67e5 100644
--- a/maven-resolver-provider/pom.xml
+++ b/maven-resolver-provider/pom.xml
@@ -64,10 +64,6 @@ under the License.
 
 
   org.codehaus.plexus
-  plexus-component-annotations
-
-
-  org.codehaus.plexus
   plexus-utils
 
 
@@ -125,8 +121,8 @@ under the License.
   
 
   
-org.codehaus.plexus
-plexus-component-metadata
+org.eclipse.sisu
+sisu-maven-plugin
   
 
   

http://git-wip-us.apache.org/repos/asf/maven/blob/66fc74d6/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
--
diff --git 
a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
 
b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
index 82e1284..7ccdc05 100644
--- 
a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
+++ 
b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
@@ -26,6 +26,7 @@ import java.util.Set;
 
 import javax.inject.Inject;
 import javax.inject.Named;
+import javax.inject.Singleton;
 
 import org.apache.commons.lang3.Validate;
 import org.apache.maven.model.DistributionManagement;
@@ -39,8 +40,6 @@ import org.apache.maven.model.building.ModelBuildingException;
 import org.apache.maven.model.building.ModelBuildingRequest;
 import org.apache.maven.model.building.ModelProblem;
 import org.apache.maven.model.resolution.UnresolvableModelException;
-import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.component.annotations.Requirement;
 import org.eclipse.aether.RepositoryEvent;
 import org.eclipse.aether.RepositoryEvent.EventType;
 import org.eclipse.aether.RepositoryException;
@@ -77,31 +76,24 @@ import 
org.eclipse.aether.transfer.ArtifactNotFoundException;
  * @author Benjamin Bentmann
  */
 @Named
-@Component( role = ArtifactDescriptorReader.class )
+@Singleton
 public class DefaultArtifactDescriptorReader
 implements ArtifactDescriptorReader, Service
 {
 
 @SuppressWarnings( "unused" )
-@Requirement( role = LoggerFactory.class )
 private Logger logger = NullLoggerFactory.LOGGER;
 
-@Requirement
 private RemoteRepositoryManager remoteRepositoryManager;
 
-@Requirement
 private VersionResolver versionResolver;
 
-@Requirement
 private VersionRangeResolver versionRangeResolver;
 
-@Requirement
 private ArtifactResolver artifactResolver;
 
-@Requirement
 private RepositoryEventDispatcher repositoryEventDispatcher;
 
-@Requirement
 private ModelBuilder modelBuilder;
 
 public DefaultArtifactDescriptorReader()
@@ -117,6 +109,7 @@ public class DefaultArtifactDescriptorReader
 {
 setRemoteRepositoryManager( remoteRepositoryManager );
 setVersionResolver( versionResolver );
+setVersionRangeResolver( versionRangeResolver );
 setArtifactResolver( artifactResolver );
 setModelBuilder( modelBuilder );
 setLoggerFactory( loggerFactory );

[02/18] maven git commit: Improve Javadoc of ComparableVersion#main()

[khmarbaise]

Improve Javadoc of ComparableVersion#main()

This closes #108


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

Branch: refs/heads/MNG-6123-detect-self-references
Commit: 6a93bbea23e362c9cea7d710a37556258c2dbd47
Parents: 08f3c76 10a18cf
Author: Lubomir Varga 
Authored: Tue Apr 11 16:00:42 2017 +0200
Committer: Michael Osipov 
Committed: Tue Apr 11 16:02:21 2017 +0200

--
 .../maven/artifact/versioning/ComparableVersion.java   | 13 -
 1 file changed, 12 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/6a93bbea/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
--
diff --cc 
maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
index 5222871,0ae4acb..e1fc5f0
--- 
a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
+++ 
b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
@@@ -472,8 -472,19 +472,19 @@@ public class ComparableVersio
  
  /**
   * Main to test version parsing and comparison.
+  * 
 - * To check how "1.2.7" compares to "1.2-SNAPSHOT" for example, you can 
issue
 - * java -cp 
~/.m2/repository/org/apache/maven/maven-artifact/3.3.9/maven-artifact-3.3.9.jar 
org.apache.maven.artifact.versioning.ComparableVersion "1.2.7" 
"1.2-SNAPSHOT"
 - * command to commandline. Result of given command will be something like 
this:
 - * java -cp 
${maven.repo.local}/org/apache/maven/maven-artifact/${maven.version}/maven-artifact-${maven.version}.jar
 org.apache.maven.artifact.versioning.ComparableVersion "1.2.7" 
"1.2-SNAPSHOT"
++ * command to command line. Result of given command will be something 
like this:
++ * 
+  * Display parameters as parsed by Maven (in canonical form) and 
comparison result:
+  * 1. 1.2.7 == 1.2.7
 - *1.2.7 > 1.2-SNAPSHOT
++ *1.2.7  1.2-SNAPSHOT
+  * 2. 1.2-SNAPSHOT == 1.2-snapshot
+  * 
   *
-  * @param args the version strings to parse and compare
+  * @param args the version strings to parse and compare. You can pass 
arbitrary number of version strings and always
+  * two adjacent will be compared
   */
  public static void main( String... args )
  {

[10/18] maven git commit: [MNG-6205] upgraded JAnsi to 1.16 for console encoding fix

[khmarbaise]

[MNG-6205] upgraded JAnsi to 1.16 for console encoding fix

also fixes MNG-6218 MinGW bash detection fixed by JAnsi 1.14

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

Branch: refs/heads/MNG-6123-detect-self-references
Commit: 2a79d1e71edc0ddd0c0ba1612ce520f43961eef2
Parents: 2d44015
Author: Hervé Boutemy 
Authored: Sat May 6 18:25:36 2017 +0200
Committer: Hervé Boutemy 
Committed: Tue May 9 21:08:04 2017 +0200

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/2a79d1e7/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 2962487..e16d93b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -277,7 +277,7 @@ under the License.
   
 org.fusesource.jansi
 jansi
-1.13
+1.16
   
   
 org.slf4j

[17/18] maven git commit: [MNG-6084] Support JSR 250 annotations

[khmarbaise]

[MNG-6084] Support JSR 250 annotations


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

Branch: refs/heads/MNG-6123-detect-self-references
Commit: a7dddcb87626fec256f1b8ccbe957f94cdf401e4
Parents: 66fc74d
Author: Dan Tran 
Authored: Sun Sep 11 21:07:39 2016 -0700
Committer: Michael Osipov 
Committed: Thu May 25 20:05:35 2017 +0200

--
 maven-core/src/main/resources/META-INF/maven/extension.xml| 3 +++
 maven-embedder/pom.xml| 4 
 .../src/main/java/org/apache/maven/cli/MavenCli.java  | 7 ---
 pom.xml   | 5 +
 4 files changed, 16 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/a7dddcb8/maven-core/src/main/resources/META-INF/maven/extension.xml
--
diff --git a/maven-core/src/main/resources/META-INF/maven/extension.xml 
b/maven-core/src/main/resources/META-INF/maven/extension.xml
index 1d24d92..1f0b95f 100644
--- a/maven-core/src/main/resources/META-INF/maven/extension.xml
+++ b/maven-core/src/main/resources/META-INF/maven/extension.xml
@@ -98,6 +98,8 @@ under the License.
 javax.enterprise.util.*
 javax.enterprise.inject.*
 
+
+javax.annotation.*
 
 

[12/18] maven git commit: [MNG-6228] Optionality not displayed in dependency tree when run in debug mode

[khmarbaise]

[MNG-6228] Optionality not displayed in dependency tree when run in debug mode

Log message in DefaultProjectDependenciesResolver has been extended with
"(optional)" if dependency is marked as optional (direct or transitive).


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

Branch: refs/heads/MNG-6123-detect-self-references
Commit: fd988e78e95a53c3a39ec944869ba62b0c7fc0f0
Parents: 6182a20
Author: Michael Osipov 
Authored: Tue May 9 22:15:21 2017 +0200
Committer: Michael Osipov 
Committed: Tue May 9 22:15:21 2017 +0200

--
 .../maven/project/DefaultProjectDependenciesResolver.java   | 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/fd988e78/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
 
b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
index 5a803af..4e26de2 100644
--- 
a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
+++ 
b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
@@ -295,6 +295,11 @@ public class DefaultProjectDependenciesResolver
 //  The resolver 1.0.x releases do not record 
premanaged state of properties.
 buffer.append( " (properties managed)" );
 }
+
+if ( dep.isOptional() )
+{
+buffer.append( " (optional)" );
+}
 }
 else
 {

[08/18] maven git commit: Add a ProjectArtifactsCache similar to PluginArtifactsCache

[khmarbaise]

Add a ProjectArtifactsCache similar to PluginArtifactsCache

Signed-off-by: Jason van Zyl 

closes #82


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

Branch: refs/heads/MNG-6123-detect-self-references
Commit: be223808939d75152d7157db33d45f230114555e
Parents: f7d4bce
Author: Anton Tanasenko 
Authored: Wed May 18 18:40:28 2016 +0300
Committer: Karl Heinz Marbaise 
Committed: Fri May 5 22:08:16 2017 +0200

--
 .../internal/LifecycleDependencyResolver.java   |  34 ++-
 .../plugin/DefaultProjectArtifactsCache.java| 256 +++
 .../maven/plugin/ProjectArtifactsCache.java |  90 +++
 3 files changed, 377 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/be223808/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java
 
b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java
index 0d42aeb..504274f 100644
--- 
a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java
+++ 
b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java
@@ -37,6 +37,7 @@ import org.apache.maven.artifact.ArtifactUtils;
 import org.apache.maven.eventspy.internal.EventSpyDispatcher;
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.lifecycle.LifecycleExecutionException;
+import org.apache.maven.plugin.ProjectArtifactsCache;
 import org.apache.maven.project.DefaultDependencyResolutionRequest;
 import org.apache.maven.project.DependencyResolutionException;
 import org.apache.maven.project.DependencyResolutionResult;
@@ -75,6 +76,9 @@ public class LifecycleDependencyResolver
 
 @Inject
 private EventSpyDispatcher eventSpyDispatcher;
+
+@Inject
+private ProjectArtifactsCache projectArtifactsCache;
 
 public LifecycleDependencyResolver()
 {
@@ -123,9 +127,33 @@ public class LifecycleDependencyResolver
 throw new LifecycleExecutionException( e );
 }
 }
-
-Set artifacts =
-getDependencies( project, scopesToCollect, scopesToResolve, 
session, aggregating, projectArtifacts );
+
+Set artifacts;
+ProjectArtifactsCache.Key cacheKey = 
projectArtifactsCache.createKey( project,  scopesToCollect, 
+scopesToResolve, aggregating, session.getRepositorySession() );
+ProjectArtifactsCache.CacheRecord recordArtifacts;
+recordArtifacts = projectArtifactsCache.get( cacheKey );
+
+if ( recordArtifacts != null )
+{
+artifacts = recordArtifacts.artifacts;
+}
+else
+{
+try
+{
+artifacts = getDependencies( project, scopesToCollect, 
scopesToResolve, session, aggregating, 
+projectArtifacts );
+recordArtifacts = projectArtifactsCache.put( cacheKey, 
artifacts );
+}
+catch ( LifecycleExecutionException e )
+{
+  projectArtifactsCache.put( cacheKey, e );
+  projectArtifactsCache.register( project, cacheKey, 
recordArtifacts );
+throw e;
+}
+}
+projectArtifactsCache.register( project, cacheKey, recordArtifacts 
);
 
 project.setResolvedArtifacts( artifacts );
 

http://git-wip-us.apache.org/repos/asf/maven/blob/be223808/maven-core/src/main/java/org/apache/maven/plugin/DefaultProjectArtifactsCache.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/plugin/DefaultProjectArtifactsCache.java
 
b/maven-core/src/main/java/org/apache/maven/plugin/DefaultProjectArtifactsCache.java
new file mode 100644
index 000..1eaa627
--- /dev/null
+++ 
b/maven-core/src/main/java/org/apache/maven/plugin/DefaultProjectArtifactsCache.java
@@ -0,0 +1,256 @@
+package org.apache.maven.plugin;
+
+/*
+ * 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
+ 

[09/18] maven git commit: [MNG-6223] support -f path/to/dir when detecting .mvn

[khmarbaise]

[MNG-6223] support -f path/to/dir when detecting .mvn

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

Branch: refs/heads/MNG-6123-detect-self-references
Commit: 2d4401557c3c870409e8b1c65d2dcc9a68281cae
Parents: be22380
Author: Hervé Boutemy 
Authored: Sat May 6 18:15:42 2017 +0200
Committer: Hervé Boutemy 
Committed: Tue May 9 21:07:41 2017 +0200

--
 apache-maven/src/bin/mvn | 4 +++-
 apache-maven/src/bin/mvn.cmd | 6 +-
 2 files changed, 8 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/2d440155/apache-maven/src/bin/mvn
--
diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn
index 623b5f2..eedd344 100755
--- a/apache-maven/src/bin/mvn
+++ b/apache-maven/src/bin/mvn
@@ -141,7 +141,9 @@ find_file_argument_basedir() {
   found_file_switch=0
   for arg in "$@"; do
 if [ ${found_file_switch} -eq 1 ]; then
-  if [ -f "${arg}" ]; then
+  if [ -d "${arg}" ]; then
+basedir=`cd "${arg}" && pwd -P`
+  elif [ -f "${arg}" ]; then
 basedir=`dirname "${arg}"`
 basedir=`cd "${basedir}" && pwd -P`
 if [ ! -d "${basedir}" ]; then

http://git-wip-us.apache.org/repos/asf/maven/blob/2d440155/apache-maven/src/bin/mvn.cmd
--
diff --git a/apache-maven/src/bin/mvn.cmd b/apache-maven/src/bin/mvn.cmd
index 9d92279..bfcc1b5 100644
--- a/apache-maven/src/bin/mvn.cmd
+++ b/apache-maven/src/bin/mvn.cmd
@@ -120,7 +120,11 @@ if not exist "%FILE_ARG%" (
   echo POM file %FILE_ARG% specified the -f/--file command-line argument does 
not exist >&2
   goto error
 )
-call :get_directory_from_file "%FILE_ARG%"
+if exist "%FILE_ARG%\*" (
+  set "POM_DIR=%FILE_ARG%"
+) else (
+  call :get_directory_from_file "%FILE_ARG%"
+)
 if not exist "%POM_DIR%" (
   echo Directory %POM_DIR% extracted from the -f/--file command-line argument 
%FILE_ARG% does not exist >&2
   goto error

[03/18] maven git commit: use "java -jar" command

[khmarbaise]

use "java -jar" command

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

Branch: refs/heads/MNG-6123-detect-self-references
Commit: 567af0d964cf823b275300aa4671b84a28da5baa
Parents: 6a93bbe
Author: Hervé Boutemy 
Authored: Wed Apr 12 03:59:44 2017 +0200
Committer: Hervé Boutemy 
Committed: Wed Apr 12 03:59:44 2017 +0200

--
 .../apache/maven/artifact/versioning/ComparableVersion.java| 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/567af0d9/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
--
diff --git 
a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
 
b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
index e1fc5f0..105d9b5 100644
--- 
a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
+++ 
b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
@@ -470,11 +470,12 @@ public class ComparableVersion
 return canonical.hashCode();
 }
 
+// CHECKSTYLE_OFF: LineLength
 /**
  * Main to test version parsing and comparison.
  * 
- * Checks how "1.2.7" compares to "1.2-SNAPSHOT", for example, you can 
issue
- * java -cp 
${maven.repo.local}/org/apache/maven/maven-artifact/${maven.version}/maven-artifact-${maven.version}.jar
 org.apache.maven.artifact.versioning.ComparableVersion "1.2.7" 
"1.2-SNAPSHOT"
+ * To check how "1.2.7" compares to "1.2-SNAPSHOT", for example, you can 
issue
+ * java -jar 
${maven.repo.local}/org/apache/maven/maven-artifact/${maven.version}/maven-artifact-${maven.version}.jar
 "1.2.7" "1.2-SNAPSHOT"
  * command to command line. Result of given command will be something like 
this:
  * 
  * Display parameters as parsed by Maven (in canonical form) and 
comparison result:
@@ -486,6 +487,7 @@ public class ComparableVersion
  * @param args the version strings to parse and compare. You can pass 
arbitrary number of version strings and always
  * two adjacent will be compared
  */
+// CHECKSTYLE_ON: LineLength
 public static void main( String... args )
 {
 System.out.println( "Display parameters as parsed by Maven (in 
canonical form) and comparison result:" );

[15/18] maven git commit: improved modello and animal sniffer's execution ids

[khmarbaise]

improved modello and animal sniffer's execution ids

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

Branch: refs/heads/MNG-6123-detect-self-references
Commit: 44634982a103a696d18619346756b1adaf3dbfd9
Parents: ecef59f
Author: Hervé Boutemy 
Authored: Sun May 21 19:14:54 2017 +0200
Committer: Hervé Boutemy 
Committed: Sun May 21 19:14:54 2017 +0200

--
 maven-core/pom.xml   | 2 +-
 maven-model/pom.xml  | 2 +-
 maven-plugin-api/pom.xml | 2 +-
 pom.xml  | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/44634982/maven-core/pom.xml
--
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index 717e2a5..6cd8d85 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -214,7 +214,7 @@ under the License.
 
 
   
-plugin-site-doc
+modello-site-doc
 pre-site
 
   xdoc

http://git-wip-us.apache.org/repos/asf/maven/blob/44634982/maven-model/pom.xml
--
diff --git a/maven-model/pom.xml b/maven-model/pom.xml
index aabb25d..581e927 100644
--- a/maven-model/pom.xml
+++ b/maven-model/pom.xml
@@ -61,7 +61,7 @@ under the License.
 
 
   
-standard
+modello
 
   java
   xpp3-reader

http://git-wip-us.apache.org/repos/asf/maven/blob/44634982/maven-plugin-api/pom.xml
--
diff --git a/maven-plugin-api/pom.xml b/maven-plugin-api/pom.xml
index cf7e0ef..271404f 100644
--- a/maven-plugin-api/pom.xml
+++ b/maven-plugin-api/pom.xml
@@ -75,7 +75,7 @@ under the License.
 
 
   
-plugin-site-doc
+modello-site-doc
 pre-site
 
   xdoc

http://git-wip-us.apache.org/repos/asf/maven/blob/44634982/pom.xml
--
diff --git a/pom.xml b/pom.xml
index ce84168..5e12e36 100644
--- a/pom.xml
+++ b/pom.xml
@@ -465,7 +465,7 @@ under the License.
   ${modelloVersion}
   
 
-  site-docs
+  modello-site-docs
   pre-site
   
 xdoc
@@ -473,7 +473,7 @@ under the License.
   
 
 
-  standard
+  modello
   
 java
 xpp3-reader
@@ -567,7 +567,7 @@ under the License.
 
 
   
-check-java-1.6-compat
+check-java-compat
 process-classes
 
   check

[18/18] maven git commit: [MNG-6123] detect self references in POM and fail fast o Added unit test and self referencing pom

[khmarbaise]

[MNG-6123] detect self references in POM and fail fast
 o Added unit test and self referencing pom


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

Branch: refs/heads/MNG-6123-detect-self-references
Commit: 5194216e248ca10c68e5897ef0be3c1466ba19b9
Parents: a7dddcb
Author: Karl Heinz Marbaise 
Authored: Tue Apr 4 22:46:11 2017 +0200
Committer: Karl Heinz Marbaise 
Committed: Sun Jun 4 20:04:35 2017 +0200

--
 .../model/validation/DefaultModelValidator.java | 49 ++--
 .../validation/DefaultModelValidatorTest.java   | 12 +
 .../validation/raw-model/self-referencing.xml   | 38 +++
 3 files changed, 96 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/5194216e/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
--
diff --git 
a/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
 
b/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
index e790f21..9af8096 100644
--- 
a/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
+++ 
b/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
@@ -131,6 +131,9 @@ public class DefaultModelValidator
 
 validate20RawDependencies( problems, m.getDependencies(), 
"dependencies.dependency", request );
 
+validate20RawDependenciesSelfReferencing( problems, m, 
m.getDependencies(), "dependencies.dependency",
+  request );
+
 if ( m.getDependencyManagement() != null )
 {
 validate20RawDependencies( problems, 
m.getDependencyManagement().getDependencies(),
@@ -344,12 +347,12 @@ public class DefaultModelValidator
 
 Severity errOn30 = getSeverity( request, 
ModelBuildingRequest.VALIDATION_LEVEL_MAVEN_3_0 );
 
-validateEffectiveDependencies( problems, m.getDependencies(), false, 
request );
+validateEffectiveDependencies( problems, m, m.getDependencies(), 
false, request );
 
 DependencyManagement mgmt = m.getDependencyManagement();
 if ( mgmt != null )
 {
-validateEffectiveDependencies( problems, mgmt.getDependencies(), 
true, request );
+validateEffectiveDependencies( problems, m, 
mgmt.getDependencies(), true, request );
 }
 
 if ( request.getValidationLevel() >= 
ModelBuildingRequest.VALIDATION_LEVEL_MAVEN_2_0 )
@@ -511,7 +514,28 @@ public class DefaultModelValidator
 }
 }
 
-private void validateEffectiveDependencies( ModelProblemCollector 
problems, List dependencies,
+private void validate20RawDependenciesSelfReferencing( 
ModelProblemCollector problems, Model m,
+   List 
dependencies, String prefix,
+   
ModelBuildingRequest request )
+{
+for ( Dependency dependency : dependencies )
+{
+String key = dependency.getGroupId() + ":" + 
dependency.getArtifactId() + ":" + dependency.getVersion();
+String mKey = m.getGroupId() + ":" + m.getArtifactId() + ":" + 
m.getVersion();
+if ( key.equals( mKey ) )
+{
+// This means a module which is build has a dependency which 
has the same
+// groupId, artifactId and version coordinates. This is in 
consequence
+// a self reference or in other words a circular reference 
which can not
+// being resolved.
+addViolation( problems, Severity.FATAL, Version.V31, prefix + 
" " + key, key, "is referencing itself.",
+  dependency );
+
+}
+}
+}
+
+private void validateEffectiveDependencies( ModelProblemCollector 
problems, Model m, List dependencies,
 boolean management, 
ModelBuildingRequest request )
 {
 Severity errOn30 = getSeverity( request, 
ModelBuildingRequest.VALIDATION_LEVEL_MAVEN_3_0 );
@@ -538,11 +562,30 @@ public class DefaultModelValidator
  */
 validateEnum( prefix + "scope", problems, 
Severity.WARNING, Version.V20, d.getScope(),
   d.getManagementKey(), d, "provided", 
"compile", "runtime", "test", "system" );
+
+

[14/18] maven git commit: [MNG-6167] Clean up dependency mess (reported by dependency:analyze)

[khmarbaise]

[MNG-6167] Clean up dependency mess (reported by dependency:analyze)

Clean up compile and runtime dependencies. Test dependencies have not been
touched because their seem to be false positives due to DI.


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

Branch: refs/heads/MNG-6123-detect-self-references
Commit: ecef59f1cb822e48c63215fa7dd0c8f4fd54d6af
Parents: f4ede96
Author: Michael Osipov 
Authored: Tue May 16 15:27:22 2017 +0200
Committer: Michael Osipov 
Committed: Tue May 16 15:27:22 2017 +0200

--
 maven-builder-support/pom.xml   |  4 
 maven-compat/pom.xml| 10 +-
 maven-core/pom.xml  | 22 +++---
 maven-embedder/pom.xml  | 30 +-
 maven-model-builder/pom.xml |  1 +
 maven-plugin-api/pom.xml|  8 
 maven-resolver-provider/pom.xml |  8 
 pom.xml | 10 ++
 8 files changed, 76 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/ecef59f1/maven-builder-support/pom.xml
--
diff --git a/maven-builder-support/pom.xml b/maven-builder-support/pom.xml
index 5eb7903..9557731 100644
--- a/maven-builder-support/pom.xml
+++ b/maven-builder-support/pom.xml
@@ -35,10 +35,6 @@ under the License.
 
   
 
-  org.codehaus.plexus
-  plexus-utils
-
-
   org.apache.commons
   commons-lang3
 

http://git-wip-us.apache.org/repos/asf/maven/blob/ecef59f1/maven-compat/pom.xml
--
diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml
index 8392dca..b3cf039 100644
--- a/maven-compat/pom.xml
+++ b/maven-compat/pom.xml
@@ -52,6 +52,10 @@ under the License.
 
 
   org.apache.maven
+  maven-settings-builder
+
+
+  org.apache.maven
   maven-artifact
 
 
@@ -63,6 +67,10 @@ under the License.
   maven-resolver-provider
 
 
+  org.apache.maven
+  maven-repository-metadata
+
+
   org.apache.maven.resolver
   maven-resolver-api
 
@@ -131,5 +139,5 @@ under the License.
   
 
   
-  
+
 

http://git-wip-us.apache.org/repos/asf/maven/blob/ecef59f1/maven-core/pom.xml
--
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index 71f09c0..717e2a5 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -54,6 +54,10 @@ under the License.
 
 
   org.apache.maven
+  maven-builder-support
+
+
+  org.apache.maven
   maven-repository-metadata
 
 
@@ -92,20 +96,28 @@ under the License.
   org.apache.maven.shared
   maven-shared-utils
 
-
 
   org.eclipse.sisu
   org.eclipse.sisu.plexus
 
 
+  org.eclipse.sisu
+  org.eclipse.sisu.inject
+
+
   com.google.inject
   guice
   no_aop
 
 
-  org.codehaus.plexus
-  plexus-interpolation
+  com.google.guava
+  guava
+
+
+  javax.inject
+  javax.inject
 
+
 
   org.codehaus.plexus
   plexus-utils
@@ -119,10 +131,6 @@ under the License.
   plexus-component-annotations
 
 
-  org.sonatype.plexus
-  plexus-sec-dispatcher
-
-
   org.apache.commons
   commons-lang3
 

http://git-wip-us.apache.org/repos/asf/maven/blob/ecef59f1/maven-embedder/pom.xml
--
diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml
index 66e09a3..52e9c82 100644
--- a/maven-embedder/pom.xml
+++ b/maven-embedder/pom.xml
@@ -40,6 +40,10 @@ under the License.
 
 
   org.apache.maven
+  maven-settings-builder
+
+
+  org.apache.maven
   maven-core
 
 
@@ -48,9 +52,17 @@ under the License.
 
 
   org.apache.maven
+  maven-model
+
+
+  org.apache.maven
   maven-model-builder
 
 
+  org.apache.maven
+  maven-builder-support
+
+
   org.apache.maven.resolver
   maven-resolver-api
 
@@ -59,15 +71,23 @@ under the License.
   maven-resolver-util
 
 
-  org.apache.maven
-  maven-compat
-  runtime
-
-
   org.apache.maven.shared
   maven-shared-utils
 
 
+   com.google.inject
+   guice
+   no_aop
+ 
+ 
+  com.google.guava
+  guava
+
+
+  javax.inject
+  javax.inject
+
+
   org.codehaus.plexus
   

svn commit: r1797596 - in /maven/plugins/trunk/maven-checkstyle-plugin/src: it/MCHECKSTYLE-337/ it/MCHECKSTYLE-337/src/ it/MCHECKSTYLE-337/src/main/ it/MCHECKSTYLE-337/src/main/java/ it/MCHECKSTYLE-33

[gboue]

Author: gboue
Date: Sun Jun  4 17:26:27 2017
New Revision: 1797596

URL: http://svn.apache.org/viewvc?rev=1797596=rev
Log:
[MCHECKSTYLE-337] checkstyle:check only supports xml output format, but the 
docs say it supports plain as well
Submitted by: Stig Rohde Døssing

Adding support for 'plain' output file format in the 'check' goal. It is still 
not possible to use it in combination with 'skipExec' because the plain format 
does not interact fully with 'violationIgnore' (which can contain fully 
qualified class name, when Checkstyle plain format only has the class simple 
name).

Added:
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-337/

maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-337/invoker.properties
   (with props)
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-337/pom.xml  
 (with props)
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-337/src/
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-337/src/main/

maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-337/src/main/java/

maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-337/src/main/java/org/

maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-337/src/main/java/org/MyClass.java
   (with props)

maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-337/src/main/java/org/package-info.java
   (with props)

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

maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/CompositeAuditListener.java
   (with props)

maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/check-plugin-plain-output.xml
   (with props)
Modified:

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

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

Added: 
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-337/invoker.properties
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-337/invoker.properties?rev=1797596=auto
==
--- 
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-337/invoker.properties
 (added)
+++ 
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-337/invoker.properties
 Sun Jun  4 17:26:27 2017
@@ -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 = verify
+invoker.buildResult = failure
+invoker.mavenOpts = -Duser.language=en -Duser.country=US -Duser.variant=US

Propchange: 
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-337/invoker.properties
--
svn:eol-style = native

Propchange: 
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-337/invoker.properties
--
svn:keywords = Author Date Id Revision

Added: 
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-337/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-337/pom.xml?rev=1797596=auto
==
--- maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-337/pom.xml 
(added)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-337/pom.xml 
Sun Jun  4 17:26:27 2017
@@ -0,0 +1,59 @@
+
+
+
+http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+  4.0.0
+
+  org.apache.maven.plugins.checkstyle
+  MCHECKSTYLE-337
+  1.0-SNAPSHOT
+  jar
+
+  http://maven.apache.org/
+
+  
+UTF-8
+
NewlineAtEndOfFile
+  
+
+  
+
+  
+org.apache.maven.plugins
+maven-checkstyle-plugin
+@pom.version@
+

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

[hboutemy]

Author: hboutemy
Date: Sun Jun  4 09:04:21 2017
New Revision: 1797562

URL: http://svn.apache.org/viewvc?rev=1797562=rev
Log:
|MINVOKER-220] avoid second space when job name is too long

Modified:

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

Modified: 
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugins/invoker/AbstractInvokerMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugins/invoker/AbstractInvokerMojo.java?rev=1797562=1797561=1797562=diff
==
--- 
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugins/invoker/AbstractInvokerMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugins/invoker/AbstractInvokerMojo.java
 Sun Jun  4 09:04:21 2017
@@ -1616,15 +1616,20 @@ public abstract class AbstractInvokerMoj
 
 buffer.a( "  " );
 buffer.a( buildJob.getProject() );
-buffer.a( ' ' );
 
-int l = 11 + buildJob.getProject().length();
+int l = 10 + buildJob.getProject().length();
 
 if ( l < RESULT_COLUMN )
 {
-for ( int i = RESULT_COLUMN - l; i > 0; i-- )
+buffer.a( ' ' );
+l++;
+
+if ( l < RESULT_COLUMN )
 {
-buffer.a( '.' );
+for ( int i = RESULT_COLUMN - l; i > 0; i-- )
+{
+buffer.a( '.' );
+}
 }
 }
 

svn commit: r1013432 [3/4] - in /websites/staging/maven/trunk/content: ./ apache-resource-bundles/ archetypes/ archives/maven-2.x/ background/ developers/ developers/conventions/ developers/release/ d

[buildbot]

Modified: 
websites/staging/maven/trunk/content/guides/introduction/introduction-to-archetypes.html
==
--- 
websites/staging/maven/trunk/content/guides/introduction/introduction-to-archetypes.html
 (original)
+++ 
websites/staging/maven/trunk/content/guides/introduction/introduction-to-archetypes.html
 Sun Jun  4 06:53:59 2017
@@ -1,6 +1,6 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
@@ -9,7 +9,7 @@
 
 
 
-
+
 
 Maven  Introduction to Archetypes
 
@@ -41,7 +41,7 @@
 https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 Introduction to Archetypes
-Last Published: 2017-06-03
+Last Published: 2017-06-04
 
   
   

Modified: 
websites/staging/maven/trunk/content/guides/introduction/introduction-to-dependency-mechanism.html
==
--- 
websites/staging/maven/trunk/content/guides/introduction/introduction-to-dependency-mechanism.html
 (original)
+++ 
websites/staging/maven/trunk/content/guides/introduction/introduction-to-dependency-mechanism.html
 Sun Jun  4 06:53:59 2017
@@ -1,6 +1,6 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
@@ -11,7 +11,7 @@
 Trygve Laugstol
 Karl Heinz Marbaise" />
 
-
+
 
 Maven  Introduction to the Dependency Mechanism
 
@@ -43,7 +43,7 @@ Karl Heinz Marbaise" />
 https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 Introduction to the Dependency Mechanism
-Last Published: 2017-06-03
+Last Published: 2017-06-04
 
   
   

Modified: 
websites/staging/maven/trunk/content/guides/introduction/introduction-to-optional-and-excludes-dependencies.html
==
--- 
websites/staging/maven/trunk/content/guides/introduction/introduction-to-optional-and-excludes-dependencies.html
 (original)
+++ 
websites/staging/maven/trunk/content/guides/introduction/introduction-to-optional-and-excludes-dependencies.html
 Sun Jun  4 06:53:59 2017
@@ -1,6 +1,6 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
@@ -9,7 +9,7 @@
 
 
 
-
+
 
 Maven  Optional Dependencies and Dependency 
Exclusions
 
@@ -41,7 +41,7 @@
 https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 Optional Dependencies and Dependency Exclusions
-Last Published: 2017-06-03
+Last Published: 2017-06-04
 
   
   

Modified: 
websites/staging/maven/trunk/content/guides/introduction/introduction-to-plugin-prefix-mapping.html
==
--- 
websites/staging/maven/trunk/content/guides/introduction/introduction-to-plugin-prefix-mapping.html
 (original)
+++ 
websites/staging/maven/trunk/content/guides/introduction/introduction-to-plugin-prefix-mapping.html
 Sun Jun  4 06:53:59 2017
@@ -1,6 +1,6 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
@@ -9,7 +9,7 @@
 
 
 
-
+
 
 Maven  Introduction to Plugin Prefix Resolution
 
@@ -41,7 +41,7 @@
 https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 Introduction to Plugin Prefix Resolution
-Last Published: 2017-06-03
+Last Published: 2017-06-04
 
   
   

Modified: 
websites/staging/maven/trunk/content/guides/introduction/introduction-to-plugins.html
==
--- 
websites/staging/maven/trunk/content/guides/introduction/introduction-to-plugins.html
 (original)
+++ 
websites/staging/maven/trunk/content/guides/introduction/introduction-to-plugins.html
 Sun Jun  4 06:53:59 2017
@@ -1,6 +1,6 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
@@ -9,7 +9,7 @@
 
 
 
-
+
 
 Maven  Introduction to Maven 2.0 Plugin Development
 
@@ -41,7 +41,7 @@
 https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 Introduction to Maven 2.0 Plugin Development
-Last Published: 2017-06-03
+Last Published: 2017-06-04
 
   
   

Modified: 
websites/staging/maven/trunk/content/guides/introduction/introduction-to-profiles.html
==
--- 
websites/staging/maven/trunk/content/guides/introduction/introduction-to-profiles.html
 (original)
+++ 
websites/staging/maven/trunk/content/guides/introduction/introduction-to-profiles.html
 Sun Jun  4 06:53:59 2017
@@ -1,6 +1,6 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
@@ -9,7 +9,7 @@
 
 
 
-
+
 
 Maven  Introduction to build profiles
 
@@ 

svn commit: r1013432 [1/4] - in /websites/staging/maven/trunk/content: ./ apache-resource-bundles/ archetypes/ archives/maven-2.x/ background/ developers/ developers/conventions/ developers/release/ d

[buildbot]

Author: buildbot
Date: Sun Jun  4 06:53:59 2017
New Revision: 1013432

Log:
Staging update by buildbot for maven

Modified:
websites/staging/maven/trunk/content/   (props changed)
websites/staging/maven/trunk/content/about.html
websites/staging/maven/trunk/content/aether.html
websites/staging/maven/trunk/content/apache-resource-bundles/index.html
websites/staging/maven/trunk/content/archetypes/index.html
websites/staging/maven/trunk/content/archives/maven-2.x/index.html
websites/staging/maven/trunk/content/articles.html
websites/staging/maven/trunk/content/background/history-of-maven.html
websites/staging/maven/trunk/content/background/philosophy-of-maven.html
websites/staging/maven/trunk/content/code-quality-management.html
websites/staging/maven/trunk/content/community.html
websites/staging/maven/trunk/content/configure.html
websites/staging/maven/trunk/content/continuous-integration.html
websites/staging/maven/trunk/content/developers/committer-environment.html
websites/staging/maven/trunk/content/developers/committer-settings.html
websites/staging/maven/trunk/content/developers/conventions/code.html
websites/staging/maven/trunk/content/developers/conventions/git.html
websites/staging/maven/trunk/content/developers/conventions/jira.html
websites/staging/maven/trunk/content/developers/conventions/svn.html
websites/staging/maven/trunk/content/developers/dependency-policies.html
websites/staging/maven/trunk/content/developers/index.html
websites/staging/maven/trunk/content/developers/java5.html
websites/staging/maven/trunk/content/developers/java6.html
websites/staging/maven/trunk/content/developers/mojo-api-specification.html
websites/staging/maven/trunk/content/developers/release/index.html

websites/staging/maven/trunk/content/developers/release/maven-core-release.html

websites/staging/maven/trunk/content/developers/release/maven-project-release-procedure.html

websites/staging/maven/trunk/content/developers/release/parent-pom-release.html
websites/staging/maven/trunk/content/developers/release/pmc-gpg-keys.html
websites/staging/maven/trunk/content/developers/retirement-plan-plugins.html

websites/staging/maven/trunk/content/developers/website/component-reference-documentation-helper.html

websites/staging/maven/trunk/content/developers/website/deploy-component-reference-documentation.html

websites/staging/maven/trunk/content/developers/website/deploy-maven-website.html
websites/staging/maven/trunk/content/developers/website/index.html

websites/staging/maven/trunk/content/developers/website/website-overview.html

websites/staging/maven/trunk/content/developers/welcome-to-new-committers.html
websites/staging/maven/trunk/content/docs-required.html
websites/staging/maven/trunk/content/docs/2.0.1/release-notes.html
websites/staging/maven/trunk/content/docs/2.0.10/release-notes.html
websites/staging/maven/trunk/content/docs/2.0.11/release-notes.html
websites/staging/maven/trunk/content/docs/2.0.2/release-notes.html
websites/staging/maven/trunk/content/docs/2.0.3/release-notes.html
websites/staging/maven/trunk/content/docs/2.0.4/release-notes.html
websites/staging/maven/trunk/content/docs/2.0.5/release-notes.html
websites/staging/maven/trunk/content/docs/2.0.6/release-notes.html
websites/staging/maven/trunk/content/docs/2.0.7/release-notes.html
websites/staging/maven/trunk/content/docs/2.0.8/release-notes.html
websites/staging/maven/trunk/content/docs/2.0.9/release-notes.html
websites/staging/maven/trunk/content/docs/2.0/release-notes.html
websites/staging/maven/trunk/content/docs/2.1.0/release-notes.html
websites/staging/maven/trunk/content/docs/2.2.0/release-notes.html
websites/staging/maven/trunk/content/docs/2.2.1/release-notes.html
websites/staging/maven/trunk/content/docs/3.0-alpha-3/release-notes.html
websites/staging/maven/trunk/content/docs/3.0-alpha-4/release-notes.html
websites/staging/maven/trunk/content/docs/3.0-alpha-5/release-notes.html
websites/staging/maven/trunk/content/docs/3.0-alpha-6/release-notes.html
websites/staging/maven/trunk/content/docs/3.0-alpha-7/release-notes.html
websites/staging/maven/trunk/content/docs/3.0-beta-1/release-notes.html
websites/staging/maven/trunk/content/docs/3.0-beta-2/release-notes.html
websites/staging/maven/trunk/content/docs/3.0-beta-3/release-notes.html
websites/staging/maven/trunk/content/docs/3.0.1/release-notes.html
websites/staging/maven/trunk/content/docs/3.0.2/release-notes.html
websites/staging/maven/trunk/content/docs/3.0.3/release-notes.html
websites/staging/maven/trunk/content/docs/3.0.4/release-notes.html
websites/staging/maven/trunk/content/docs/3.0.5/release-notes.html
websites/staging/maven/trunk/content/docs/3.0/release-notes.html

svn commit: r1013432 [2/4] - in /websites/staging/maven/trunk/content: ./ apache-resource-bundles/ archetypes/ archives/maven-2.x/ background/ developers/ developers/conventions/ developers/release/ d

[buildbot]

Modified: websites/staging/maven/trunk/content/docs/2.0.7/release-notes.html
==
--- websites/staging/maven/trunk/content/docs/2.0.7/release-notes.html 
(original)
+++ websites/staging/maven/trunk/content/docs/2.0.7/release-notes.html Sun Jun  
4 06:53:59 2017
@@ -1,6 +1,6 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
@@ -9,7 +9,7 @@
 
 
 
-
+
 
 Maven  Release Notes - Maven 2.0.7
 
@@ -41,7 +41,7 @@
 https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 Release Notes - Maven 2.0.7
-Last Published: 2017-06-03
+Last Published: 2017-06-04
 
   
   

Modified: websites/staging/maven/trunk/content/docs/2.0.8/release-notes.html
==
--- websites/staging/maven/trunk/content/docs/2.0.8/release-notes.html 
(original)
+++ websites/staging/maven/trunk/content/docs/2.0.8/release-notes.html Sun Jun  
4 06:53:59 2017
@@ -1,6 +1,6 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
@@ -9,7 +9,7 @@
 
 
 
-
+
 
 Maven  Release Notes - Maven 2.0.8
 
@@ -41,7 +41,7 @@
 https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 Release Notes - Maven 2.0.8
-Last Published: 2017-06-03
+Last Published: 2017-06-04
 
   
   

Modified: websites/staging/maven/trunk/content/docs/2.0.9/release-notes.html
==
--- websites/staging/maven/trunk/content/docs/2.0.9/release-notes.html 
(original)
+++ websites/staging/maven/trunk/content/docs/2.0.9/release-notes.html Sun Jun  
4 06:53:59 2017
@@ -1,6 +1,6 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
@@ -9,7 +9,7 @@
 
 
 
-
+
 
 Maven  Release Notes - Maven 2.0.9
 
@@ -41,7 +41,7 @@
 https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 Release Notes - Maven 2.0.9
-Last Published: 2017-06-03
+Last Published: 2017-06-04
 
   
   

Modified: websites/staging/maven/trunk/content/docs/2.0/release-notes.html
==
--- websites/staging/maven/trunk/content/docs/2.0/release-notes.html (original)
+++ websites/staging/maven/trunk/content/docs/2.0/release-notes.html Sun Jun  4 
06:53:59 2017
@@ -1,6 +1,6 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 Maven  Release Notes - Maven 2.0
 
@@ -40,7 +40,7 @@
 https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 Release Notes - Maven 2.0
-Last Published: 2017-06-03
+Last Published: 2017-06-04
 
   
   

Modified: websites/staging/maven/trunk/content/docs/2.1.0/release-notes.html
==
--- websites/staging/maven/trunk/content/docs/2.1.0/release-notes.html 
(original)
+++ websites/staging/maven/trunk/content/docs/2.1.0/release-notes.html Sun Jun  
4 06:53:59 2017
@@ -1,6 +1,6 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
@@ -11,7 +11,7 @@
 Jason van Zyl
 Brian Fox" />
 
-
+
 
 Maven  Release Notes - Maven 2.1.0
 
@@ -43,7 +43,7 @@ Brian Fox" />
 https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 Release Notes - Maven 2.1.0
-Last Published: 2017-06-03
+Last Published: 2017-06-04
 
   
   

Modified: websites/staging/maven/trunk/content/docs/2.2.0/release-notes.html
==
--- websites/staging/maven/trunk/content/docs/2.2.0/release-notes.html 
(original)
+++ websites/staging/maven/trunk/content/docs/2.2.0/release-notes.html Sun Jun  
4 06:53:59 2017
@@ -1,6 +1,6 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
@@ -12,7 +12,7 @@ Jason van Zyl
 Brian Fox
 John Casey" />
 
-
+
 
 Maven  Release Notes - Maven 2.2.0
 
@@ -44,7 +44,7 @@ John Casey" />
 https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 Release Notes - Maven 2.2.0
-Last Published: 2017-06-03
+Last Published: 2017-06-04
 
   
   

Modified: websites/staging/maven/trunk/content/docs/2.2.1/release-notes.html
==
--- websites/staging/maven/trunk/content/docs/2.2.1/release-notes.html 
(original)
+++ websites/staging/maven/trunk/content/docs/2.2.1/release-notes.html Sun Jun  
4 06:53:59 2017
@@ -1,6 +1,6 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">

svn commit: r1013432 [4/4] - in /websites/staging/maven/trunk/content: ./ apache-resource-bundles/ archetypes/ archives/maven-2.x/ background/ developers/ developers/conventions/ developers/release/ d

[buildbot]

Modified: websites/staging/maven/trunk/content/index.html
==
--- websites/staging/maven/trunk/content/index.html (original)
+++ websites/staging/maven/trunk/content/index.html Sun Jun  4 06:53:59 2017
@@ -1,6 +1,6 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
@@ -10,7 +10,7 @@
 
 
 
-
+
 
 Maven  Welcome to Apache Maven
 
@@ -42,7 +42,7 @@
 https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 Welcome to Apache Maven
-Last Published: 2017-06-03
+Last Published: 2017-06-04
 
   
   

Modified: websites/staging/maven/trunk/content/install.html
==
--- websites/staging/maven/trunk/content/install.html (original)
+++ websites/staging/maven/trunk/content/install.html Sun Jun  4 06:53:59 2017
@@ -1,13 +1,13 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
   
 
 
-
+
 
 Maven  Installing Apache Maven
 
@@ -39,7 +39,7 @@
 https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 Installing Apache Maven
-Last Published: 2017-06-03
+Last Published: 2017-06-04
 
   
   

Modified: websites/staging/maven/trunk/content/integration.html
==
--- websites/staging/maven/trunk/content/integration.html (original)
+++ websites/staging/maven/trunk/content/integration.html Sun Jun  4 06:53:59 
2017
@@ -1,13 +1,13 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
   
 
 
-
+
 
 Maven  CI Management
 
@@ -39,7 +39,7 @@
 https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 CI Management
-Last Published: 2017-06-03
+Last Published: 2017-06-04
 
   
   

Modified: websites/staging/maven/trunk/content/issue-tracking.html
==
--- websites/staging/maven/trunk/content/issue-tracking.html (original)
+++ websites/staging/maven/trunk/content/issue-tracking.html Sun Jun  4 
06:53:59 2017
@@ -1,13 +1,13 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
   
 
 
-
+
 
 Maven  Overview
 
@@ -39,7 +39,7 @@
 https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 Overview
-Last Published: 2017-06-03
+Last Published: 2017-06-04
 
   
   

Modified: websites/staging/maven/trunk/content/mail-lists.html
==
--- websites/staging/maven/trunk/content/mail-lists.html (original)
+++ websites/staging/maven/trunk/content/mail-lists.html Sun Jun  4 06:53:59 
2017
@@ -1,13 +1,13 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
   
 
 
-
+
 
 Maven  Project Mailing Lists
 
@@ -39,7 +39,7 @@
 https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 Project Mailing Lists
-Last Published: 2017-06-03
+Last Published: 2017-06-04
 
   
   

Modified: websites/staging/maven/trunk/content/maven-1.x-eol.html
==
--- websites/staging/maven/trunk/content/maven-1.x-eol.html (original)
+++ websites/staging/maven/trunk/content/maven-1.x-eol.html Sun Jun  4 06:53:59 
2017
@@ -1,13 +1,13 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
   
 
 
-
+
 
 Maven  End Of Life Apache Maven 1.x
 
@@ -39,7 +39,7 @@
 https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 End Of Life Apache Maven 1.x
-Last Published: 2017-06-03
+Last Published: 2017-06-04
 
   
   

Modified: websites/staging/maven/trunk/content/maven-2.x-eol.html
==
--- websites/staging/maven/trunk/content/maven-2.x-eol.html (original)
+++ websites/staging/maven/trunk/content/maven-2.x-eol.html Sun Jun  4 06:53:59 
2017
@@ -1,6 +1,6 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
@@ -9,7 +9,7 @@
 
 
 
-
+
 
 Maven  End Of Life of Maven 2.x
 
@@ -41,7 +41,7 @@
 https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 End Of Life of Maven 2.x
-Last Published: 2017-06-03
+Last Published: 2017-06-04
 
   
   

Modified: websites/staging/maven/trunk/content/maven-ci-friendly.html
==
--- 

svn commit: r1797558 - /maven/site/trunk/content/apt/repository/central-index.apt

[hboutemy]

Author: hboutemy
Date: Sun Jun  4 06:52:42 2017
New Revision: 1797558

URL: http://svn.apache.org/viewvc?rev=1797558=rev
Log:
added link to CLI documentation and use long CLI options

Modified:
maven/site/trunk/content/apt/repository/central-index.apt

Modified: maven/site/trunk/content/apt/repository/central-index.apt
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/repository/central-index.apt?rev=1797558=1797557=1797558=diff
==
--- maven/site/trunk/content/apt/repository/central-index.apt (original)
+++ maven/site/trunk/content/apt/repository/central-index.apt Sun Jun  4 
06:52:42 2017
@@ -46,10 +46,10 @@ Central Index
   * download {{{https://repo.maven.apache.org/maven2/.index/}the Central 
index: <<>>}}
   
   * download 
{{{https://repo.maven.apache.org/maven2/org/apache/maven/indexer/indexer-cli/5.1.1/indexer-cli-5.1.1.jar}Maven
 Indexer CLI}}
-and unpack the index to raw Lucene index directory:
+and {{{/maven-indexer-archives/maven-indexer-LATEST/indexer-cli/}unpack}} 
the index to raw Lucene index directory:
 
 ++
-java -jar indexer-cli-5.1.1.jar -u nexus-maven-repository-index.gz -d 
central-lucene-index
+java -jar indexer-cli-5.1.1.jar --unpack nexus-maven-repository-index.gz 
--destination central-lucene-index
 ++
 
   * download and extract 
{{{https://github.com/DmitryKey/luke/releases/download/luke-4.10.4/luke-with-deps.tar.gz}Luke
 binary tarball}}