date:20170124

svn commit: r1005541 - /websites/production/maven/components/resolver-archives/resolver-ant-tasks-LATEST/download.cgi

2017-01-24 Thread hboutemy

Author: hboutemy
Date: Wed Jan 25 07:17:37 2017
New Revision: 1005541

Log:
added executable bit

Modified:

websites/production/maven/components/resolver-archives/resolver-ant-tasks-LATEST/download.cgi
   (props changed)

Propchange: 
websites/production/maven/components/resolver-archives/resolver-ant-tasks-LATEST/download.cgi
--
svn:executable = *

maven git commit: o Updated to remove errors reported by Checkstyle.

2017-01-24 Thread hboutemy

Repository: maven
Updated Branches:
  refs/heads/master 311fc62b7 -> a99a78984


o Updated to remove errors reported by Checkstyle.

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

Branch: refs/heads/master
Commit: a99a78984c1f20394abf6e76b6167b9e61e6163c
Parents: 311fc62
Author: Christian Schulte 
Authored: Tue Jun 14 21:26:56 2016 +0200
Committer: HervÃ© Boutemy 
Committed: Wed Jan 25 08:09:30 2017 +0100

--
 .../UnknownRepositoryLayoutException.java   |  2 +-
 .../DefaultArtifactRepositoryFactory.java   |  4 +-
 .../repository/layout/FlatRepositoryLayout.java |  6 +-
 .../artifact/resolver/ArtifactResolver.java | 62 +++---
 .../resolver/DefaultArtifactResolver.java   | 12 ++-
 .../profiles/activation/ProfileActivator.java   |  4 +-
 .../org/apache/maven/project/ProjectUtils.java  | 15 ++--
 .../AbstractStringBasedModelInterpolator.java   | 22 +++--
 .../StringSearchModelInterpolator.java  | 14 ++--
 .../project/path/DefaultPathTranslator.java | 10 +--
 .../repository/MetadataResolutionResult.java|  8 +-
 .../repository/legacy/DefaultWagonManager.java  | 85 +---
 .../legacy/LegacyRepositorySystem.java  | 31 ---
 .../maven/repository/legacy/WagonManager.java   |  6 +-
 .../repository/ArtifactRepositoryFactory.java   |  6 +-
 .../DefaultLegacyArtifactCollector.java | 84 +++
 .../resolver/LegacyArtifactCollector.java   |  9 ++-
 .../repository/metadata/MetadataGraph.java  |  3 +-
 .../repository/metadata/MetadataGraphEdge.java  |  3 +-
 .../MetadataGraphTransformationException.java   |  4 +-
 .../usability/plugin/ExpressionDocumenter.java  | 18 +++--
 21 files changed, 236 insertions(+), 172 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/a99a7898/maven-compat/src/main/java/org/apache/maven/artifact/UnknownRepositoryLayoutException.java
--
diff --git 
a/maven-compat/src/main/java/org/apache/maven/artifact/UnknownRepositoryLayoutException.java
 
b/maven-compat/src/main/java/org/apache/maven/artifact/UnknownRepositoryLayoutException.java
index 5abe110..e23bea9 100644
--- 
a/maven-compat/src/main/java/org/apache/maven/artifact/UnknownRepositoryLayoutException.java
+++ 
b/maven-compat/src/main/java/org/apache/maven/artifact/UnknownRepositoryLayoutException.java
@@ -23,7 +23,7 @@ import 
org.codehaus.plexus.component.repository.exception.ComponentLookupExcepti
 
 /**
  * Exception which is meant to occur when a layout specified for a particular
- * repository doesn't have a corresponding {@link ArtifactRepositoryLayout}
+ * repository doesn't have a corresponding {@link 
org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout}
  * component in the current container.
  *
  * @author jdcasey

http://git-wip-us.apache.org/repos/asf/maven/blob/a99a7898/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java
--
diff --git 
a/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java
 
b/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java
index 658dbda..0f69835 100644
--- 
a/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java
+++ 
b/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java
@@ -81,7 +81,9 @@ public class DefaultArtifactRepositoryFactory
 
ArtifactRepositoryPolicy snapshots,
 
ArtifactRepositoryPolicy releases )
 {
-return injectSession( factory.createArtifactRepository( id, url, 
repositoryLayout, snapshots, releases ), true );
+return injectSession( factory.createArtifactRepository( id, url, 
repositoryLayout, snapshots, releases ),
+  true );
+
 }
 
 public void setGlobalUpdatePolicy( String updatePolicy )

http://git-wip-us.apache.org/repos/asf/maven/blob/a99a7898/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/FlatRepositoryLayout.java
--
diff --git 
a/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/FlatRepositoryLayout.java
 
b/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/FlatRepositoryLayout.java
index 8553a31..58143e0

[2/6] maven git commit: improved documentation

2017-01-24 Thread hboutemy

improved documentation

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

Branch: refs/heads/master
Commit: 512fa6a45b73663ed5b5e0e896539d1084da36f3
Parents: 0b684af
Author: HervÃ© Boutemy 
Authored: Sun Oct 2 10:02:21 2016 +0200
Committer: HervÃ© Boutemy 
Committed: Wed Jan 25 00:07:55 2017 +0100

--
 maven-core/project-builder.txt  |   1 -
 .../src/main/java/org/apache/maven/Maven.java   |   3 +
 .../java/org/apache/maven/SessionScoped.java|   4 +-
 .../apache/maven/execution/MavenSession.java|   2 +
 .../maven/execution/ProjectDependencyGraph.java |   1 +
 .../org/apache/maven/graph/GraphBuilder.java|   5 +
 maven-core/src/site/apt/index.apt   |  23 ++-
 .../apt/scripting-support/marmalade-support.apt | 196 ---
 8 files changed, 26 insertions(+), 209 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/512fa6a4/maven-core/project-builder.txt
--
diff --git a/maven-core/project-builder.txt b/maven-core/project-builder.txt
deleted file mode 100644
index a9aab65..000
--- a/maven-core/project-builder.txt
+++ /dev/null
@@ -1 +0,0 @@
-Maven Project Builder and Maven Model Builder

http://git-wip-us.apache.org/repos/asf/maven/blob/512fa6a4/maven-core/src/main/java/org/apache/maven/Maven.java
--
diff --git a/maven-core/src/main/java/org/apache/maven/Maven.java 
b/maven-core/src/main/java/org/apache/maven/Maven.java
index 8563847..69f9fca 100644
--- a/maven-core/src/main/java/org/apache/maven/Maven.java
+++ b/maven-core/src/main/java/org/apache/maven/Maven.java
@@ -23,7 +23,10 @@ import org.apache.maven.execution.MavenExecutionRequest;
 import org.apache.maven.execution.MavenExecutionResult;
 
 /**
+ * The main Maven execution entry point, which will execute a full Maven 
execution session.
+ *
  * @author Jason van Zyl
+ * @see org.apache.maven.execution.MavenSession
  */
 public interface Maven
 {

http://git-wip-us.apache.org/repos/asf/maven/blob/512fa6a4/maven-core/src/main/java/org/apache/maven/SessionScoped.java
--
diff --git a/maven-core/src/main/java/org/apache/maven/SessionScoped.java 
b/maven-core/src/main/java/org/apache/maven/SessionScoped.java
index 63b1eb7..7738938 100644
--- a/maven-core/src/main/java/org/apache/maven/SessionScoped.java
+++ b/maven-core/src/main/java/org/apache/maven/SessionScoped.java
@@ -28,8 +28,8 @@ import java.lang.annotation.Target;
 import com.google.inject.ScopeAnnotation;
 
 /**
- * Indicates that annotated component should be instantiated before session 
starts and discarded after session execution
- * completes.
+ * Indicates that annotated component should be instantiated before session 
execution starts
+ * and discarded after session execution completes.
  *
  * @author Jason van Zyl
  * @since 3.2.0

http://git-wip-us.apache.org/repos/asf/maven/blob/512fa6a4/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java 
b/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
index 864c49ad..d69bbba 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
@@ -39,6 +39,8 @@ import 
org.codehaus.plexus.component.repository.exception.ComponentLookupExcepti
 import org.eclipse.aether.RepositorySystemSession;
 
 /**
+ * A Maven execution session.
+ *
  * @author Jason van Zyl
  */
 public class MavenSession

http://git-wip-us.apache.org/repos/asf/maven/blob/512fa6a4/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 1db277d..0d5584b 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
@@ -27,6 +27,7 @@ import org.apache.maven.project.MavenProject;
  * Describes the inter-dependencies between projects in the reactor.
  *
  * @author Benjamin Bentmann
+ * @since 3.0-alpha
  */
 public interface ProjectDependencyGraph
 {

[4/6] maven git commit: removed now unused checkstyle suppress warnings

2017-01-24 Thread hboutemy

removed now unused checkstyle suppress warnings

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

Branch: refs/heads/master
Commit: 8a8f7cd53f08bd0847e6263f79894d18881dcd9d
Parents: 60e4fa6
Author: HervÃ© Boutemy 
Authored: Sun Oct 16 23:16:52 2016 +0200
Committer: HervÃ© Boutemy 
Committed: Wed Jan 25 00:09:01 2017 +0100

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


http://git-wip-us.apache.org/repos/asf/maven/blob/8a8f7cd5/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 8455848..c0b0dcf 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
@@ -1056,7 +1056,6 @@ public class MavenCli
 
 private static final String ANSI_RESET = "\u001B\u005Bm";
 
-@SuppressWarnings( "checkstyle:methodlength" )
 private void configure( CliRequest cliRequest )
 throws Exception
 {
@@ -1122,7 +1121,6 @@ public class MavenCli
 }
 }
 
-@SuppressWarnings( "checkstyle:methodlength" )
 private void toolchains( CliRequest cliRequest )
 throws Exception
 {

[5/6] maven git commit: added link to 3.3.1 release notes for details on .mvn

2017-01-24 Thread hboutemy

added link to 3.3.1 release notes for details on .mvn

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

Branch: refs/heads/master
Commit: 4547ff73d84f189dea35f60dffafff9cf2f446ba
Parents: 8a8f7cd
Author: HervÃ© Boutemy 
Authored: Mon Nov 14 12:50:10 2016 +0100
Committer: HervÃ© Boutemy 
Committed: Wed Jan 25 00:09:30 2017 +0100

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


http://git-wip-us.apache.org/repos/asf/maven/blob/4547ff73/maven-embedder/src/site/apt/index.apt.vm
--
diff --git a/maven-embedder/src/site/apt/index.apt.vm 
b/maven-embedder/src/site/apt/index.apt.vm
index 17220c9..e820765 100644
--- a/maven-embedder/src/site/apt/index.apt.vm
+++ b/maven-embedder/src/site/apt/index.apt.vm
@@ -20,7 +20,7 @@
  -
  HervÃ© Boutemy
  -
- 2015-03-12
+ 2016-11-14
  -
 
 ${project.name}
@@ -33,13 +33,14 @@ ${project.name}
 
  * {{{./logging.html}logging API}}.
 
- * since 3.3.0, per project settings can be defined by files in <<<.mvn/>>> 
directory:
+ * since 3.3.1 (see {{{/docs/3.3.1/release-notes.html#Core_Extensions}3.3.1 
release notes}} for more details),
+   per project settings can be defined by files in <<<.mvn/>>> directory:
 
* <<<.mvn/jvm.config>>> containing jvm options,
 
* <<<.mvn/maven.config>>> containing Maven command-line parameter,
 
-   * <<<.mvn/extensions.xml>>> containing {{{./core-extensions.html}a list of 
extensions}}.
+   * <<<.mvn/extensions.xml>>> containing {{{./core-extensions.html}a list of 
extensions}},
 
  * since 3.5.0, output is colorized by default, with color disabled in batch 
mode: see

{{{/shared/maven-shared-utils/apidocs/org/apache/maven/shared/utils/logging/package-summary.html}styled
 message API}}

[3/6] maven git commit: updated notice

2017-01-24 Thread hboutemy

updated notice

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

Branch: refs/heads/master
Commit: 60e4fa650fc2e5b3b646c74f3eeab7d0381b8bcb
Parents: 512fa6a
Author: HervÃ© Boutemy 
Authored: Wed Oct 5 23:57:03 2016 +0200
Committer: HervÃ© Boutemy 
Committed: Wed Jan 25 00:08:12 2017 +0100

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


http://git-wip-us.apache.org/repos/asf/maven/blob/60e4fa65/maven-compat/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
--
diff --git 
a/maven-compat/src/main/java/org/apache/maven/project/MavenProjectBuilder.java 
b/maven-compat/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
index c44d8db..816b4a9 100644
--- 
a/maven-compat/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
+++ 
b/maven-compat/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
@@ -39,7 +39,8 @@ public interface MavenProjectBuilder
 MavenProject build( File pom, ProjectBuilderConfiguration configuration )
 throws ProjectBuildingException;
 
-//TODO maven-site-plugin -- Vincent, Dennis and Lukas are checking but 
this doesn't appear to be required anymore.
+//TODO maven-site-plugin -- not used by the plugin directly, but used by 
Doxia Integration Tool & MPIR
+// see DOXIASITETOOLS-167 & MPIR-349
 MavenProject build( File pom, ArtifactRepository localRepository, 
ProfileManager profileManager )
 throws ProjectBuildingException;

[1/6] maven git commit: added core extensions documentation

2017-01-24 Thread hboutemy

Repository: maven
Updated Branches:
  refs/heads/master 9d432fb51 -> 311fc62b7


added core extensions documentation

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

Branch: refs/heads/master
Commit: 0b684af45ee85381a06a20cbdddb6b3fa0ff3b46
Parents: 9d432fb
Author: HervÃ© Boutemy 
Authored: Sat Jun 25 18:58:01 2016 +0200
Committer: HervÃ© Boutemy 
Committed: Wed Jan 25 00:04:31 2017 +0100

--
 .../main/resources/META-INF/maven/extension.xml |  7 +++--
 maven-core/src/site/apt/core-extensions.apt.vm  | 30 
 maven-core/src/site/apt/index.apt   |  2 +-
 maven-core/src/site/site.xml|  1 +
 4 files changed, 36 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/0b684af4/maven-core/src/main/resources/META-INF/maven/extension.xml
--
diff --git a/maven-core/src/main/resources/META-INF/maven/extension.xml 
b/maven-core/src/main/resources/META-INF/maven/extension.xml
index 07e60aa..f9cf07a 100644
--- a/maven-core/src/main/resources/META-INF/maven/extension.xml
+++ b/maven-core/src/main/resources/META-INF/maven/extension.xml
@@ -18,7 +18,7 @@ KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
 -->
-
+
 
   
 
@@ -161,7 +161,7 @@ under the License.
 org.fusesource.jansi:jansi
 
 
 org.sonatype.aether:aether-api
 org.sonatype.aether:aether-spi
@@ -174,4 +174,5 @@ under the License.
   | wagon from their plugin realm. 
  -->
   
-
\ No newline at end of file
+
+

http://git-wip-us.apache.org/repos/asf/maven/blob/0b684af4/maven-core/src/site/apt/core-extensions.apt.vm
--
diff --git a/maven-core/src/site/apt/core-extensions.apt.vm 
b/maven-core/src/site/apt/core-extensions.apt.vm
new file mode 100644
index 000..3d7abca
--- /dev/null
+++ b/maven-core/src/site/apt/core-extensions.apt.vm
@@ -0,0 +1,30 @@
+~~ 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.
+
+ ---
+ Maven Core Extensions Reference
+ ---
+ HervÃ© Boutemy
+ ---
+ 2016-06-25
+ ---
+
+Maven Core Extensions Reference
+
+  Maven core provides default extensions as defined in 
<<>>:
+
+%{snippet|id=core-extension|file=${project.basedir}/src/main/resources/META-INF/maven/extension.xml}

http://git-wip-us.apache.org/repos/asf/maven/blob/0b684af4/maven-core/src/site/apt/index.apt
--
diff --git a/maven-core/src/site/apt/index.apt 
b/maven-core/src/site/apt/index.apt
index 61d1772..966b57c 100644
--- a/maven-core/src/site/apt/index.apt
+++ b/maven-core/src/site/apt/index.apt
@@ -53,7 +53,7 @@ Maven Core
  
({{{./xref/org/apache/maven/classrealm/DefaultClassRealmManager.html}source}}), 
using
  {{{https://codehaus-plexus.github.io/plexus-classworlds/}Plexus Classworlds}},
 
- * {{{./extension.html}extension descriptor}},
+ * {{{./extension.html}extension descriptor}} and 
{{{./core-extensions.html}core extensions}},
 
  * <<>> component 
({{{./apidocs/org/apache/maven/exception/ExceptionHandler.html}javadoc}}),
  with its <<>> implementation

http://git-wip-us.apache.org/repos/asf/maven/blob/0b684af4/maven-core/src/site/site.xml
--
diff --git a/maven-core/src/site/site.xml b/maven-core/src/site/site.xml
index 2c38d2a..9eb3ad0 100644
--- a/maven-core/src/site/site.xml
+++ b/maven-core/src/site/site.xml
@@ -34,6 +34,7 @@ under the License.
   
   
   
+

[6/6] maven git commit: added core its to projects' sources

2017-01-24 Thread hboutemy

added core its to projects' sources


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

Branch: refs/heads/master
Commit: 311fc62b7daca1d63596e2202598a0fd3e4d77e2
Parents: 4547ff7
Author: HervÃ© Boutemy 
Authored: Wed Nov 16 14:41:06 2016 +0100
Committer: HervÃ© Boutemy 
Committed: Wed Jan 25 00:09:42 2017 +0100

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


http://git-wip-us.apache.org/repos/asf/maven/blob/311fc62b/doap_Maven.rdf
--
diff --git a/doap_Maven.rdf b/doap_Maven.rdf
index a50b68f..9a043ce 100644
--- a/doap_Maven.rdf
+++ b/doap_Maven.rdf
@@ -190,6 +190,12 @@ under the License.
 https://git-wip-us.apache.org/repos/asf/maven.git"/>
   
 
+
+  
+https://git-wip-us.apache.org/repos/asf/maven-integration-testing.git"/>
+https://git-wip-us.apache.org/repos/asf/maven-integration-testing.git"/>
+  
+
 
   
 Apache Maven PMC

maven git commit: added README.md to rat excludes

2017-01-24 Thread hboutemy

Repository: maven
Updated Branches:
  refs/heads/master cfbad56f6 -> 9d432fb51


added README.md to rat excludes

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

Branch: refs/heads/master
Commit: 9d432fb515c390beb593d8c4608775c46cfc03f9
Parents: cfbad56
Author: HervÃ© Boutemy 
Authored: Sat May 28 21:14:54 2016 +0200
Committer: HervÃ© Boutemy 
Committed: Wed Jan 25 00:00:43 2017 +0100

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


http://git-wip-us.apache.org/repos/asf/maven/blob/9d432fb5/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 3f9ce4f..5d1f57f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -581,6 +581,7 @@ under the License.
 .repository/** 
 .maven/spy.log 
 .java-version
+README.md

[maven] Git Push Summary

2017-01-24 Thread hboutemy

Repository: maven
Updated Branches:
  refs/heads/MNG-5904 [deleted] 020b0a4f7

[maven] Git Push Summary

2017-01-24 Thread hboutemy

Repository: maven
Updated Branches:
  refs/heads/MNG-3507 [deleted] 5957c474f

[2/2] maven git commit: updated urls (https, plexus) and license header formatting

2017-01-24 Thread hboutemy

updated urls (https, plexus) and license header formatting

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

Branch: refs/heads/master
Commit: 84085c0a9ce4febee8be124fe61f02cd40185d20
Parents: bc07e74
Author: HervÃ© Boutemy 
Authored: Sat May 28 13:28:23 2016 +0200
Committer: HervÃ© Boutemy 
Committed: Tue Jan 24 23:50:10 2017 +0100

--
 README.md   |  6 ++--
 apache-maven/README.txt |  6 ++--
 apache-maven/pom.xml| 32 ++
 apache-maven/src/conf/toolchains.xml|  2 +-
 maven-artifact/pom.xml  | 27 ++-
 maven-compat/pom.xml| 27 ++-
 .../maven/artifact/manager/WagonManager.java|  2 +-
 maven-core/pom.xml  | 27 ++-
 .../AbstractMavenLifecycleParticipant.java  |  2 +-
 maven-core/src/main/mdo/toolchains.mdo  |  4 +--
 maven-core/src/site/apt/index.apt   |  2 +-
 maven-embedder/pom.xml  | 27 ++-
 maven-embedder/src/site/apt/logging.apt |  6 ++--
 maven-model-builder/pom.xml | 27 ++-
 .../maven/model/io/xpp3/package-info.java   |  6 ++--
 maven-model/src/main/mdo/maven.mdo  | 20 +--
 maven-model/src/site/xdoc/navigation.xml| 35 
 .../org/apache/maven/plugin/AbstractMojo.java   |  8 ++---
 .../maven/plugin/descriptor/MojoDescriptor.java |  4 +--
 maven-settings/src/main/mdo/settings.mdo|  2 +-
 maven-settings/src/site/apt/index.apt   |  2 +-
 pom.xml | 34 ++-
 src/site/site.xml   |  6 ++--
 src/site/xdoc/index.xml | 16 -
 24 files changed, 174 insertions(+), 156 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/84085c0a/README.md
--
diff --git a/README.md b/README.md
index 7a5ed4d..33a4be4 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,11 @@
 # Maven
 
-Maven is available under the [Apache License, Version 
2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
+Maven is available under the [Apache License, Version 
2.0](https://www.apache.org/licenses/LICENSE-2.0.txt)
 
 - [Maven Issue Tracker](https://issues.apache.org/jira/browse/MNG)
 - [Maven Wiki](https://cwiki.apache.org/confluence/display/MAVEN/Index)
-- [Building 
Maven](http://maven.apache.org/guides/development/guide-building-maven.html)
-- [Running Core ITs](http://maven.apache.org/core-its/core-it-suite/)
+- [Building 
Maven](https://maven.apache.org/guides/development/guide-building-maven.html)
+- [Running Core ITs](https://maven.apache.org/core-its/core-it-suite/)
 
 ## Bootstrapping Basics
 

http://git-wip-us.apache.org/repos/asf/maven/blob/84085c0a/apache-maven/README.txt
--
diff --git a/apache-maven/README.txt b/apache-maven/README.txt
index cbaa7d4..6a1bafd 100644
--- a/apache-maven/README.txt
+++ b/apache-maven/README.txt
@@ -11,12 +11,12 @@
   Documentation
   -
 
-  The most up-to-date documentation can be found at http://maven.apache.org/.
+  The most up-to-date documentation can be found at https://maven.apache.org/.
 
   Release Notes
   -
 
-  The full list of changes can be found at 
http://maven.apache.org/docs/history.html.
+  The full list of changes can be found at 
https://maven.apache.org/docs/history.html.
 
   System Requirements
   ---
@@ -59,7 +59,7 @@
 
   5) Run "mvn --version" to verify that it is correctly installed.
 
-  For complete documentation, see 
http://maven.apache.org/download.html#Installation
+  For complete documentation, see 
https://maven.apache.org/download.html#Installation
 
   Licensing
   -

http://git-wip-us.apache.org/repos/asf/maven/blob/84085c0a/apache-maven/pom.xml
--
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index b2fa989..ba7fda3 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -1,19 +1,23 @@
 
 
-  
+
 
 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

http://git-wip-us.apache.org/repos/asf/maven/blob/84085c0a/apache-maven/src/conf/toolchains.xml

[1/2] maven git commit: point to our documentation on plugins dependencies upgrade

2017-01-24 Thread hboutemy

Repository: maven
Updated Branches:
  refs/heads/master bc07e74d3 -> cfbad56f6


point to our documentation on plugins dependencies upgrade

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

Branch: refs/heads/master
Commit: cfbad56f65b9d664c7967122b76a5389931080f8
Parents: 84085c0
Author: HervÃ© Boutemy 
Authored: Sun May 29 09:55:54 2016 +0200
Committer: HervÃ© Boutemy 
Committed: Tue Jan 24 23:50:10 2017 +0100

--
 maven-compat/src/site/apt/index.apt | 32 
 1 file changed, 32 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/cfbad56f/maven-compat/src/site/apt/index.apt
--
diff --git a/maven-compat/src/site/apt/index.apt 
b/maven-compat/src/site/apt/index.apt
new file mode 100644
index 000..a288cdc
--- /dev/null
+++ b/maven-compat/src/site/apt/index.apt
@@ -0,0 +1,32 @@
+~~ Licensed to the Apache Software Foundation (ASF) under one
+~~ or more contributor license agreements.  See the NOTICE file
+~~ distributed with this work for additional information
+~~ regarding copyright ownership.  The ASF licenses this file
+~~ to you under the Apache License, Version 2.0 (the
+~~ "License"); you may not use this file except in compliance
+~~ with the License.  You may obtain a copy of the License at
+~~
+~~ http://www.apache.org/licenses/LICENSE-2.0
+~~
+~~ Unless required by applicable law or agreed to in writing,
+~~ software distributed under the License is distributed on an
+~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+~~ KIND, either express or implied.  See the License for the
+~~ specific language governing permissions and limitations
+~~ under the License.
+
+ -
+ Introduction
+ -
+ HervÃ© Boutemy
+ -
+ 2016-05-29
+ -
+
+Maven Compat
+
+ Maven2 classes maintained as compatibility layer for plugins that need to 
keep Maven2 compatibility.
+
+ Plugins should avoid these classes and be updated to use only Maven3 
dependencies (and require Maven3): see
+ 
{{{https://cwiki.apache.org/confluence/display/MAVEN/Plugin+migration+to+Maven3+dependencies}
 Plugin migration to Maven3 dependencies}}
+ documentation to get hints on how to make the update.

maven-integration-testing git commit: added license link

2017-01-24 Thread hboutemy

Repository: maven-integration-testing
Updated Branches:
  refs/heads/master 6c86dc6fe -> 7e5b365dc


added license link

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

Branch: refs/heads/master
Commit: 7e5b365dc961a186ee2307825fdf1168d167117b
Parents: 6c86dc6
Author: HervÃ© Boutemy 
Authored: Tue Jan 24 23:41:59 2017 +0100
Committer: HervÃ© Boutemy 
Committed: Tue Jan 24 23:41:59 2017 +0100

--
 core-it-suite/src/site/site.xml | 1 +
 src/site/site.xml   | 6 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/7e5b365d/core-it-suite/src/site/site.xml
--
diff --git a/core-it-suite/src/site/site.xml b/core-it-suite/src/site/site.xml
index e46df34..57e8a72 100644
--- a/core-it-suite/src/site/site.xml
+++ b/core-it-suite/src/site/site.xml
@@ -27,6 +27,7 @@ under the License.
   
   
   
+  http://www.apache.org/licenses/"/>
 
 
   

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/7e5b365d/src/site/site.xml
--
diff --git a/src/site/site.xml b/src/site/site.xml
index 9689d9b..7285498 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -38,9 +38,13 @@ under the License.
   
 
   
+
+  
+  
+  http://www.apache.org/licenses/"/>
+
 
 
 
-

maven-integration-testing git commit: [MNG-3507] added color to ITs run tracking

2017-01-24 Thread hboutemy

Repository: maven-integration-testing
Updated Branches:
  refs/heads/MNG-3507 [created] 47e463085


[MNG-3507] added color to ITs run tracking

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

Branch: refs/heads/MNG-3507
Commit: 47e463085885b728ab7d6c32b2acb4e41e658f4d
Parents: 6c86dc6
Author: HervÃ© Boutemy 
Authored: Sun Jun 5 11:44:56 2016 +0200
Committer: HervÃ© Boutemy 
Committed: Tue Jan 24 23:39:21 2017 +0100

--
 core-it-support/maven-it-helper/pom.xml |  5 
 .../it/AbstractMavenIntegrationTestCase.java| 26 
 pom.xml |  2 +-
 3 files changed, 22 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/47e46308/core-it-support/maven-it-helper/pom.xml
--
diff --git a/core-it-support/maven-it-helper/pom.xml 
b/core-it-support/maven-it-helper/pom.xml
index 4bafebc..da9c352 100644
--- a/core-it-support/maven-it-helper/pom.xml
+++ b/core-it-support/maven-it-helper/pom.xml
@@ -60,5 +60,10 @@ under the License.
   junit
   3.8.2
 
+
+  org.fusesource.jansi
+  jansi
+  1.12
+
   
 

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/47e46308/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/AbstractMavenIntegrationTestCase.java
--
diff --git 
a/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/AbstractMavenIntegrationTestCase.java
 
b/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/AbstractMavenIntegrationTestCase.java
index 8966dce..6628a66 100644
--- 
a/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/AbstractMavenIntegrationTestCase.java
+++ 
b/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/AbstractMavenIntegrationTestCase.java
@@ -26,6 +26,8 @@ import 
org.apache.maven.artifact.versioning.InvalidVersionSpecificationException
 import org.apache.maven.artifact.versioning.VersionRange;
 import org.apache.maven.shared.utils.io.FileUtils;
 
+import static org.fusesource.jansi.Ansi.ansi;
+
 import java.io.File;
 import java.io.IOException;
 import java.io.PrintStream;
@@ -97,8 +99,8 @@ public abstract class AbstractMavenIntegrationTestCase
 }
 else
 {
-out.println( "WARNING: " + getITName() + ": version range '" + 
versionRange
- + "' supplied but no Maven version - not skipping 
test." );
+out.println( ansi().bold().fgYellow().a( "WARNING: " ).reset() + 
getITName() + ": version range '"
++ versionRange + "' supplied but no Maven version - not 
skipping test." );
 }
 }
 
@@ -201,10 +203,12 @@ public abstract class AbstractMavenIntegrationTestCase
 String line = getTestName();
 out.print( line );
 out.print( pad( RESULT_COLUMN - line.length() ) );
+out.print( ' ' );
 
 if ( skip )
 {
-out.println( "SKIPPED - Maven version " + getMavenVersion() + " 
not in range " + versionRange );
+out.println( ansi().bold().fgYellow().a( "SKIPPED" ).reset() + " - 
Maven version " + getMavenVersion()
++ " not in range " + versionRange );
 return;
 }
 
@@ -218,22 +222,24 @@ public abstract class AbstractMavenIntegrationTestCase
 {
 super.runTest();
 milliseconds = System.currentTimeMillis() - milliseconds;
-out.println( "OK " + formatTime( milliseconds ) );
+out.println( ansi().bold().fgGreen().a( "OK " ).reset() + 
formatTime( milliseconds ) );
 }
 catch ( UnsupportedJavaVersionException e )
 {
-out.println( "SKIPPED - Java version " + e.javaVersion + " not in 
range " + e.supportedRange );
+out.println( ansi().bold().fgYellow().a( "SKIPPED" ).reset() + " - 
Java version " + e.javaVersion
++ " not in range " + e.supportedRange );
 return;
 }
 catch ( UnsupportedMavenVersionException e )
 {
-out.println( "SKIPPED - Maven version " + e.mavenVersion + " not 
in range " + e.supportedRange );
+out.println( ansi().bold().fgYellow().a( "SKIPPED" ).reset() + " - 
Maven version " + e.mavenVersion
++ " not in range " + e.supportedRange );
 return;
 }

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

2017-01-24 Thread gboue

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


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

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


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

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

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


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

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

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

[06/11] maven git commit: [MNG-5904] Remove the whole Ant build

2017-01-24 Thread khmarbaise

[MNG-5904] Remove the whole Ant build


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

Branch: refs/heads/MNG-6014
Commit: 8b661620521de63586f825257e9c08c37e251eb5
Parents: be5cacc
Author: Karl Heinz Marbaise 
Authored: Fri Dec 11 19:41:02 2015 +0100
Committer: HervÃ© Boutemy 
Committed: Tue Jan 24 18:40:07 2017 +0100

--
 README.md|   6 +-
 apache-maven/README.txt  |   2 +-
 apache-maven/pom.xml |  55 +++-
 apache-maven/src/main/assembly/bin.xml   |  74 +-
 apache-maven/src/main/assembly/component.xml |  89 +++
 apache-maven/src/main/assembly/dir.xml   |  30 +++
 apache-maven/src/main/assembly/src.xml   |   3 +-
 build.xml| 307 --
 maven-ant-tasks-2.1.1.jar| Bin 1314262 -> 0 bytes
 9 files changed, 184 insertions(+), 382 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/8b661620/README.md
--
diff --git a/README.md b/README.md
index a263dca..7a5ed4d 100644
--- a/README.md
+++ b/README.md
@@ -12,12 +12,12 @@ Maven is available under the [Apache License, Version 
2.0](http://www.apache.org
 If you want to bootstrap Maven, you'll need:
 
 - Java 1.7+
-- Ant 1.8 or later
+- Maven 3.0.5 or later
 
-Run Ant, specifying a location into which the completed Maven distro should be 
installed:
+Run Maven, specifying a location into which the completed Maven distro should 
be installed:
 
 ```
-ant -Dmaven.home="$HOME/apps/maven/apache-maven-3.3.x-SNAPSHOT"
+mvn -DdistributionTargetDir="$HOME/app/maven/apache-maven-3.5.x-SNAPSHOT" 
clean package
 ```
 
 Once the build completes, you should have a new Maven distro ready to roll in 
that directory!

http://git-wip-us.apache.org/repos/asf/maven/blob/8b661620/apache-maven/README.txt
--
diff --git a/apache-maven/README.txt b/apache-maven/README.txt
index b05080d..cbaa7d4 100644
--- a/apache-maven/README.txt
+++ b/apache-maven/README.txt
@@ -16,7 +16,7 @@
   Release Notes
   -
 
-  The full list of changes can be found at 
http://maven.apache.org/release-notes.html.
+  The full list of changes can be found at 
http://maven.apache.org/docs/history.html.
 
   System Requirements
   ---

http://git-wip-us.apache.org/repos/asf/maven/blob/8b661620/apache-maven/pom.xml
--
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index 2db95cf..735e5b8 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -151,7 +151,7 @@
 maven-assembly-plugin
 
   
-create-distro
+create-distro-packages
 package
 
   single
@@ -182,6 +182,59 @@
 
   
 
+  create-distribution-in-dir
+  
+
+  distributionTargetDir
+
+  
+  
+
+  
+org.apache.maven.plugins
+maven-clean-plugin
+
+  
+
+  clean
+
+clean-target-dir
+prepare-package
+
+  
+
+  ${distributionTargetDir}
+
+  
+
+  
+
+  
+  
+maven-assembly-plugin
+
+  
+create-distribution-dir
+package
+
+  single
+
+
+  ./
+  false
+  false
+  ${distributionTargetDir}
+  
+src/main/assembly/dir.xml
+  
+
+  
+
+  
+
+  
+
+
   apache-release
   
 

http://git-wip-us.apache.org/repos/asf/maven/blob/8b661620/apache-maven/src/main/assembly/bin.xml
--
diff --git a/apache-maven/src/main/assembly/bin.xml 
b/apache-maven/src/main/assembly/bin.xml
index ea14a9d..79723c2 100644
--- a/apache-maven/src/main/assembly/bin.xml
+++ b/apache-maven/src/main/assembly/bin.xml
@@ -17,78 +17,14 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-

[09/11] maven git commit: [MNG-6017] Removing ArtifactHandler for par LifeCycle o Removed ArtifactHandler configuration for par lifeclyce which has been removed in Maven 3.3.9 See MNG-5892

2017-01-24 Thread khmarbaise

[MNG-6017] Removing ArtifactHandler for par LifeCycle
 o Removed ArtifactHandler configuration for par lifeclyce
   which has been removed in Maven 3.3.9
   See MNG-5892


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

Branch: refs/heads/MNG-6014
Commit: bc07e74d3c974dae60aad1024d4cd1c4d0714b3a
Parents: cfb075a
Author: Karl Heinz Marbaise 
Authored: Thu May 5 22:40:18 2016 +0200
Committer: Karl Heinz Marbaise 
Committed: Tue Jan 24 20:21:55 2017 +0100

--
 .../resources/META-INF/plexus/artifact-handlers.xml   | 14 --
 maven-core/src/site/apt/artifact-handlers.apt |  2 --
 2 files changed, 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/bc07e74d/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml
--
diff --git 
a/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml 
b/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml
index 05795be..f467252 100644
--- a/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml
+++ b/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml
@@ -201,19 +201,5 @@ Artifact handlers are required by the dependency 
resolution mechanism.
   
 
 
-
-
-  org.apache.maven.artifact.handler.ArtifactHandler
-  par
-  
org.apache.maven.artifact.handler.DefaultArtifactHandler
-  
-par
-true
-java
-false
-  
-
   
 

http://git-wip-us.apache.org/repos/asf/maven/blob/bc07e74d/maven-core/src/site/apt/artifact-handlers.apt
--
diff --git a/maven-core/src/site/apt/artifact-handlers.apt 
b/maven-core/src/site/apt/artifact-handlers.apt
index 916161b..a7ffade 100644
--- a/maven-core/src/site/apt/artifact-handlers.apt
+++ b/maven-core/src/site/apt/artifact-handlers.apt
@@ -47,8 +47,6 @@ Default Artifact Handlers Reference
 
*+++---+---+-+---+
 | <<>>  | <= type>   | <= type>   |   | java  |   
  | <<>>|
 
*+++---+---+-+---+
-| <<>>  | <= type>   | <= type>   |   | java  |   
  | <<>>|
-*+++---+---+-+---+
 | <<>>  | <<>>  | <= type>   | <<>> | java  |   
  |   |
 
*+++---+---+-+---+
 | <<>>  | <<>>  | <= type>   | <<>> | java  | 
<<>>  |   |

[04/11] maven git commit: Jenkins file notification email title improvement

2017-01-24 Thread khmarbaise

Jenkins file notification email title improvement

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

Branch: refs/heads/MNG-6014
Commit: 21d1bfb5a08ecf67a10b88a6fdbda98e7361376b
Parents: 94bc4de
Author: HervÃ© Boutemy 
Authored: Mon Jan 23 23:11:22 2017 +0100
Committer: HervÃ© Boutemy 
Committed: Tue Jan 24 18:40:07 2017 +0100

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


http://git-wip-us.apache.org/repos/asf/maven/blob/21d1bfb5/Jenkinsfile
--
diff --git a/Jenkinsfile b/Jenkinsfile
index 07ce2e6..5b82d78 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -131,7 +131,7 @@ parallel linuxJava7:{
 }
 } finally {
 node('ubuntu') {
-emailext body: "See ${env.BUILD_URL}", recipientProviders: [[$class: 
'CulpritsRecipientProvider'], [$class: 'FailingTestSuspectsRecipientProvider'], 
[$class: 'FirstFailingBuildSuspectsRecipientProvider']], replyTo: 
'd...@maven.apache.org', subject: "Maven Jenkinsfile finished with 
${currentBuild.result}", to: 'notificati...@maven.apache.org'
+emailext body: "See ${env.BUILD_URL}", recipientProviders: [[$class: 
'CulpritsRecipientProvider'], [$class: 'FailingTestSuspectsRecipientProvider'], 
[$class: 'FirstFailingBuildSuspectsRecipientProvider']], replyTo: 
'd...@maven.apache.org', subject: "${env.JOB_NAME} - build 
${env.BUILD_DISPLAY_NAME} - ${currentBuild.result}", to: 
'notificati...@maven.apache.org'
 }
 }

[10/11] maven git commit: [MNG-6014] Removing ArtifactHandler for ejb3 o Followup to MNG-5894 of Maven 3.3.9 where the maven-ejb3-plugin has been removed from life cycle. o Removed the ArtifactHandler

2017-01-24 Thread khmarbaise

[MNG-6014] Removing ArtifactHandler for ejb3
 o Followup to MNG-5894 of Maven 3.3.9 where the maven-ejb3-plugin
   has been removed from life cycle.
 o Removed the ArtifactHandler for ejb3 cause without
   a bound life cycle it does not make sense.


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

Branch: refs/heads/MNG-6014
Commit: cdfd7bd935c52f72fe60c1b4ac6ac2eac8384606
Parents: bc07e74
Author: Karl Heinz Marbaise 
Authored: Mon May 2 20:45:01 2016 +0200
Committer: Karl Heinz Marbaise 
Committed: Tue Jan 24 20:50:27 2017 +0100

--
 .../main/resources/META-INF/plexus/artifact-handlers.xml | 11 ---
 1 file changed, 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/cdfd7bd9/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml
--
diff --git 
a/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml 
b/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml
index f467252..2f26ce2 100644
--- a/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml
+++ b/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml
@@ -80,17 +80,6 @@ Artifact handlers are required by the dependency resolution 
mechanism.
 true
   
 
-
-  org.apache.maven.artifact.handler.ArtifactHandler
-  ejb3
-  
org.apache.maven.artifact.handler.DefaultArtifactHandler
-  
-ejb3
-true
-java
-false
-  
-

[01/11] maven git commit: [MNG-5977] Improve output readability of our MavenTransferListener implementations [Forced Update!]

2017-01-24 Thread khmarbaise

Repository: maven
Updated Branches:
  refs/heads/MNG-6014 4e996eec3 -> 1bdc4abe7 (forced update)


[MNG-5977] Improve output readability of our MavenTransferListener 
implementations

* Applied a general decimal formatter which automatically scales file sizes 
between [0,10) (one decimal digit) and [10,1000) (whole numbers) along with 
proper size and time units
* The progress meter will now properly
** tell the amount of transfers along with file names (in debug mode) and 
absolute progress by size
** visually seperate parallel transfers with " | "
* Optimized and reduced padding to the cases where it actually is necessary
* Padding has to be applied to every event which can succeed with progress 
update
* Synchronize all calls to console to avoid race conditions where output is 
terminated by a carriage return only. If no sync is done, SLF4J or 
INIT/SUCCEEDED update can interleave and overwrite the progress while being 
shorter as the progress itself.
* Replaced the concurrent hash map with a synchronized linked hash map to 
retain order of the progress meter. It will behave now like a queue.
* Work around a rounding bug existed upto Java 7
  See http://stackoverflow.com/q/22797964/696632 and Oracle's bugfix
  Announcement: 
http://www.oracle.com/technetwork/java/javase/8-compatibility-guide-2156366.html

Race conditions cannot be avoided if -T is employed since one does not have 
access to the output stream of a SLF4J backend to synchronize on.


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

Branch: refs/heads/MNG-6014
Commit: 149cce7a867956efeaf72d527f61297bf2471b1e
Parents: deefd93
Author: Michael Osipov 
Authored: Thu Feb 18 00:28:50 2016 +0100
Committer: Michael Osipov <1983-01...@gmx.net>
Committed: Mon Jan 23 11:18:15 2017 +0100

--
 .../java/org/apache/maven/cli/MavenCli.java |  10 +-
 .../transfer/AbstractMavenTransferListener.java | 209 +++--
 .../transfer/ConsoleMavenTransferListener.java  | 112 ---
 .../transfer/Slf4jMavenTransferListener.java|  38 +--
 .../maven/cli/transfer/FileSizeFormatTest.java  | 313 +++
 5 files changed, 595 insertions(+), 87 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/149cce7a/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 176ce4d..2b9f099 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
@@ -1005,13 +1005,13 @@ public class MavenCli
 // present supplied by the user. The rule is that we only allow the 
execution of one ConfigurationProcessor.
 // If there is more than one then we execute the one supplied by the 
user, otherwise we execute the
 // the default SettingsXmlConfigurationProcessor.
-// 
+//
 int userSuppliedConfigurationProcessorCount = 
configurationProcessors.size() - 1;
 
 if ( userSuppliedConfigurationProcessorCount == 0 )
 {
 //
-// Our settings.xml source is historically how we have configured 
Maven from the CLI so we are going to 
+// Our settings.xml source is historically how we have configured 
Maven from the CLI so we are going to
 // have to honour its existence forever. So let's run it.
 //
 configurationProcessors.get( 
SettingsXmlConfigurationProcessor.HINT ).process( cliRequest );
@@ -1288,7 +1288,7 @@ public class MavenCli
 // If we're logging to a file then we don't want the console 
transfer listener as it will spew
 // download progress all over the place
 //
-transferListener = getConsoleTransferListener();
+transferListener = getConsoleTransferListener( 
cliRequest.commandLine.hasOption( CLIManager.DEBUG ) );
 }
 else
 {
@@ -1588,9 +1588,9 @@ public class MavenCli
 // Customizations available via the CLI
 //
 
-protected TransferListener getConsoleTransferListener()
+protected TransferListener getConsoleTransferListener( boolean 
printResourceNames )
 {
-return new ConsoleMavenTransferListener( System.out );
+return new ConsoleMavenTransferListener( System.out, 
printResourceNames );
 }
 
 protected TransferListener getBatchTransferListener()

[08/11] maven git commit: [MNG-6030] ReactorModelCache do not used effectively after maven version 3.0.5 which cause a large memory footprint o Reintroduced ReactorModelCache reduces the memory footpr

2017-01-24 Thread khmarbaise

[MNG-6030] ReactorModelCache do not used effectively after maven version 3.0.5 
which cause a large memory footprint
 o Reintroduced ReactorModelCache reduces the memory footprint.


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

Branch: refs/heads/MNG-6014
Commit: cfb075ac706b25df630f3671f61f8d8313e0f138
Parents: 733eedc
Author: Karl Heinz Marbaise 
Authored: Tue May 31 21:39:31 2016 +0200
Committer: Karl Heinz Marbaise 
Committed: Tue Jan 24 20:19:10 2017 +0100

--
 .../maven/project/DefaultProjectBuilder.java   | 17 +++--
 1 file changed, 11 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/cfb075ac/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java 
b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
index 9d51a6d..d064ab4 100644
--- 
a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
+++ 
b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
@@ -116,14 +116,14 @@ public class DefaultProjectBuilder
 public ProjectBuildingResult build( File pomFile, ProjectBuildingRequest 
request )
 throws ProjectBuildingException
 {
-return build( pomFile, new FileModelSource( pomFile ), new 
InternalConfig( request, null ) );
+return build( pomFile, new FileModelSource( pomFile ), new 
InternalConfig( request, null, null ) );
 }
 
 @Override
 public ProjectBuildingResult build( ModelSource modelSource, 
ProjectBuildingRequest request )
 throws ProjectBuildingException
 {
-return build( null, modelSource, new InternalConfig( request, null ) );
+return build( null, modelSource, new InternalConfig( request, null, 
null ) );
 }
 
 private ProjectBuildingResult build( File pomFile, ModelSource 
modelSource, InternalConfig config )
@@ -275,7 +275,7 @@ public class DefaultProjectBuilder
 request.setUserProperties( configuration.getUserProperties() );
 request.setBuildStartTime( configuration.getBuildStartTime() );
 request.setModelResolver( resolver );
-request.setModelCache( new ReactorModelCache() );
+request.setModelCache( config.modelCache );
 
 return request;
 }
@@ -294,7 +294,7 @@ public class DefaultProjectBuilder
 org.eclipse.aether.artifact.Artifact pomArtifact = 
RepositoryUtils.toArtifact( artifact );
 pomArtifact = ArtifactDescriptorUtils.toPomArtifact( pomArtifact );
 
-InternalConfig config = new InternalConfig( request, null );
+InternalConfig config = new InternalConfig( request, null, null );
 
 boolean localProject;
 
@@ -394,7 +394,9 @@ public class DefaultProjectBuilder
 
 ReactorModelPool modelPool = new ReactorModelPool();
 
-InternalConfig config = new InternalConfig( request, modelPool );
+ReactorModelCache modelCache = new ReactorModelCache();
+
+InternalConfig config = new InternalConfig( request, modelPool, 
modelCache );
 
 Map projectIndex = new HashMap<>( 256 );
 
@@ -913,11 +915,14 @@ public class DefaultProjectBuilder
 public final List repositories;
 
 public final ReactorModelPool modelPool;
+
+public final ReactorModelCache modelCache;
 
-InternalConfig( ProjectBuildingRequest request, ReactorModelPool 
modelPool )
+InternalConfig( ProjectBuildingRequest request, ReactorModelPool 
modelPool, ReactorModelCache modelCache )
 {
 this.request = request;
 this.modelPool = modelPool;
+this.modelCache = modelCache;
 session =
 LegacyLocalRepositoryManager.overlay( 
request.getLocalRepository(), request.getRepositorySession(),
   repoSystem );

[07/11] maven git commit: added standard license and download links

2017-01-24 Thread khmarbaise

added standard license and download links

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

Branch: refs/heads/MNG-6014
Commit: 733eedc4fb16b0ed0d9cf792dd644e659b738cd9
Parents: 21d1bfb
Author: HervÃ© Boutemy 
Authored: Tue Jan 24 19:22:28 2017 +0100
Committer: HervÃ© Boutemy 
Committed: Tue Jan 24 19:22:28 2017 +0100

--
 src/site/site.xml | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/733eedc4/src/site/site.xml
--
diff --git a/src/site/site.xml b/src/site/site.xml
index bcc6103..86d5ecb 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -49,6 +49,8 @@ under the License.
   
   
   
+  http://www.apache.org/licenses/"/>
+

[02/11] maven git commit: [MNG-6102] Introduce ${maven.conf} in m2.conf

2017-01-24 Thread khmarbaise

[MNG-6102] Introduce ${maven.conf} in m2.conf

Set maven.conf to default ${maven.home}/conf in ${maven.home}/bin/m2.conf
to have a canonical property pointing to global configuration files from
within Java code.

This also helps package maintainers to decouple the Maven installation
from a global configuration by solely modifying m2.conf instead of using
dirty hacks, if possible at all.


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

Branch: refs/heads/MNG-6014
Commit: be5caccaff3d00ffca4b3cefe9665b6106bc44bf
Parents: 149cce7
Author: Michael Osipov 
Authored: Sun Oct 9 21:00:42 2016 +0200
Committer: Michael Osipov 
Committed: Mon Jan 23 20:54:54 2017 +0100

--
 apache-maven/src/bin/m2.conf | 4 +++-
 apache-maven/src/conf/settings.xml   | 2 +-
 apache-maven/src/conf/toolchains.xml | 2 +-
 .../org/apache/maven/settings/DefaultMavenSettingsBuilder.java   | 2 +-
 maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java  | 2 +-
 .../cli/configuration/SettingsXmlConfigurationProcessor.java | 4 ++--
 maven-embedder/src/site/apt/logging.apt  | 2 +-
 7 files changed, 10 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/be5cacca/apache-maven/src/bin/m2.conf
--
diff --git a/apache-maven/src/bin/m2.conf b/apache-maven/src/bin/m2.conf
index 346554c..2235f82 100644
--- a/apache-maven/src/bin/m2.conf
+++ b/apache-maven/src/bin/m2.conf
@@ -1,6 +1,8 @@
 main is org.apache.maven.cli.MavenCli from plexus.core
 
+set maven.conf default ${maven.home}/conf
+
 [plexus.core]
-load   ${maven.home}/conf/logging
+load   ${maven.conf}/logging
 optionally ${maven.home}/lib/ext/*.jar
 load   ${maven.home}/lib/*.jar

http://git-wip-us.apache.org/repos/asf/maven/blob/be5cacca/apache-maven/src/conf/settings.xml
--
diff --git a/apache-maven/src/conf/settings.xml 
b/apache-maven/src/conf/settings.xml
index 19d7a97..e27c579 100644
--- a/apache-maven/src/conf/settings.xml
+++ b/apache-maven/src/conf/settings.xml
@@ -32,7 +32,7 @@ under the License.
  |  2. Global Level. This settings.xml file provides configuration for all 
Maven
  | users on a machine (assuming they're all using the same 
Maven
  | installation). It's normally provided in
- | ${maven.home}/conf/settings.xml.
+ | ${maven.conf}/settings.xml.
  |
  | NOTE: This location can be overridden with the CLI option:
  |

http://git-wip-us.apache.org/repos/asf/maven/blob/be5cacca/apache-maven/src/conf/toolchains.xml
--
diff --git a/apache-maven/src/conf/toolchains.xml 
b/apache-maven/src/conf/toolchains.xml
index aefddd8..b737c17 100644
--- a/apache-maven/src/conf/toolchains.xml
+++ b/apache-maven/src/conf/toolchains.xml
@@ -32,7 +32,7 @@ under the License.
  |  2. Global Level. This toolchains.xml file provides configuration for all 
Maven
  | users on a machine (assuming they're all using the same 
Maven
  | installation). It's normally provided in
- | ${maven.home}/conf/toolchains.xml.
+ | ${maven.conf}/toolchains.xml.
  |
  | NOTE: This location can be overridden with the CLI option:
  |

http://git-wip-us.apache.org/repos/asf/maven/blob/be5cacca/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
 
b/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
index 820d886..207b9aa 100644
--- 
a/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
+++ 
b/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
@@ -66,7 +66,7 @@ public class DefaultMavenSettingsBuilder
 throws IOException, XmlPullParserException
 {
 File globalSettingsFile =
-getFile( "${maven.home}/conf/settings.xml", "maven.home",
+getFile( "${maven.conf}/settings.xml", "maven.conf",
  MavenSettingsBuilder.ALT_GLOBAL_SETTINGS_XML_LOCATION );
 
 SettingsBuildingRequest request = new DefaultSettingsBuildingRequest();

[11/11] maven git commit: [MNG-6014] Removing ArtifactHandler for ejb3 o fixed artifact-handlers.apt site.

2017-01-24 Thread khmarbaise

[MNG-6014] Removing ArtifactHandler for ejb3
 o fixed artifact-handlers.apt site.


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

Branch: refs/heads/MNG-6014
Commit: 1bdc4abe7b73c859f70760dc78f94c099e622054
Parents: cdfd7bd
Author: Karl Heinz Marbaise 
Authored: Tue Jan 24 20:56:17 2017 +0100
Committer: Karl Heinz Marbaise 
Committed: Tue Jan 24 20:56:17 2017 +0100

--
 maven-core/src/site/apt/artifact-handlers.apt | 2 --
 1 file changed, 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/1bdc4abe/maven-core/src/site/apt/artifact-handlers.apt
--
diff --git a/maven-core/src/site/apt/artifact-handlers.apt 
b/maven-core/src/site/apt/artifact-handlers.apt
index a7ffade..1a4b344 100644
--- a/maven-core/src/site/apt/artifact-handlers.apt
+++ b/maven-core/src/site/apt/artifact-handlers.apt
@@ -39,8 +39,6 @@ Default Artifact Handlers Reference
 
*+++---+---+-+---+
 | <<>>  | <<>>  | <= type>   |   | java  | 
<<>>  |   |
 
*+++---+---+-+---+
-| <<>> | <= type>   | <= type>   |   | java  |   
  | <<>>|
-*+++---+---+-+---+
 | <<>>  | <= type>   | <= type>   |   | java  |   
  | <<>>|
 
*+++---+---+-+---+
 | <<>>  | <= type>   | <= type>   |   | java  |   
  | <<>>|

[03/11] maven git commit: [MNG-6093] use monkey patched slf4j-simple provider with Maven color

2017-01-24 Thread khmarbaise

[MNG-6093] use monkey patched slf4j-simple provider with Maven color

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

Branch: refs/heads/MNG-6014
Commit: 94bc4de2ea54afa09a353034ed06edf0f68a8d87
Parents: b80915b
Author: HervÃ© Boutemy 
Authored: Thu Sep 22 17:46:53 2016 +0200
Committer: HervÃ© Boutemy 
Committed: Tue Jan 24 18:40:07 2017 +0100

--
 apache-maven/pom.xml|   4 +-
 .../maven/slf4j-configuration.properties|   1 +
 maven-slf4j-provider/pom.xml| 116 +++
 .../java/org/slf4j/impl/MavenSimpleLogger.java  | 115 ++
 .../slf4j/impl/MavenSimpleLoggerFactory.java|  44 +++
 .../src/main/script/patch-slf4j-simple.groovy   |  53 +
 maven-slf4j-provider/src/site/site.xml  |  36 ++
 pom.xml |   6 +
 src/site/xdoc/index.xml |   2 +
 9 files changed, 375 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/94bc4de2/apache-maven/pom.xml
--
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index f7c28ed..b2fa989 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -88,8 +88,8 @@
   aether-transport-wagon
 
 
-  org.slf4j
-  slf4j-simple
+  org.apache.maven
+  maven-slf4j-provider
 
 
   org.fusesource.jansi

http://git-wip-us.apache.org/repos/asf/maven/blob/94bc4de2/maven-embedder/src/main/resources/META-INF/maven/slf4j-configuration.properties
--
diff --git 
a/maven-embedder/src/main/resources/META-INF/maven/slf4j-configuration.properties
 
b/maven-embedder/src/main/resources/META-INF/maven/slf4j-configuration.properties
index 8741836..ae1bc39 100644
--- 
a/maven-embedder/src/main/resources/META-INF/maven/slf4j-configuration.properties
+++ 
b/maven-embedder/src/main/resources/META-INF/maven/slf4j-configuration.properties
@@ -18,5 +18,6 @@
 # key = Slf4j effective logger factory implementation
 # value = corresponding o.a.m.cli.logging.Slf4jConfiguration class
 org.slf4j.impl.SimpleLoggerFactory 
org.apache.maven.cli.logging.impl.Slf4jSimpleConfiguration
+org.slf4j.impl.MavenSimpleLoggerFactory 
org.apache.maven.cli.logging.impl.Slf4jSimpleConfiguration
 org.slf4j.helpers.Log4jLoggerFactory 
org.apache.maven.cli.logging.impl.Log4j2Configuration
 ch.qos.logback.classic.LoggerContext 
org.apache.maven.cli.logging.impl.LogbackConfiguration

http://git-wip-us.apache.org/repos/asf/maven/blob/94bc4de2/maven-slf4j-provider/pom.xml
--
diff --git a/maven-slf4j-provider/pom.xml b/maven-slf4j-provider/pom.xml
new file mode 100644
index 000..81af382
--- /dev/null
+++ b/maven-slf4j-provider/pom.xml
@@ -0,0 +1,116 @@
+
+
+
+
+http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+  4.0.0
+
+  
+org.apache.maven
+maven
+3.5.0-SNAPSHOT
+  
+
+  maven-slf4j-provider
+
+  Maven SLF4J Simple Provider
+  
+Maven SLF4J provider based on SLF4J's simple provider, monkey-patched to 
support Maven styled colors
+for levels and stacktraces rendering.
+  
+
+  
+
+  org.slf4j
+  slf4j-api
+
+
+  org.apache.maven.shared
+  maven-shared-utils
+
+  
+
+  
+
+  
+org.apache.maven.plugins
+maven-dependency-plugin
+
+  
+
+  org.slf4j
+  slf4j-simple
+  ${slf4jVersion}
+  jar
+  sources
+  false
+  
${project.build.directory}/generated-sources/slf4j-simple
+  org/slf4j/impl/*.java
+
+  
+
+
+  
+unzip-slf4j-simple
+
+  unpack
+
+  
+
+  
+  
+org.codehaus.mojo
+build-helper-maven-plugin
+1.12
+
+  
+add-slf4j-simple
+generate-sources
+
+  add-source
+
+
+  
+
${project.build.directory}/generated-sources/slf4j-simple
+  
+
+  
+
+  
+  
+org.codehaus.gmaven
+groovy-maven-plugin
+2.0
+
+  
+patch-slf4j-simple
+

[05/11] maven git commit: [MNG-3507] added color to Maven execution output messages

2017-01-24 Thread khmarbaise

[MNG-3507] added color to Maven execution output messages

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

Branch: refs/heads/MNG-6014
Commit: b80915b8822b51aafa962a9ef53a61c0ac59033d
Parents: 8b66162
Author: HervÃ© Boutemy 
Authored: Sun Jun 5 13:11:45 2016 +0200
Committer: HervÃ© Boutemy 
Committed: Tue Jan 24 18:40:07 2017 +0100

--
 apache-maven/pom.xml|   4 +
 apache-maven/src/bin/mvn|   1 +
 apache-maven/src/bin/mvn.cmd|   2 +-
 maven-core/pom.xml  |   4 +
 .../lifecycle/LifecycleExecutionException.java  |  27 ++---
 .../main/resources/META-INF/maven/extension.xml |   3 +
 maven-embedder/pom.xml  |   4 +
 .../java/org/apache/maven/cli/CLIManager.java   |   4 +-
 .../org/apache/maven/cli/CLIReportingUtils.java |   6 +-
 .../java/org/apache/maven/cli/MavenCli.java |  87 --
 .../maven/cli/event/ExecutionEventLogger.java   | 117 ++-
 maven-embedder/src/site/apt/index.apt.vm|   5 +
 pom.xml |  10 ++
 13 files changed, 192 insertions(+), 82 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/b80915b8/apache-maven/pom.xml
--
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index 735e5b8..f7c28ed 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -91,6 +91,10 @@
   org.slf4j
   slf4j-simple
 
+
+  org.fusesource.jansi
+  jansi
+
   
 
   

http://git-wip-us.apache.org/repos/asf/maven/blob/b80915b8/apache-maven/src/bin/mvn
--
diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn
index 6875628..f3acb73 100755
--- a/apache-maven/src/bin/mvn
+++ b/apache-maven/src/bin/mvn
@@ -241,4 +241,5 @@ exec "$JAVACMD" \
   -classpath "${M2_HOME}"/boot/plexus-classworlds-*.jar \
   "-Dclassworlds.conf=${M2_HOME}/bin/m2.conf" \
   "-Dmaven.home=${M2_HOME}" 
"-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+  "-Dlibrary.jansi.path=${MAVEN_HOME}/lib/ext" \
   ${CLASSWORLDS_LAUNCHER} "$@"

http://git-wip-us.apache.org/repos/asf/maven/blob/b80915b8/apache-maven/src/bin/mvn.cmd
--
diff --git a/apache-maven/src/bin/mvn.cmd b/apache-maven/src/bin/mvn.cmd
index d35c1d2..5ad99ae 100644
--- a/apache-maven/src/bin/mvn.cmd
+++ b/apache-maven/src/bin/mvn.cmd
@@ -154,7 +154,7 @@ for %%i in ("%M2_HOME%"\boot\plexus-classworlds-*) do set 
CLASSWORLDS_JAR="%%i"
 
 set CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
 
-%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% 
-classpath %CLASSWORLDS_JAR% "-Dclassworlds.conf=%M2_HOME%\bin\m2.conf" 
"-Dmaven.home=%M2_HOME%" 
"-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" 
%CLASSWORLDS_LAUNCHER% %MAVEN_CMD_LINE_ARGS%
+%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% 
-classpath %CLASSWORLDS_JAR% "-Dclassworlds.conf=%M2_HOME%\bin\m2.conf" 
"-Dmaven.home=%M2_HOME%" 
"-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" 
"-Dlibrary.jansi.path=%MAVEN_HOME%\lib\ext" %CLASSWORLDS_LAUNCHER% 
%MAVEN_CMD_LINE_ARGS%
 if ERRORLEVEL 1 goto error
 goto end
 

http://git-wip-us.apache.org/repos/asf/maven/blob/b80915b8/maven-core/pom.xml
--
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index ac1968b..efff5c1 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -75,6 +75,10 @@
   org.eclipse.aether
   aether-util
 
+
+  org.apache.maven.shared
+  maven-shared-utils
+
 
 
   org.eclipse.sisu

http://git-wip-us.apache.org/repos/asf/maven/blob/b80915b8/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java
 
b/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java
index 349576c..62ae269 100644
--- 
a/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java
+++ 
b/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java
@@ -19,8 +19,11 @@ package org.apache.maven.lifecycle;
  * under the License.
  */
 
+import static

maven git commit: [MNG-5993] Confusing error message in case of missing/empty artifactId/groupId and version in pluginManagement

2017-01-24 Thread khmarbaise

Repository: maven
Updated Branches:
  refs/heads/MNG-5993 [created] be21b5f56


[MNG-5993] Confusing error message in case of missing/empty
 artifactId/groupId and version in pluginManagement


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

Branch: refs/heads/MNG-5993
Commit: be21b5f5670a5369495cf21237db5eda5c9cc446
Parents: bc07e74
Author: Karl Heinz Marbaise 
Authored: Fri Apr 1 22:53:37 2016 +0200
Committer: Karl Heinz Marbaise 
Committed: Tue Jan 24 20:32:46 2017 +0100

--
 .../internal/LifecyclePluginResolver.java   |  12 +-
 .../internal/DefaultPluginVersionResolver.java  |   8 +-
 .../model/validation/DefaultModelValidator.java | 170 +++
 .../validation/DefaultModelValidatorTest.java   |  73 ++--
 .../missing-artifactId-pluginManagement.xml |  39 +
 .../raw-model/missing-ga-pluginManagement.xml   |  39 +
 .../missing-groupId-pluginManagement.xml|  39 +
 .../missing-plugin-version-pluginManagement.xml |  40 +
 8 files changed, 323 insertions(+), 97 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/be21b5f5/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecyclePluginResolver.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecyclePluginResolver.java
 
b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecyclePluginResolver.java
index 956e717..f02552a 100644
--- 
a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecyclePluginResolver.java
+++ 
b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecyclePluginResolver.java
@@ -19,6 +19,9 @@ package org.apache.maven.lifecycle.internal;
  * under the License.
  */
 
+import java.util.HashMap;
+import java.util.Map;
+
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.model.Plugin;
 import org.apache.maven.model.PluginManagement;
@@ -30,9 +33,6 @@ import org.apache.maven.project.MavenProject;
 import org.codehaus.plexus.component.annotations.Component;
 import org.codehaus.plexus.component.annotations.Requirement;
 
-import java.util.HashMap;
-import java.util.Map;
-
 /**
  * @since 3.0
  * @author Benjamin Bentmann
@@ -46,7 +46,6 @@ public class LifecyclePluginResolver
 @Requirement
 private PluginVersionResolver pluginVersionResolver;
 
-
 public LifecyclePluginResolver( PluginVersionResolver 
pluginVersionResolver )
 {
 this.pluginVersionResolver = pluginVersionResolver;
@@ -65,9 +64,8 @@ public class LifecyclePluginResolver
 {
 if ( plugin.getVersion() == null )
 {
-PluginVersionRequest request =
-new DefaultPluginVersionRequest( plugin, 
session.getRepositorySession(),
- 
project.getRemotePluginRepositories() );
+PluginVersionRequest request = new 
DefaultPluginVersionRequest( plugin, session.getRepositorySession(),
+   
 project.getRemotePluginRepositories() );
 plugin.setVersion( pluginVersionResolver.resolve( request 
).getVersion() );
 }
 versions.put( plugin.getKey(), plugin.getVersion() );

http://git-wip-us.apache.org/repos/asf/maven/blob/be21b5f5/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java
 
b/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java
index f11ee95..2275b7a 100644
--- 
a/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java
+++ 
b/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java
@@ -87,8 +87,6 @@ public class DefaultPluginVersionResolver
 public PluginVersionResult resolve( PluginVersionRequest request )
 throws PluginVersionResolutionException
 {
-logger.debug( "Resolving plugin version for " + request.getGroupId() + 
":" + request.getArtifactId() );
-
 PluginVersionResult result = resolveFromProject( request );
 
 if ( result == null )
@@ -103,8 +101,8 @@ public class DefaultPluginVersionResolver
 }
 else if ( logger.isDebugEnabled() )
 {
-logger.debug( "Resolved plugin

[maven] Git Push Summary

2017-01-24 Thread khmarbaise

Repository: maven
Updated Branches:
  refs/heads/MNG-6017 [deleted] da81d4ee8

maven git commit: [MNG-6017] Removing ArtifactHandler for par LifeCycle o Removed ArtifactHandler configuration for par lifeclyce which has been removed in Maven 3.3.9 See MNG-5892

2017-01-24 Thread khmarbaise

Repository: maven
Updated Branches:
  refs/heads/master cfb075ac7 -> bc07e74d3


[MNG-6017] Removing ArtifactHandler for par LifeCycle
 o Removed ArtifactHandler configuration for par lifeclyce
   which has been removed in Maven 3.3.9
   See MNG-5892


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

Branch: refs/heads/master
Commit: bc07e74d3c974dae60aad1024d4cd1c4d0714b3a
Parents: cfb075a
Author: Karl Heinz Marbaise 
Authored: Thu May 5 22:40:18 2016 +0200
Committer: Karl Heinz Marbaise 
Committed: Tue Jan 24 20:21:55 2017 +0100

--
 .../resources/META-INF/plexus/artifact-handlers.xml   | 14 --
 maven-core/src/site/apt/artifact-handlers.apt |  2 --
 2 files changed, 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/bc07e74d/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml
--
diff --git 
a/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml 
b/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml
index 05795be..f467252 100644
--- a/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml
+++ b/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml
@@ -201,19 +201,5 @@ Artifact handlers are required by the dependency 
resolution mechanism.
   
 
 
-
-
-  org.apache.maven.artifact.handler.ArtifactHandler
-  par
-  
org.apache.maven.artifact.handler.DefaultArtifactHandler
-  
-par
-true
-java
-false
-  
-
   
 

http://git-wip-us.apache.org/repos/asf/maven/blob/bc07e74d/maven-core/src/site/apt/artifact-handlers.apt
--
diff --git a/maven-core/src/site/apt/artifact-handlers.apt 
b/maven-core/src/site/apt/artifact-handlers.apt
index 916161b..a7ffade 100644
--- a/maven-core/src/site/apt/artifact-handlers.apt
+++ b/maven-core/src/site/apt/artifact-handlers.apt
@@ -47,8 +47,6 @@ Default Artifact Handlers Reference
 
*+++---+---+-+---+
 | <<>>  | <= type>   | <= type>   |   | java  |   
  | <<>>|
 
*+++---+---+-+---+
-| <<>>  | <= type>   | <= type>   |   | java  |   
  | <<>>|
-*+++---+---+-+---+
 | <<>>  | <<>>  | <= type>   | <<>> | java  |   
  |   |
 
*+++---+---+-+---+
 | <<>>  | <<>>  | <= type>   | <<>> | java  | 
<<>>  |   |

maven git commit: [MNG-6030] ReactorModelCache do not used effectively after maven version 3.0.5 which cause a large memory footprint o Reintroduced ReactorModelCache reduces the memory footprint.

2017-01-24 Thread khmarbaise

Repository: maven
Updated Branches:
  refs/heads/master 733eedc4f -> cfb075ac7


[MNG-6030] ReactorModelCache do not used effectively after maven version 3.0.5 
which cause a large memory footprint
 o Reintroduced ReactorModelCache reduces the memory footprint.


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

Branch: refs/heads/master
Commit: cfb075ac706b25df630f3671f61f8d8313e0f138
Parents: 733eedc
Author: Karl Heinz Marbaise 
Authored: Tue May 31 21:39:31 2016 +0200
Committer: Karl Heinz Marbaise 
Committed: Tue Jan 24 20:19:10 2017 +0100

--
 .../maven/project/DefaultProjectBuilder.java   | 17 +++--
 1 file changed, 11 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/cfb075ac/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java 
b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
index 9d51a6d..d064ab4 100644
--- 
a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
+++ 
b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
@@ -116,14 +116,14 @@ public class DefaultProjectBuilder
 public ProjectBuildingResult build( File pomFile, ProjectBuildingRequest 
request )
 throws ProjectBuildingException
 {
-return build( pomFile, new FileModelSource( pomFile ), new 
InternalConfig( request, null ) );
+return build( pomFile, new FileModelSource( pomFile ), new 
InternalConfig( request, null, null ) );
 }
 
 @Override
 public ProjectBuildingResult build( ModelSource modelSource, 
ProjectBuildingRequest request )
 throws ProjectBuildingException
 {
-return build( null, modelSource, new InternalConfig( request, null ) );
+return build( null, modelSource, new InternalConfig( request, null, 
null ) );
 }
 
 private ProjectBuildingResult build( File pomFile, ModelSource 
modelSource, InternalConfig config )
@@ -275,7 +275,7 @@ public class DefaultProjectBuilder
 request.setUserProperties( configuration.getUserProperties() );
 request.setBuildStartTime( configuration.getBuildStartTime() );
 request.setModelResolver( resolver );
-request.setModelCache( new ReactorModelCache() );
+request.setModelCache( config.modelCache );
 
 return request;
 }
@@ -294,7 +294,7 @@ public class DefaultProjectBuilder
 org.eclipse.aether.artifact.Artifact pomArtifact = 
RepositoryUtils.toArtifact( artifact );
 pomArtifact = ArtifactDescriptorUtils.toPomArtifact( pomArtifact );
 
-InternalConfig config = new InternalConfig( request, null );
+InternalConfig config = new InternalConfig( request, null, null );
 
 boolean localProject;
 
@@ -394,7 +394,9 @@ public class DefaultProjectBuilder
 
 ReactorModelPool modelPool = new ReactorModelPool();
 
-InternalConfig config = new InternalConfig( request, modelPool );
+ReactorModelCache modelCache = new ReactorModelCache();
+
+InternalConfig config = new InternalConfig( request, modelPool, 
modelCache );
 
 Map projectIndex = new HashMap<>( 256 );
 
@@ -913,11 +915,14 @@ public class DefaultProjectBuilder
 public final List repositories;
 
 public final ReactorModelPool modelPool;
+
+public final ReactorModelCache modelCache;
 
-InternalConfig( ProjectBuildingRequest request, ReactorModelPool 
modelPool )
+InternalConfig( ProjectBuildingRequest request, ReactorModelPool 
modelPool, ReactorModelCache modelCache )
 {
 this.request = request;
 this.modelPool = modelPool;
+this.modelCache = modelCache;
 session =
 LegacyLocalRepositoryManager.overlay( 
request.getLocalRepository(), request.getRepositorySession(),
   repoSystem );

[maven] Git Push Summary

2017-01-24 Thread khmarbaise

Repository: maven
Updated Branches:
  refs/heads/MNG-6030 [deleted] 9520c5937

maven-archetype git commit: [ARCHETYPE-509] RequiredProperty not set in batch mode this closes #14 Signed-off-by: rfscholte <rfscho...@apache.org>

2017-01-24 Thread rfscholte

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


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


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

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

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


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

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

maven git commit: added standard license and download links

2017-01-24 Thread hboutemy

Repository: maven
Updated Branches:
  refs/heads/master 21d1bfb5a -> 733eedc4f


added standard license and download links

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

Branch: refs/heads/master
Commit: 733eedc4fb16b0ed0d9cf792dd644e659b738cd9
Parents: 21d1bfb
Author: HervÃ© Boutemy 
Authored: Tue Jan 24 19:22:28 2017 +0100
Committer: HervÃ© Boutemy 
Committed: Tue Jan 24 19:22:28 2017 +0100

--
 src/site/site.xml | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/733eedc4/src/site/site.xml
--
diff --git a/src/site/site.xml b/src/site/site.xml
index bcc6103..86d5ecb 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -49,6 +49,8 @@ under the License.
   
   
   
+  http://www.apache.org/licenses/"/>
+

[2/4] maven git commit: [MNG-3507] added color to Maven execution output messages

2017-01-24 Thread hboutemy

[MNG-3507] added color to Maven execution output messages

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

Branch: refs/heads/master
Commit: b80915b8822b51aafa962a9ef53a61c0ac59033d
Parents: 8b66162
Author: HervÃ© Boutemy 
Authored: Sun Jun 5 13:11:45 2016 +0200
Committer: HervÃ© Boutemy 
Committed: Tue Jan 24 18:40:07 2017 +0100

--
 apache-maven/pom.xml|   4 +
 apache-maven/src/bin/mvn|   1 +
 apache-maven/src/bin/mvn.cmd|   2 +-
 maven-core/pom.xml  |   4 +
 .../lifecycle/LifecycleExecutionException.java  |  27 ++---
 .../main/resources/META-INF/maven/extension.xml |   3 +
 maven-embedder/pom.xml  |   4 +
 .../java/org/apache/maven/cli/CLIManager.java   |   4 +-
 .../org/apache/maven/cli/CLIReportingUtils.java |   6 +-
 .../java/org/apache/maven/cli/MavenCli.java |  87 --
 .../maven/cli/event/ExecutionEventLogger.java   | 117 ++-
 maven-embedder/src/site/apt/index.apt.vm|   5 +
 pom.xml |  10 ++
 13 files changed, 192 insertions(+), 82 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/b80915b8/apache-maven/pom.xml
--
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index 735e5b8..f7c28ed 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -91,6 +91,10 @@
   org.slf4j
   slf4j-simple
 
+
+  org.fusesource.jansi
+  jansi
+
   
 
   

http://git-wip-us.apache.org/repos/asf/maven/blob/b80915b8/apache-maven/src/bin/mvn
--
diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn
index 6875628..f3acb73 100755
--- a/apache-maven/src/bin/mvn
+++ b/apache-maven/src/bin/mvn
@@ -241,4 +241,5 @@ exec "$JAVACMD" \
   -classpath "${M2_HOME}"/boot/plexus-classworlds-*.jar \
   "-Dclassworlds.conf=${M2_HOME}/bin/m2.conf" \
   "-Dmaven.home=${M2_HOME}" 
"-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+  "-Dlibrary.jansi.path=${MAVEN_HOME}/lib/ext" \
   ${CLASSWORLDS_LAUNCHER} "$@"

http://git-wip-us.apache.org/repos/asf/maven/blob/b80915b8/apache-maven/src/bin/mvn.cmd
--
diff --git a/apache-maven/src/bin/mvn.cmd b/apache-maven/src/bin/mvn.cmd
index d35c1d2..5ad99ae 100644
--- a/apache-maven/src/bin/mvn.cmd
+++ b/apache-maven/src/bin/mvn.cmd
@@ -154,7 +154,7 @@ for %%i in ("%M2_HOME%"\boot\plexus-classworlds-*) do set 
CLASSWORLDS_JAR="%%i"
 
 set CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
 
-%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% 
-classpath %CLASSWORLDS_JAR% "-Dclassworlds.conf=%M2_HOME%\bin\m2.conf" 
"-Dmaven.home=%M2_HOME%" 
"-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" 
%CLASSWORLDS_LAUNCHER% %MAVEN_CMD_LINE_ARGS%
+%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% 
-classpath %CLASSWORLDS_JAR% "-Dclassworlds.conf=%M2_HOME%\bin\m2.conf" 
"-Dmaven.home=%M2_HOME%" 
"-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" 
"-Dlibrary.jansi.path=%MAVEN_HOME%\lib\ext" %CLASSWORLDS_LAUNCHER% 
%MAVEN_CMD_LINE_ARGS%
 if ERRORLEVEL 1 goto error
 goto end
 

http://git-wip-us.apache.org/repos/asf/maven/blob/b80915b8/maven-core/pom.xml
--
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index ac1968b..efff5c1 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -75,6 +75,10 @@
   org.eclipse.aether
   aether-util
 
+
+  org.apache.maven.shared
+  maven-shared-utils
+
 
 
   org.eclipse.sisu

http://git-wip-us.apache.org/repos/asf/maven/blob/b80915b8/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java
 
b/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java
index 349576c..62ae269 100644
--- 
a/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java
+++ 
b/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java
@@ -19,8 +19,11 @@ package org.apache.maven.lifecycle;
  * under the License.
  */
 
+import static

[1/4] maven git commit: Jenkins file notification email title improvement

2017-01-24 Thread hboutemy

Repository: maven
Updated Branches:
  refs/heads/master be5caccaf -> 21d1bfb5a


Jenkins file notification email title improvement

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

Branch: refs/heads/master
Commit: 21d1bfb5a08ecf67a10b88a6fdbda98e7361376b
Parents: 94bc4de
Author: HervÃ© Boutemy 
Authored: Mon Jan 23 23:11:22 2017 +0100
Committer: HervÃ© Boutemy 
Committed: Tue Jan 24 18:40:07 2017 +0100

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


http://git-wip-us.apache.org/repos/asf/maven/blob/21d1bfb5/Jenkinsfile
--
diff --git a/Jenkinsfile b/Jenkinsfile
index 07ce2e6..5b82d78 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -131,7 +131,7 @@ parallel linuxJava7:{
 }
 } finally {
 node('ubuntu') {
-emailext body: "See ${env.BUILD_URL}", recipientProviders: [[$class: 
'CulpritsRecipientProvider'], [$class: 'FailingTestSuspectsRecipientProvider'], 
[$class: 'FirstFailingBuildSuspectsRecipientProvider']], replyTo: 
'd...@maven.apache.org', subject: "Maven Jenkinsfile finished with 
${currentBuild.result}", to: 'notificati...@maven.apache.org'
+emailext body: "See ${env.BUILD_URL}", recipientProviders: [[$class: 
'CulpritsRecipientProvider'], [$class: 'FailingTestSuspectsRecipientProvider'], 
[$class: 'FirstFailingBuildSuspectsRecipientProvider']], replyTo: 
'd...@maven.apache.org', subject: "${env.JOB_NAME} - build 
${env.BUILD_DISPLAY_NAME} - ${currentBuild.result}", to: 
'notificati...@maven.apache.org'
 }
 }

[4/4] maven git commit: [MNG-5904] Remove the whole Ant build

2017-01-24 Thread hboutemy

[MNG-5904] Remove the whole Ant build


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

Branch: refs/heads/master
Commit: 8b661620521de63586f825257e9c08c37e251eb5
Parents: be5cacc
Author: Karl Heinz Marbaise 
Authored: Fri Dec 11 19:41:02 2015 +0100
Committer: HervÃ© Boutemy 
Committed: Tue Jan 24 18:40:07 2017 +0100

--
 README.md|   6 +-
 apache-maven/README.txt  |   2 +-
 apache-maven/pom.xml |  55 +++-
 apache-maven/src/main/assembly/bin.xml   |  74 +-
 apache-maven/src/main/assembly/component.xml |  89 +++
 apache-maven/src/main/assembly/dir.xml   |  30 +++
 apache-maven/src/main/assembly/src.xml   |   3 +-
 build.xml| 307 --
 maven-ant-tasks-2.1.1.jar| Bin 1314262 -> 0 bytes
 9 files changed, 184 insertions(+), 382 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/8b661620/README.md
--
diff --git a/README.md b/README.md
index a263dca..7a5ed4d 100644
--- a/README.md
+++ b/README.md
@@ -12,12 +12,12 @@ Maven is available under the [Apache License, Version 
2.0](http://www.apache.org
 If you want to bootstrap Maven, you'll need:
 
 - Java 1.7+
-- Ant 1.8 or later
+- Maven 3.0.5 or later
 
-Run Ant, specifying a location into which the completed Maven distro should be 
installed:
+Run Maven, specifying a location into which the completed Maven distro should 
be installed:
 
 ```
-ant -Dmaven.home="$HOME/apps/maven/apache-maven-3.3.x-SNAPSHOT"
+mvn -DdistributionTargetDir="$HOME/app/maven/apache-maven-3.5.x-SNAPSHOT" 
clean package
 ```
 
 Once the build completes, you should have a new Maven distro ready to roll in 
that directory!

http://git-wip-us.apache.org/repos/asf/maven/blob/8b661620/apache-maven/README.txt
--
diff --git a/apache-maven/README.txt b/apache-maven/README.txt
index b05080d..cbaa7d4 100644
--- a/apache-maven/README.txt
+++ b/apache-maven/README.txt
@@ -16,7 +16,7 @@
   Release Notes
   -
 
-  The full list of changes can be found at 
http://maven.apache.org/release-notes.html.
+  The full list of changes can be found at 
http://maven.apache.org/docs/history.html.
 
   System Requirements
   ---

http://git-wip-us.apache.org/repos/asf/maven/blob/8b661620/apache-maven/pom.xml
--
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index 2db95cf..735e5b8 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -151,7 +151,7 @@
 maven-assembly-plugin
 
   
-create-distro
+create-distro-packages
 package
 
   single
@@ -182,6 +182,59 @@
 
   
 
+  create-distribution-in-dir
+  
+
+  distributionTargetDir
+
+  
+  
+
+  
+org.apache.maven.plugins
+maven-clean-plugin
+
+  
+
+  clean
+
+clean-target-dir
+prepare-package
+
+  
+
+  ${distributionTargetDir}
+
+  
+
+  
+
+  
+  
+maven-assembly-plugin
+
+  
+create-distribution-dir
+package
+
+  single
+
+
+  ./
+  false
+  false
+  ${distributionTargetDir}
+  
+src/main/assembly/dir.xml
+  
+
+  
+
+  
+
+  
+
+
   apache-release
   
 

http://git-wip-us.apache.org/repos/asf/maven/blob/8b661620/apache-maven/src/main/assembly/bin.xml
--
diff --git a/apache-maven/src/main/assembly/bin.xml 
b/apache-maven/src/main/assembly/bin.xml
index ea14a9d..79723c2 100644
--- a/apache-maven/src/main/assembly/bin.xml
+++ b/apache-maven/src/main/assembly/bin.xml
@@ -17,78 +17,14 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-

[3/4] maven git commit: [MNG-6093] use monkey patched slf4j-simple provider with Maven color

2017-01-24 Thread hboutemy

[MNG-6093] use monkey patched slf4j-simple provider with Maven color

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

Branch: refs/heads/master
Commit: 94bc4de2ea54afa09a353034ed06edf0f68a8d87
Parents: b80915b
Author: HervÃ© Boutemy 
Authored: Thu Sep 22 17:46:53 2016 +0200
Committer: HervÃ© Boutemy 
Committed: Tue Jan 24 18:40:07 2017 +0100

--
 apache-maven/pom.xml|   4 +-
 .../maven/slf4j-configuration.properties|   1 +
 maven-slf4j-provider/pom.xml| 116 +++
 .../java/org/slf4j/impl/MavenSimpleLogger.java  | 115 ++
 .../slf4j/impl/MavenSimpleLoggerFactory.java|  44 +++
 .../src/main/script/patch-slf4j-simple.groovy   |  53 +
 maven-slf4j-provider/src/site/site.xml  |  36 ++
 pom.xml |   6 +
 src/site/xdoc/index.xml |   2 +
 9 files changed, 375 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/94bc4de2/apache-maven/pom.xml
--
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index f7c28ed..b2fa989 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -88,8 +88,8 @@
   aether-transport-wagon
 
 
-  org.slf4j
-  slf4j-simple
+  org.apache.maven
+  maven-slf4j-provider
 
 
   org.fusesource.jansi

http://git-wip-us.apache.org/repos/asf/maven/blob/94bc4de2/maven-embedder/src/main/resources/META-INF/maven/slf4j-configuration.properties
--
diff --git 
a/maven-embedder/src/main/resources/META-INF/maven/slf4j-configuration.properties
 
b/maven-embedder/src/main/resources/META-INF/maven/slf4j-configuration.properties
index 8741836..ae1bc39 100644
--- 
a/maven-embedder/src/main/resources/META-INF/maven/slf4j-configuration.properties
+++ 
b/maven-embedder/src/main/resources/META-INF/maven/slf4j-configuration.properties
@@ -18,5 +18,6 @@
 # key = Slf4j effective logger factory implementation
 # value = corresponding o.a.m.cli.logging.Slf4jConfiguration class
 org.slf4j.impl.SimpleLoggerFactory 
org.apache.maven.cli.logging.impl.Slf4jSimpleConfiguration
+org.slf4j.impl.MavenSimpleLoggerFactory 
org.apache.maven.cli.logging.impl.Slf4jSimpleConfiguration
 org.slf4j.helpers.Log4jLoggerFactory 
org.apache.maven.cli.logging.impl.Log4j2Configuration
 ch.qos.logback.classic.LoggerContext 
org.apache.maven.cli.logging.impl.LogbackConfiguration

http://git-wip-us.apache.org/repos/asf/maven/blob/94bc4de2/maven-slf4j-provider/pom.xml
--
diff --git a/maven-slf4j-provider/pom.xml b/maven-slf4j-provider/pom.xml
new file mode 100644
index 000..81af382
--- /dev/null
+++ b/maven-slf4j-provider/pom.xml
@@ -0,0 +1,116 @@
+
+
+
+
+http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+  4.0.0
+
+  
+org.apache.maven
+maven
+3.5.0-SNAPSHOT
+  
+
+  maven-slf4j-provider
+
+  Maven SLF4J Simple Provider
+  
+Maven SLF4J provider based on SLF4J's simple provider, monkey-patched to 
support Maven styled colors
+for levels and stacktraces rendering.
+  
+
+  
+
+  org.slf4j
+  slf4j-api
+
+
+  org.apache.maven.shared
+  maven-shared-utils
+
+  
+
+  
+
+  
+org.apache.maven.plugins
+maven-dependency-plugin
+
+  
+
+  org.slf4j
+  slf4j-simple
+  ${slf4jVersion}
+  jar
+  sources
+  false
+  
${project.build.directory}/generated-sources/slf4j-simple
+  org/slf4j/impl/*.java
+
+  
+
+
+  
+unzip-slf4j-simple
+
+  unpack
+
+  
+
+  
+  
+org.codehaus.mojo
+build-helper-maven-plugin
+1.12
+
+  
+add-slf4j-simple
+generate-sources
+
+  add-source
+
+
+  
+
${project.build.directory}/generated-sources/slf4j-simple
+  
+
+  
+
+  
+  
+org.codehaus.gmaven
+groovy-maven-plugin
+2.0
+
+  
+patch-slf4j-simple
+

maven git commit: [MNG-6102] Introduce ${maven.conf} in m2.conf

2017-01-24 Thread michaelo

Repository: maven
Updated Branches:
  refs/heads/master 149cce7a8 -> be5caccaf


[MNG-6102] Introduce ${maven.conf} in m2.conf

Set maven.conf to default ${maven.home}/conf in ${maven.home}/bin/m2.conf
to have a canonical property pointing to global configuration files from
within Java code.

This also helps package maintainers to decouple the Maven installation
from a global configuration by solely modifying m2.conf instead of using
dirty hacks, if possible at all.


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

Branch: refs/heads/master
Commit: be5caccaff3d00ffca4b3cefe9665b6106bc44bf
Parents: 149cce7
Author: Michael Osipov 
Authored: Sun Oct 9 21:00:42 2016 +0200
Committer: Michael Osipov 
Committed: Mon Jan 23 20:54:54 2017 +0100

--
 apache-maven/src/bin/m2.conf | 4 +++-
 apache-maven/src/conf/settings.xml   | 2 +-
 apache-maven/src/conf/toolchains.xml | 2 +-
 .../org/apache/maven/settings/DefaultMavenSettingsBuilder.java   | 2 +-
 maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java  | 2 +-
 .../cli/configuration/SettingsXmlConfigurationProcessor.java | 4 ++--
 maven-embedder/src/site/apt/logging.apt  | 2 +-
 7 files changed, 10 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/be5cacca/apache-maven/src/bin/m2.conf
--
diff --git a/apache-maven/src/bin/m2.conf b/apache-maven/src/bin/m2.conf
index 346554c..2235f82 100644
--- a/apache-maven/src/bin/m2.conf
+++ b/apache-maven/src/bin/m2.conf
@@ -1,6 +1,8 @@
 main is org.apache.maven.cli.MavenCli from plexus.core
 
+set maven.conf default ${maven.home}/conf
+
 [plexus.core]
-load   ${maven.home}/conf/logging
+load   ${maven.conf}/logging
 optionally ${maven.home}/lib/ext/*.jar
 load   ${maven.home}/lib/*.jar

http://git-wip-us.apache.org/repos/asf/maven/blob/be5cacca/apache-maven/src/conf/settings.xml
--
diff --git a/apache-maven/src/conf/settings.xml 
b/apache-maven/src/conf/settings.xml
index 19d7a97..e27c579 100644
--- a/apache-maven/src/conf/settings.xml
+++ b/apache-maven/src/conf/settings.xml
@@ -32,7 +32,7 @@ under the License.
  |  2. Global Level. This settings.xml file provides configuration for all 
Maven
  | users on a machine (assuming they're all using the same 
Maven
  | installation). It's normally provided in
- | ${maven.home}/conf/settings.xml.
+ | ${maven.conf}/settings.xml.
  |
  | NOTE: This location can be overridden with the CLI option:
  |

http://git-wip-us.apache.org/repos/asf/maven/blob/be5cacca/apache-maven/src/conf/toolchains.xml
--
diff --git a/apache-maven/src/conf/toolchains.xml 
b/apache-maven/src/conf/toolchains.xml
index aefddd8..b737c17 100644
--- a/apache-maven/src/conf/toolchains.xml
+++ b/apache-maven/src/conf/toolchains.xml
@@ -32,7 +32,7 @@ under the License.
  |  2. Global Level. This toolchains.xml file provides configuration for all 
Maven
  | users on a machine (assuming they're all using the same 
Maven
  | installation). It's normally provided in
- | ${maven.home}/conf/toolchains.xml.
+ | ${maven.conf}/toolchains.xml.
  |
  | NOTE: This location can be overridden with the CLI option:
  |

http://git-wip-us.apache.org/repos/asf/maven/blob/be5cacca/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
 
b/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
index 820d886..207b9aa 100644
--- 
a/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
+++ 
b/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
@@ -66,7 +66,7 @@ public class DefaultMavenSettingsBuilder
 throws IOException, XmlPullParserException
 {
 File globalSettingsFile =
-getFile( "${maven.home}/conf/settings.xml", "maven.home",
+getFile( "${maven.conf}/settings.xml", "maven.conf",
  MavenSettingsBuilder.ALT_GLOBAL_SETTINGS_XML_LOCATION );
 
 SettingsBuildingRequest request

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

2017-01-24 Thread rfscholte

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


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


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

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

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


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

40 matches

Mail list logo