date:20170401

[09/28] maven git commit: MNG-6078: commons-cli 1.4 released

2017-04-01 Thread michaelo

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/773474fd
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/773474fd
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/773474fd

Branch: refs/heads/MNG-6169
Commit: 773474fd07e00c43871279d10343d3b9be4fd74c
Parents: 6e499f6
Author: rfscholte 
Authored: Mon Mar 13 23:27:35 2017 +0100
Committer: Michael Osipov 
Committed: Sun Apr 2 00:21:12 2017 +0200

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


http://git-wip-us.apache.org/repos/asf/maven/blob/773474fd/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

[04/28] maven git commit: [maven-release-plugin] prepare for next development iteration

2017-04-01 Thread michaelo

[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/b83d779a
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/b83d779a
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/b83d779a

Branch: refs/heads/MNG-6169
Commit: b83d779aad23152662d8ffab4d0ccabcf3c9592f
Parents: 80a10e8
Author: Stephen Connolly 
Authored: Mon Mar 20 16:55:53 2017 +
Committer: Michael Osipov 
Committed: Sun Apr 2 00:21:12 2017 +0200

--
 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/b83d779a/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/b83d779a/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/b83d779a/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/b83d779a/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/b83d779a/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/b83d779a/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/b83d779a/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/b83d779a/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

[12/28] maven git commit: [MNG-6182] ModelResolver interface enhancements.

2017-04-01 Thread michaelo

[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/d0159094
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/d0159094
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/d0159094

Branch: refs/heads/MNG-6169
Commit: d01590944c59471ac438839142ce9ff0b6789a62
Parents: da0aec8
Author: Christian Schulte 
Authored: Sun Mar 19 03:46:29 2017 +0100
Committer: Michael Osipov 
Committed: Sun Apr 2 00:21:12 2017 +0200

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


http://git-wip-us.apache.org/repos/asf/maven/blob/d0159094/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 '[2.0,2.1)'",
+

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

2017-04-01 Thread michaelo

[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/f4bc3c0d
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/f4bc3c0d
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/f4bc3c0d

Branch: refs/heads/MNG-6169
Commit: f4bc3c0daac5b86767b3845540d6b10a3fcd9e74
Parents: b65d6d3
Author: HervÃ© Boutemy 
Authored: Thu Mar 23 05:11:12 2017 +0100
Committer: Michael Osipov 
Committed: Sun Apr 2 00:21:12 2017 +0200

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


http://git-wip-us.apache.org/repos/asf/maven/blob/f4bc3c0d/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

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

2017-04-01 Thread michaelo

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/00afbaa5
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/00afbaa5
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/00afbaa5

Branch: refs/heads/MNG-6169
Commit: 00afbaa53fb73a0dc6639387a8f93d72398994b9
Parents: fa11274
Author: HervÃ© Boutemy 
Authored: Sun Mar 26 10:27:59 2017 +0200
Committer: Michael Osipov 
Committed: Sun Apr 2 00:21:12 2017 +0200

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


http://git-wip-us.apache.org/repos/asf/maven/blob/00afbaa5/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()
 }

[10/28] maven git commit: [MNG-6176] Fix javadoc errors in maven-compat

2017-04-01 Thread michaelo

[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/c7f827ea
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/c7f827ea
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/c7f827ea

Branch: refs/heads/MNG-6169
Commit: c7f827eaa703d0a03932d4f8a7f1dd7ab154e98d
Parents: 773474f
Author: Stephen Connolly 
Authored: Sat Mar 18 12:04:38 2017 +
Committer: Michael Osipov 
Committed: Sun Apr 2 00:21:12 2017 +0200

--
 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/c7f827ea/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/c7f827ea/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/c7f827ea/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/c7f827ea/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 100644
---

[22/28] maven git commit: [MNG-6168] Fix unclosed streams

2017-04-01 Thread michaelo

[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/3a6a901f
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/3a6a901f
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/3a6a901f

Branch: refs/heads/MNG-6169
Commit: 3a6a901fabe48296f932d1563d757a8892fec842
Parents: f4bc3c0
Author: Christian Schulte 
Authored: Fri Mar 24 22:04:37 2017 +0100
Committer: Michael Osipov 
Committed: Sun Apr 2 00:21:12 2017 +0200

--
 .../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/3a6a901f/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/3a6a901f/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" );
 
-

[06/28] maven git commit: [MNG-6183] Dependency management debug message corrections.

2017-04-01 Thread michaelo

[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/aaae0b25
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/aaae0b25
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/aaae0b25

Branch: refs/heads/MNG-6169
Commit: aaae0b25a7bc9ad0ebebdcb017fa70f5a605d4c8
Parents: f48c9f9
Author: Christian Schulte 
Authored: Tue Mar 14 19:20:47 2017 +0100
Committer: Michael Osipov 
Committed: Sun Apr 2 00:21:12 2017 +0200

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


http://git-wip-us.apache.org/repos/asf/maven/blob/aaae0b25/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 && !premanagedOptional.equals( 
dep.getOptional() ) )
+if ( ( node.getManagedBits() &

[03/28] maven git commit: trying to make Jenkinsfile easier to understand

2017-04-01 Thread michaelo

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/92db20e5
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/92db20e5
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/92db20e5

Branch: refs/heads/MNG-6169
Commit: 92db20e5bd130669524b08d86ee0d9c759292efa
Parents: 0261208
Author: HervÃ© Boutemy 
Authored: Fri Mar 24 03:25:17 2017 +0100
Committer: Michael Osipov 
Committed: Sun Apr 2 00:21:12 2017 +0200

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


http://git-wip-us.apache.org/repos/asf/maven/blob/92db20e5/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') {
 emailext

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

2017-04-01 Thread michaelo

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/b4027263
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/b4027263
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/b4027263

Branch: refs/heads/MNG-6169
Commit: b4027263e9f3d14603f789c066ad2e6597961ba2
Parents: d015909
Author: HervÃ© Boutemy 
Authored: Sun Mar 19 10:38:18 2017 +0100
Committer: Michael Osipov 
Committed: Sun Apr 2 00:21:12 2017 +0200

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


http://git-wip-us.apache.org/repos/asf/maven/blob/b4027263/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

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

2017-04-01 Thread michaelo

[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/da0aec82
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/da0aec82
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/da0aec82

Branch: refs/heads/MNG-6169
Commit: da0aec82a23f4519651d8c740b65749fb9d4d37e
Parents: c7f827e
Author: Stephen Connolly 
Authored: Sat Mar 18 12:32:06 2017 +
Committer: Michael Osipov 
Committed: Sun Apr 2 00:21:12 2017 +0200

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


http://git-wip-us.apache.org/repos/asf/maven/blob/da0aec82/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
+

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

2017-04-01 Thread michaelo

Repository: maven
Updated Branches:
  refs/heads/MNG-6169 430f70c03 -> f983adf68


[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/f983adf6
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/f983adf6
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/f983adf6

Branch: refs/heads/MNG-6169
Commit: f983adf68f605d34002765d37f4f2bf1056e2f6b
Parents: a14237d
Author: Stephen Connolly 
Authored: Mon Mar 27 21:07:01 2017 +0100
Committer: Michael Osipov 
Committed: Sun Apr 2 00:21:12 2017 +0200

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


http://git-wip-us.apache.org/repos/asf/maven/blob/f983adf6/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

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

2017-04-01 Thread michaelo

[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/a14237d0
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/a14237d0
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/a14237d0

Branch: refs/heads/MNG-6169
Commit: a14237d07e4b1ff8d89b983f6ba74276b354dc2c
Parents: 9aabe2a
Author: Stephen Connolly 
Authored: Sun Mar 26 22:41:24 2017 +0100
Committer: Michael Osipov 
Committed: Sun Apr 2 00:21:12 2017 +0200

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


http://git-wip-us.apache.org/repos/asf/maven/blob/a14237d0/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

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

2017-04-01 Thread michaelo

[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/b65d6d34
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/b65d6d34
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/b65d6d34

Branch: refs/heads/MNG-6169
Commit: b65d6d34b82d57fe7bb69a49caa8850b803c0ef3
Parents: 04d540c
Author: Christian Schulte 
Authored: Tue Mar 21 04:06:02 2017 +0100
Committer: Michael Osipov 
Committed: Sun Apr 2 00:21:12 2017 +0200

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


http://git-wip-us.apache.org/repos/asf/maven/blob/b65d6d34/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 )

[25/28] maven git commit: INFRA have been changing JDK labels again

2017-04-01 Thread michaelo

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/02612084
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/02612084
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/02612084

Branch: refs/heads/MNG-6169
Commit: 02612084453bf4cfd2f48ad15c39a91373fa8d83
Parents: 934a159
Author: Stephen Connolly 
Authored: Mon Mar 27 16:22:29 2017 +0100
Committer: Michael Osipov 
Committed: Sun Apr 2 00:21:12 2017 +0200

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


http://git-wip-us.apache.org/repos/asf/maven/blob/02612084/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()
 }

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

2017-04-01 Thread michaelo

[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/ef6167e5
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/ef6167e5
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/ef6167e5

Branch: refs/heads/MNG-6169
Commit: ef6167e587477275b04808eebc1b3bc8ba15
Parents: d1eb1ba
Author: HervÃ© Boutemy 
Authored: Sun Mar 19 17:04:04 2017 +0100
Committer: Michael Osipov 
Committed: Sun Apr 2 00:21:12 2017 +0200

--
 .../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/ef6167e5/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/ef6167e5/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}.

[05/28] maven git commit: [MNG-6090] CI friendly properties break submodule builds [MNG-6057] Problem with CI friendly usage of ${..} reactor order is changed o Based on the missing replacement of the

2017-04-01 Thread michaelo

[MNG-6090] CI friendly properties break submodule builds
[MNG-6057] Problem with CI friendly usage of ${..} reactor order is changed
 o Based on the missing replacement of the versions ${revision}
   ${changelist} or ${sha1} within the parent element the order
   of the reactor changes.
[MNG-5895] Problem with CI friendly usage of ${..} which is already
defined via property in pom file.


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

Branch: refs/heads/MNG-6169
Commit: f48c9f98583ae9d1503f1f0ca8a796be9e2a4657
Parents: 430f70c
Author: Karl Heinz Marbaise 
Authored: Tue Sep 29 11:46:48 2015 +0200
Committer: Michael Osipov 
Committed: Sun Apr 2 00:21:12 2017 +0200

--
 .../resolver/DefaultArtifactResolver.java   |  3 +-
 .../model/building/DefaultModelBuilder.java | 35 ++--
 .../AbstractStringBasedModelInterpolator.java   | 20 +++
 .../model/validation/DefaultModelValidator.java |  7 ++--
 4 files changed, 59 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/f48c9f98/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
--
diff --git 
a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
 
b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
index fc154cb..915ee72 100644
--- 
a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
+++ 
b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
@@ -376,7 +376,7 @@ public class DefaultArtifactResolver
 ArtifactFilter resolutionFilter = request.getResolutionFilter();
 RepositorySystemSession session = getSession( 
request.getLocalRepository() );
 
-// TODO hack because metadata isn't generated in m2e correctly and i 
want to run the maven i have in the
+// TODO: hack because metadata isn't generated in m2e correctly and i 
want to run the maven i have in the
 // workspace
 if ( source == null )
 {
@@ -506,6 +506,7 @@ public class DefaultArtifactResolver
 if ( result.hasMetadataResolutionExceptions() || 
result.hasVersionRangeViolations()
 || result.hasCircularDependencyExceptions() )
 {
+logger.info( "Failure detected." );
 return result;
 }
 

http://git-wip-us.apache.org/repos/asf/maven/blob/f48c9f98/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
--
diff --git 
a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
 
b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
index 4ebb033..463bf1c 100644
--- 
a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
+++ 
b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
@@ -62,6 +62,8 @@ import org.apache.maven.model.superpom.SuperPomProvider;
 import org.apache.maven.model.validation.ModelValidator;
 import org.codehaus.plexus.component.annotations.Component;
 import org.codehaus.plexus.component.annotations.Requirement;
+import org.codehaus.plexus.interpolation.MapBasedValueSource;
+import org.codehaus.plexus.interpolation.StringSearchInterpolator;
 
 import java.io.File;
 import java.io.IOException;
@@ -766,13 +768,40 @@ public class DefaultModelBuilder
 // save profile activations before interpolation, since they are 
evaluated with limited scope
 Map originalActivations = getProfileActivations( 
model, true );
 
-Model result = modelInterpolator.interpolateModel( model, 
model.getProjectDirectory(), request, problems );
-result.setPomFile( model.getPomFile() );
+Model interpolatedModel =
+modelInterpolator.interpolateModel( model, 
model.getProjectDirectory(), request, problems );
+if ( interpolatedModel.getParent() != null )
+{
+StringSearchInterpolator ssi = new StringSearchInterpolator();
+ssi.addValueSource( new MapBasedValueSource( 
request.getUserProperties() ) );
+
+ssi.addValueSource( new MapBasedValueSource( model.getProperties() 
) );
+
+ssi.addValueSource( new MapBasedValueSource( 
request.getSystemProperties() ) );
+
+try
+{
+String interpolated =

[02/28] maven git commit: Squashed commit of the following:

2017-04-01 Thread michaelo

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/9aabe2a7
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/9aabe2a7
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/9aabe2a7

Branch: refs/heads/MNG-6169
Commit: 9aabe2a7adf89bc1de0c9cd9f3bb4486c0e4ebd5
Parents: 00afbaa
Author: rfscholte 
Authored: Wed Mar 29 19:50:15 2017 +0200
Committer: Michael Osipov 
Committed: Sun Apr 2 00:21:12 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/9aabe2a7/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;
 target="_blank">Guide

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

2017-04-01 Thread michaelo

[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/934a1596
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/934a1596
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/934a1596

Branch: refs/heads/MNG-6169
Commit: 934a1596148fe90760feed23905d7e42520d68a9
Parents: 3a6a901
Author: Christian Schulte 
Authored: Sat Mar 25 20:40:05 2017 +0100
Committer: Michael Osipov 
Committed: Sun Apr 2 00:21:12 2017 +0200

--
 .../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/934a1596/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/934a1596/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
-

[18/28] maven git commit: [maven-release-plugin] prepare release maven-3.5.0-beta-1

2017-04-01 Thread michaelo

[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/80a10e8e
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/80a10e8e
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/80a10e8e

Branch: refs/heads/MNG-6169
Commit: 80a10e8e88bc86c5ea4c61c08ec962b5d5e503a5
Parents: ffb8731
Author: Stephen Connolly 
Authored: Mon Mar 20 16:55:36 2017 +
Committer: Michael Osipov 
Committed: Sun Apr 2 00:21:12 2017 +0200

--
 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/80a10e8e/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/80a10e8e/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/80a10e8e/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/80a10e8e/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/80a10e8e/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/80a10e8e/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/80a10e8e/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/80a10e8e/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

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

2017-04-01 Thread michaelo

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/fa11274b
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/fa11274b
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/fa11274b

Branch: refs/heads/MNG-6169
Commit: fa11274b0b039d95d32d606aacf834e44c0a6ffd
Parents: af414f8
Author: HervÃ© Boutemy 
Authored: Fri Mar 24 03:28:59 2017 +0100
Committer: Michael Osipov 
Committed: Sun Apr 2 00:21:12 2017 +0200

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


http://git-wip-us.apache.org/repos/asf/maven/blob/fa11274b/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 {

[24/28] maven git commit: added CORE_IT_PROFILES parameter

2017-04-01 Thread michaelo

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/af414f8c
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/af414f8c
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/af414f8c

Branch: refs/heads/MNG-6169
Commit: af414f8cefa0877dc47bacac250487aa4ba61710
Parents: 92db20e
Author: HervÃ© Boutemy 
Authored: Fri Mar 24 03:28:26 2017 +0100
Committer: Michael Osipov 
Committed: Sun Apr 2 00:21:12 2017 +0200

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


http://git-wip-us.apache.org/repos/asf/maven/blob/af414f8c/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

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

2017-04-01 Thread michaelo

[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/3e637625
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/3e637625
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/3e637625

Branch: refs/heads/MNG-6169
Commit: 3e63762503dadbc530238042a32b697e7dcad5bc
Parents: aaae0b2
Author: rfscholte 
Authored: Sat Mar 18 12:35:18 2017 +0100
Committer: Michael Osipov 
Committed: Sun Apr 2 00:21:12 2017 +0200

--
 .../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/3e637625/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/3e637625/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/3e637625/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/3e637625/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

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

2017-04-01 Thread michaelo

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/ffb87318
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/ffb87318
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/ffb87318

Branch: refs/heads/MNG-6169
Commit: ffb87318a0c29435cdef7ee183de8249550c5c2f
Parents: ef6167e
Author: Stephen Connolly 
Authored: Sun Mar 19 21:54:31 2017 +
Committer: Michael Osipov 
Committed: Sun Apr 2 00:21:12 2017 +0200

--
 .../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/ffb87318/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;

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

2017-04-01 Thread michaelo

[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/04d540c6
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/04d540c6
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/04d540c6

Branch: refs/heads/MNG-6169
Commit: 04d540c62bad1d8be09c805cf02442e6a088289b
Parents: 3223eca
Author: Christian Schulte 
Authored: Tue Mar 21 00:30:28 2017 +0100
Committer: Michael Osipov 
Committed: Sun Apr 2 00:21:12 2017 +0200

--
 .../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/04d540c6/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/04d540c6/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
+

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

2017-04-01 Thread michaelo

[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/6e499f64
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/6e499f64
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/6e499f64

Branch: refs/heads/MNG-6169
Commit: 6e499f64d5f8d3e826d548592a4c4c9ffcde5246
Parents: 3e63762
Author: rfscholte 
Authored: Wed Mar 8 21:38:08 2017 +0100
Committer: Michael Osipov 
Committed: Sun Apr 2 00:21:12 2017 +0200

--
 .../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/6e499f64/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/6e499f64/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 permissions

[17/28] maven git commit: s/@since 3.5.0-alpha-2/@since 3.5.0/g

2017-04-01 Thread michaelo

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/3223ecaa
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/3223ecaa
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/3223ecaa

Branch: refs/heads/MNG-6169
Commit: 3223ecaaf2ff9fccd769f3e4cb5ed5f00468a1ca
Parents: b83d779
Author: Christian Schulte 
Authored: Tue Mar 21 00:21:43 2017 +0100
Committer: Michael Osipov 
Committed: Sun Apr 2 00:21:12 2017 +0200

--
 .../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/3223ecaa/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/3223ecaa/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/3223ecaa/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/3223ecaa/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/3223ecaa/maven-model-builder/src/main/java/org/apache/maven/model/resolution/ModelResolver.java

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

2017-04-01 Thread michaelo

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/d1eb1ba3
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/d1eb1ba3
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/d1eb1ba3

Branch: refs/heads/MNG-6169
Commit: d1eb1ba3612f529baf82006e7da6569f42c6dd9a
Parents: b402726
Author: HervÃ© Boutemy 
Authored: Sun Mar 19 14:44:33 2017 +0100
Committer: Michael Osipov 
Committed: Sun Apr 2 00:21:12 2017 +0200

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


http://git-wip-us.apache.org/repos/asf/maven/blob/d1eb1ba3/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
+

[maven-integration-testing] Git Push Summary

2017-04-01 Thread michaelo

Repository: maven-integration-testing
Updated Branches:
  refs/heads/MNG-6202 [deleted] 416175933

maven-integration-testing git commit: [MNG-6202] Cannot pass nonProxyHosts to ITs making remote tests lock up when proxy rejects to proxy internal hosts

2017-04-01 Thread michaelo

Repository: maven-integration-testing
Updated Branches:
  refs/heads/master 0e1fc366a -> 217d956ed


[MNG-6202] Cannot pass nonProxyHosts to ITs making remote tests lock up when 
proxy rejects to proxy internal hosts

Set default value 'localhost' of 'proxy.nonProxyHosts' and allow users to
override if necessary.


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

Branch: refs/heads/master
Commit: 217d956edeb20c71db8c06883a24aecfff8497f4
Parents: 0e1fc36
Author: Michael Osipov 
Authored: Sat Apr 1 22:10:35 2017 +0200
Committer: Michael Osipov 
Committed: Sat Apr 1 23:11:05 2017 +0200

--
 core-it-suite/pom.xml| 8 +---
 core-it-suite/src/site/apt/index.apt.vm  | 7 ---
 .../src/test/resources-filtered/settings-remote.xml  | 2 +-
 run-its.bat  | 4 ++--
 run-its.sh   | 2 +-
 5 files changed, 13 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/217d956e/core-it-suite/pom.xml
--
diff --git a/core-it-suite/pom.xml b/core-it-suite/pom.xml
index bf03ace..8cfb3cb 100644
--- a/core-it-suite/pom.xml
+++ b/core-it-suite/pom.xml
@@ -58,9 +58,10 @@ under the License.
   ITs that don't require to fork Maven can also be run from the IDE using the 
Maven projects from the workspace if the
   Maven dependencies are added to the test class path.
   
-  If you're behind a proxy, use the system properties proxy.host, proxy.port, 
proxy.user and proxy.pass to specify the
-  required proxy setup for the ITs. Alternatively, set the system property 
maven.it.central to a URL of a local
-  repository manager that proxies the required artifacts.
+  If you're behind a proxy, use the system properties proxy.host, proxy.port, 
proxy.user, proxy.pass and
+  proxy.nonProxyHosts to specify the required proxy setup for the ITs. 
Alternatively, set the system property
+  maven.it.central to a URL of a local repository manager (anonymous 
authentication only) that proxies the
+  required artifacts.
   -->
 
   
@@ -78,6 +79,7 @@ under the License.
 none
 
 
+localhost
 1.6.1
 9.0.4.v20130625
   

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/217d956e/core-it-suite/src/site/apt/index.apt.vm
--
diff --git a/core-it-suite/src/site/apt/index.apt.vm 
b/core-it-suite/src/site/apt/index.apt.vm
index cdbf980..ce57d20 100644
--- a/core-it-suite/src/site/apt/index.apt.vm
+++ b/core-it-suite/src/site/apt/index.apt.vm
@@ -59,9 +59,10 @@ mvn clean test -Prun-its -DmavenVersion=2.2.1
   ITs that don't require to fork Maven can also be run from the IDE using the 
Maven projects from the workspace if the
   Maven dependencies are added to the test class path.
   
-  If you're behind a proxy, use the <<>>, <<>>, 
<<>> and <<>> system properties
-  to specify the required proxy setup for the ITs. Alternatively, set the 
<<>> system property to a URL of a local
-  repository manager that proxies the required artifacts.
+  If you're behind a proxy, use the system properties <<>>, 
<<>>, <<>>, <<>>
+  and <<>> to specify the required proxy setup for the 
ITs. Alternatively, set the system property
+  <<>> to a URL of a local repository manager (anonymous 
authentication only) that proxies the required
+  artifacts.
 
 * Results
 

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/217d956e/core-it-suite/src/test/resources-filtered/settings-remote.xml
--
diff --git a/core-it-suite/src/test/resources-filtered/settings-remote.xml 
b/core-it-suite/src/test/resources-filtered/settings-remote.xml
index 6cac118..d0d696e 100644
--- a/core-it-suite/src/test/resources-filtered/settings-remote.xml
+++ b/core-it-suite/src/test/resources-filtered/settings-remote.xml
@@ -34,7 +34,7 @@ plugins/artifacts from test repos so use of these settings 
should be the excepti
   ${proxy.port}
   ${proxy.user}
   ${proxy.pass}
-  localhost
+  ${proxy.nonProxyHosts}
 
   
   

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/217d956e/run-its.bat
--
diff --git a/run-its.bat b/run-its.bat
index 8bb9faf..7f3 100644
---

maven-integration-testing git commit: [MNG-6202] Cannot pass nonProxyHosts to ITs making remote tests lock up when proxy rejects to proxy internal hosts

2017-04-01 Thread michaelo

Repository: maven-integration-testing
Updated Branches:
  refs/heads/MNG-6202 [created] 416175933


[MNG-6202] Cannot pass nonProxyHosts to ITs making remote tests lock up when 
proxy rejects to proxy internal hosts

Set default value 'localhost' of 'proxy.nonProxyHosts' and allow users to
override if necessary.


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

Branch: refs/heads/MNG-6202
Commit: 416175933fc0bc0c57e233aa0f6c48bd7c070ec0
Parents: 0e1fc36
Author: Michael Osipov 
Authored: Sat Apr 1 22:10:35 2017 +0200
Committer: Michael Osipov 
Committed: Sat Apr 1 22:10:35 2017 +0200

--
 core-it-suite/pom.xml| 8 +---
 core-it-suite/src/site/apt/index.apt.vm  | 7 ---
 .../src/test/resources-filtered/settings-remote.xml  | 2 +-
 run-its.bat  | 4 ++--
 run-its.sh   | 2 +-
 5 files changed, 13 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/41617593/core-it-suite/pom.xml
--
diff --git a/core-it-suite/pom.xml b/core-it-suite/pom.xml
index bf03ace..8cfb3cb 100644
--- a/core-it-suite/pom.xml
+++ b/core-it-suite/pom.xml
@@ -58,9 +58,10 @@ under the License.
   ITs that don't require to fork Maven can also be run from the IDE using the 
Maven projects from the workspace if the
   Maven dependencies are added to the test class path.
   
-  If you're behind a proxy, use the system properties proxy.host, proxy.port, 
proxy.user and proxy.pass to specify the
-  required proxy setup for the ITs. Alternatively, set the system property 
maven.it.central to a URL of a local
-  repository manager that proxies the required artifacts.
+  If you're behind a proxy, use the system properties proxy.host, proxy.port, 
proxy.user, proxy.pass and
+  proxy.nonProxyHosts to specify the required proxy setup for the ITs. 
Alternatively, set the system property
+  maven.it.central to a URL of a local repository manager (anonymous 
authentication only) that proxies the
+  required artifacts.
   -->
 
   
@@ -78,6 +79,7 @@ under the License.
 none
 
 
+localhost
 1.6.1
 9.0.4.v20130625
   

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/41617593/core-it-suite/src/site/apt/index.apt.vm
--
diff --git a/core-it-suite/src/site/apt/index.apt.vm 
b/core-it-suite/src/site/apt/index.apt.vm
index cdbf980..ce57d20 100644
--- a/core-it-suite/src/site/apt/index.apt.vm
+++ b/core-it-suite/src/site/apt/index.apt.vm
@@ -59,9 +59,10 @@ mvn clean test -Prun-its -DmavenVersion=2.2.1
   ITs that don't require to fork Maven can also be run from the IDE using the 
Maven projects from the workspace if the
   Maven dependencies are added to the test class path.
   
-  If you're behind a proxy, use the <<>>, <<>>, 
<<>> and <<>> system properties
-  to specify the required proxy setup for the ITs. Alternatively, set the 
<<>> system property to a URL of a local
-  repository manager that proxies the required artifacts.
+  If you're behind a proxy, use the system properties <<>>, 
<<>>, <<>>, <<>>
+  and <<>> to specify the required proxy setup for the 
ITs. Alternatively, set the system property
+  <<>> to a URL of a local repository manager (anonymous 
authentication only) that proxies the required
+  artifacts.
 
 * Results
 

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/41617593/core-it-suite/src/test/resources-filtered/settings-remote.xml
--
diff --git a/core-it-suite/src/test/resources-filtered/settings-remote.xml 
b/core-it-suite/src/test/resources-filtered/settings-remote.xml
index 6cac118..d0d696e 100644
--- a/core-it-suite/src/test/resources-filtered/settings-remote.xml
+++ b/core-it-suite/src/test/resources-filtered/settings-remote.xml
@@ -34,7 +34,7 @@ plugins/artifacts from test repos so use of these settings 
should be the excepti
   ${proxy.port}
   ${proxy.user}
   ${proxy.pass}
-  localhost
+  ${proxy.nonProxyHosts}
 
   
   

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/41617593/run-its.bat
--
diff --git a/run-its.bat b/run-its.bat
index 8bb9faf..e4b4deb 100644
---

maven-surefire git commit: [SUREFIRE-1353] Integration tests testing jvm forks should use subprocess and not embedded mode

2017-04-01 Thread tibordigana

Repository: maven-surefire
Updated Branches:
  refs/heads/master b08627f0f -> 9c417780b


[SUREFIRE-1353] Integration tests testing jvm forks should use subprocess and 
not embedded mode


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

Branch: refs/heads/master
Commit: 9c417780b512533edbe20f630525f75c6248160c
Parents: b08627f
Author: Tibor17 
Authored: Sat Apr 1 20:44:02 2017 +0200
Committer: Tibor17 
Committed: Sat Apr 1 20:44:02 2017 +0200

--
 .../maven/surefire/its/ForkConsoleOutputIT.java | 36 ++--
 .../its/ForkConsoleOutputWithErrorsIT.java  | 18 +-
 .../apache/maven/surefire/its/ForkModeIT.java   |  2 +-
 3 files changed, 36 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/9c417780/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputIT.java
--
diff --git 
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputIT.java
 
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputIT.java
index 7ec0039..6aac330 100644
--- 
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputIT.java
+++ 
b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputIT.java
@@ -19,7 +19,6 @@ package org.apache.maven.surefire.its;
  * under the License.
  */
 
-import org.apache.maven.surefire.its.fixture.OutputValidator;
 import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
 import org.apache.maven.surefire.its.fixture.SurefireLauncher;
 import org.junit.Test;
@@ -37,30 +36,47 @@ public class ForkConsoleOutputIT
 @Test
 public void printSummaryTrueWithRedirect()
 {
-final OutputValidator outputValidator = unpack().redirectToFile( true 
).printSummary( true ).executeTest();
-outputValidator.getSurefireReportsFile( 
"forkConsoleOutput.Test1-output.txt" ).assertFileExists();
+unpack().setForkJvm()
+.redirectToFile( true )
+.printSummary( true )
+.executeTest()
+.getSurefireReportsFile( "forkConsoleOutput.Test1-output.txt" )
+.assertFileExists();
 }
 
 @Test
 public void printSummaryTrueWithoutRedirect()
 {
-final OutputValidator outputValidator = unpack().redirectToFile( false 
).printSummary( true ).executeTest();
-outputValidator.getSurefireReportsFile( 
"forkConsoleOutput.Test1-output.txt" ).assertFileNotExists();
+unpack().setForkJvm()
+.redirectToFile( false )
+.printSummary( true )
+.executeTest()
+.getSurefireReportsFile( "forkConsoleOutput.Test1-output.txt" )
+.assertFileNotExists();
 }
 
 @Test
 public void printSummaryFalseWithRedirect()
 {
-final OutputValidator outputValidator =
-unpack().redirectToFile( true ).printSummary( false 
).debugLogging().showErrorStackTraces().executeTest();
-outputValidator.getSurefireReportsFile( 
"forkConsoleOutput.Test1-output.txt" ).assertFileExists();
+unpack().setForkJvm()
+.redirectToFile( true )
+.printSummary( false )
+.debugLogging()
+.showErrorStackTraces()
+.executeTest()
+.getSurefireReportsFile( "forkConsoleOutput.Test1-output.txt" )
+.assertFileExists();
 }
 
 @Test
 public void printSummaryFalseWithoutRedirect()
 {
-final OutputValidator outputValidator = unpack().redirectToFile( false 
).printSummary( false ).executeTest();
-outputValidator.getSurefireReportsFile( 
"forkConsoleOutput.Test1-output.txt" ).assertFileNotExists();
+unpack().setForkJvm()
+.redirectToFile( false )
+.printSummary( false )
+.executeTest()
+.getSurefireReportsFile( "forkConsoleOutput.Test1-output.txt" )
+.assertFileNotExists();
 }
 
 

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/9c417780/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputWithErrorsIT.java
--
diff --git 
a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputWithErrorsIT.java

maven-surefire git commit: [SUREFIRE-1352] Dump file [date]-jvmRun[N] where N should be real fork number

2017-04-01 Thread tibordigana

Repository: maven-surefire
Updated Branches:
  refs/heads/master dc3f3674e -> b08627f0f


[SUREFIRE-1352] Dump file [date]-jvmRun[N] where N should be real fork number


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

Branch: refs/heads/master
Commit: b08627f0fd21ab16b682badbc205cd2823f64656
Parents: dc3f367
Author: Tibor17 
Authored: Sat Apr 1 19:55:45 2017 +0200
Committer: Tibor17 
Committed: Sat Apr 1 19:55:45 2017 +0200

--
 .../apache/maven/plugin/surefire/booterclient/ForkStarter.java   | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b08627f0/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
--
diff --git 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
index b69d010..5360b4c 100644
--- 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
+++ 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
@@ -132,8 +132,6 @@ public class ForkStarter
 
 private static final String DUMP_FILE_PREFIX = 
DumpFileUtils.newFormattedDateFileName() + "-jvmRun";
 
-private static final AtomicInteger DUMP_FILE_POSTFIX_COUNTER = new 
AtomicInteger();
-
 private final ScheduledExecutorService pingThreadScheduler = 
createPingScheduler();
 
 private final ScheduledExecutorService timeoutCheckScheduler;
@@ -594,7 +592,7 @@ public class ForkStarter
 }
 
 cli.createArg().setValue( tempDir );
-cli.createArg().setValue( DUMP_FILE_PREFIX + 
DUMP_FILE_POSTFIX_COUNTER.incrementAndGet() );
+cli.createArg().setValue( DUMP_FILE_PREFIX + forkNumber );
 cli.createArg().setValue( surefireProperties.getName() );
 if ( systPropsFile != null )
 {

maven-integration-testing git commit: [MNG-6200] Some ITs fail if proxy is configured

2017-04-01 Thread michaelo

Repository: maven-integration-testing
Updated Branches:
  refs/heads/master 47d5885eb -> 0e1fc366a


[MNG-6200] Some ITs fail if proxy is configured


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

Branch: refs/heads/master
Commit: 0e1fc366a404341b24a4fd32773fa876e9a15252
Parents: 47d5885
Author: Michael Osipov 
Authored: Sat Apr 1 18:00:18 2017 +0200
Committer: Michael Osipov 
Committed: Sat Apr 1 18:00:18 2017 +0200

--
 .../maven/it/MavenIT0041ArtifactTypeFromPluginExtensionTest.java   | 2 +-
 .../org/apache/maven/it/MavenITmng0507ArtifactRelocationTest.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/0e1fc366/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0041ArtifactTypeFromPluginExtensionTest.java
--
diff --git 
a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0041ArtifactTypeFromPluginExtensionTest.java
 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0041ArtifactTypeFromPluginExtensionTest.java
index 558df8b..32db3f5 100644
--- 
a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0041ArtifactTypeFromPluginExtensionTest.java
+++ 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0041ArtifactTypeFromPluginExtensionTest.java
@@ -46,7 +46,7 @@ public class MavenIT0041ArtifactTypeFromPluginExtensionTest
 {
 File testDir = ResourceExtractor.simpleExtractResources( getClass(), 
"/it0041" );
 
-Verifier verifier = newVerifier( testDir.getAbsolutePath() );
+Verifier verifier = newVerifier( testDir.getAbsolutePath(), "remote" );
 verifier.setAutoclean( false );
 verifier.deleteArtifacts( "org.apache.maven", "maven-core-it-support", 
"1.2" );
 verifier.addCliOption( "--settings" );

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/0e1fc366/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0507ArtifactRelocationTest.java
--
diff --git 
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0507ArtifactRelocationTest.java
 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0507ArtifactRelocationTest.java
index 8fc0c37..397b561 100644
--- 
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0507ArtifactRelocationTest.java
+++ 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0507ArtifactRelocationTest.java
@@ -47,7 +47,7 @@ public class MavenITmng0507ArtifactRelocationTest
 {
 File testDir = ResourceExtractor.simpleExtractResources( getClass(), 
"/mng-0507" );
 
-Verifier verifier = newVerifier( testDir.getAbsolutePath() );
+Verifier verifier = newVerifier( testDir.getAbsolutePath(), "remote" );
 verifier.setAutoclean( false );
 verifier.deleteDirectory( "target" );
 verifier.deleteArtifacts( "org.apache.maven", "maven-core-it-support", 
"1.1" );

[maven-integration-testing] Git Push Summary

2017-04-01 Thread michaelo

Repository: maven-integration-testing
Updated Branches:
  refs/heads/MNG-6200 [deleted] 47d5885eb

maven-integration-testing git commit: [MNG-6200] Some ITs fails if proxy is configured

2017-04-01 Thread michaelo

Repository: maven-integration-testing
Updated Branches:
  refs/heads/master 31f1e8a1d -> 47d5885eb


[MNG-6200] Some ITs fails if proxy is configured


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

Branch: refs/heads/master
Commit: 47d5885eb81fff13610b2b916655f45be978b638
Parents: 31f1e8a
Author: Michael Osipov 
Authored: Fri Mar 31 13:21:19 2017 +0200
Committer: Michael Osipov 
Committed: Fri Mar 31 13:21:19 2017 +0200

--
 .../src/test/resources/mng-3599-mk2/settings-template.xml  | 2 +-
 core-it-suite/src/test/resources/mng-3599/settings-template.xml| 2 +-
 .../src/main/java/org/apache/maven/its/mng3652/MyMojo.java | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/47d5885e/core-it-suite/src/test/resources/mng-3599-mk2/settings-template.xml
--
diff --git 
a/core-it-suite/src/test/resources/mng-3599-mk2/settings-template.xml 
b/core-it-suite/src/test/resources/mng-3599-mk2/settings-template.xml
index 257b399..059721c 100644
--- a/core-it-suite/src/test/resources/mng-3599-mk2/settings-template.xml
+++ b/core-it-suite/src/test/resources/mng-3599-mk2/settings-template.xml
@@ -10,7 +10,7 @@
 
   http-proxy
   http
-  127.0.0.1
+  localhost
   @port@
 
   

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/47d5885e/core-it-suite/src/test/resources/mng-3599/settings-template.xml
--
diff --git a/core-it-suite/src/test/resources/mng-3599/settings-template.xml 
b/core-it-suite/src/test/resources/mng-3599/settings-template.xml
index 809db8f..0652b2c 100644
--- a/core-it-suite/src/test/resources/mng-3599/settings-template.xml
+++ b/core-it-suite/src/test/resources/mng-3599/settings-template.xml
@@ -10,7 +10,7 @@
 
   http-proxy
   http
-  127.0.0.1
+  localhost
   @port@
 
   

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/47d5885e/core-it-suite/src/test/resources/mng-3652/test-plugin/src/main/java/org/apache/maven/its/mng3652/MyMojo.java
--
diff --git 
a/core-it-suite/src/test/resources/mng-3652/test-plugin/src/main/java/org/apache/maven/its/mng3652/MyMojo.java
 
b/core-it-suite/src/test/resources/mng-3652/test-plugin/src/main/java/org/apache/maven/its/mng3652/MyMojo.java
index 0d60178..684ff72 100644
--- 
a/core-it-suite/src/test/resources/mng-3652/test-plugin/src/main/java/org/apache/maven/its/mng3652/MyMojo.java
+++ 
b/core-it-suite/src/test/resources/mng-3652/test-plugin/src/main/java/org/apache/maven/its/mng3652/MyMojo.java
@@ -96,7 +96,7 @@ public class MyMojo
 policy.setEnabled( true );
 
 ArtifactRepository remote =
-repositoryFactory.createArtifactRepository( "test", testProtocol + 
"://127.0.0.1:" + testPort, layout,
+repositoryFactory.createArtifactRepository( "test", testProtocol + 
"://localhost:" + testPort, layout,
 policy, policy );
 
 Artifact artifact = artifactFactory.createArtifact( "bad.group", 
"missing-artifact", "1", null, "jar" );

[1/3] maven-surefire git commit: [SUREFIRE-1350] Upgrade Version of maven-invoker-plugin to 2.0.0

2017-04-01 Thread tibordigana

Repository: maven-surefire
Updated Branches:
  refs/heads/master 67e61b07e -> dc3f3674e


[SUREFIRE-1350] Upgrade Version of maven-invoker-plugin to 2.0.0


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

Branch: refs/heads/master
Commit: 40f38c521b839d80a04f0f0de3deebb8009370f3
Parents: 67e61b0
Author: Tibor17 
Authored: Sat Apr 1 14:52:44 2017 +0200
Committer: Tibor17 
Committed: Sat Apr 1 14:52:44 2017 +0200

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


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/40f38c52/pom.xml
--
diff --git a/pom.xml b/pom.xml
index df9d79b..41e5a5a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -325,7 +325,7 @@
 
 
   maven-invoker-plugin
-  1.10
+  2.0.0
 
 
   org.jacoco

[2/3] maven-surefire git commit: improve verify.bsh to verify in maven-invoker-plugin

2017-04-01 Thread tibordigana

improve verify.bsh to verify in maven-invoker-plugin


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

Branch: refs/heads/master
Commit: 561c696523bf431c65ca1c6eef88a66599f94105
Parents: 40f38c5
Author: Tibor17 
Authored: Sat Apr 1 14:54:03 2017 +0200
Committer: Tibor17 
Committed: Sat Apr 1 14:54:03 2017 +0200

--
 maven-failsafe-plugin/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/561c6965/maven-failsafe-plugin/pom.xml
--
diff --git a/maven-failsafe-plugin/pom.xml b/maven-failsafe-plugin/pom.xml
index a5d41ff..dc1df6d 100644
--- a/maven-failsafe-plugin/pom.xml
+++ b/maven-failsafe-plugin/pom.xml
@@ -291,7 +291,7 @@
   
 */pom.xml
   
-  verify.bsh
+  verify
   src/it/settings.xml
   ${skipTests}
   false

[3/3] maven-surefire git commit: [SUREFIRE-1351] Performance unit tests should GC to free limited memory size.

2017-04-01 Thread tibordigana

[SUREFIRE-1351] Performance unit tests should GC to free limited memory size.


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

Branch: refs/heads/master
Commit: dc3f3674e17c3502312a88385272c6add9d4b4ad
Parents: 561c696
Author: Tibor17 
Authored: Sat Apr 1 15:05:02 2017 +0200
Committer: Tibor17 
Committed: Sat Apr 1 15:09:05 2017 +0200

--
 surefire-providers/surefire-junit47/pom.xml | 1 +
 .../surefire/junitcore/pc/ParallelComputerBuilderTest.java  | 5 +++--
 .../maven/surefire/junitcore/pc/ParallelComputerUtilTest.java   | 3 +++
 3 files changed, 7 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/dc3f3674/surefire-providers/surefire-junit47/pom.xml
--
diff --git a/surefire-providers/surefire-junit47/pom.xml 
b/surefire-providers/surefire-junit47/pom.xml
index 919c525..91dc0c1 100644
--- a/surefire-providers/surefire-junit47/pom.xml
+++ b/surefire-providers/surefire-junit47/pom.xml
@@ -128,6 +128,7 @@
   
 **/JUnit47SuiteTest.java
   
+  -Xms256m -Xmx256m
 
   
   

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/dc3f3674/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/pc/ParallelComputerBuilderTest.java
--
diff --git 
a/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/pc/ParallelComputerBuilderTest.java
 
b/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/pc/ParallelComputerBuilderTest.java
index 5184cdd..0af17cd 100644
--- 
a/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/pc/ParallelComputerBuilderTest.java
+++ 
b/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/pc/ParallelComputerBuilderTest.java
@@ -91,8 +91,7 @@ public class ParallelComputerBuilderTest
 }
 
 @Before
-public void beforeTest()
-{
+public void beforeTest() throws InterruptedException {
 Class1.maxConcurrentMethods = 0;
 Class1.concurrentMethods = 0;
 shutdownTask = null;
@@ -101,6 +100,8 @@ public class ParallelComputerBuilderTest
 NotThreadSafeTest3.t = null;
 NormalTest1.t = null;
 NormalTest2.t = null;
+System.gc();
+Thread.sleep( 50L );
 }
 
 @Test

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/dc3f3674/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/pc/ParallelComputerUtilTest.java
--
diff --git 
a/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/pc/ParallelComputerUtilTest.java
 
b/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/pc/ParallelComputerUtilTest.java
index 15daac9..e41dbaa 100644
--- 
a/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/pc/ParallelComputerUtilTest.java
+++ 
b/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/pc/ParallelComputerUtilTest.java
@@ -87,7 +87,10 @@ public final class ParallelComputerUtilTest
 
 @Before
 public void beforeTest()
+throws InterruptedException
 {
+System.gc();
+Thread.sleep( 50L );
 assertFalse( Thread.currentThread().isInterrupted() );
 }

maven-surefire git commit: [SUREFIRE-1349] FreeBSD cross process communication needs to commit stdout data in forked JVM within a synchronized block

2017-04-01 Thread tibordigana

Repository: maven-surefire
Updated Branches:
  refs/heads/master da7ff6aa2 -> 67e61b07e


[SUREFIRE-1349] FreeBSD cross process communication needs to commit stdout data 
in forked JVM within a synchronized block


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

Branch: refs/heads/master
Commit: 67e61b07e35ce2ade82efc8e69240003b28fd83e
Parents: da7ff6a
Author: Tibor17 
Authored: Sat Apr 1 14:27:07 2017 +0200
Committer: Tibor17 
Committed: Sat Apr 1 14:27:07 2017 +0200

--
 .../maven/plugin/surefire/booterclient/ForkConfiguration.java | 7 +--
 .../java/org/apache/maven/surefire/booter/CommandReader.java  | 6 +-
 .../org/apache/maven/surefire/booter/ForkingRunListener.java  | 2 ++
 .../java/org/apache/maven/surefire/booter/ForkedBooter.java   | 7 +--
 4 files changed, 17 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/67e61b07/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkConfiguration.java
--
diff --git 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkConfiguration.java
 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkConfiguration.java
index 988af8f..52bc928 100644
--- 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkConfiguration.java
+++ 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkConfiguration.java
@@ -297,13 +297,16 @@ public class ForkConfiguration
 man.getMainAttributes().putValue( "Main-Class", startClassName );
 
 man.write( jos );
+
+jos.closeEntry();
+jos.flush();
+
+return file;
 }
 finally
 {
 jos.close();
 }
-
-return file;
 }
 
 public boolean isDebug()

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/67e61b07/surefire-api/src/main/java/org/apache/maven/surefire/booter/CommandReader.java
--
diff --git 
a/surefire-api/src/main/java/org/apache/maven/surefire/booter/CommandReader.java
 
b/surefire-api/src/main/java/org/apache/maven/surefire/booter/CommandReader.java
index fb3ad05..2e80f44 100644
--- 
a/surefire-api/src/main/java/org/apache/maven/surefire/booter/CommandReader.java
+++ 
b/surefire-api/src/main/java/org/apache/maven/surefire/booter/CommandReader.java
@@ -342,7 +342,11 @@ public final class CommandReader
 private void requestNextTest()
 {
 byte[] encoded = encodeStringForForkCommunication( ( (char) 
BOOTERCODE_NEXT_TEST ) + ",0,want more!\n" );
-originalOutStream.write( encoded, 0, encoded.length );
+synchronized ( originalOutStream )
+{
+originalOutStream.write( encoded, 0, encoded.length );
+originalOutStream.flush();
+}
 }
 
 private boolean shouldFinish()

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/67e61b07/surefire-api/src/main/java/org/apache/maven/surefire/booter/ForkingRunListener.java
--
diff --git 
a/surefire-api/src/main/java/org/apache/maven/surefire/booter/ForkingRunListener.java
 
b/surefire-api/src/main/java/org/apache/maven/surefire/booter/ForkingRunListener.java
index 1216502..7856dac 100644
--- 
a/surefire-api/src/main/java/org/apache/maven/surefire/booter/ForkingRunListener.java
+++ 
b/surefire-api/src/main/java/org/apache/maven/surefire/booter/ForkingRunListener.java
@@ -206,6 +206,7 @@ public class ForkingRunListener
 synchronized ( target ) // See notes about synchronization/thread 
safety in class javadoc
 {
 target.write( encodeBytes, 0, encodeBytes.length );
+target.flush();
 if ( target.checkError() )
 {
 // We MUST NOT throw any exception from this method; otherwise 
we are in loop and CPU goes up:
@@ -275,6 +276,7 @@ public class ForkingRunListener
 synchronized ( target ) // See notes about synchronization/thread 
safety in class javadoc
 {
 target.write( encodeBytes, 0, encodeBytes.length );
+target.flush();
 if ( target.checkError() )
 {
 // We MUST NOT throw any exception from this method; otherwise 
we are in loop and CPU goes up:

maven-archetype git commit: Update documentation regarding archetypeCatalog and archetype repositories

2017-04-01 Thread rfscholte

Repository: maven-archetype
Updated Branches:
  refs/heads/master ee96192df -> aea8ccad2


Update documentation regarding archetypeCatalog and archetype repositories


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

Branch: refs/heads/master
Commit: aea8ccad2de3c2d2551d391e5814b2f2bea730db
Parents: ee96192
Author: rfscholte 
Authored: Sat Apr 1 14:14:21 2017 +0200
Committer: rfscholte 
Committed: Sat Apr 1 14:14:21 2017 +0200

--
 maven-archetype-plugin/src/it/mrm/settings.xml  |  1 -
 .../src/site/apt/archetype-repository.apt   | 81 
 .../examples/generate-alternative-catalog.apt   |  8 +-
 .../src/site/apt/specification/generate.apt | 13 +---
 maven-archetype-plugin/src/site/apt/usage.apt   |  8 ++
 maven-archetype-plugin/src/site/site.xml|  1 +
 6 files changed, 94 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/aea8ccad/maven-archetype-plugin/src/it/mrm/settings.xml
--
diff --git a/maven-archetype-plugin/src/it/mrm/settings.xml 
b/maven-archetype-plugin/src/it/mrm/settings.xml
index 5913350..bcae17c 100644
--- a/maven-archetype-plugin/src/it/mrm/settings.xml
+++ b/maven-archetype-plugin/src/it/mrm/settings.xml
@@ -1,5 +1,4 @@
 
-
 
+  
+  
+
+  acme
+  
+
+  archetype
+  https://www.acme.com/repo
+  
+true
+fail
+  
+  
+true
+warn
+  
+
+  
+
+  
+
+---
+

http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/aea8ccad/maven-archetype-plugin/src/site/apt/examples/generate-alternative-catalog.apt
--
diff --git 
a/maven-archetype-plugin/src/site/apt/examples/generate-alternative-catalog.apt 
b/maven-archetype-plugin/src/site/apt/examples/generate-alternative-catalog.apt
index 585e398..242eecf 100644
--- 
a/maven-archetype-plugin/src/site/apt/examples/generate-alternative-catalog.apt
+++ 
b/maven-archetype-plugin/src/site/apt/examples/generate-alternative-catalog.apt
@@ -37,19 +37,13 @@ Generate project using an alternative catalog
 
* <<>> to use the maven's remote catalog. No catalog is currently 
provided.
 
-   * <<>> to use a specific local 
catalog.
- When the catalog file is named <<>>, it can be 
omitted.
-
-   * <<>> to use a specific remote 
catalog.
- When the catalog file is named <<>>, it can be 
omitted.
-
[]
 
The default value is <<>>. Thus the local catalog is shown
just after the remote one.
 
 +--
-$ mvn archetype:generate -DarchetypeCatalog=http://cocoon.apache.org
+$ mvn archetype:generate
 [INFO] Scanning for projects...
 [INFO] Searching repository for plugin with prefix: 'archetype'.
 [INFO] 

http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/aea8ccad/maven-archetype-plugin/src/site/apt/specification/generate.apt
--
diff --git a/maven-archetype-plugin/src/site/apt/specification/generate.apt 
b/maven-archetype-plugin/src/site/apt/specification/generate.apt
index 41a605f..eae9c58 100644
--- a/maven-archetype-plugin/src/site/apt/specification/generate.apt
+++ b/maven-archetype-plugin/src/site/apt/specification/generate.apt
@@ -68,22 +68,15 @@ What is done during the creation of a project?
 Archetype Plugin with all the needed values as system properties.
 
 * <<>> which specifies the catalog(s).
-   The valid catalogs are: <<>> (the default), <<>>, 
<<>>,
-   <<>>, <<>>.
+   The valid catalogs are: <<>> (the default), <<>>, 
<<>>.
 
* <<>> uses an internal catalog
 
-   * <<>> uses the <<<~/.m2/archetype-catalog.xml>>> file
+   * <<>> uses the <<>> file from the local 
repository
 
-   * <<>> uses the 
<<>>
+   * <<>> uses the <<>> from Maven Central, 
either direct or via a repository manager 
  file
 
-   * <<>> uses the catalog file defined by path (or the
- <<>> file located in path directory)
-
-   * <<>> uses the catalog file defined by url (or the
- <<>> file located in URL directory)
-
[]
 
 * <<>> specifies the groupId of the archetype to use

maven-archetype git commit: [ARCHETYPE-521] Cannot specify remote repository for generate project from archetype

2017-04-01 Thread rfscholte

Repository: maven-archetype
Updated Branches:
  refs/heads/master f831932ce -> ee96192df


[ARCHETYPE-521] Cannot specify remote repository for generate project from 
archetype

Verified with integration-test


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

Branch: refs/heads/master
Commit: ee96192df88a50cf90726ddfb95a72be4bdf2df0
Parents: f831932
Author: rfscholte 
Authored: Sat Apr 1 13:21:41 2017 +0200
Committer: rfscholte 
Committed: Sat Apr 1 13:21:41 2017 +0200

--
 maven-archetype-plugin/pom.xml  | 36 +++-
 .../META-INF/maven/archetype-metadata.xml   | 30 
 .../archetype-resources/pom.xml | 31 +
 .../3rdparty-archetype-1.0.pom  | 29 
 .../archetype-repository/archetype-catalog.xml  | 35 +++
 maven-archetype-plugin/src/it/mrm/settings.xml  | 22 +++-
 .../invoker.properties  | 18 ++
 .../test.properties | 25 ++
 .../ARCHETYPE-521_archetype-repo/verify.groovy  | 21 
 9 files changed, 237 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/ee96192d/maven-archetype-plugin/pom.xml
--
diff --git a/maven-archetype-plugin/pom.xml b/maven-archetype-plugin/pom.xml
index ba6b272..3fc6765 100644
--- a/maven-archetype-plugin/pom.xml
+++ b/maven-archetype-plugin/pom.xml
@@ -181,21 +181,38 @@
 1.1.0
 
   
+mirror
 
   start
   stop
 
+
+  
+
+  src/it/mrm/repository
+  target/mock-repo
+
+
+  
+
+  
+  
+archetype-repository
+
+  start
+  stop
+
+
+  archetype-repo.proxy.url
+  
+
+  src/it/mrm/archetype-repository
+  target/archetype-repo
+
+  
+
   
 
-
-  
-
-  src/it/mrm/repository
-  target/mock-repo
-
-
-  
-
   
   
 org.apache.maven.plugins
@@ -213,6 +230,7 @@
   src/it/mrm/settings.xml
   
 
${mrm.repository.url}
+
${archetype-repo.proxy.url}
   
 
 

http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/ee96192d/maven-archetype-plugin/src/it/mrm/archetype-repository/3rdparty-archetype-1.0.jar/META-INF/maven/archetype-metadata.xml
--
diff --git 
a/maven-archetype-plugin/src/it/mrm/archetype-repository/3rdparty-archetype-1.0.jar/META-INF/maven/archetype-metadata.xml
 
b/maven-archetype-plugin/src/it/mrm/archetype-repository/3rdparty-archetype-1.0.jar/META-INF/maven/archetype-metadata.xml
new file mode 100644
index 000..d504e4e
--- /dev/null
+++ 
b/maven-archetype-plugin/src/it/mrm/archetype-repository/3rdparty-archetype-1.0.jar/META-INF/maven/archetype-metadata.xml
@@ -0,0 +1,30 @@
+
+
+
+
+  
+
+  src/main/java
+  
+**/*.java
+  
+
+  
+
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/ee96192d/maven-archetype-plugin/src/it/mrm/archetype-repository/3rdparty-archetype-1.0.jar/archetype-resources/pom.xml
--
diff --git 
a/maven-archetype-plugin/src/it/mrm/archetype-repository/3rdparty-archetype-1.0.jar/archetype-resources/pom.xml
 
b/maven-archetype-plugin/src/it/mrm/archetype-repository/3rdparty-archetype-1.0.jar/archetype-resources/pom.xml
new file mode 100644
index 000..9cde305
--- /dev/null
+++ 
b/maven-archetype-plugin/src/it/mrm/archetype-repository/3rdparty-archetype-1.0.jar/archetype-resources/pom.xml
@@ -0,0 +1,31 @@
+
+
+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
+
+

[maven] Git Push Summary

2017-04-01 Thread hboutemy

Repository: maven
Updated Branches:
  refs/heads/embedded-ITs [deleted] f92a82788

[maven] Git Push Summary

2017-04-01 Thread hboutemy

Repository: maven
Updated Branches:
  refs/heads/Jenkins-tools-names [deleted] d8f2f0c6b

[maven-archetype] Git Push Summary

2017-04-01 Thread rfscholte

Repository: maven-archetype
Updated Branches:
  refs/heads/ARCHETYPE-520 [deleted] 35b4a76d1

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

2017-04-01 Thread stephenc

Repository: maven
Updated Branches:
  refs/heads/master 00c82b7e2 -> 87cf1eeb7


[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/master
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

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

2017-04-01 Thread stephenc

[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/master
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

[maven] Git Push Summary

2017-04-01 Thread stephenc

Repository: maven
Updated Branches:
  refs/heads/mng-6195 [deleted] e782534b0

maven-archetype git commit: Squashed commit of the following:

2017-04-01 Thread rfscholte

Repository: maven-archetype
Updated Branches:
  refs/heads/master cb1ffb298 -> f831932ce


Squashed commit of the following:

commit 35b4a76d1d6d73f23320aa2c825c616c9816760c
Author: rfscholte 
Date:   Sat Apr 1 11:39:22 2017 +0200

[ARCHETYPE-520] Following mirror configuration from settings.xml for 
downloading archetype metadata

Add verify script to ensure nothing is downloaded directly from Central

commit 50b21e8a99d7d1d0170d5fc7b5ba7fb82425814e
Author: rfscholte 
Date:   Sat Apr 1 11:08:46 2017 +0200

[ARCHETYPE-520] Following mirror configuration from settings.xml for 
downloading archetype metadata

Use released 1.1.0 of mrm-maven-plugin

commit be052022c053e887aa964060255231e579e15d56
Author: rfscholte 
Date:   Mon Mar 20 20:07:47 2017 +0100

ARCHETYPE-520: Following mirror configuration from settings.xml for 
downloading archetype metadata

MRM based integration test


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

Branch: refs/heads/master
Commit: f831932cef0709cf72609d8e23169b5a4c01649f
Parents: cb1ffb2
Author: rfscholte 
Authored: Sat Apr 1 11:43:41 2017 +0200
Committer: rfscholte 
Committed: Sat Apr 1 11:51:24 2017 +0200

--
 maven-archetype-plugin/pom.xml  |  3 +-
 .../src/it/mrm/repository/archetype-catalog.xml | 35 
 .../META-INF/maven/archetype-metadata.xml   | 30 +
 .../archetype-resources/pom.xml | 29 
 .../it/mrm/repository/custom-archetype-1.0.pom  | 29 
 .../ARCHETYPE-520_mirror/invoker.properties | 18 ++
 .../ARCHETYPE-520_mirror/test.properties| 26 +++
 .../projects/ARCHETYPE-520_mirror/verify.groovy | 21 
 8 files changed, 190 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/f831932c/maven-archetype-plugin/pom.xml
--
diff --git a/maven-archetype-plugin/pom.xml b/maven-archetype-plugin/pom.xml
index d059eb7..ba6b272 100644
--- a/maven-archetype-plugin/pom.xml
+++ b/maven-archetype-plugin/pom.xml
@@ -178,7 +178,7 @@
   
 org.codehaus.mojo
 mrm-maven-plugin
-1.0.0
+1.1.0
 
   
 
@@ -191,6 +191,7 @@
   
 
   src/it/mrm/repository
+  target/mock-repo
 
 
   

http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/f831932c/maven-archetype-plugin/src/it/mrm/repository/archetype-catalog.xml
--
diff --git a/maven-archetype-plugin/src/it/mrm/repository/archetype-catalog.xml 
b/maven-archetype-plugin/src/it/mrm/repository/archetype-catalog.xml
new file mode 100644
index 000..ac069a6
--- /dev/null
+++ b/maven-archetype-plugin/src/it/mrm/repository/archetype-catalog.xml
@@ -0,0 +1,35 @@
+
+
+
+
+http://maven.apache.org/plugins/maven-archetype-plugin/archetype-catalog/1.0.0
 http://maven.apache.org/xsd/archetype-catalog-1.0.0.xsd;
+  
xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-catalog/1.0.0;
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;>
+
+  
+
+  org.apache.maven.archetypes.its
+  custom-archetype
+  1.0
+  A custom archetype only available or ITs
+
+  
+
+
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/f831932c/maven-archetype-plugin/src/it/mrm/repository/custom-archetype-1.0.jar/META-INF/maven/archetype-metadata.xml
--
diff --git 
a/maven-archetype-plugin/src/it/mrm/repository/custom-archetype-1.0.jar/META-INF/maven/archetype-metadata.xml
 
b/maven-archetype-plugin/src/it/mrm/repository/custom-archetype-1.0.jar/META-INF/maven/archetype-metadata.xml
new file mode 100644
index 000..d504e4e
--- /dev/null
+++ 
b/maven-archetype-plugin/src/it/mrm/repository/custom-archetype-1.0.jar/META-INF/maven/archetype-metadata.xml
@@ -0,0 +1,30 @@
+
+
+
+
+  
+
+  src/main/java
+  
+**/*.java
+  
+
+  
+
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/f831932c/maven-archetype-plugin/src/it/mrm/repository/custom-archetype-1.0.jar/archetype-resources/pom.xml

maven-archetype git commit: [ARCHETYPE-520] Following mirror configuration from settings.xml for downloading archetype metadata

2017-04-01 Thread rfscholte

Repository: maven-archetype
Updated Branches:
  refs/heads/ARCHETYPE-520 50b21e8a9 -> 35b4a76d1


[ARCHETYPE-520] Following mirror configuration from settings.xml for 
downloading archetype metadata

Add verify script to ensure nothing is downloaded directly from Central


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

Branch: refs/heads/ARCHETYPE-520
Commit: 35b4a76d1d6d73f23320aa2c825c616c9816760c
Parents: 50b21e8
Author: rfscholte 
Authored: Sat Apr 1 11:39:22 2017 +0200
Committer: rfscholte 
Committed: Sat Apr 1 11:39:22 2017 +0200

--
 .../ARCHETYPE-520_mirror/invoker.properties |  3 +--
 .../projects/ARCHETYPE-520_mirror/verify.groovy | 21 
 2 files changed, 22 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/35b4a76d/maven-archetype-plugin/src/it/projects/ARCHETYPE-520_mirror/invoker.properties
--
diff --git 
a/maven-archetype-plugin/src/it/projects/ARCHETYPE-520_mirror/invoker.properties
 
b/maven-archetype-plugin/src/it/projects/ARCHETYPE-520_mirror/invoker.properties
index 262d621..0517021 100644
--- 
a/maven-archetype-plugin/src/it/projects/ARCHETYPE-520_mirror/invoker.properties
+++ 
b/maven-archetype-plugin/src/it/projects/ARCHETYPE-520_mirror/invoker.properties
@@ -15,5 +15,4 @@
 # specific language governing permissions and limitations
 # under the License.
 
-invoker.goals = 
org.apache.maven.plugins:maven-archetype-plugin:${project.version}:generate
-invoker.debug = true
\ No newline at end of file
+invoker.goals = 
org.apache.maven.plugins:maven-archetype-plugin:${project.version}:generate
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/35b4a76d/maven-archetype-plugin/src/it/projects/ARCHETYPE-520_mirror/verify.groovy
--
diff --git 
a/maven-archetype-plugin/src/it/projects/ARCHETYPE-520_mirror/verify.groovy 
b/maven-archetype-plugin/src/it/projects/ARCHETYPE-520_mirror/verify.groovy
new file mode 100644
index 000..ffbb061
--- /dev/null
+++ b/maven-archetype-plugin/src/it/projects/ARCHETYPE-520_mirror/verify.groovy
@@ -0,0 +1,21 @@
+/*
+ * 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.
+ */
+
+buildLog = new File( basedir, "build.log" )
+assert !buildLog.text.contains( "://repo.maven.apache.org" )
\ No newline at end of file

maven-archetype git commit: [ARCHETYPE-520] Following mirror configuration from settings.xml for downloading archetype metadata

2017-04-01 Thread rfscholte

Repository: maven-archetype
Updated Branches:
  refs/heads/ARCHETYPE-520 be052022c -> 50b21e8a9


[ARCHETYPE-520] Following mirror configuration from settings.xml for 
downloading archetype metadata

Use released 1.1.0 of mrm-maven-plugin


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

Branch: refs/heads/ARCHETYPE-520
Commit: 50b21e8a99d7d1d0170d5fc7b5ba7fb82425814e
Parents: be05202
Author: rfscholte 
Authored: Sat Apr 1 11:08:46 2017 +0200
Committer: rfscholte 
Committed: Sat Apr 1 11:08:46 2017 +0200

--
 maven-archetype-plugin/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/50b21e8a/maven-archetype-plugin/pom.xml
--
diff --git a/maven-archetype-plugin/pom.xml b/maven-archetype-plugin/pom.xml
index ee84351..ba6b272 100644
--- a/maven-archetype-plugin/pom.xml
+++ b/maven-archetype-plugin/pom.xml
@@ -178,7 +178,7 @@
   
 org.codehaus.mojo
 mrm-maven-plugin
-1.0.2-SNAPSHOT
+1.1.0

51 matches

Mail list logo