You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2017/05/12 19:49:05 UTC
[01/18] maven git commit: Added some javadoc [Forced Update!]
Repository: maven
Updated Branches:
refs/heads/MNG-6169_2/not-updated-MJAR-MCOMPILER 3cb6dc2f1 -> c7cc7b3ae (forced update)
Added some javadoc
Added javadoc help for making easier to compare two versions in command line.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/5b3c27c9
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/5b3c27c9
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/5b3c27c9
Branch: refs/heads/MNG-6169_2/not-updated-MJAR-MCOMPILER
Commit: 5b3c27c917e378c58732635905e201531648f2b9
Parents: 87cf1ee
Author: LuboVarga <lu...@nike.sk>
Authored: Mon Mar 13 13:23:04 2017 +0100
Committer: Michael Osipov <mi...@apache.org>
Committed: Fri May 12 21:45:58 2017 +0200
----------------------------------------------------------------------
.../maven/artifact/versioning/ComparableVersion.java | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/5b3c27c9/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
----------------------------------------------------------------------
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
index 5222871..0ae4acb 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
@@ -472,8 +472,19 @@ public class ComparableVersion
/**
* Main to test version parsing and comparison.
+ * <p>
+ * To check how "1.2.7" compares to "1.2-SNAPSHOT" for example, you can issue
+ * <code>java -cp ~/.m2/repository/org/apache/maven/maven-artifact/3.3.9/maven-artifact-3.3.9.jar org.apache.maven.artifact.versioning.ComparableVersion "1.2.7" "1.2-SNAPSHOT"</code>
+ * command to commandline. Result of given command will be something like this:
+ * <pre
+ * Display parameters as parsed by Maven (in canonical form) and comparison result:
+ * 1. 1.2.7 == 1.2.7
+ * 1.2.7 > 1.2-SNAPSHOT
+ * 2. 1.2-SNAPSHOT == 1.2-snapshot
+ * </pre>
*
- * @param args the version strings to parse and compare
+ * @param args the version strings to parse and compare. You can pass arbitrary number of version strings and always
+ * two adjacent will be compared
*/
public static void main( String... args )
{
[08/18] maven git commit: MNG-6209 better executeMojo thread context
classloader
Posted by mi...@apache.org.
MNG-6209 better executeMojo thread context classloader
Signed-off-by: Igor Fedorenko <if...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/dcc12659
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/dcc12659
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/dcc12659
Branch: refs/heads/MNG-6169_2/not-updated-MJAR-MCOMPILER
Commit: dcc126590da0ec48a82b6cd127c148651754952f
Parents: 5f8bfa7
Author: Igor Fedorenko <if...@apache.org>
Authored: Tue Apr 11 07:59:34 2017 -0700
Committer: Michael Osipov <mi...@apache.org>
Committed: Fri May 12 21:46:04 2017 +0200
----------------------------------------------------------------------
.../java/org/apache/maven/plugin/DefaultBuildPluginManager.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/dcc12659/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java b/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java
index b4f7a4d..3af1125 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java
@@ -106,8 +106,11 @@ public class DefaultBuildPluginManager
throw new PluginExecutionException( mojoExecution, project, e );
}
+ // use project realm as thread context classloader to enable components from all extensions=true plugins
+ ClassRealm tccl = mojoExecution.getPlugin().isExtensions() ? project.getClassRealm() : pluginRealm;
+
ClassLoader oldClassLoader = Thread.currentThread().getContextClassLoader();
- Thread.currentThread().setContextClassLoader( pluginRealm );
+ Thread.currentThread().setContextClassLoader( tccl );
MavenSession oldSession = legacySupport.getSession();
[17/18] maven git commit: [MNG-5935] Optional true getting lost in
managed dependencies when transitive
Posted by mi...@apache.org.
[MNG-5935] Optional true getting lost in managed dependencies when transitive
Updated to correctly map the optional flag of Maven model dependencies to
Aether dependencies. Prior to this change all managed dependencies implicitly
had the optional flag set to 'false' leading to Aether managing that flag to
'false' on all managed dependencies when transitive.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/4feb0a27
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/4feb0a27
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/4feb0a27
Branch: refs/heads/MNG-6169_2/not-updated-MJAR-MCOMPILER
Commit: 4feb0a27038cd23b2ff7744b8dd4c1eb17049041
Parents: fb5566c
Author: Christian Schulte <sc...@apache.org>
Authored: Thu Feb 11 08:45:19 2016 +0100
Committer: Michael Osipov <mi...@apache.org>
Committed: Fri May 12 21:46:12 2017 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/maven/RepositoryUtils.java | 7 ++++++-
.../repository/internal/ArtifactDescriptorReaderDelegate.java | 6 +++++-
2 files changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/4feb0a27/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java b/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
index 86eab4e..52442b7 100644
--- a/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
+++ b/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
@@ -316,7 +316,12 @@ public class RepositoryUtils
exclusions.add( toExclusion( exclusion ) );
}
- Dependency result = new Dependency( artifact, dependency.getScope(), dependency.isOptional(), exclusions );
+ Dependency result = new Dependency( artifact,
+ dependency.getScope(),
+ dependency.getOptional() != null
+ ? dependency.isOptional()
+ : null,
+ exclusions );
return result;
}
http://git-wip-us.apache.org/repos/asf/maven/blob/4feb0a27/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java
----------------------------------------------------------------------
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java
index 42060b4..8219205 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java
@@ -124,7 +124,11 @@ public class ArtifactDescriptorReaderDelegate
exclusions.add( convert( exclusion ) );
}
- Dependency result = new Dependency( artifact, dependency.getScope(), dependency.isOptional(), exclusions );
+ Dependency result = new Dependency( artifact, dependency.getScope(),
+ dependency.getOptional() != null
+ ? dependency.isOptional()
+ : null,
+ exclusions );
return result;
}
[14/18] maven git commit: [MNG-6205] upgraded JAnsi to 1.16 for
console encoding fix
Posted by mi...@apache.org.
[MNG-6205] upgraded JAnsi to 1.16 for console encoding fix
also fixes MNG-6218 MinGW bash detection fixed by JAnsi 1.14
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/605ff23e
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/605ff23e
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/605ff23e
Branch: refs/heads/MNG-6169_2/not-updated-MJAR-MCOMPILER
Commit: 605ff23e62a3efdaf2cdf4d44207d4f2253bc38b
Parents: 08d6cbf
Author: Hervé Boutemy <hb...@apache.org>
Authored: Sat May 6 18:25:36 2017 +0200
Committer: Michael Osipov <mi...@apache.org>
Committed: Fri May 12 21:46:10 2017 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/605ff23e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2962487..e16d93b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -277,7 +277,7 @@ under the License.
<dependency>
<groupId>org.fusesource.jansi</groupId>
<artifactId>jansi</artifactId>
- <version>1.13</version>
+ <version>1.16</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
[11/18] maven git commit: [MNG-6149]
MetadataResolutionResult#getGraph() never resolves request type 'test'
Posted by mi...@apache.org.
[MNG-6149] MetadataResolutionResult#getGraph() never resolves request type 'test'
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/b9d46b53
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/b9d46b53
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/b9d46b53
Branch: refs/heads/MNG-6169_2/not-updated-MJAR-MCOMPILER
Commit: b9d46b53d6b27f2c38650e6301f03de805acf4c6
Parents: 756d984
Author: Michael Osipov <mi...@apache.org>
Authored: Fri Apr 21 22:57:53 2017 +0200
Committer: Michael Osipov <mi...@apache.org>
Committed: Fri May 12 21:46:07 2017 +0200
----------------------------------------------------------------------
.../apache/maven/repository/metadata/MetadataResolutionResult.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/b9d46b53/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java
index 814b66c..74a3427 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java
@@ -115,7 +115,7 @@ public class MetadataResolutionResult
{
return conflictResolver.resolveConflicts( getGraph(), ArtifactScopeEnum.runtime );
}
- else if ( requestType.equals( MetadataResolutionRequestTypeEnum.classpathRuntime ) )
+ else if ( requestType.equals( MetadataResolutionRequestTypeEnum.classpathTest ) )
{
return conflictResolver.resolveConflicts( getGraph(), ArtifactScopeEnum.test );
}
[07/18] maven git commit: improved description of styled message API
Posted by mi...@apache.org.
improved description of styled message API
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/244197c8
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/244197c8
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/244197c8
Branch: refs/heads/MNG-6169_2/not-updated-MJAR-MCOMPILER
Commit: 244197c8c5f226fa9249148cc3fc3ded98b2360f
Parents: 0a2f222
Author: Hervé Boutemy <hb...@apache.org>
Authored: Sat Apr 8 08:50:55 2017 +0200
Committer: Michael Osipov <mi...@apache.org>
Committed: Fri May 12 21:46:03 2017 +0200
----------------------------------------------------------------------
maven-embedder/src/site/apt/index.apt.vm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/244197c8/maven-embedder/src/site/apt/index.apt.vm
----------------------------------------------------------------------
diff --git a/maven-embedder/src/site/apt/index.apt.vm b/maven-embedder/src/site/apt/index.apt.vm
index e820765..d327717 100644
--- a/maven-embedder/src/site/apt/index.apt.vm
+++ b/maven-embedder/src/site/apt/index.apt.vm
@@ -44,5 +44,6 @@ ${project.name}
* since 3.5.0, output is colorized by default, with color disabled in batch mode: see
{{{/shared/maven-shared-utils/apidocs/org/apache/maven/shared/utils/logging/package-summary.html}styled message API}}
- for more details.
+ for more details on adding color to a plugin output or customizing colors.
+
\ No newline at end of file
[02/18] maven git commit: [maven-release-plugin] prepare release
maven-3.5.0
Posted by mi...@apache.org.
[maven-release-plugin] prepare release maven-3.5.0
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/5787c0b9
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/5787c0b9
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/5787c0b9
Branch: refs/heads/MNG-6169_2/not-updated-MJAR-MCOMPILER
Commit: 5787c0b9746bf026c73f8551dfc2cf5e4410ef29
Parents: 5b3c27c
Author: Stephen Connolly <st...@gmail.com>
Authored: Mon Apr 3 20:35:30 2017 +0100
Committer: Michael Osipov <mi...@apache.org>
Committed: Fri May 12 21:45:59 2017 +0200
----------------------------------------------------------------------
apache-maven/pom.xml | 2 +-
maven-artifact/pom.xml | 2 +-
maven-builder-support/pom.xml | 2 +-
maven-compat/pom.xml | 2 +-
maven-core/pom.xml | 2 +-
maven-embedder/pom.xml | 2 +-
maven-model-builder/pom.xml | 2 +-
maven-model/pom.xml | 2 +-
maven-plugin-api/pom.xml | 2 +-
maven-repository-metadata/pom.xml | 2 +-
maven-resolver-provider/pom.xml | 2 +-
maven-settings-builder/pom.xml | 2 +-
maven-settings/pom.xml | 2 +-
maven-slf4j-provider/pom.xml | 2 +-
pom.xml | 4 ++--
15 files changed, 16 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/5787c0b9/apache-maven/pom.xml
----------------------------------------------------------------------
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index a528ddb..8a72146 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0</version>
</parent>
<artifactId>apache-maven</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/5787c0b9/maven-artifact/pom.xml
----------------------------------------------------------------------
diff --git a/maven-artifact/pom.xml b/maven-artifact/pom.xml
index e3943c9..977fd34 100644
--- a/maven-artifact/pom.xml
+++ b/maven-artifact/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0</version>
</parent>
<artifactId>maven-artifact</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/5787c0b9/maven-builder-support/pom.xml
----------------------------------------------------------------------
diff --git a/maven-builder-support/pom.xml b/maven-builder-support/pom.xml
index 39eb161..7457a4c 100644
--- a/maven-builder-support/pom.xml
+++ b/maven-builder-support/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0</version>
</parent>
<artifactId>maven-builder-support</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/5787c0b9/maven-compat/pom.xml
----------------------------------------------------------------------
diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml
index bfd2b47..9552803 100644
--- a/maven-compat/pom.xml
+++ b/maven-compat/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0</version>
</parent>
<artifactId>maven-compat</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/5787c0b9/maven-core/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index 0e20235..4fb86a3 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0</version>
</parent>
<artifactId>maven-core</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/5787c0b9/maven-embedder/pom.xml
----------------------------------------------------------------------
diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml
index 30ad2ce..3e778b3 100644
--- a/maven-embedder/pom.xml
+++ b/maven-embedder/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0</version>
</parent>
<artifactId>maven-embedder</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/5787c0b9/maven-model-builder/pom.xml
----------------------------------------------------------------------
diff --git a/maven-model-builder/pom.xml b/maven-model-builder/pom.xml
index 0dd08ac..3aefbc7 100644
--- a/maven-model-builder/pom.xml
+++ b/maven-model-builder/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0</version>
</parent>
<artifactId>maven-model-builder</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/5787c0b9/maven-model/pom.xml
----------------------------------------------------------------------
diff --git a/maven-model/pom.xml b/maven-model/pom.xml
index 41cf168..1ec4f89 100644
--- a/maven-model/pom.xml
+++ b/maven-model/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0</version>
</parent>
<artifactId>maven-model</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/5787c0b9/maven-plugin-api/pom.xml
----------------------------------------------------------------------
diff --git a/maven-plugin-api/pom.xml b/maven-plugin-api/pom.xml
index d8f802d..500a824 100644
--- a/maven-plugin-api/pom.xml
+++ b/maven-plugin-api/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0</version>
</parent>
<artifactId>maven-plugin-api</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/5787c0b9/maven-repository-metadata/pom.xml
----------------------------------------------------------------------
diff --git a/maven-repository-metadata/pom.xml b/maven-repository-metadata/pom.xml
index 7480de7..3fce172 100644
--- a/maven-repository-metadata/pom.xml
+++ b/maven-repository-metadata/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0</version>
</parent>
<artifactId>maven-repository-metadata</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/5787c0b9/maven-resolver-provider/pom.xml
----------------------------------------------------------------------
diff --git a/maven-resolver-provider/pom.xml b/maven-resolver-provider/pom.xml
index e95cc41..da293dd 100644
--- a/maven-resolver-provider/pom.xml
+++ b/maven-resolver-provider/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0</version>
</parent>
<artifactId>maven-resolver-provider</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/5787c0b9/maven-settings-builder/pom.xml
----------------------------------------------------------------------
diff --git a/maven-settings-builder/pom.xml b/maven-settings-builder/pom.xml
index 2d415c9..dcc9116 100644
--- a/maven-settings-builder/pom.xml
+++ b/maven-settings-builder/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0</version>
</parent>
<artifactId>maven-settings-builder</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/5787c0b9/maven-settings/pom.xml
----------------------------------------------------------------------
diff --git a/maven-settings/pom.xml b/maven-settings/pom.xml
index 133ee32..bc22578 100644
--- a/maven-settings/pom.xml
+++ b/maven-settings/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0</version>
</parent>
<artifactId>maven-settings</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/5787c0b9/maven-slf4j-provider/pom.xml
----------------------------------------------------------------------
diff --git a/maven-slf4j-provider/pom.xml b/maven-slf4j-provider/pom.xml
index 81af382..363e00d 100644
--- a/maven-slf4j-provider/pom.xml
+++ b/maven-slf4j-provider/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0</version>
</parent>
<artifactId>maven-slf4j-provider</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/5787c0b9/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 857ce07..1eb0740 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@ under the License.
</parent>
<artifactId>maven</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0</version>
<packaging>pom</packaging>
<name>Apache Maven</name>
@@ -98,7 +98,7 @@ under the License.
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/maven.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/maven.git</developerConnection>
<url>https://github.com/apache/maven/tree/${project.scm.tag}</url>
- <tag>master</tag>
+ <tag>maven-3.5.0</tag>
</scm>
<issueManagement>
<system>jira</system>
[16/18] maven git commit: [MNG-6228] Optionality not displayed in
dependency tree when run in debug mode
Posted by mi...@apache.org.
[MNG-6228] Optionality not displayed in dependency tree when run in debug mode
Log message in DefaultProjectDependenciesResolver has been extended with
"(optional)" if dependency is marked as optional (direct or transitive).
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/fb5566c0
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/fb5566c0
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/fb5566c0
Branch: refs/heads/MNG-6169_2/not-updated-MJAR-MCOMPILER
Commit: fb5566c087340044837a513898ae46e5f45bc998
Parents: 6253214
Author: Michael Osipov <mi...@apache.org>
Authored: Tue May 9 22:15:21 2017 +0200
Committer: Michael Osipov <mi...@apache.org>
Committed: Fri May 12 21:46:11 2017 +0200
----------------------------------------------------------------------
.../maven/project/DefaultProjectDependenciesResolver.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/fb5566c0/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
index 5a803af..4e26de2 100644
--- a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
+++ b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
@@ -295,6 +295,11 @@ public class DefaultProjectDependenciesResolver
// The resolver 1.0.x releases do not record premanaged state of properties.
buffer.append( " (properties managed)" );
}
+
+ if ( dep.isOptional() )
+ {
+ buffer.append( " (optional)" );
+ }
}
else
{
[10/18] maven git commit: Doc improvement in simplelogger.properties
Posted by mi...@apache.org.
Doc improvement in simplelogger.properties
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/756d9848
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/756d9848
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/756d9848
Branch: refs/heads/MNG-6169_2/not-updated-MJAR-MCOMPILER
Commit: 756d984886d4ca2094d3f66978578c958c2d6c90
Parents: 87280cd
Author: Michael Osipov <mi...@apache.org>
Authored: Fri Apr 21 22:50:11 2017 +0200
Committer: Michael Osipov <mi...@apache.org>
Committed: Fri May 12 21:46:06 2017 +0200
----------------------------------------------------------------------
apache-maven/src/conf/logging/simplelogger.properties | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/756d9848/apache-maven/src/conf/logging/simplelogger.properties
----------------------------------------------------------------------
diff --git a/apache-maven/src/conf/logging/simplelogger.properties b/apache-maven/src/conf/logging/simplelogger.properties
index eb3d049..8dea717 100644
--- a/apache-maven/src/conf/logging/simplelogger.properties
+++ b/apache-maven/src/conf/logging/simplelogger.properties
@@ -24,8 +24,8 @@ org.slf4j.simpleLogger.levelInBrackets=true
org.slf4j.simpleLogger.log.Sisu=info
org.slf4j.simpleLogger.warnLevelString=WARNING
-# MNG-6181: mvn -X also prints all debug logging from http-client
+# MNG-6181: mvn -X also prints all debug logging from HttpClient
# Be aware that the shaded packages are used
# org.apache.http -> org.apache.maven.wagon.providers.http.httpclient
org.slf4j.simpleLogger.log.org.apache.maven.wagon.providers.http.httpclient=off
-org.slf4j.simpleLogger.log.org.apache.maven.wagon.providers.http.httpclient.wire=off
\ No newline at end of file
+org.slf4j.simpleLogger.log.org.apache.maven.wagon.providers.http.httpclient.wire=off
[05/18] maven git commit: Update the DOAP to include the 3.5.0 release
Posted by mi...@apache.org.
Update the DOAP to include the 3.5.0 release
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/0a2f2226
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/0a2f2226
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/0a2f2226
Branch: refs/heads/MNG-6169_2/not-updated-MJAR-MCOMPILER
Commit: 0a2f2226878ba610818a1f2d84cd7edfdf0d88d3
Parents: 4494aaf
Author: Stephen Connolly <st...@gmail.com>
Authored: Fri Apr 7 09:11:26 2017 +0100
Committer: Michael Osipov <mi...@apache.org>
Committed: Fri May 12 21:46:02 2017 +0200
----------------------------------------------------------------------
doap_Maven.rdf | 11 +++++++++++
1 file changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/0a2f2226/doap_Maven.rdf
----------------------------------------------------------------------
diff --git a/doap_Maven.rdf b/doap_Maven.rdf
index 86fbd1d..7b671d7 100644
--- a/doap_Maven.rdf
+++ b/doap_Maven.rdf
@@ -33,6 +33,17 @@ under the License.
<release>
<Version>
<name>Latest stable release</name>
+ <created>2017-04-07</created>
+ <revision>3.5.0</revision>
+ <file-release>http://archive.apache.org/dist/maven/maven-3/3.5.0/binaries/apache-maven-3.5.0-bin.zip</file-release>
+ <file-release>http://archive.apache.org/dist/maven/maven-3/3.5.0/binaries/apache-maven-3.5.0-bin.tar.gz</file-release>
+ <file-release>http://archive.apache.org/dist/maven/maven-3/3.5.0/source/apache-maven-3.5.0-src.zip</file-release>
+ <file-release>http://archive.apache.org/dist/maven/maven-3/3.5.0/source/apache-maven-3.5.0-src.tar.gz</file-release>
+ </Version>
+ </release>
+ <release>
+ <Version>
+ <name>Apache Maven 3.3.9</name>
<created>2015-11-14</created>
<revision>3.3.9</revision>
<file-release>http://archive.apache.org/dist/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.zip</file-release>
[15/18] maven git commit: [MNG-6186] use enhanced HawtJNI library
loading (remove previous hack)
Posted by mi...@apache.org.
[MNG-6186] use enhanced HawtJNI library loading (remove previous hack)
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/62532143
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/62532143
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/62532143
Branch: refs/heads/MNG-6169_2/not-updated-MJAR-MCOMPILER
Commit: 62532143f6f010a57d32130025a21dca29210455
Parents: 605ff23
Author: Hervé Boutemy <hb...@apache.org>
Authored: Sat May 6 18:28:04 2017 +0200
Committer: Michael Osipov <mi...@apache.org>
Committed: Fri May 12 21:46:11 2017 +0200
----------------------------------------------------------------------
apache-maven/src/bin/mvn | 4 +-
apache-maven/src/bin/mvn.cmd | 1 +
.../java/org/apache/maven/cli/MavenCli.java | 59 --------------------
3 files changed, 4 insertions(+), 60 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/62532143/apache-maven/src/bin/mvn
----------------------------------------------------------------------
diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn
index eedd344..525b2ef 100755
--- a/apache-maven/src/bin/mvn
+++ b/apache-maven/src/bin/mvn
@@ -193,5 +193,7 @@ exec "$JAVACMD" \
$MAVEN_DEBUG_OPTS \
-classpath "${CLASSWORLDS_JAR}" \
"-Dclassworlds.conf=${MAVEN_HOME}/bin/m2.conf" \
- "-Dmaven.home=${MAVEN_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+ "-Dmaven.home=${MAVEN_HOME}" \
+ "-Dlibrary.jansi.path=${MAVEN_HOME}/jansi-native" \
+ "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
${CLASSWORLDS_LAUNCHER} "$@"
http://git-wip-us.apache.org/repos/asf/maven/blob/62532143/apache-maven/src/bin/mvn.cmd
----------------------------------------------------------------------
diff --git a/apache-maven/src/bin/mvn.cmd b/apache-maven/src/bin/mvn.cmd
index bfcc1b5..ba61f80 100644
--- a/apache-maven/src/bin/mvn.cmd
+++ b/apache-maven/src/bin/mvn.cmd
@@ -181,6 +181,7 @@ set CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
-classpath %CLASSWORLDS_JAR% ^
"-Dclassworlds.conf=%MAVEN_HOME%\bin\m2.conf" ^
"-Dmaven.home=%MAVEN_HOME%" ^
+ "-Dlibrary.jansi.path=%MAVEN_HOME%\jansi-native" ^
"-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^
%CLASSWORLDS_LAUNCHER% %MAVEN_CMD_LINE_ARGS%
if ERRORLEVEL 1 goto error
http://git-wip-us.apache.org/repos/asf/maven/blob/62532143/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
index 79ab45d..e1e58c8 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
@@ -188,7 +188,6 @@ public class MavenCli
{
MavenCli cli = new MavenCli();
- prepareJansiNative();
MessageUtils.systemInstall();
int result = cli.doMain( new CliRequest( args, classWorld ) );
MessageUtils.systemUninstall();
@@ -196,64 +195,6 @@ public class MavenCli
return result;
}
- /**
- * temporary method while improvement reported to JAnsi+HawtJNI and integrated:
- * library.jansi.path should point to lib/jansi-native and HawtJNI should be able to detect
- * the platform instead of forcing the user having to point library.jansi.path to
- * lib/jansi-native/[platform]
- */
- private static void prepareJansiNative()
- {
- if ( System.getProperty( "library.jansi.path" ) == null )
- {
- String mavenHome = System.getProperty( "maven.home" );
-
- if ( mavenHome != null )
- {
- File jansiNative = new File( mavenHome, "lib/jansi-native/" + hawtJNIgetPlatform() );
- System.setProperty( "library.jansi.path", jansiNative.getAbsolutePath() );
- }
- }
- }
-
- private static String hawtJNIgetOperatingSystem()
- {
- String name = System.getProperty( "os.name" ).toLowerCase().trim();
- if ( name.startsWith( "linux" ) )
- {
- return "linux";
- }
- if ( name.startsWith( "mac os x" ) )
- {
- return "osx";
- }
- if ( name.startsWith( "win" ) )
- {
- return "windows";
- }
- return name.replaceAll( "\\W+", "_" );
-
- }
-
- private static String hawtJNIgetPlatform()
- {
- return hawtJNIgetOperatingSystem() + hawtJNIgetBitModel();
- }
-
- private static int hawtJNIgetBitModel()
- {
- String prop = System.getProperty( "sun.arch.data.model" );
- if ( prop == null )
- {
- prop = System.getProperty( "com.ibm.vm.bitmode" );
- }
- if ( prop != null )
- {
- return Integer.parseInt( prop );
- }
- return -1; // we don't know..
- }
-
// TODO need to externalize CliRequest
public static int doMain( String[] args, ClassWorld classWorld )
{
[06/18] maven git commit: use "java -jar" command
Posted by mi...@apache.org.
use "java -jar" command
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/5f8bfa74
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/5f8bfa74
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/5f8bfa74
Branch: refs/heads/MNG-6169_2/not-updated-MJAR-MCOMPILER
Commit: 5f8bfa74df694bff948aaaf7b5cd0e93a577a0ba
Parents: 244197c
Author: Hervé Boutemy <hb...@apache.org>
Authored: Wed Apr 12 03:59:44 2017 +0200
Committer: Michael Osipov <mi...@apache.org>
Committed: Fri May 12 21:46:03 2017 +0200
----------------------------------------------------------------------
.../maven/artifact/versioning/ComparableVersion.java | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/5f8bfa74/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
----------------------------------------------------------------------
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
index 0ae4acb..105d9b5 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
@@ -470,22 +470,24 @@ public class ComparableVersion
return canonical.hashCode();
}
+ // CHECKSTYLE_OFF: LineLength
/**
* Main to test version parsing and comparison.
* <p>
- * To check how "1.2.7" compares to "1.2-SNAPSHOT" for example, you can issue
- * <code>java -cp ~/.m2/repository/org/apache/maven/maven-artifact/3.3.9/maven-artifact-3.3.9.jar org.apache.maven.artifact.versioning.ComparableVersion "1.2.7" "1.2-SNAPSHOT"</code>
- * command to commandline. Result of given command will be something like this:
- * <pre
+ * To check how "1.2.7" compares to "1.2-SNAPSHOT", for example, you can issue
+ * <pre>java -jar ${maven.repo.local}/org/apache/maven/maven-artifact/${maven.version}/maven-artifact-${maven.version}.jar "1.2.7" "1.2-SNAPSHOT"</pre>
+ * command to command line. Result of given command will be something like this:
+ * <pre>
* Display parameters as parsed by Maven (in canonical form) and comparison result:
* 1. 1.2.7 == 1.2.7
- * 1.2.7 > 1.2-SNAPSHOT
+ * 1.2.7 > 1.2-SNAPSHOT
* 2. 1.2-SNAPSHOT == 1.2-snapshot
* </pre>
*
* @param args the version strings to parse and compare. You can pass arbitrary number of version strings and always
* two adjacent will be compared
*/
+ // CHECKSTYLE_ON: LineLength
public static void main( String... args )
{
System.out.println( "Display parameters as parsed by Maven (in canonical form) and comparison result:" );
[03/18] maven git commit: [maven-release-plugin] prepare for next
development iteration
Posted by mi...@apache.org.
[maven-release-plugin] prepare for next development iteration
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/35cfaeff
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/35cfaeff
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/35cfaeff
Branch: refs/heads/MNG-6169_2/not-updated-MJAR-MCOMPILER
Commit: 35cfaeff4f6a55478cceca93cf3a9ba2f8cc17fb
Parents: 5787c0b
Author: Stephen Connolly <st...@gmail.com>
Authored: Mon Apr 3 20:35:47 2017 +0100
Committer: Michael Osipov <mi...@apache.org>
Committed: Fri May 12 21:46:00 2017 +0200
----------------------------------------------------------------------
apache-maven/pom.xml | 2 +-
maven-artifact/pom.xml | 2 +-
maven-builder-support/pom.xml | 2 +-
maven-compat/pom.xml | 2 +-
maven-core/pom.xml | 2 +-
maven-embedder/pom.xml | 2 +-
maven-model-builder/pom.xml | 2 +-
maven-model/pom.xml | 2 +-
maven-plugin-api/pom.xml | 2 +-
maven-repository-metadata/pom.xml | 2 +-
maven-resolver-provider/pom.xml | 2 +-
maven-settings-builder/pom.xml | 2 +-
maven-settings/pom.xml | 2 +-
maven-slf4j-provider/pom.xml | 2 +-
pom.xml | 4 ++--
15 files changed, 16 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/35cfaeff/apache-maven/pom.xml
----------------------------------------------------------------------
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index 8a72146..b286f74 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.5.0</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>apache-maven</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/35cfaeff/maven-artifact/pom.xml
----------------------------------------------------------------------
diff --git a/maven-artifact/pom.xml b/maven-artifact/pom.xml
index 977fd34..b13482b 100644
--- a/maven-artifact/pom.xml
+++ b/maven-artifact/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.5.0</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>maven-artifact</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/35cfaeff/maven-builder-support/pom.xml
----------------------------------------------------------------------
diff --git a/maven-builder-support/pom.xml b/maven-builder-support/pom.xml
index 7457a4c..5eb7903 100644
--- a/maven-builder-support/pom.xml
+++ b/maven-builder-support/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.5.0</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>maven-builder-support</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/35cfaeff/maven-compat/pom.xml
----------------------------------------------------------------------
diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml
index 9552803..8392dca 100644
--- a/maven-compat/pom.xml
+++ b/maven-compat/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.5.0</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>maven-compat</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/35cfaeff/maven-core/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index 4fb86a3..71f09c0 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.5.0</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>maven-core</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/35cfaeff/maven-embedder/pom.xml
----------------------------------------------------------------------
diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml
index 3e778b3..66e09a3 100644
--- a/maven-embedder/pom.xml
+++ b/maven-embedder/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.5.0</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>maven-embedder</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/35cfaeff/maven-model-builder/pom.xml
----------------------------------------------------------------------
diff --git a/maven-model-builder/pom.xml b/maven-model-builder/pom.xml
index 3aefbc7..859f0b3 100644
--- a/maven-model-builder/pom.xml
+++ b/maven-model-builder/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.5.0</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>maven-model-builder</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/35cfaeff/maven-model/pom.xml
----------------------------------------------------------------------
diff --git a/maven-model/pom.xml b/maven-model/pom.xml
index 1ec4f89..aabb25d 100644
--- a/maven-model/pom.xml
+++ b/maven-model/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.5.0</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>maven-model</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/35cfaeff/maven-plugin-api/pom.xml
----------------------------------------------------------------------
diff --git a/maven-plugin-api/pom.xml b/maven-plugin-api/pom.xml
index 500a824..1596a41 100644
--- a/maven-plugin-api/pom.xml
+++ b/maven-plugin-api/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.5.0</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>maven-plugin-api</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/35cfaeff/maven-repository-metadata/pom.xml
----------------------------------------------------------------------
diff --git a/maven-repository-metadata/pom.xml b/maven-repository-metadata/pom.xml
index 3fce172..dcc6a22 100644
--- a/maven-repository-metadata/pom.xml
+++ b/maven-repository-metadata/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.5.0</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>maven-repository-metadata</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/35cfaeff/maven-resolver-provider/pom.xml
----------------------------------------------------------------------
diff --git a/maven-resolver-provider/pom.xml b/maven-resolver-provider/pom.xml
index da293dd..a724d3b 100644
--- a/maven-resolver-provider/pom.xml
+++ b/maven-resolver-provider/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.5.0</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>maven-resolver-provider</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/35cfaeff/maven-settings-builder/pom.xml
----------------------------------------------------------------------
diff --git a/maven-settings-builder/pom.xml b/maven-settings-builder/pom.xml
index dcc9116..904b085 100644
--- a/maven-settings-builder/pom.xml
+++ b/maven-settings-builder/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.5.0</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>maven-settings-builder</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/35cfaeff/maven-settings/pom.xml
----------------------------------------------------------------------
diff --git a/maven-settings/pom.xml b/maven-settings/pom.xml
index bc22578..eb4ad22 100644
--- a/maven-settings/pom.xml
+++ b/maven-settings/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.5.0</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>maven-settings</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/35cfaeff/maven-slf4j-provider/pom.xml
----------------------------------------------------------------------
diff --git a/maven-slf4j-provider/pom.xml b/maven-slf4j-provider/pom.xml
index 363e00d..315b9a7 100644
--- a/maven-slf4j-provider/pom.xml
+++ b/maven-slf4j-provider/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.5.0</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>maven-slf4j-provider</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/35cfaeff/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 1eb0740..2962487 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@ under the License.
</parent>
<artifactId>maven</artifactId>
- <version>3.5.0</version>
+ <version>3.5.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Maven</name>
@@ -98,7 +98,7 @@ under the License.
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/maven.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/maven.git</developerConnection>
<url>https://github.com/apache/maven/tree/${project.scm.tag}</url>
- <tag>maven-3.5.0</tag>
+ <tag>master</tag>
</scm>
<issueManagement>
<system>jira</system>
[13/18] maven git commit: [MNG-6223] support -f path/to/dir when
detecting .mvn
Posted by mi...@apache.org.
[MNG-6223] support -f path/to/dir when detecting .mvn
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/08d6cbfd
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/08d6cbfd
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/08d6cbfd
Branch: refs/heads/MNG-6169_2/not-updated-MJAR-MCOMPILER
Commit: 08d6cbfdeaeef1a87c051fd52e6db5c18fea5742
Parents: bf05ee1
Author: Hervé Boutemy <hb...@apache.org>
Authored: Sat May 6 18:15:42 2017 +0200
Committer: Michael Osipov <mi...@apache.org>
Committed: Fri May 12 21:46:09 2017 +0200
----------------------------------------------------------------------
apache-maven/src/bin/mvn | 4 +++-
apache-maven/src/bin/mvn.cmd | 6 +++++-
2 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/08d6cbfd/apache-maven/src/bin/mvn
----------------------------------------------------------------------
diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn
index 623b5f2..eedd344 100755
--- a/apache-maven/src/bin/mvn
+++ b/apache-maven/src/bin/mvn
@@ -141,7 +141,9 @@ find_file_argument_basedir() {
found_file_switch=0
for arg in "$@"; do
if [ ${found_file_switch} -eq 1 ]; then
- if [ -f "${arg}" ]; then
+ if [ -d "${arg}" ]; then
+ basedir=`cd "${arg}" && pwd -P`
+ elif [ -f "${arg}" ]; then
basedir=`dirname "${arg}"`
basedir=`cd "${basedir}" && pwd -P`
if [ ! -d "${basedir}" ]; then
http://git-wip-us.apache.org/repos/asf/maven/blob/08d6cbfd/apache-maven/src/bin/mvn.cmd
----------------------------------------------------------------------
diff --git a/apache-maven/src/bin/mvn.cmd b/apache-maven/src/bin/mvn.cmd
index 9d92279..bfcc1b5 100644
--- a/apache-maven/src/bin/mvn.cmd
+++ b/apache-maven/src/bin/mvn.cmd
@@ -120,7 +120,11 @@ if not exist "%FILE_ARG%" (
echo POM file %FILE_ARG% specified the -f/--file command-line argument does not exist >&2
goto error
)
-call :get_directory_from_file "%FILE_ARG%"
+if exist "%FILE_ARG%\*" (
+ set "POM_DIR=%FILE_ARG%"
+) else (
+ call :get_directory_from_file "%FILE_ARG%"
+)
if not exist "%POM_DIR%" (
echo Directory %POM_DIR% extracted from the -f/--file command-line argument %FILE_ARG% does not exist >&2
goto error
[18/18] maven git commit: [MNG-6169] Lifecycle/binding plugin version
updates
Posted by mi...@apache.org.
[MNG-6169] Lifecycle/binding plugin version updates
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/c7cc7b3a
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/c7cc7b3a
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/c7cc7b3a
Branch: refs/heads/MNG-6169_2/not-updated-MJAR-MCOMPILER
Commit: c7cc7b3ae6e7568d1f81c443736e587dd4e71a45
Parents: 4feb0a2
Author: Christian Schulte <cs...@apache.org>
Authored: Sat Feb 11 19:19:35 2017 +0100
Committer: Michael Osipov <mi...@apache.org>
Committed: Fri May 12 21:47:38 2017 +0200
----------------------------------------------------------------------
.../resources/META-INF/plexus/components.xml | 7 +-
.../META-INF/plexus/default-bindings.xml | 95 ++++++++++----------
2 files changed, 53 insertions(+), 49 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/c7cc7b3a/maven-core/src/main/resources/META-INF/plexus/components.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/main/resources/META-INF/plexus/components.xml b/maven-core/src/main/resources/META-INF/plexus/components.xml
index 3f099cb..ff41c8a 100644
--- a/maven-core/src/main/resources/META-INF/plexus/components.xml
+++ b/maven-core/src/main/resources/META-INF/plexus/components.xml
@@ -77,8 +77,9 @@ under the License.
<phase>post-clean</phase>
</phases>
<default-phases>
+ <!-- DO NOT upgrade to 3.0.0 or newer, SUREFIRE-722 fails repeatedly on FreeBSD -->
<clean>
- org.apache.maven.plugins:maven-clean-plugin:2.5:clean
+ org.apache.maven.plugins:maven-clean-plugin:2.6.1:clean
</clean>
</default-phases>
<!-- END SNIPPET: clean -->
@@ -101,10 +102,10 @@ under the License.
</phases>
<default-phases>
<site>
- org.apache.maven.plugins:maven-site-plugin:3.3:site
+ org.apache.maven.plugins:maven-site-plugin:3.6:site
</site>
<site-deploy>
- org.apache.maven.plugins:maven-site-plugin:3.3:deploy
+ org.apache.maven.plugins:maven-site-plugin:3.6:deploy
</site-deploy>
</default-phases>
<!-- END SNIPPET: site -->
http://git-wip-us.apache.org/repos/asf/maven/blob/c7cc7b3a/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml b/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml
index 4a303db..0314981 100644
--- a/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml
+++ b/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml
@@ -41,10 +41,10 @@ Mappings to default lifecycle, specific for each packaging.
<!-- START SNIPPET: pom-lifecycle -->
<phases>
<install>
- org.apache.maven.plugins:maven-install-plugin:2.4:install
+ org.apache.maven.plugins:maven-install-plugin:2.5.2:install
</install>
<deploy>
- org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy
+ org.apache.maven.plugins:maven-deploy-plugin:2.8.2:deploy
</deploy>
</phases>
<!-- END SNIPPET: pom-lifecycle -->
@@ -67,28 +67,28 @@ Mappings to default lifecycle, specific for each packaging.
<!-- START SNIPPET: jar-lifecycle -->
<phases>
<process-resources>
- org.apache.maven.plugins:maven-resources-plugin:2.6:resources
+ org.apache.maven.plugins:maven-resources-plugin:3.0.2:resources
</process-resources>
<compile>
- org.apache.maven.plugins:maven-compiler-plugin:3.1:compile
+ org.apache.maven.plugins:maven-compiler-plugin:3.5.1:compile
</compile>
<process-test-resources>
- org.apache.maven.plugins:maven-resources-plugin:2.6:testResources
+ org.apache.maven.plugins:maven-resources-plugin:3.0.2:testResources
</process-test-resources>
<test-compile>
- org.apache.maven.plugins:maven-compiler-plugin:3.1:testCompile
+ org.apache.maven.plugins:maven-compiler-plugin:3.5.1:testCompile
</test-compile>
<test>
- org.apache.maven.plugins:maven-surefire-plugin:2.12.4:test
+ org.apache.maven.plugins:maven-surefire-plugin:2.20:test
</test>
<package>
- org.apache.maven.plugins:maven-jar-plugin:2.4:jar
+ org.apache.maven.plugins:maven-jar-plugin:3.0.2:jar
</package>
<install>
- org.apache.maven.plugins:maven-install-plugin:2.4:install
+ org.apache.maven.plugins:maven-install-plugin:2.5.2:install
</install>
<deploy>
- org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy
+ org.apache.maven.plugins:maven-deploy-plugin:2.8.2:deploy
</deploy>
</phases>
<!-- END SNIPPET: jar-lifecycle -->
@@ -111,28 +111,28 @@ Mappings to default lifecycle, specific for each packaging.
<!-- START SNIPPET: ejb-lifecycle -->
<phases>
<process-resources>
- org.apache.maven.plugins:maven-resources-plugin:2.6:resources
+ org.apache.maven.plugins:maven-resources-plugin:3.0.2:resources
</process-resources>
<compile>
- org.apache.maven.plugins:maven-compiler-plugin:3.1:compile
+ org.apache.maven.plugins:maven-compiler-plugin:3.5.1:compile
</compile>
<process-test-resources>
- org.apache.maven.plugins:maven-resources-plugin:2.6:testResources
+ org.apache.maven.plugins:maven-resources-plugin:3.0.2:testResources
</process-test-resources>
<test-compile>
- org.apache.maven.plugins:maven-compiler-plugin:3.1:testCompile
+ org.apache.maven.plugins:maven-compiler-plugin:3.5.1:testCompile
</test-compile>
<test>
- org.apache.maven.plugins:maven-surefire-plugin:2.12.4:test
+ org.apache.maven.plugins:maven-surefire-plugin:2.20:test
</test>
<package>
- org.apache.maven.plugins:maven-ejb-plugin:2.3:ejb
+ org.apache.maven.plugins:maven-ejb-plugin:2.5.1:ejb
</package>
<install>
- org.apache.maven.plugins:maven-install-plugin:2.4:install
+ org.apache.maven.plugins:maven-install-plugin:2.5.2:install
</install>
<deploy>
- org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy
+ org.apache.maven.plugins:maven-deploy-plugin:2.8.2:deploy
</deploy>
</phases>
<!-- END SNIPPET: ejb-lifecycle -->
@@ -155,32 +155,35 @@ Mappings to default lifecycle, specific for each packaging.
<!-- START SNIPPET: maven-plugin-lifecycle -->
<phases>
<process-resources>
- org.apache.maven.plugins:maven-resources-plugin:2.6:resources
+ org.apache.maven.plugins:maven-resources-plugin:3.0.2:resources
</process-resources>
+ <!-- Do not update, several ITs fail! -->
<compile>
org.apache.maven.plugins:maven-compiler-plugin:3.1:compile
</compile>
<process-classes>
- org.apache.maven.plugins:maven-plugin-plugin:3.2:descriptor
+ org.apache.maven.plugins:maven-plugin-plugin:3.3:descriptor
</process-classes>
<process-test-resources>
- org.apache.maven.plugins:maven-resources-plugin:2.6:testResources
+ org.apache.maven.plugins:maven-resources-plugin:3.0.2:testResources
</process-test-resources>
+ <!-- Do not update, several ITs fail! -->
<test-compile>
org.apache.maven.plugins:maven-compiler-plugin:3.1:testCompile
</test-compile>
<test>
- org.apache.maven.plugins:maven-surefire-plugin:2.12.4:test
+ org.apache.maven.plugins:maven-surefire-plugin:2.20:test
</test>
+ <!-- Do not update, several ITs fail! -->
<package>
org.apache.maven.plugins:maven-jar-plugin:2.4:jar,
- org.apache.maven.plugins:maven-plugin-plugin:3.2:addPluginArtifactMetadata
+ org.apache.maven.plugins:maven-plugin-plugin:3.3:addPluginArtifactMetadata
</package>
<install>
- org.apache.maven.plugins:maven-install-plugin:2.4:install
+ org.apache.maven.plugins:maven-install-plugin:2.5.2:install
</install>
<deploy>
- org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy
+ org.apache.maven.plugins:maven-deploy-plugin:2.8.2:deploy
</deploy>
</phases>
<!-- END SNIPPET: maven-plugin-lifecycle -->
@@ -203,28 +206,28 @@ Mappings to default lifecycle, specific for each packaging.
<!-- START SNIPPET: war-lifecycle -->
<phases>
<process-resources>
- org.apache.maven.plugins:maven-resources-plugin:2.6:resources
+ org.apache.maven.plugins:maven-resources-plugin:3.0.2:resources
</process-resources>
<compile>
- org.apache.maven.plugins:maven-compiler-plugin:3.1:compile
+ org.apache.maven.plugins:maven-compiler-plugin:3.5.1:compile
</compile>
<process-test-resources>
- org.apache.maven.plugins:maven-resources-plugin:2.6:testResources
+ org.apache.maven.plugins:maven-resources-plugin:3.0.2:testResources
</process-test-resources>
<test-compile>
- org.apache.maven.plugins:maven-compiler-plugin:3.1:testCompile
+ org.apache.maven.plugins:maven-compiler-plugin:3.5.1:testCompile
</test-compile>
<test>
- org.apache.maven.plugins:maven-surefire-plugin:2.12.4:test
+ org.apache.maven.plugins:maven-surefire-plugin:2.20:test
</test>
<package>
- org.apache.maven.plugins:maven-war-plugin:2.2:war
+ org.apache.maven.plugins:maven-war-plugin:3.0.0:war
</package>
<install>
- org.apache.maven.plugins:maven-install-plugin:2.4:install
+ org.apache.maven.plugins:maven-install-plugin:2.5.2:install
</install>
<deploy>
- org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy
+ org.apache.maven.plugins:maven-deploy-plugin:2.8.2:deploy
</deploy>
</phases>
<!-- END SNIPPET: war-lifecycle -->
@@ -247,19 +250,19 @@ Mappings to default lifecycle, specific for each packaging.
<!-- START SNIPPET: ear-lifecycle -->
<phases>
<generate-resources>
- org.apache.maven.plugins:maven-ear-plugin:2.8:generate-application-xml
+ org.apache.maven.plugins:maven-ear-plugin:2.9.1:generate-application-xml
</generate-resources>
<process-resources>
- org.apache.maven.plugins:maven-resources-plugin:2.6:resources
+ org.apache.maven.plugins:maven-resources-plugin:3.0.2:resources
</process-resources>
<package>
- org.apache.maven.plugins:maven-ear-plugin:2.8:ear
+ org.apache.maven.plugins:maven-ear-plugin:2.9.1:ear
</package>
<install>
- org.apache.maven.plugins:maven-install-plugin:2.4:install
+ org.apache.maven.plugins:maven-install-plugin:2.5.2:install
</install>
<deploy>
- org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy
+ org.apache.maven.plugins:maven-deploy-plugin:2.8.2:deploy
</deploy>
</phases>
<!-- END SNIPPET: ear-lifecycle -->
@@ -282,28 +285,28 @@ Mappings to default lifecycle, specific for each packaging.
<!-- START SNIPPET: rar-lifecycle -->
<phases>
<process-resources>
- org.apache.maven.plugins:maven-resources-plugin:2.6:resources
+ org.apache.maven.plugins:maven-resources-plugin:3.0.2:resources
</process-resources>
<compile>
- org.apache.maven.plugins:maven-compiler-plugin:3.1:compile
+ org.apache.maven.plugins:maven-compiler-plugin:3.5.1:compile
</compile>
<process-test-resources>
- org.apache.maven.plugins:maven-resources-plugin:2.6:testResources
+ org.apache.maven.plugins:maven-resources-plugin:3.0.2:testResources
</process-test-resources>
<test-compile>
- org.apache.maven.plugins:maven-compiler-plugin:3.1:testCompile
+ org.apache.maven.plugins:maven-compiler-plugin:3.5.1:testCompile
</test-compile>
<test>
- org.apache.maven.plugins:maven-surefire-plugin:2.12.4:test
+ org.apache.maven.plugins:maven-surefire-plugin:2.20:test
</test>
<package>
- org.apache.maven.plugins:maven-rar-plugin:2.2:rar
+ org.apache.maven.plugins:maven-rar-plugin:2.4:rar
</package>
<install>
- org.apache.maven.plugins:maven-install-plugin:2.4:install
+ org.apache.maven.plugins:maven-install-plugin:2.5.2:install
</install>
<deploy>
- org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy
+ org.apache.maven.plugins:maven-deploy-plugin:2.8.2:deploy
</deploy>
</phases>
<!-- END SNIPPET: rar-lifecycle -->
[04/18] maven git commit: Minor cleanup in MavenCli.java
Posted by mi...@apache.org.
Minor cleanup in MavenCli.java
There is some unnecessary code in the MavenCli.java from line #1465 to #1474.
The functionality has been moved to line #1215.
Signed-off-by: Karl Heinz Marbaise <kh...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/4494aafb
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/4494aafb
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/4494aafb
Branch: refs/heads/MNG-6169_2/not-updated-MJAR-MCOMPILER
Commit: 4494aafbdb5ef550f81978f9a18f65073cef57ca
Parents: 35cfaef
Author: Stefan Eicher <st...@gmail.com>
Authored: Wed Apr 5 20:52:01 2017 +0200
Committer: Michael Osipov <mi...@apache.org>
Committed: Fri May 12 21:46:01 2017 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/maven/cli/MavenCli.java | 11 -----------
1 file changed, 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/4494aafb/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
index 004cf4e..877b88b 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
@@ -1462,17 +1462,6 @@ public class MavenCli
alternatePomFile = commandLine.getOptionValue( CLIManager.ALTERNATE_POM_FILE );
}
- File userToolchainsFile;
- if ( commandLine.hasOption( CLIManager.ALTERNATE_USER_TOOLCHAINS ) )
- {
- userToolchainsFile = new File( commandLine.getOptionValue( CLIManager.ALTERNATE_USER_TOOLCHAINS ) );
- userToolchainsFile = resolveFile( userToolchainsFile, workingDirectory );
- }
- else
- {
- userToolchainsFile = MavenCli.DEFAULT_USER_TOOLCHAINS_FILE;
- }
-
request.setBaseDirectory( baseDirectory ).setGoals( goals ).setSystemProperties(
cliRequest.systemProperties ).setUserProperties( cliRequest.userProperties ).setReactorFailureBehavior(
reactorFailureBehaviour ) // default: fail fast
[12/18] maven git commit: Add a ProjectArtifactsCache similar to
PluginArtifactsCache
Posted by mi...@apache.org.
Add a ProjectArtifactsCache similar to PluginArtifactsCache
Signed-off-by: Jason van Zyl <ja...@vanzyl.ca>
closes #82
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/bf05ee15
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/bf05ee15
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/bf05ee15
Branch: refs/heads/MNG-6169_2/not-updated-MJAR-MCOMPILER
Commit: bf05ee15c5fb2f6d77f074113e807924b72231c8
Parents: b9d46b5
Author: Anton Tanasenko <at...@gmail.com>
Authored: Wed May 18 18:40:28 2016 +0300
Committer: Michael Osipov <mi...@apache.org>
Committed: Fri May 12 21:46:08 2017 +0200
----------------------------------------------------------------------
.../internal/LifecycleDependencyResolver.java | 34 ++-
.../plugin/DefaultProjectArtifactsCache.java | 256 +++++++++++++++++++
.../maven/plugin/ProjectArtifactsCache.java | 90 +++++++
3 files changed, 377 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/bf05ee15/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java
index 0d42aeb..504274f 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java
@@ -37,6 +37,7 @@ import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.eventspy.internal.EventSpyDispatcher;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.lifecycle.LifecycleExecutionException;
+import org.apache.maven.plugin.ProjectArtifactsCache;
import org.apache.maven.project.DefaultDependencyResolutionRequest;
import org.apache.maven.project.DependencyResolutionException;
import org.apache.maven.project.DependencyResolutionResult;
@@ -75,6 +76,9 @@ public class LifecycleDependencyResolver
@Inject
private EventSpyDispatcher eventSpyDispatcher;
+
+ @Inject
+ private ProjectArtifactsCache projectArtifactsCache;
public LifecycleDependencyResolver()
{
@@ -123,9 +127,33 @@ public class LifecycleDependencyResolver
throw new LifecycleExecutionException( e );
}
}
-
- Set<Artifact> artifacts =
- getDependencies( project, scopesToCollect, scopesToResolve, session, aggregating, projectArtifacts );
+
+ Set<Artifact> artifacts;
+ ProjectArtifactsCache.Key cacheKey = projectArtifactsCache.createKey( project, scopesToCollect,
+ scopesToResolve, aggregating, session.getRepositorySession() );
+ ProjectArtifactsCache.CacheRecord recordArtifacts;
+ recordArtifacts = projectArtifactsCache.get( cacheKey );
+
+ if ( recordArtifacts != null )
+ {
+ artifacts = recordArtifacts.artifacts;
+ }
+ else
+ {
+ try
+ {
+ artifacts = getDependencies( project, scopesToCollect, scopesToResolve, session, aggregating,
+ projectArtifacts );
+ recordArtifacts = projectArtifactsCache.put( cacheKey, artifacts );
+ }
+ catch ( LifecycleExecutionException e )
+ {
+ projectArtifactsCache.put( cacheKey, e );
+ projectArtifactsCache.register( project, cacheKey, recordArtifacts );
+ throw e;
+ }
+ }
+ projectArtifactsCache.register( project, cacheKey, recordArtifacts );
project.setResolvedArtifacts( artifacts );
http://git-wip-us.apache.org/repos/asf/maven/blob/bf05ee15/maven-core/src/main/java/org/apache/maven/plugin/DefaultProjectArtifactsCache.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DefaultProjectArtifactsCache.java b/maven-core/src/main/java/org/apache/maven/plugin/DefaultProjectArtifactsCache.java
new file mode 100644
index 0000000..1eaa627
--- /dev/null
+++ b/maven-core/src/main/java/org/apache/maven/plugin/DefaultProjectArtifactsCache.java
@@ -0,0 +1,256 @@
+package org.apache.maven.plugin;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.apache.commons.lang3.Validate;
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.lifecycle.LifecycleExecutionException;
+import org.apache.maven.model.Plugin;
+import org.apache.maven.project.MavenProject;
+import org.codehaus.plexus.component.annotations.Component;
+import org.eclipse.aether.RepositorySystemSession;
+import org.eclipse.aether.repository.LocalRepository;
+import org.eclipse.aether.repository.RemoteRepository;
+import org.eclipse.aether.repository.WorkspaceRepository;
+
+/**
+ * @author Igor Fedorenko
+ * @author Benjamin Bentmann
+ * @author Anton Tanasenko
+ */
+@Component( role = ProjectArtifactsCache.class )
+public class DefaultProjectArtifactsCache
+ implements ProjectArtifactsCache
+{
+
+ protected static class CacheKey
+ implements Key
+ {
+
+ private final String groupId;
+
+ private final String artifactId;
+
+ private final String version;
+
+ private final Set<String> dependencyArtifacts;
+
+ private final WorkspaceRepository workspace;
+
+ private final LocalRepository localRepo;
+
+ private final List<RemoteRepository> repositories;
+
+ private final Set<String> collect;
+
+ private final Set<String> resolve;
+
+ private boolean aggregating;
+
+ private final int hashCode;
+
+ public CacheKey( MavenProject project, List<RemoteRepository> repositories,
+ Collection<String> scopesToCollect, Collection<String> scopesToResolve, boolean aggregating,
+ RepositorySystemSession session )
+ {
+
+ groupId = project.getGroupId();
+ artifactId = project.getArtifactId();
+ version = project.getVersion();
+
+ Set<String> deps = new HashSet<>();
+ if ( project.getDependencyArtifacts() != null )
+ {
+ for ( Artifact dep: project.getDependencyArtifacts() )
+ {
+ deps.add( dep.toString() );
+ }
+ }
+ dependencyArtifacts = Collections.unmodifiableSet( deps );
+
+ workspace = CacheUtils.getWorkspace( session );
+ this.localRepo = session.getLocalRepository();
+ this.repositories = new ArrayList<>( repositories.size() );
+ for ( RemoteRepository repository : repositories )
+ {
+ if ( repository.isRepositoryManager() )
+ {
+ this.repositories.addAll( repository.getMirroredRepositories() );
+ }
+ else
+ {
+ this.repositories.add( repository );
+ }
+ }
+ collect = scopesToCollect == null
+ ? Collections.<String>emptySet()
+ : Collections.unmodifiableSet( new HashSet<>( scopesToCollect ) );
+ resolve = scopesToResolve == null
+ ? Collections.<String>emptySet()
+ : Collections.unmodifiableSet( new HashSet<>( scopesToResolve ) );
+ this.aggregating = aggregating;
+
+ int hash = 17;
+ hash = hash * 31 + hash( groupId );
+ hash = hash * 31 + hash( artifactId );
+ hash = hash * 31 + hash( version );
+ hash = hash * 31 + hash( dependencyArtifacts );
+ hash = hash * 31 + hash( workspace );
+ hash = hash * 31 + hash( localRepo );
+ hash = hash * 31 + CacheUtils.repositoriesHashCode( repositories );
+ hash = hash * 31 + hash( collect );
+ hash = hash * 31 + hash( resolve );
+ hash = hash * 31 + hash( aggregating );
+ this.hashCode = hash;
+ }
+
+ @Override
+ public String toString()
+ {
+ return groupId + ":" + artifactId + ":" + version;
+ }
+
+ @Override
+ public int hashCode()
+ {
+ return hashCode;
+ }
+
+ private static int hash( Object obj )
+ {
+ return obj != null ? obj.hashCode() : 0;
+ }
+
+ @Override
+ public boolean equals( Object o )
+ {
+ if ( o == this )
+ {
+ return true;
+ }
+
+ if ( !( o instanceof CacheKey ) )
+ {
+ return false;
+ }
+
+ CacheKey that = (CacheKey) o;
+
+ return eq( groupId, that.groupId ) && eq( artifactId, that.artifactId ) && eq( version, that.version )
+ && eq( dependencyArtifacts, that.dependencyArtifacts )
+ && eq( workspace, that.workspace ) && eq( localRepo, that.localRepo )
+ && CacheUtils.repositoriesEquals( repositories, that.repositories ) && eq( collect, that.collect )
+ && eq( resolve, that.resolve ) && aggregating == that.aggregating;
+ }
+
+ private static <T> boolean eq( T s1, T s2 )
+ {
+ return s1 != null ? s1.equals( s2 ) : s2 == null;
+ }
+
+ }
+
+ protected final Map<Key, CacheRecord> cache = new ConcurrentHashMap<>();
+
+ public Key createKey( MavenProject project, Collection<String> scopesToCollect,
+ Collection<String> scopesToResolve, boolean aggregating, RepositorySystemSession session )
+ {
+ return new CacheKey( project, project.getRemoteProjectRepositories(), scopesToCollect, scopesToResolve,
+ aggregating, session );
+ }
+
+ public CacheRecord get( Key key )
+ throws LifecycleExecutionException
+ {
+ CacheRecord cacheRecord = cache.get( key );
+
+ if ( cacheRecord != null && cacheRecord.exception != null )
+ {
+ throw cacheRecord.exception;
+ }
+
+ return cacheRecord;
+ }
+
+ public CacheRecord put( Key key, Set<Artifact> projectArtifacts )
+ {
+ Validate.notNull( projectArtifacts, "projectArtifacts cannot be null" );
+
+ assertUniqueKey( key );
+
+ CacheRecord record =
+ new CacheRecord( Collections.unmodifiableSet( new HashSet<>( projectArtifacts ) ) );
+
+ cache.put( key, record );
+
+ return record;
+ }
+
+ protected void assertUniqueKey( Key key )
+ {
+ if ( cache.containsKey( key ) )
+ {
+ throw new IllegalStateException( "Duplicate artifact resolution result for project " + key );
+ }
+ }
+
+ public CacheRecord put( Key key, LifecycleExecutionException exception )
+ {
+ Validate.notNull( exception, "exception cannot be null" );
+
+ assertUniqueKey( key );
+
+ CacheRecord record = new CacheRecord( exception );
+
+ cache.put( key, record );
+
+ return record;
+ }
+
+ public void flush()
+ {
+ cache.clear();
+ }
+
+ protected static int pluginHashCode( Plugin plugin )
+ {
+ return CacheUtils.pluginHashCode( plugin );
+ }
+
+ protected static boolean pluginEquals( Plugin a, Plugin b )
+ {
+ return CacheUtils.pluginEquals( a, b );
+ }
+
+ public void register( MavenProject project, Key cacheKey, CacheRecord record )
+ {
+ // default cache does not track record usage
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven/blob/bf05ee15/maven-core/src/main/java/org/apache/maven/plugin/ProjectArtifactsCache.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/ProjectArtifactsCache.java b/maven-core/src/main/java/org/apache/maven/plugin/ProjectArtifactsCache.java
new file mode 100644
index 0000000..42a95e5
--- /dev/null
+++ b/maven-core/src/main/java/org/apache/maven/plugin/ProjectArtifactsCache.java
@@ -0,0 +1,90 @@
+package org.apache.maven.plugin;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.util.Collection;
+import java.util.Set;
+
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.lifecycle.LifecycleExecutionException;
+import org.apache.maven.project.MavenProject;
+import org.eclipse.aether.RepositorySystemSession;
+/**
+ * Caches project artifacts. <strong>Warning:</strong> This is an internal utility interface that is only public for
+ * technical reasons, it is not part of the public API. In particular, this interface can be changed or deleted without
+ * prior notice.
+ *
+ * @author Igor Fedorenko
+ * @author Benjamin Bentmann
+ * @author Anton Tanasenko
+ */
+public interface ProjectArtifactsCache
+{
+
+ /**
+ * A cache key.
+ */
+ interface Key
+ {
+ // marker interface for cache keys
+ }
+
+ static class CacheRecord
+ {
+
+ public final Set<Artifact> artifacts;
+
+ public final LifecycleExecutionException exception;
+
+ public CacheRecord( Set<Artifact> artifacts )
+ {
+ this.artifacts = artifacts;
+ this.exception = null;
+ }
+
+ public CacheRecord( LifecycleExecutionException exception )
+ {
+ this.artifacts = null;
+ this.exception = exception;
+ }
+ }
+
+ Key createKey( MavenProject project, Collection<String> scopesToCollect, Collection<String> scopesToResolve,
+ boolean aggregating, RepositorySystemSession session );
+
+ CacheRecord get( Key key ) throws LifecycleExecutionException;
+
+ CacheRecord put( Key key, Set<Artifact> pluginArtifacts );
+
+ CacheRecord put( Key key, LifecycleExecutionException e );
+
+ void flush();
+
+ /**
+ * Registers the specified cache record for usage with the given project. Integrators can use the information
+ * collected from this method in combination with a custom cache implementation to dispose unused records from the
+ * cache.
+ *
+ * @param project The project that employs the plugin realm, must not be {@code null}.
+ * @param record The cache record being used for the project, must not be {@code null}.
+ */
+ void register( MavenProject project, Key cacheKey, CacheRecord record );
+
+}
[09/18] maven git commit: MNG-6210 allow maven custom guice scopes in
.mvn/extensions
Posted by mi...@apache.org.
MNG-6210 allow maven custom guice scopes in .mvn/extensions
Signed-off-by: Igor Fedorenko <if...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/87280cdb
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/87280cdb
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/87280cdb
Branch: refs/heads/MNG-6169_2/not-updated-MJAR-MCOMPILER
Commit: 87280cdba69fe9fcdb50ecb55d984da955b56e00
Parents: dcc1265
Author: Igor Fedorenko <if...@apache.org>
Authored: Thu Apr 13 12:58:29 2017 -0700
Committer: Michael Osipov <mi...@apache.org>
Committed: Fri May 12 21:46:05 2017 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/maven/cli/MavenCli.java | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/87280cdb/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
index 877b88b..79ab45d 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
@@ -56,6 +56,7 @@ import org.apache.maven.execution.MavenExecutionRequest;
import org.apache.maven.execution.MavenExecutionRequestPopulationException;
import org.apache.maven.execution.MavenExecutionRequestPopulator;
import org.apache.maven.execution.MavenExecutionResult;
+import org.apache.maven.execution.scope.internal.MojoExecutionScopeModule;
import org.apache.maven.extension.internal.CoreExports;
import org.apache.maven.extension.internal.CoreExtensionEntry;
import org.apache.maven.lifecycle.LifecycleExecutionException;
@@ -63,6 +64,7 @@ import org.apache.maven.model.building.ModelProcessor;
import org.apache.maven.project.MavenProject;
import org.apache.maven.properties.internal.EnvironmentUtils;
import org.apache.maven.properties.internal.SystemProperties;
+import org.apache.maven.session.scope.internal.SessionScopeModule;
import org.apache.maven.shared.utils.logging.MessageBuilder;
import org.apache.maven.shared.utils.logging.MessageUtils;
import org.apache.maven.toolchain.building.DefaultToolchainsBuildingRequest;
@@ -684,20 +686,20 @@ public class MavenCli
// NOTE: To avoid inconsistencies, we'll use the TCCL exclusively for lookups
container.setLookupRealm( null );
+ Thread.currentThread().setContextClassLoader( container.getContainerRealm() );
container.setLoggerManager( plexusLoggerManager );
for ( CoreExtensionEntry extension : extensions )
{
- container.discoverComponents( extension.getClassRealm() );
+ container.discoverComponents( extension.getClassRealm(), new SessionScopeModule( container ),
+ new MojoExecutionScopeModule( container ) );
}
customizeContainer( container );
container.getLoggerManager().setThresholds( cliRequest.request.getLoggingLevel() );
- Thread.currentThread().setContextClassLoader( container.getContainerRealm() );
-
eventSpyDispatcher = container.lookup( EventSpyDispatcher.class );
DefaultEventSpyContext eventSpyContext = new DefaultEventSpyContext();