maven-integration-testing git commit: [MNG-2199] Support version ranges in parent elements [Forced Update!]

[schulte]

Repository: maven-integration-testing
Updated Branches:
  refs/heads/MNG-2199 d41670892 -> 012d21261 (forced update)


[MNG-2199] Support version ranges in parent elements

o Updated the ITs to correctly detect parent resolution failures. Maven does
  not fail the build when it cannot resolve a parent but instead logs a
  warning message. The ITs never checked the log to contain the warning messages
  but instead asserted the build to fail when a parent cannot be resolved.
  The only Maven version supporting parent version ranges is Maven 3.2.2 due to
  this.
o Deprecated an incorrect test case for local parent resolution. Maven ignored
  the '' in '' elements for local parent resolution. The core
  has been updated across various versions to eliminate any differences between
  local and remote parent resolution. When local parent resolution had been
  updated to match remote parent resolution, an existing IT started to fail
  testing incorrect behaviour. As soon as the '' is referenced using a
  version range, the '' element in the project becomes mandatory and
  does no longer support using an expression any more. This has been that way
  for remote parent resolution from day one. It has never been supported to
  inherit a version from a parent when referencing that parent using a version
  range intentionally.
o Updated to account for updated error messages.


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

Branch: refs/heads/MNG-2199
Commit: 012d21261f243d4f11160338c8ebcaab173e524a
Parents: c4365ab
Author: Christian Schulte 
Authored: Sat Dec 12 19:25:15 2015 +0100
Committer: Christian Schulte 
Committed: Sat Jan 28 04:55:33 2017 +0100

--
 .../apache/maven/it/IntegrationTestSuite.java   |   2 +
 ...mng2199DeprecatedParentVersionRangeTest.java |  65 ++
 ...MavenITmng2199ParentVersionRange350Test.java | 199 +++
 .../MavenITmng2199ParentVersionRangeTest.java   |  98 +
 .../expression-local/child/pom.xml  |  12 ++
 .../expression-local/pom.xml|  10 +
 .../inherited-local/child/pom.xml   |  11 +
 .../inherited-local/pom.xml |  10 +
 .../invalid-local/child/pom.xml |  12 ++
 .../invalid-local/pom.xml   |  10 +
 .../local-fallback-to-remote/child/pom.xml  |  18 ++
 .../local-fallback-to-remote/pom.xml|   8 +
 .../valid-local/child/pom.xml   |  11 +
 .../valid-local/pom.xml |  10 +
 14 files changed, 433 insertions(+), 43 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/012d2126/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
--
diff --git 
a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java 
b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
index a91eeb0..1f83b1f 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
@@ -123,6 +123,8 @@ public class IntegrationTestSuite
 suite.addTestSuite( 
MavenITmng5663NestedImportScopePomResolutionTest.class );
 suite.addTestSuite( MavenITmng2562Timestamp322Test.class );
 suite.addTestSuite( MavenITmng2199ParentVersionRangeTest.class );
+suite.addTestSuite( MavenITmng2199ParentVersionRange350Test.class );
+suite.addTestSuite( 
MavenITmng2199DeprecatedParentVersionRangeTest.class );
 suite.addTestSuite( 
MavenITmng5640LifecycleParticipantAfterSessionEnd.class );
 suite.addTestSuite( MavenITmng5639ImportScopePomResolutionTest.class );
 suite.addTestSuite( MavenITmng5608ProfileActivationWarningTest.class );

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/012d2126/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199DeprecatedParentVersionRangeTest.java
--
diff --git 
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199DeprecatedParentVersionRangeTest.java
 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199DeprecatedParentVersionRangeTest.java
new file mode 100644
index 000..8cf74a9
--- /dev/null
+++ 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199DeprecatedParentVersionRangeTest.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2014 The Apache 

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

[gboue]

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

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

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

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

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

[gboue]

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

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

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

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

Added:

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

[3/4] maven git commit: [MNG-2199] Support version ranges in parent elements

[schulte]

[MNG-2199] Support version ranges in parent elements

o Updated to remove parent version range resolution logic obsolete since Maven
  3.2.3 which changed the initialization of MavenProject instances.
o Updated local parent resolution to behave the same way remote parent
  resolution behaves. When referencing a parent using version ranges,
  inheriting the version or using version expressions should not be supported.
  It has been implemented that way for remote parent resolution as it got
  introduced in Maven 3.2.2. For local parent resolution the version in parent
  declarations had been ignored completely as of Maven 3.3.0 due to commit
  be3fb200326208ca4b8c41ebf16d5ae6b8049792 removing all local parent version
  validation. Work on fixing this is tracked by MNG-5840 released with Maven
  3.3.9. This commit adds the final missing bits to make local and remote parent
  resolution behave the same way as much as possible. As an exception, remote
  parent resolution still is a bit more strict than local parent resolution due
  to a different API in use. When resolving a parent from a repository using
  version ranges, the ModelBuilder verifies the range in use to declare an upper
  bound. When resolving a parent locally using version ranges, those ranges are
  not required to declare an upper bound because the API in use does not support
  querying that. Authoring a POM relying on this difference should be considered
  a bug.
o Added test cases to maven-core testing parent version range resolution for
  local and remote parent models.


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

Branch: refs/heads/MNG-2199-IT
Commit: 99e2287a531ec1cd241cee5b326579cd8d9905b5
Parents: 1e2a80e
Author: Christian Schulte 
Authored: Sat Dec 12 20:28:56 2015 +0100
Committer: Christian Schulte 
Committed: Fri Jan 27 23:41:13 2017 +0100

--
 .../maven/project/DefaultProjectBuilder.java|  71 --
 .../project/DefaultProjectBuildingRequest.java  |  15 ++-
 .../maven/project/ProjectBuildingRequest.java   |  14 +-
 .../project/AbstractMavenProjectTestCase.java   |  11 ++
 .../project/DefaultMavenProjectBuilderTest.java | 130 +++
 .../repository/TestRepositoryConnector.java |  38 ++
 .../org/apache/apache/1/apache-1.pom|  82 
 .../org/apache/apache/maven-metadata.xml|  13 ++
 .../pom.xml |  12 ++
 .../pom.xml |  11 ++
 .../parent-version-range-external-valid/pom.xml |  11 ++
 .../child/pom.xml   |  12 ++
 .../pom.xml |   7 +
 .../child/pom.xml   |  11 ++
 .../pom.xml |   7 +
 .../child/pom.xml   |  11 ++
 .../parent-version-range-local-valid/pom.xml|   7 +
 .../model/building/DefaultModelBuilder.java |  25 +++-
 18 files changed, 435 insertions(+), 53 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/99e2287a/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 d064ab4..2785c4c 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
@@ -43,7 +43,6 @@ import org.apache.maven.model.DependencyManagement;
 import org.apache.maven.model.DeploymentRepository;
 import org.apache.maven.model.Extension;
 import org.apache.maven.model.Model;
-import org.apache.maven.model.Parent;
 import org.apache.maven.model.Plugin;
 import org.apache.maven.model.Profile;
 import org.apache.maven.model.ReportPlugin;
@@ -73,9 +72,6 @@ import org.eclipse.aether.repository.RemoteRepository;
 import org.eclipse.aether.repository.WorkspaceRepository;
 import org.eclipse.aether.resolution.ArtifactRequest;
 import org.eclipse.aether.resolution.ArtifactResult;
-import org.eclipse.aether.resolution.VersionRangeRequest;
-import org.eclipse.aether.resolution.VersionRangeResolutionException;
-import org.eclipse.aether.resolution.VersionRangeResult;
 
 /**
  */
@@ -298,44 +294,6 @@ public class DefaultProjectBuilder
 
 boolean localProject;
 
-if ( request.isResolveVersionRanges() )
-{
-VersionRangeRequest versionRangeRequest = new VersionRangeRequest( 

[4/4] maven git commit: o Updated to run the core integration tests from the MNG-2199 branch.

[schulte]

o Updated to run the core integration tests from the MNG-2199 branch.


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

Branch: refs/heads/MNG-2199-IT
Commit: 7ae42d7b23b82c771a496024e5dda5240273e78e
Parents: 99e2287
Author: Christian Schulte 
Authored: Sat Jan 21 16:41:45 2017 +0100
Committer: Christian Schulte 
Committed: Fri Jan 27 23:42:10 2017 +0100

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


http://git-wip-us.apache.org/repos/asf/maven/blob/7ae42d7b/Jenkinsfile
--
diff --git a/Jenkinsfile b/Jenkinsfile
index 5b82d78..198914f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -19,7 +19,7 @@
 
 properties([buildDiscarder(logRotator(artifactNumToKeepStr: '5', numToKeepStr: 
env.BRANCH_NAME=='master'?'10':'5'))])
 
-def itBranch='master'
+def itBranch='MNG-2199'
 
 try {
 node('ubuntu') {

[1/4] maven git commit: [MNG-5958] restore binary compatibility of Lifecycle.setPhases [Forced Update!]

[schulte]

Repository: maven
Updated Branches:
  refs/heads/MNG-2199-IT 26ba28c2d -> 7ae42d7b2 (forced update)


[MNG-5958] restore binary compatibility of Lifecycle.setPhases

While MNG-5805 restored binary compatibility of Lifecycle.getPhases
it didn't do the same for Lifecycle.setPhases. This breaks plugins
like flexmojos-maven-plugin which have their own lifecycle mapping
implementations.

This closes #77


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

Branch: refs/heads/MNG-2199-IT
Commit: 6b31c4a556f51cd1c2064fe773550c0acf14d307
Parents: f20a5d9
Author: Stuart McCulloch 
Authored: Wed Jan 6 11:23:06 2016 +
Committer: Christian Schulte 
Committed: Thu Jan 26 20:19:57 2017 +0100

--
 .../java/org/apache/maven/lifecycle/mapping/Lifecycle.java  | 9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/6b31c4a5/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/Lifecycle.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/Lifecycle.java 
b/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/Lifecycle.java
index d2b6d6c..c14cf94 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/Lifecycle.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/Lifecycle.java
@@ -106,8 +106,13 @@ public class Lifecycle
 }
 
 @Deprecated
-public void setPhases( Map phases )
+public void setPhases( Map phases )
 {
-setLifecyclePhases( phases );
+Map lphases = new LinkedHashMap<>();
+for ( Map.Entry e: phases.entrySet() )
+{
+lphases.put( e.getKey(), new LifecyclePhase( e.getValue() ) );
+}
+setLifecyclePhases( lphases );
 }
 }

[3/3] maven git commit: [MNG-2199] Support version ranges in parent elements

[schulte]

[MNG-2199] Support version ranges in parent elements

o Updated to remove parent version range resolution logic obsolete since Maven
  3.2.3 which changed the initialization of MavenProject instances.
o Updated local parent resolution to behave the same way remote parent
  resolution behaves. When referencing a parent using version ranges,
  inheriting the version or using version expressions should not be supported.
  It has been implemented that way for remote parent resolution as it got
  introduced in Maven 3.2.2. For local parent resolution the version in parent
  declarations had been ignored completely as of Maven 3.3.0 due to commit
  be3fb200326208ca4b8c41ebf16d5ae6b8049792 removing all local parent version
  validation. Work on fixing this is tracked by MNG-5840 released with Maven
  3.3.9. This commit adds the final missing bits to make local and remote parent
  resolution behave the same way as much as possible. As an exception, remote
  parent resolution still is a bit more strict than local parent resolution due
  to a different API in use. When resolving a parent from a repository using
  version ranges, the ModelBuilder verifies the range in use to declare an upper
  bound. When resolving a parent locally using version ranges, those ranges are
  not required to declare an upper bound because the API in use does not support
  querying that. Authoring a POM relying on this difference should be considered
  a bug.
o Added test cases to maven-core testing parent version range resolution for
  local and remote parent models.


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

Branch: refs/heads/MNG-2199
Commit: 99e2287a531ec1cd241cee5b326579cd8d9905b5
Parents: 1e2a80e
Author: Christian Schulte 
Authored: Sat Dec 12 20:28:56 2015 +0100
Committer: Christian Schulte 
Committed: Fri Jan 27 23:41:13 2017 +0100

--
 .../maven/project/DefaultProjectBuilder.java|  71 --
 .../project/DefaultProjectBuildingRequest.java  |  15 ++-
 .../maven/project/ProjectBuildingRequest.java   |  14 +-
 .../project/AbstractMavenProjectTestCase.java   |  11 ++
 .../project/DefaultMavenProjectBuilderTest.java | 130 +++
 .../repository/TestRepositoryConnector.java |  38 ++
 .../org/apache/apache/1/apache-1.pom|  82 
 .../org/apache/apache/maven-metadata.xml|  13 ++
 .../pom.xml |  12 ++
 .../pom.xml |  11 ++
 .../parent-version-range-external-valid/pom.xml |  11 ++
 .../child/pom.xml   |  12 ++
 .../pom.xml |   7 +
 .../child/pom.xml   |  11 ++
 .../pom.xml |   7 +
 .../child/pom.xml   |  11 ++
 .../parent-version-range-local-valid/pom.xml|   7 +
 .../model/building/DefaultModelBuilder.java |  25 +++-
 18 files changed, 435 insertions(+), 53 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/99e2287a/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 d064ab4..2785c4c 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
@@ -43,7 +43,6 @@ import org.apache.maven.model.DependencyManagement;
 import org.apache.maven.model.DeploymentRepository;
 import org.apache.maven.model.Extension;
 import org.apache.maven.model.Model;
-import org.apache.maven.model.Parent;
 import org.apache.maven.model.Plugin;
 import org.apache.maven.model.Profile;
 import org.apache.maven.model.ReportPlugin;
@@ -73,9 +72,6 @@ import org.eclipse.aether.repository.RemoteRepository;
 import org.eclipse.aether.repository.WorkspaceRepository;
 import org.eclipse.aether.resolution.ArtifactRequest;
 import org.eclipse.aether.resolution.ArtifactResult;
-import org.eclipse.aether.resolution.VersionRangeRequest;
-import org.eclipse.aether.resolution.VersionRangeResolutionException;
-import org.eclipse.aether.resolution.VersionRangeResult;
 
 /**
  */
@@ -298,44 +294,6 @@ public class DefaultProjectBuilder
 
 boolean localProject;
 
-if ( request.isResolveVersionRanges() )
-{
-VersionRangeRequest versionRangeRequest = new VersionRangeRequest( 

[1/3] maven git commit: [MNG-5958] restore binary compatibility of Lifecycle.setPhases [Forced Update!]

[schulte]

Repository: maven
Updated Branches:
  refs/heads/MNG-2199 13a3a8b81 -> 99e2287a5 (forced update)


[MNG-5958] restore binary compatibility of Lifecycle.setPhases

While MNG-5805 restored binary compatibility of Lifecycle.getPhases
it didn't do the same for Lifecycle.setPhases. This breaks plugins
like flexmojos-maven-plugin which have their own lifecycle mapping
implementations.

This closes #77


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

Branch: refs/heads/MNG-2199
Commit: 6b31c4a556f51cd1c2064fe773550c0acf14d307
Parents: f20a5d9
Author: Stuart McCulloch 
Authored: Wed Jan 6 11:23:06 2016 +
Committer: Christian Schulte 
Committed: Thu Jan 26 20:19:57 2017 +0100

--
 .../java/org/apache/maven/lifecycle/mapping/Lifecycle.java  | 9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/6b31c4a5/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/Lifecycle.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/Lifecycle.java 
b/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/Lifecycle.java
index d2b6d6c..c14cf94 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/Lifecycle.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/Lifecycle.java
@@ -106,8 +106,13 @@ public class Lifecycle
 }
 
 @Deprecated
-public void setPhases( Map phases )
+public void setPhases( Map phases )
 {
-setLifecyclePhases( phases );
+Map lphases = new LinkedHashMap<>();
+for ( Map.Entry e: phases.entrySet() )
+{
+lphases.put( e.getKey(), new LifecyclePhase( e.getValue() ) );
+}
+setLifecyclePhases( lphases );
 }
 }

[2/3] maven git commit: [MNG-5883] Silence unnecessary legacy local repository warning

[schulte]

[MNG-5883] Silence unnecessary legacy local repository warning

o Updated to decrease logging level from 'warning' to 'info'.


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

Branch: refs/heads/MNG-2199
Commit: 1e2a80eced0f01c182458a2c7e7919634fa632f6
Parents: 6b31c4a
Author: Christian Schulte 
Authored: Mon Jan 25 02:40:03 2016 +0100
Committer: Christian Schulte 
Committed: Thu Jan 26 20:30:37 2017 +0100

--
 .../aether/DefaultRepositorySystemSessionFactory.java| 8 
 1 file changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/1e2a80ec/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java
 
b/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java
index 0c91cf9..a0c5444 100644
--- 
a/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java
+++ 
b/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java
@@ -132,16 +132,16 @@ public class DefaultRepositorySystemSessionFactory
 
 if ( request.isUseLegacyLocalRepository() )
 {
-logger.warn( "Disabling enhanced local repository: using legacy is 
strongly discouraged to ensure"
- + " build reproducibility." );
 try
 {
 session.setLocalRepositoryManager( 
simpleLocalRepoMgrFactory.newInstance( session, localRepo ) );
+logger.info( "Disabling enhanced local repository: using 
legacy is strongly discouraged to ensure"
+ + " build reproducibility." );
+
 }
 catch ( NoLocalRepositoryManagerException e )
 {
-
-logger.warn( "Failed to configure legacy local repository: 
back to default" );
+logger.error( "Failed to configure legacy local repository: 
falling back to default" );
 session.setLocalRepositoryManager( 
repoSystem.newLocalRepositoryManager( session, localRepo ) );
 }
 }

maven-integration-testing git commit: [MNG-2199] Support version ranges in parent elements [Forced Update!]

[schulte]

Repository: maven-integration-testing
Updated Branches:
  refs/heads/MNG-2199 e6ca0fb2d -> d41670892 (forced update)


[MNG-2199] Support version ranges in parent elements

o Updated the ITs to correctly detect parent resolution failures. Maven does
  not fail the build when it cannot resolve a parent but instead logs a
  warning message. The ITs never checked the log to contain the warning messages
  but instead asserted the build to fail when a parent cannot be resolved.
  The only Maven version supporting parent version ranges is Maven 3.2.2 due to
  this.
o Deprecated an incorrect test case for local parent resolution. Maven ignored
  the '' in '' elements for local parent resolution. The core
  has been updated across various versions to eliminate any differences between
  local and remote parent resolution. When local parent resolution had been
  updated to match remote parent resolution, an existing IT started to fail
  testing incorrect behaviour. As soon as the '' is referenced using a
  version range, the '' element in the project becomes mandatory and
  does no longer support using an expression any more. This has been that way
  for remote parent resolution from day one. It has never been supported to
  inherit a version from a parent when referencing that parent using a version
  range intentionally.
o Updated to account for updated error messages.


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

Branch: refs/heads/MNG-2199
Commit: d416708928c1213d94505838d71e84a850b25924
Parents: c4365ab
Author: Christian Schulte 
Authored: Sat Dec 12 19:25:15 2015 +0100
Committer: Christian Schulte 
Committed: Fri Jan 27 22:52:09 2017 +0100

--
 .../apache/maven/it/IntegrationTestSuite.java   |   2 +
 ...mng2199DeprecatedParentVersionRangeTest.java |  65 ++
 ...MavenITmng2199ParentVersionRange350Test.java | 199 +++
 .../MavenITmng2199ParentVersionRangeTest.java   |  98 +
 .../expression-local/child/pom.xml  |  12 ++
 .../expression-local/pom.xml|  10 +
 .../inherited-local/child/pom.xml   |  11 +
 .../inherited-local/pom.xml |  10 +
 .../invalid-local/child/pom.xml |  12 ++
 .../invalid-local/pom.xml   |  10 +
 .../local-fallback-to-remote/child/pom.xml  |  18 ++
 .../local-fallback-to-remote/pom.xml|   8 +
 .../valid-local/child/pom.xml   |  11 +
 .../valid-local/pom.xml |  10 +
 14 files changed, 433 insertions(+), 43 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/d4167089/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
--
diff --git 
a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java 
b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
index a91eeb0..1f83b1f 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
@@ -123,6 +123,8 @@ public class IntegrationTestSuite
 suite.addTestSuite( 
MavenITmng5663NestedImportScopePomResolutionTest.class );
 suite.addTestSuite( MavenITmng2562Timestamp322Test.class );
 suite.addTestSuite( MavenITmng2199ParentVersionRangeTest.class );
+suite.addTestSuite( MavenITmng2199ParentVersionRange350Test.class );
+suite.addTestSuite( 
MavenITmng2199DeprecatedParentVersionRangeTest.class );
 suite.addTestSuite( 
MavenITmng5640LifecycleParticipantAfterSessionEnd.class );
 suite.addTestSuite( MavenITmng5639ImportScopePomResolutionTest.class );
 suite.addTestSuite( MavenITmng5608ProfileActivationWarningTest.class );

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/d4167089/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199DeprecatedParentVersionRangeTest.java
--
diff --git 
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199DeprecatedParentVersionRangeTest.java
 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199DeprecatedParentVersionRangeTest.java
new file mode 100644
index 000..8cf74a9
--- /dev/null
+++ 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199DeprecatedParentVersionRangeTest.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2014 The Apache 

[1/2] maven-integration-testing git commit: [MNG-5958] restore binary compatibility of Lifecycle.setPhases [Forced Update!]

[schulte]

Repository: maven-integration-testing
Updated Branches:
  refs/heads/MNG-2199 07c254517 -> e6ca0fb2d (forced update)


[MNG-5958] restore binary compatibility of Lifecycle.setPhases

Modify tests for MNG-5805

This closes #13 #18


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

Branch: refs/heads/MNG-2199
Commit: c4365abe20b58b2cbc174de812e43c7741dc10e1
Parents: 7e5b365
Author: Anton Tanasenko 
Authored: Thu Jan 7 04:01:28 2016 +0200
Committer: Christian Schulte 
Committed: Thu Jan 26 20:24:02 2017 +0100

--
 .../apache/maven/it/IntegrationTestSuite.java   |  2 +
 .../MavenITmng5805PkgTypeMojoConfiguration.java |  2 +-
 ...MavenITmng5805PkgTypeMojoConfiguration2.java | 30 +
 ...avenITmng5958LifecyclePhaseBinaryCompat.java | 45 +
 .../test/resources/bootstrap/group-3/pom.xml| 12 
 .../pom.xml | 40 +++
 .../mng-5958-lifecycle-phases/bad/pom.xml   | 53 +++
 .../mng-5958-lifecycle-phases/good/pom.xml  | 53 +++
 .../core-it-plugins/mng5805-extension2/pom.xml  | 37 ++
 .../resources/META-INF/plexus/components.xml| 71 
 .../core-it-plugins/mng5958-extension/pom.xml   | 45 +
 .../its/mng5958/AbstractLifecycleMapping.java   | 71 
 .../maven/its/mng5958/BadLifecycleMapping.java  | 45 +
 .../maven/its/mng5958/GoodLifecycleMapping.java | 40 +++
 .../resources/META-INF/plexus/components.xml| 62 +
 core-it-support/core-it-plugins/pom.xml |  2 +
 16 files changed, 609 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c4365abe/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
--
diff --git 
a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java 
b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
index 5536620..a91eeb0 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
@@ -106,10 +106,12 @@ public class IntegrationTestSuite
 // 
-
 // suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- 
MNG-3137
 
+suite.addTestSuite( MavenITmng5958LifecyclePhaseBinaryCompat.class );
 suite.addTestSuite( 
MavenITmng5898BuildMultimoduleWithEARFailsToResolveWARTest.class );
 suite.addTestSuite( MavenITmng5840ParentVersionRanges.class );
 suite.addTestSuite( MavenITmng5840RelativePathReactorMatching.class );
 suite.addTestSuite( MavenITmng5805PkgTypeMojoConfiguration.class );
+suite.addTestSuite( MavenITmng5805PkgTypeMojoConfiguration2.class );
 suite.addTestSuite( MavenITmng5783PluginDependencyFiltering.class );
 suite.addTestSuite( MavenITmng5774ConfigurationProcessorsTest.class );
 suite.addTestSuite( MavenITmng5771CoreExtensionsTest.class );

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c4365abe/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration.java
--
diff --git 
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration.java
 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration.java
index ada7448..5335677 100644
--- 
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration.java
+++ 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration.java
@@ -10,7 +10,7 @@ public class MavenITmng5805PkgTypeMojoConfiguration
 
 public MavenITmng5805PkgTypeMojoConfiguration()
 {
-super( "(3.3.3,)" );
+super( "(3.3.3,3.5.0)" );
 }
 
 public void testPkgTypeMojoConfiguration()

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c4365abe/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration2.java
--
diff --git 
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration2.java
 

[2/2] maven-integration-testing git commit: [MNG-2199] Support version ranges in parent elements

[schulte]

[MNG-2199] Support version ranges in parent elements

o Updated the ITs to correctly detect parent resolution failures. Maven does
  not fail the build when it cannot resolve a parent but instead logs a
  warning message. The ITs never checked the log to contain the warning messages
  but instead asserted the build to fail when a parent cannot be resolved.
  The only Maven version supporting parent version ranges is Maven 3.2.2 due to
  this.
o Deprecated an incorrect test case for local parent resolution. Maven ignored
  the '' in '' elements for local parent resolution. The core
  has been updated across various versions to eliminate any differences between
  local and remote parent resolution. When local parent resolution had been
  updated to match remote parent resolution, an existing IT started to fail
  testing incorrect behaviour. As soon as the '' is referenced using a
  version range, the '' element in the project becomes mandatory and
  does no longer support using an expression any more. This has been that way
  for remote parent resolution from day one. It has never been supported to
  inherit a version from a parent when referencing that parent using a version
  range intentionally.
o Updated to account for updated error messages.


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

Branch: refs/heads/MNG-2199
Commit: e6ca0fb2d02442855028d6fe8ff91342f7acbd43
Parents: c4365ab
Author: Christian Schulte 
Authored: Sat Dec 12 19:25:15 2015 +0100
Committer: Christian Schulte 
Committed: Fri Jan 27 22:42:42 2017 +0100

--
 .../apache/maven/it/IntegrationTestSuite.java   |   2 +
 ...mng2199DeprecatedParentVersionRangeTest.java |  64 ++
 ...MavenITmng2199ParentVersionRange350Test.java | 199 +++
 .../MavenITmng2199ParentVersionRangeTest.java   |  98 +
 .../expression-local/child/pom.xml  |  12 ++
 .../expression-local/pom.xml|  10 +
 .../inherited-local/child/pom.xml   |  11 +
 .../inherited-local/pom.xml |  10 +
 .../invalid-local/child/pom.xml |  12 ++
 .../invalid-local/pom.xml   |  10 +
 .../local-fallback-to-remote/child/pom.xml  |  18 ++
 .../local-fallback-to-remote/pom.xml|   8 +
 .../valid-local/child/pom.xml   |  11 +
 .../valid-local/pom.xml |  10 +
 14 files changed, 432 insertions(+), 43 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/e6ca0fb2/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
--
diff --git 
a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java 
b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
index a91eeb0..1f83b1f 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
@@ -123,6 +123,8 @@ public class IntegrationTestSuite
 suite.addTestSuite( 
MavenITmng5663NestedImportScopePomResolutionTest.class );
 suite.addTestSuite( MavenITmng2562Timestamp322Test.class );
 suite.addTestSuite( MavenITmng2199ParentVersionRangeTest.class );
+suite.addTestSuite( MavenITmng2199ParentVersionRange350Test.class );
+suite.addTestSuite( 
MavenITmng2199DeprecatedParentVersionRangeTest.class );
 suite.addTestSuite( 
MavenITmng5640LifecycleParticipantAfterSessionEnd.class );
 suite.addTestSuite( MavenITmng5639ImportScopePomResolutionTest.class );
 suite.addTestSuite( MavenITmng5608ProfileActivationWarningTest.class );

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/e6ca0fb2/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199DeprecatedParentVersionRangeTest.java
--
diff --git 
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199DeprecatedParentVersionRangeTest.java
 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199DeprecatedParentVersionRangeTest.java
new file mode 100644
index 000..d758e07
--- /dev/null
+++ 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199DeprecatedParentVersionRangeTest.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2014 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this 

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

[gboue]

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

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

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

Modified:

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

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

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

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

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

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

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

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

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

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

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

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

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

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

[gboue]

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

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

Added:

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

Added: 
maven/plugins/trunk/maven-checkstyle-plugin/src/it/check-tests-only/verify.groovy
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/it/check-tests-only/verify.groovy?rev=1780608=auto
==
--- 
maven/plugins/trunk/maven-checkstyle-plugin/src/it/check-tests-only/verify.groovy
 (added)
+++ 
maven/plugins/trunk/maven-checkstyle-plugin/src/it/check-tests-only/verify.groovy
 Fri Jan 27 20:37:20 2017
@@ -0,0 +1,22 @@
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+def buildLog = new File( basedir, 'build.log' )
+
+assert buildLog.text =~ /There are \d+ errors reported by Checkstyle/

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

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

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

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

[rfscholte]

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


[ARCHETYPE-437] Remove support for the create goal


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

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

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


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

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

[rfscholte]

[ARCHETYPE-515] Migrate plugin to Maven3

Squashed commit of the following:

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

clean up dependencies

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

maven-compat now always has test scope

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

Replace maven-compat classes in IntegrationTestMojo

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

archetype-common main sources freed from maven-compat

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

Replace maven-compat class in DefaultArchetypeRegistryManager

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

Replace maven-compat classes in DefaultDownloader

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

Maven 3.0 dependencies + maven-compat

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

Move parent to proper location

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

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


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

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

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


http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/624f9aff/archetype-common/pom.xml

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

[rfscholte]

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


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

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

svn commit: r1005748 - in /websites/production/maven/components/wagon-archives/wagon-LATEST: ./ apidocs/ apidocs/org/apache/jackrabbit/webdav/ apidocs/org/apache/jackrabbit/webdav/class-use/ apidocs/o

[michaelo]

Author: michaelo
Date: Fri Jan 27 13:10:07 2017
New Revision: 1005748

Log:
Site checkin for project Apache Maven Wagon


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

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

[rfscholte]

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

Log:
Maven Invoker 3.0.0

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

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

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

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

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

[maven-wagon] Git Push Summary

[michaelo]

Repository: maven-wagon
Updated Tags:  refs/tags/wagon-2.12 [created] 14de82a8a

maven-wagon git commit: [maven-release-plugin] prepare for next development iteration

[michaelo]

Repository: maven-wagon
Updated Branches:
  refs/heads/master 0f2c8bc57 -> f76c0982b


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


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

Branch: refs/heads/master
Commit: f76c0982bd2fbcd5eded8ce3fd0d15d6e02245e3
Parents: 0f2c8bc
Author: Michael Osipov 
Authored: Fri Jan 27 12:51:36 2017 +0100
Committer: Michael Osipov 
Committed: Fri Jan 27 12:51:36 2017 +0100

--
 pom.xml | 4 ++--
 wagon-provider-api/pom.xml  | 2 +-
 wagon-provider-test/pom.xml | 2 +-
 wagon-providers/pom.xml | 2 +-
 wagon-providers/wagon-file/pom.xml  | 2 +-
 wagon-providers/wagon-ftp/pom.xml   | 2 +-
 wagon-providers/wagon-http-lightweight/pom.xml  | 2 +-
 wagon-providers/wagon-http-shared/pom.xml   | 2 +-
 wagon-providers/wagon-http/pom.xml  | 2 +-
 wagon-providers/wagon-scm/pom.xml   | 2 +-
 wagon-providers/wagon-ssh-common-test/pom.xml   | 2 +-
 wagon-providers/wagon-ssh-common/pom.xml| 2 +-
 wagon-providers/wagon-ssh-external/pom.xml  | 2 +-
 wagon-providers/wagon-ssh/pom.xml   | 2 +-
 wagon-providers/wagon-webdav-jackrabbit/pom.xml | 2 +-
 wagon-tcks/pom.xml  | 2 +-
 wagon-tcks/wagon-tck-http/pom.xml   | 2 +-
 17 files changed, 18 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/f76c0982/pom.xml
--
diff --git a/pom.xml b/pom.xml
index fe90cfc..0930036 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@ under the License.
 
   org.apache.maven.wagon
   wagon
-  2.12
+  2.13-SNAPSHOT
   pom
 
   Apache Maven Wagon
@@ -198,7 +198,7 @@ under the License.
 
scm:git:https://git-wip-us.apache.org/repos/asf/maven-wagon.git
 
scm:git:https://git-wip-us.apache.org/repos/asf/maven-wagon.git
 https://github.com/apache/maven-wagon/tree/${project.scm.tag}
-wagon-2.12
+master
   
 
   

http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/f76c0982/wagon-provider-api/pom.xml
--
diff --git a/wagon-provider-api/pom.xml b/wagon-provider-api/pom.xml
index f38bb55..4b2dda8 100644
--- a/wagon-provider-api/pom.xml
+++ b/wagon-provider-api/pom.xml
@@ -23,7 +23,7 @@ under the License.
   
 org.apache.maven.wagon
 wagon
-2.12
+2.13-SNAPSHOT
 ../pom.xml
   
 

http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/f76c0982/wagon-provider-test/pom.xml
--
diff --git a/wagon-provider-test/pom.xml b/wagon-provider-test/pom.xml
index 91a9a1f..c1f251c 100644
--- a/wagon-provider-test/pom.xml
+++ b/wagon-provider-test/pom.xml
@@ -23,7 +23,7 @@ under the License.
   
 org.apache.maven.wagon
 wagon
-2.12
+2.13-SNAPSHOT
 ../pom.xml
   
 

http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/f76c0982/wagon-providers/pom.xml
--
diff --git a/wagon-providers/pom.xml b/wagon-providers/pom.xml
index e29dd55..88121d8 100644
--- a/wagon-providers/pom.xml
+++ b/wagon-providers/pom.xml
@@ -23,7 +23,7 @@ under the License.
   
 org.apache.maven.wagon
 wagon
-2.12
+2.13-SNAPSHOT
 ../pom.xml
   
 

http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/f76c0982/wagon-providers/wagon-file/pom.xml
--
diff --git a/wagon-providers/wagon-file/pom.xml 
b/wagon-providers/wagon-file/pom.xml
index 08b9ce5..47e4c84 100644
--- a/wagon-providers/wagon-file/pom.xml
+++ b/wagon-providers/wagon-file/pom.xml
@@ -23,7 +23,7 @@ under the License.
   
 org.apache.maven.wagon
 wagon-providers
-2.12
+2.13-SNAPSHOT
 ../pom.xml
   
 

http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/f76c0982/wagon-providers/wagon-ftp/pom.xml
--
diff --git a/wagon-providers/wagon-ftp/pom.xml 
b/wagon-providers/wagon-ftp/pom.xml
index 87925ac..fb2bf74 100644
--- a/wagon-providers/wagon-ftp/pom.xml
+++ b/wagon-providers/wagon-ftp/pom.xml
@@ -23,7 +23,7 @@ under the License.
   
 org.apache.maven.wagon
 wagon-providers
-2.12
+2.13-SNAPSHOT
 ../pom.xml
   
 

maven-wagon git commit: [maven-release-plugin] prepare release wagon-2.12

[michaelo]

Repository: maven-wagon
Updated Branches:
  refs/heads/master 6843ead40 -> 0f2c8bc57


[maven-release-plugin] prepare release wagon-2.12


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

Branch: refs/heads/master
Commit: 0f2c8bc57a9b3094e6566ca601bf2025dabd0fe9
Parents: 6843ead
Author: Michael Osipov 
Authored: Fri Jan 27 12:51:12 2017 +0100
Committer: Michael Osipov 
Committed: Fri Jan 27 12:51:12 2017 +0100

--
 pom.xml | 4 ++--
 wagon-provider-api/pom.xml  | 2 +-
 wagon-provider-test/pom.xml | 2 +-
 wagon-providers/pom.xml | 2 +-
 wagon-providers/wagon-file/pom.xml  | 2 +-
 wagon-providers/wagon-ftp/pom.xml   | 2 +-
 wagon-providers/wagon-http-lightweight/pom.xml  | 2 +-
 wagon-providers/wagon-http-shared/pom.xml   | 2 +-
 wagon-providers/wagon-http/pom.xml  | 2 +-
 wagon-providers/wagon-scm/pom.xml   | 2 +-
 wagon-providers/wagon-ssh-common-test/pom.xml   | 2 +-
 wagon-providers/wagon-ssh-common/pom.xml| 2 +-
 wagon-providers/wagon-ssh-external/pom.xml  | 2 +-
 wagon-providers/wagon-ssh/pom.xml   | 2 +-
 wagon-providers/wagon-webdav-jackrabbit/pom.xml | 2 +-
 wagon-tcks/pom.xml  | 2 +-
 wagon-tcks/wagon-tck-http/pom.xml   | 2 +-
 17 files changed, 18 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/0f2c8bc5/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 4ca8ed0..fe90cfc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@ under the License.
 
   org.apache.maven.wagon
   wagon
-  2.12-SNAPSHOT
+  2.12
   pom
 
   Apache Maven Wagon
@@ -198,7 +198,7 @@ under the License.
 
scm:git:https://git-wip-us.apache.org/repos/asf/maven-wagon.git
 
scm:git:https://git-wip-us.apache.org/repos/asf/maven-wagon.git
 https://github.com/apache/maven-wagon/tree/${project.scm.tag}
-master
+wagon-2.12
   
 
   

http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/0f2c8bc5/wagon-provider-api/pom.xml
--
diff --git a/wagon-provider-api/pom.xml b/wagon-provider-api/pom.xml
index 36dac7d..f38bb55 100644
--- a/wagon-provider-api/pom.xml
+++ b/wagon-provider-api/pom.xml
@@ -23,7 +23,7 @@ under the License.
   
 org.apache.maven.wagon
 wagon
-2.12-SNAPSHOT
+2.12
 ../pom.xml
   
 

http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/0f2c8bc5/wagon-provider-test/pom.xml
--
diff --git a/wagon-provider-test/pom.xml b/wagon-provider-test/pom.xml
index 9b0f4e5..91a9a1f 100644
--- a/wagon-provider-test/pom.xml
+++ b/wagon-provider-test/pom.xml
@@ -23,7 +23,7 @@ under the License.
   
 org.apache.maven.wagon
 wagon
-2.12-SNAPSHOT
+2.12
 ../pom.xml
   
 

http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/0f2c8bc5/wagon-providers/pom.xml
--
diff --git a/wagon-providers/pom.xml b/wagon-providers/pom.xml
index ad89ccc..e29dd55 100644
--- a/wagon-providers/pom.xml
+++ b/wagon-providers/pom.xml
@@ -23,7 +23,7 @@ under the License.
   
 org.apache.maven.wagon
 wagon
-2.12-SNAPSHOT
+2.12
 ../pom.xml
   
 

http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/0f2c8bc5/wagon-providers/wagon-file/pom.xml
--
diff --git a/wagon-providers/wagon-file/pom.xml 
b/wagon-providers/wagon-file/pom.xml
index a96af63..08b9ce5 100644
--- a/wagon-providers/wagon-file/pom.xml
+++ b/wagon-providers/wagon-file/pom.xml
@@ -23,7 +23,7 @@ under the License.
   
 org.apache.maven.wagon
 wagon-providers
-2.12-SNAPSHOT
+2.12
 ../pom.xml
   
 

http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/0f2c8bc5/wagon-providers/wagon-ftp/pom.xml
--
diff --git a/wagon-providers/wagon-ftp/pom.xml 
b/wagon-providers/wagon-ftp/pom.xml
index 07a1811..87925ac 100644
--- a/wagon-providers/wagon-ftp/pom.xml
+++ b/wagon-providers/wagon-ftp/pom.xml
@@ -23,7 +23,7 @@ under the License.
   
 org.apache.maven.wagon
 wagon-providers
-2.12-SNAPSHOT
+2.12
 ../pom.xml
   
 

http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/0f2c8bc5/wagon-providers/wagon-http-lightweight/pom.xml

maven-wagon git commit: Bump version 2.12-SNAPSHOT

[michaelo]

Repository: maven-wagon
Updated Branches:
  refs/heads/master 3512a321e -> 6843ead40


Bump version 2.12-SNAPSHOT

Preparations for the next version, 2.11 is burned.


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

Branch: refs/heads/master
Commit: 6843ead404b0e05ec97ff80b1cbea0ecc7472e45
Parents: 3512a32
Author: Michael Osipov 
Authored: Fri Jan 27 12:24:01 2017 +0100
Committer: Michael Osipov 
Committed: Fri Jan 27 12:24:01 2017 +0100

--
 pom.xml | 2 +-
 wagon-provider-api/pom.xml  | 2 +-
 wagon-provider-test/pom.xml | 2 +-
 wagon-providers/pom.xml | 2 +-
 wagon-providers/wagon-file/pom.xml  | 2 +-
 wagon-providers/wagon-ftp/pom.xml   | 2 +-
 wagon-providers/wagon-http-lightweight/pom.xml  | 2 +-
 wagon-providers/wagon-http-shared/pom.xml   | 2 +-
 wagon-providers/wagon-http/pom.xml  | 2 +-
 wagon-providers/wagon-scm/pom.xml   | 2 +-
 wagon-providers/wagon-ssh-common-test/pom.xml   | 2 +-
 wagon-providers/wagon-ssh-common/pom.xml| 2 +-
 wagon-providers/wagon-ssh-external/pom.xml  | 2 +-
 wagon-providers/wagon-ssh/pom.xml   | 2 +-
 wagon-providers/wagon-webdav-jackrabbit/pom.xml | 2 +-
 wagon-tcks/pom.xml  | 2 +-
 wagon-tcks/wagon-tck-http/pom.xml   | 2 +-
 17 files changed, 17 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/6843ead4/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 006fbe9..4ca8ed0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@ under the License.
 
   org.apache.maven.wagon
   wagon
-  2.11-SNAPSHOT
+  2.12-SNAPSHOT
   pom
 
   Apache Maven Wagon

http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/6843ead4/wagon-provider-api/pom.xml
--
diff --git a/wagon-provider-api/pom.xml b/wagon-provider-api/pom.xml
index 30013fe..36dac7d 100644
--- a/wagon-provider-api/pom.xml
+++ b/wagon-provider-api/pom.xml
@@ -23,7 +23,7 @@ under the License.
   
 org.apache.maven.wagon
 wagon
-2.11-SNAPSHOT
+2.12-SNAPSHOT
 ../pom.xml
   
 

http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/6843ead4/wagon-provider-test/pom.xml
--
diff --git a/wagon-provider-test/pom.xml b/wagon-provider-test/pom.xml
index d1d6931..9b0f4e5 100644
--- a/wagon-provider-test/pom.xml
+++ b/wagon-provider-test/pom.xml
@@ -23,7 +23,7 @@ under the License.
   
 org.apache.maven.wagon
 wagon
-2.11-SNAPSHOT
+2.12-SNAPSHOT
 ../pom.xml
   
 

http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/6843ead4/wagon-providers/pom.xml
--
diff --git a/wagon-providers/pom.xml b/wagon-providers/pom.xml
index b94482f..ad89ccc 100644
--- a/wagon-providers/pom.xml
+++ b/wagon-providers/pom.xml
@@ -23,7 +23,7 @@ under the License.
   
 org.apache.maven.wagon
 wagon
-2.11-SNAPSHOT
+2.12-SNAPSHOT
 ../pom.xml
   
 

http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/6843ead4/wagon-providers/wagon-file/pom.xml
--
diff --git a/wagon-providers/wagon-file/pom.xml 
b/wagon-providers/wagon-file/pom.xml
index d1ef313..a96af63 100644
--- a/wagon-providers/wagon-file/pom.xml
+++ b/wagon-providers/wagon-file/pom.xml
@@ -23,7 +23,7 @@ under the License.
   
 org.apache.maven.wagon
 wagon-providers
-2.11-SNAPSHOT
+2.12-SNAPSHOT
 ../pom.xml
   
 

http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/6843ead4/wagon-providers/wagon-ftp/pom.xml
--
diff --git a/wagon-providers/wagon-ftp/pom.xml 
b/wagon-providers/wagon-ftp/pom.xml
index 8cec0c9..07a1811 100644
--- a/wagon-providers/wagon-ftp/pom.xml
+++ b/wagon-providers/wagon-ftp/pom.xml
@@ -23,7 +23,7 @@ under the License.
   
 org.apache.maven.wagon
 wagon-providers
-2.11-SNAPSHOT
+2.12-SNAPSHOT
 ../pom.xml
   
 

http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/6843ead4/wagon-providers/wagon-http-lightweight/pom.xml
--
diff --git a/wagon-providers/wagon-http-lightweight/pom.xml 
b/wagon-providers/wagon-http-lightweight/pom.xml
index 050de49..0a055b6 100644

svn commit: r1005739 - in /websites/staging/maven/trunk/content: ./ maven-site-1.0-site.jar plugins/index.html

[buildbot]

Author: buildbot
Date: Fri Jan 27 10:50:32 2017
New Revision: 1005739

Log:
Staging update by buildbot for maven

Modified:
websites/staging/maven/trunk/content/   (props changed)
websites/staging/maven/trunk/content/maven-site-1.0-site.jar
websites/staging/maven/trunk/content/plugins/index.html

Propchange: websites/staging/maven/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Fri Jan 27 10:50:32 2017
@@ -1 +1 @@
-1780535
+1780536

Modified: websites/staging/maven/trunk/content/maven-site-1.0-site.jar
==
Binary files - no diff available.

Modified: websites/staging/maven/trunk/content/plugins/index.html
==
--- websites/staging/maven/trunk/content/plugins/index.html (original)
+++ websites/staging/maven/trunk/content/plugins/index.html Fri Jan 27 10:50:32 
2017
@@ -284,8 +284,8 @@ Karl-Heinz Marbaise" />
 
  
shade
 B
-2.4.3
-2016-01-10
+3.0.0
+2017-01-27
 Build an Uber-JAR from the current project, including 
dependencies.
 https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-shade-plugin;>SVN
 https://issues.apache.org/jira/browse/MSHADE;>JIRA

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

[olamy]

Author: olamy
Date: Fri Jan 27 10:50:05 2017
New Revision: 1780536

URL: http://svn.apache.org/viewvc?rev=1780536=rev
Log:
shade plugin 3.0.0

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

Modified: maven/site/trunk/content/apt/plugins/index.apt
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/plugins/index.apt?rev=1780536=1780535=1780536=diff
==
--- maven/site/trunk/content/apt/plugins/index.apt (original)
+++ maven/site/trunk/content/apt/plugins/index.apt Fri Jan 27 10:50:05 2017
@@ -99,7 +99,7 @@ Available Plugins
 
*--++--++--+++
 | {{{/plugins/maven-acr-plugin/} <<>>}}| B  | 
3.0.0| 2015-01-23 | Build a JavaEE application client from the current 
project. | 
{{{https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-acr-plugin}SVN}} 
| {{{https://issues.apache.org/jira/browse/MACR}JIRA}}
 
*--++--++--+++
-| {{{/plugins/maven-shade-plugin/} <<>>}}   | B  | 
2.4.3| 2016-01-10 | Build an Uber-JAR from the current project, 
including dependencies. | 
{{{https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-shade-plugin}SVN}}
 | {{{https://issues.apache.org/jira/browse/MSHADE}JIRA}}
+| {{{/plugins/maven-shade-plugin/} <<>>}}   | B  | 
3.0.0| 2017-01-27 | Build an Uber-JAR from the current project, 
including dependencies. | 
{{{https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-shade-plugin}SVN}}
 | {{{https://issues.apache.org/jira/browse/MSHADE}JIRA}}
 
*--++--++--+++
 | {{{/plugins/maven-source-plugin/} <<>>}} | B  | 
3.0.1| 2016-06-18 | Build a source-JAR from the current project. | 
{{{https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-source-plugin}SVN}}
 | {{{https://issues.apache.org/jira/browse/MSOURCES}JIRA}}
 
*--++--++--+++

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

[buildbot]

Modified: websites/staging/maven/trunk/content/docs/2.0.7/release-notes.html
==
--- websites/staging/maven/trunk/content/docs/2.0.7/release-notes.html 
(original)
+++ websites/staging/maven/trunk/content/docs/2.0.7/release-notes.html Fri Jan 
27 10:37:01 2017
@@ -1,6 +1,6 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
@@ -9,7 +9,7 @@
 
 
 
-
+
 
 Maven  Release Notes - Maven 2.0.7
 
@@ -41,7 +41,7 @@
 https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 Release Notes - Maven 2.0.7
-Last Published: 2017-01-17
+Last Published: 2017-01-27
 
   
   

Modified: websites/staging/maven/trunk/content/docs/2.0.8/release-notes.html
==
--- websites/staging/maven/trunk/content/docs/2.0.8/release-notes.html 
(original)
+++ websites/staging/maven/trunk/content/docs/2.0.8/release-notes.html Fri Jan 
27 10:37:01 2017
@@ -1,6 +1,6 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
@@ -9,7 +9,7 @@
 
 
 
-
+
 
 Maven  Release Notes - Maven 2.0.8
 
@@ -41,7 +41,7 @@
 https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 Release Notes - Maven 2.0.8
-Last Published: 2017-01-17
+Last Published: 2017-01-27
 
   
   

Modified: websites/staging/maven/trunk/content/docs/2.0.9/release-notes.html
==
--- websites/staging/maven/trunk/content/docs/2.0.9/release-notes.html 
(original)
+++ websites/staging/maven/trunk/content/docs/2.0.9/release-notes.html Fri Jan 
27 10:37:01 2017
@@ -1,6 +1,6 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
@@ -9,7 +9,7 @@
 
 
 
-
+
 
 Maven  Release Notes - Maven 2.0.9
 
@@ -41,7 +41,7 @@
 https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 Release Notes - Maven 2.0.9
-Last Published: 2017-01-17
+Last Published: 2017-01-27
 
   
   

Modified: websites/staging/maven/trunk/content/docs/2.0/release-notes.html
==
--- websites/staging/maven/trunk/content/docs/2.0/release-notes.html (original)
+++ websites/staging/maven/trunk/content/docs/2.0/release-notes.html Fri Jan 27 
10:37:01 2017
@@ -1,6 +1,6 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 Maven  Release Notes - Maven 2.0
 
@@ -40,7 +40,7 @@
 https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 Release Notes - Maven 2.0
-Last Published: 2017-01-17
+Last Published: 2017-01-27
 
   
   

Modified: websites/staging/maven/trunk/content/docs/2.1.0/release-notes.html
==
--- websites/staging/maven/trunk/content/docs/2.1.0/release-notes.html 
(original)
+++ websites/staging/maven/trunk/content/docs/2.1.0/release-notes.html Fri Jan 
27 10:37:01 2017
@@ -1,6 +1,6 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
@@ -11,7 +11,7 @@
 Jason van Zyl
 Brian Fox" />
 
-
+
 
 Maven  Release Notes - Maven 2.1.0
 
@@ -43,7 +43,7 @@ Brian Fox" />
 https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 Release Notes - Maven 2.1.0
-Last Published: 2017-01-17
+Last Published: 2017-01-27
 
   
   

Modified: websites/staging/maven/trunk/content/docs/2.2.0/release-notes.html
==
--- websites/staging/maven/trunk/content/docs/2.2.0/release-notes.html 
(original)
+++ websites/staging/maven/trunk/content/docs/2.2.0/release-notes.html Fri Jan 
27 10:37:01 2017
@@ -1,6 +1,6 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
@@ -12,7 +12,7 @@ Jason van Zyl
 Brian Fox
 John Casey" />
 
-
+
 
 Maven  Release Notes - Maven 2.2.0
 
@@ -44,7 +44,7 @@ John Casey" />
 https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 Release Notes - Maven 2.2.0
-Last Published: 2017-01-17
+Last Published: 2017-01-27
 
   
   

Modified: websites/staging/maven/trunk/content/docs/2.2.1/release-notes.html
==
--- websites/staging/maven/trunk/content/docs/2.2.1/release-notes.html 
(original)
+++ websites/staging/maven/trunk/content/docs/2.2.1/release-notes.html Fri Jan 
27 10:37:01 2017
@@ -1,6 +1,6 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">

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

[buildbot]

Modified: 
websites/staging/maven/trunk/content/guides/introduction/introduction-to-optional-and-excludes-dependencies.html
==
--- 
websites/staging/maven/trunk/content/guides/introduction/introduction-to-optional-and-excludes-dependencies.html
 (original)
+++ 
websites/staging/maven/trunk/content/guides/introduction/introduction-to-optional-and-excludes-dependencies.html
 Fri Jan 27 10:37:01 2017
@@ -1,6 +1,6 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
@@ -9,7 +9,7 @@
 
 
 
-
+
 
 Maven  Optional Dependencies and Dependency 
Exclusions
 
@@ -41,7 +41,7 @@
 https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 Optional Dependencies and Dependency Exclusions
-Last Published: 2017-01-17
+Last Published: 2017-01-27
 
   
   

Modified: 
websites/staging/maven/trunk/content/guides/introduction/introduction-to-plugin-prefix-mapping.html
==
--- 
websites/staging/maven/trunk/content/guides/introduction/introduction-to-plugin-prefix-mapping.html
 (original)
+++ 
websites/staging/maven/trunk/content/guides/introduction/introduction-to-plugin-prefix-mapping.html
 Fri Jan 27 10:37:01 2017
@@ -1,6 +1,6 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
@@ -9,7 +9,7 @@
 
 
 
-
+
 
 Maven  Introduction to Plugin Prefix Resolution
 
@@ -41,7 +41,7 @@
 https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 Introduction to Plugin Prefix Resolution
-Last Published: 2017-01-17
+Last Published: 2017-01-27
 
   
   

Modified: 
websites/staging/maven/trunk/content/guides/introduction/introduction-to-plugins.html
==
--- 
websites/staging/maven/trunk/content/guides/introduction/introduction-to-plugins.html
 (original)
+++ 
websites/staging/maven/trunk/content/guides/introduction/introduction-to-plugins.html
 Fri Jan 27 10:37:01 2017
@@ -1,6 +1,6 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
@@ -9,7 +9,7 @@
 
 
 
-
+
 
 Maven  Introduction to Maven 2.0 Plugin Development
 
@@ -41,7 +41,7 @@
 https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 Introduction to Maven 2.0 Plugin Development
-Last Published: 2017-01-17
+Last Published: 2017-01-27
 
   
   

Modified: 
websites/staging/maven/trunk/content/guides/introduction/introduction-to-profiles.html
==
--- 
websites/staging/maven/trunk/content/guides/introduction/introduction-to-profiles.html
 (original)
+++ 
websites/staging/maven/trunk/content/guides/introduction/introduction-to-profiles.html
 Fri Jan 27 10:37:01 2017
@@ -1,6 +1,6 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
@@ -9,7 +9,7 @@
 
 
 
-
+
 
 Maven  Introduction to build profiles
 
@@ -41,7 +41,7 @@
 https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 Introduction to build profiles
-Last Published: 2017-01-17
+Last Published: 2017-01-27
 
   
   

Modified: 
websites/staging/maven/trunk/content/guides/introduction/introduction-to-repositories.html
==
--- 
websites/staging/maven/trunk/content/guides/introduction/introduction-to-repositories.html
 (original)
+++ 
websites/staging/maven/trunk/content/guides/introduction/introduction-to-repositories.html
 Fri Jan 27 10:37:01 2017
@@ -1,6 +1,6 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
@@ -10,7 +10,7 @@
 
 
-
+
 
 Maven  Introduction to Repositories
 
@@ -42,7 +42,7 @@ Brian Fox" />
 https://www.apache.org/; class="externalLink" 
title="Apache">Apache/
   Maven/
 Introduction to Repositories
-Last Published: 2017-01-17
+Last Published: 2017-01-27
 
   
   

Modified: 
websites/staging/maven/trunk/content/guides/introduction/introduction-to-the-lifecycle.html
==
--- 
websites/staging/maven/trunk/content/guides/introduction/introduction-to-the-lifecycle.html
 (original)
+++ 
websites/staging/maven/trunk/content/guides/introduction/introduction-to-the-lifecycle.html
 Fri Jan 27 10:37:01 2017
@@ -1,6 +1,6 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
@@ -9,7 +9,7 @@
 
 
 
-
+
 
 Maven  Introduction to the Build Lifecycle
 
@@ -41,7 +41,7 @@
 https://www.apache.org/; class="externalLink" 

svn commit: r1005736 - /websites/production/maven/content/

[rfscholte]

Author: rfscholte
Date: Fri Jan 27 10:37:45 2017
New Revision: 1005736

Log:
Publishing svnmucc operation to maven site by rfscholte

Added:
websites/production/maven/content/
  - copied from r1005735, websites/staging/maven/trunk/content/

svn commit: r1005734 - /websites/production/maven/components/plugins-archives/maven-shade-plugin-3.0.0/

[olamy]

Author: olamy
Date: Fri Jan 27 10:36:49 2017
New Revision: 1005734

Log:
backup 3.0.0


Added:

websites/production/maven/components/plugins-archives/maven-shade-plugin-3.0.0/
  - copied from r1005733, 
websites/production/maven/components/plugins-archives/maven-shade-plugin-LATEST/

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

[rfscholte]

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

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

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

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

svn commit: r1005730 - /websites/production/maven/components/shared-archives/maven-invoker-3.0.0/

[rfscholte]

Author: rfscholte
Date: Fri Jan 27 10:33:12 2017
New Revision: 1005730

Log:
Archive versioned site.

Added:
websites/production/maven/components/shared-archives/maven-invoker-3.0.0/
  - copied from r1005729, 
websites/production/maven/components/shared-archives/maven-invoker-LATEST/

svn commit: r1005732 - /websites/production/maven/components/shared/maven-invoker/

[rfscholte]

Author: rfscholte
Date: Fri Jan 27 10:33:26 2017
New Revision: 1005732

Log:
Publish new site.

Added:
websites/production/maven/components/shared/maven-invoker/
  - copied from r1005731, 
websites/production/maven/components/shared-archives/maven-invoker-3.0.0/

svn commit: r1005731 - /websites/production/maven/components/shared/maven-invoker/

[rfscholte]

Author: rfscholte
Date: Fri Jan 27 10:33:20 2017
New Revision: 1005731

Log:
Remove old site.

Removed:
websites/production/maven/components/shared/maven-invoker/