You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2017/05/01 14:43:19 UTC
[01/27] maven git commit: Added some javadoc [Forced Update!]
Repository: maven
Updated Branches:
refs/heads/MNG-6069 0cafb4c04 -> 7e8b0e090 (forced update)
Added some javadoc
Added javadoc help for making easier to compare two versions in command line.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/10a18cfe
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/10a18cfe
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/10a18cfe
Branch: refs/heads/MNG-6069
Commit: 10a18cfee7a981a41c1f571ef3c60138d40e839e
Parents: 181b021
Author: LuboVarga <lu...@nike.sk>
Authored: Mon Mar 13 13:23:04 2017 +0100
Committer: GitHub <no...@github.com>
Committed: Mon Mar 13 13:23:04 2017 +0100
----------------------------------------------------------------------
.../maven/artifact/versioning/ComparableVersion.java | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/10a18cfe/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
----------------------------------------------------------------------
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
index 5222871..0ae4acb 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
@@ -472,8 +472,19 @@ public class ComparableVersion
/**
* Main to test version parsing and comparison.
+ * <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 )
{
[10/27] maven git commit: INFRA have been changing JDK labels again
Posted by kh...@apache.org.
INFRA have been changing JDK labels again
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/33c8d8ef
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/33c8d8ef
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/33c8d8ef
Branch: refs/heads/MNG-6069
Commit: 33c8d8efe9410e134080bd979a7df82de80bcf74
Parents: 8400984
Author: Stephen Connolly <st...@gmail.com>
Authored: Mon Mar 27 16:22:29 2017 +0100
Committer: Stephen Connolly <st...@gmail.com>
Committed: Mon Mar 27 16:22:29 2017 +0100
----------------------------------------------------------------------
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/33c8d8ef/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index 2ac2644..123a246 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -117,7 +117,7 @@ parallel linuxJava7:{
MAVEN_WIN_J8=pwd()
}
echo "Driving integration tests using Maven $MAVEN_WIN_J8"
- def JAVA_WIN_J8=tool name: 'JDK 1.8 (unlimited security) 64-bit Windows only', type: 'hudson.model.JDK'
+ def JAVA_WIN_J8=tool name: 'JDK 1.8.0_121 (unlimited security) 64-bit Windows only', type: 'hudson.model.JDK'
dir(JAVA_WIN_J8) {
JAVA_WIN_J8=pwd()
}
[11/27] maven git commit: trying to make Jenkinsfile easier to
understand
Posted by kh...@apache.org.
trying to make Jenkinsfile easier to understand
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/16805f50
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/16805f50
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/16805f50
Branch: refs/heads/MNG-6069
Commit: 16805f50ea1715c42ad59312f3e64ab70af3acfe
Parents: 33c8d8e
Author: Herv� Boutemy <hb...@apache.org>
Authored: Fri Mar 24 03:25:17 2017 +0100
Committer: Herv� Boutemy <hb...@apache.org>
Committed: Tue Mar 28 08:03:44 2017 +0200
----------------------------------------------------------------------
Jenkinsfile | 41 +++++++++++++++++++++++++++--------------
1 file changed, 27 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/16805f50/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index 123a246..cc9bd92 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -22,24 +22,32 @@ properties([buildDiscarder(logRotator(artifactNumToKeepStr: '5', numToKeepStr: e
def tests
try {
+
node('ubuntu') {
- stage 'Checkout'
- def MAVEN_BUILD=tool name: 'Maven 3.3.9', type: 'hudson.tasks.Maven$MavenInstallation'
- echo "Driving build and unit tests using Maven $MAVEN_BUILD"
- def JAVA7_HOME=tool name: 'JDK 1.7 (latest)', type: 'hudson.model.JDK'
- echo "Running build and unit tests with Java $JAVA7_HOME"
dir('build') {
- checkout scm
- def WORK_DIR=pwd()
- stage 'Build / Unit Test'
- withEnv(["PATH+MAVEN=$MAVEN_BUILD/bin","PATH+JDK=$JAVA7_HOME/bin"]) {
- sh "mvn clean verify -B -U -e -fae -V -Dmaven.test.failure.ignore=true -Dmaven.repo.local=$WORK_DIR/.repository"
+ stage('Checkout') {
+ checkout scm
}
- dir ('apache-maven/target') {
- sh "mv apache-maven-*-bin.zip apache-maven-dist.zip"
- stash includes: 'apache-maven-dist.zip', name: 'dist'
+
+ def WORK_DIR=pwd()
+
+ stage('Build / Unit Test') {
+ def MAVEN_BUILD=tool name: 'Maven 3.3.9', type: 'hudson.tasks.Maven$MavenInstallation'
+ echo "Driving build and unit tests using Maven $MAVEN_BUILD"
+ def JAVA7_HOME=tool name: 'JDK 1.7 (latest)', type: 'hudson.model.JDK'
+ echo "Running build and unit tests with Java $JAVA7_HOME"
+
+ withEnv(["PATH+MAVEN=$MAVEN_BUILD/bin","PATH+JDK=$JAVA7_HOME/bin"]) {
+ sh "mvn clean verify -B -U -e -fae -V -Dmaven.test.failure.ignore=true -Dmaven.repo.local=$WORK_DIR/.repository"
+ }
+
+ dir ('apache-maven/target') {
+ sh "mv apache-maven-*-bin.zip apache-maven-dist.zip"
+ stash includes: 'apache-maven-dist.zip', name: 'dist'
+ }
+ junit allowEmptyResults: true, testResults:'**/target/*-reports/*.xml'
}
- junit allowEmptyResults: true, testResults:'**/target/*-reports/*.xml'
+
tests = resolveScm source: [$class: 'GitSCMSource', credentialsId: '', excludes: '', gitTool: 'Default', id: '_', ignoreOnPushNotifications: false, includes: '*', remote: 'https://git-wip-us.apache.org/repos/asf/maven-integration-testing.git'], targets: [BRANCH_NAME, 'master']
}
}
@@ -51,6 +59,7 @@ parallel linuxJava7:{
echo "Driving integration tests using Maven $MAVEN_NIX_J7"
def JAVA_NIX_J7=tool name: 'JDK 1.7 (latest)', type: 'hudson.model.JDK'
echo "Running integration tests with Java $JAVA_NIX_J7"
+
dir('test') {
def WORK_DIR=pwd()
checkout tests
@@ -69,6 +78,7 @@ parallel linuxJava7:{
echo "Driving integration tests using Maven $MAVEN_NIX_J8"
def JAVA_NIX_J8=tool name: 'JDK 1.8 (latest)', type: 'hudson.model.JDK'
echo "Running integration tests with Java $JAVA_NIX_J8"
+
dir('test') {
def WORK_DIR=pwd()
checkout tests
@@ -93,6 +103,7 @@ parallel linuxJava7:{
JAVA_WIN_J7=pwd()
}
echo "Running integration tests with Java $JAVA_WIN_J7"
+
// need a short path or we hit 256 character limit for paths
// using EXECUTOR_NUMBER guarantees that concurrent builds on same agent
// will not trample each other
@@ -122,6 +133,7 @@ parallel linuxJava7:{
JAVA_WIN_J8=pwd()
}
echo "Running integration tests with Java $JAVA_WIN_J8"
+
// need a short path or we hit 256 character limit for paths
// using EXECUTOR_NUMBER guarantees that concurrent builds on same agent
// will not trample each other
@@ -140,6 +152,7 @@ parallel linuxJava7:{
}
}
}
+
} finally {
node('ubuntu') {
emailext body: "See ${env.BUILD_URL}", recipientProviders: [[$class: 'CulpritsRecipientProvider'], [$class: 'FailingTestSuspectsRecipientProvider'], [$class: 'FirstFailingBuildSuspectsRecipientProvider']], replyTo: 'dev@maven.apache.org', subject: "${env.JOB_NAME} - build ${env.BUILD_DISPLAY_NAME} - ${currentBuild.result}", to: 'notifications@maven.apache.org'
[23/27] maven git commit: Improve Javadoc of ComparableVersion#main()
Posted by kh...@apache.org.
Improve Javadoc of ComparableVersion#main()
This closes #108
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/6a93bbea
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/6a93bbea
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/6a93bbea
Branch: refs/heads/MNG-6069
Commit: 6a93bbea23e362c9cea7d710a37556258c2dbd47
Parents: 08f3c76 10a18cf
Author: Lubomir Varga <lu...@nike.sk>
Authored: Tue Apr 11 16:00:42 2017 +0200
Committer: Michael Osipov <mi...@apache.org>
Committed: Tue Apr 11 16:02:21 2017 +0200
----------------------------------------------------------------------
.../maven/artifact/versioning/ComparableVersion.java | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/6a93bbea/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
----------------------------------------------------------------------
diff --cc maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
index 5222871,0ae4acb..e1fc5f0
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
@@@ -472,8 -472,19 +472,19 @@@ public class ComparableVersio
/**
* Main to test version parsing and comparison.
+ * <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
++ * Checks how "1.2.7" compares to "1.2-SNAPSHOT", for example, you can issue
++ * <code>java -cp ${maven.repo.local}/org/apache/maven/maven-artifact/${maven.version}/maven-artifact-${maven.version}.jar org.apache.maven.artifact.versioning.ComparableVersion "1.2.7" "1.2-SNAPSHOT"</code>
++ * 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
+ * @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 )
{
[14/27] maven git commit: use new "Maven 3 (latest)" and "JDK 1.x
(latest)" Ubuntu+win aliases
Posted by kh...@apache.org.
use new "Maven 3 (latest)" and "JDK 1.x (latest)" Ubuntu+win aliases
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/0baa4234
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/0baa4234
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/0baa4234
Branch: refs/heads/MNG-6069
Commit: 0baa42345283f4fea3938a8ccd7c8e12b34203b1
Parents: 94c3b60
Author: Herv� Boutemy <hb...@apache.org>
Authored: Sun Mar 26 10:27:59 2017 +0200
Committer: Herv� Boutemy <hb...@apache.org>
Committed: Tue Mar 28 08:05:56 2017 +0200
----------------------------------------------------------------------
Jenkinsfile | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/0baa4234/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index be4485c..b6c7e19 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -56,7 +56,7 @@ node('ubuntu') {
stage 'Integration Test'
parallel linuxJava7:{
node('ubuntu') {
- def MAVEN_NIX_J7=tool name: 'Maven 3.3.9', type: 'hudson.tasks.Maven$MavenInstallation'
+ def MAVEN_NIX_J7=tool name: 'Maven 3 (latest)', type: 'hudson.tasks.Maven$MavenInstallation'
echo "Driving integration tests using Maven $MAVEN_NIX_J7"
def JAVA_NIX_J7=tool name: 'JDK 1.7 (latest)', type: 'hudson.model.JDK'
echo "Running integration tests with Java $JAVA_NIX_J7"
@@ -75,7 +75,7 @@ parallel linuxJava7:{
}
},linuxJava8: {
node('ubuntu') {
- def MAVEN_NIX_J8=tool name: 'Maven 3.3.9', type: 'hudson.tasks.Maven$MavenInstallation'
+ def MAVEN_NIX_J8=tool name: 'Maven 3 (latest)', type: 'hudson.tasks.Maven$MavenInstallation'
echo "Driving integration tests using Maven $MAVEN_NIX_J8"
def JAVA_NIX_J8=tool name: 'JDK 1.8 (latest)', type: 'hudson.model.JDK'
echo "Running integration tests with Java $JAVA_NIX_J8"
@@ -94,12 +94,12 @@ parallel linuxJava7:{
}
}, winJava7: {
node('Windows') {
- def MAVEN_WIN_J7=tool name: 'Maven 3.3.9 (Windows)', type: 'hudson.tasks.Maven$MavenInstallation'
+ def MAVEN_WIN_J7=tool name: 'Maven 3 (latest)', type: 'hudson.tasks.Maven$MavenInstallation'
dir(MAVEN_WIN_J7) {
MAVEN_WIN_J7=pwd()
}
echo "Driving integration tests using Maven $MAVEN_WIN_J7"
- def JAVA_WIN_J7=tool name: 'JDK 1.7 (unlimited security) 64-bit Windows only', type: 'hudson.model.JDK'
+ def JAVA_WIN_J7=tool name: 'JDK 1.7 (latest)', type: 'hudson.model.JDK'
dir(JAVA_WIN_J7) {
JAVA_WIN_J7=pwd()
}
@@ -124,12 +124,12 @@ parallel linuxJava7:{
}
}, winJava8: {
node('Windows') {
- def MAVEN_WIN_J8=tool name: 'Maven 3.3.9 (Windows)', type: 'hudson.tasks.Maven$MavenInstallation'
+ def MAVEN_WIN_J8=tool name: 'Maven 3 (latest)', type: 'hudson.tasks.Maven$MavenInstallation'
dir(MAVEN_WIN_J8) {
MAVEN_WIN_J8=pwd()
}
echo "Driving integration tests using Maven $MAVEN_WIN_J8"
- def JAVA_WIN_J8=tool name: 'JDK 1.8.0_121 (unlimited security) 64-bit Windows only', type: 'hudson.model.JDK'
+ def JAVA_WIN_J8=tool name: 'JDK 1.8 (latest)', type: 'hudson.model.JDK'
dir(JAVA_WIN_J8) {
JAVA_WIN_J8=pwd()
}
[16/27] maven git commit: [MNG-6198] Use the directory specified by
-f for searching with 'mvn'
Posted by kh...@apache.org.
[MNG-6198] Use the directory specified by -f for searching with 'mvn'
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/87cf1eeb
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/87cf1eeb
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/87cf1eeb
Branch: refs/heads/MNG-6069
Commit: 87cf1eeb7d2506e192da77f7d5b286fae2b20314
Parents: 96543b7
Author: Stephen Connolly <st...@gmail.com>
Authored: Mon Mar 27 21:07:01 2017 +0100
Committer: Stephen Connolly <st...@gmail.com>
Committed: Sat Apr 1 11:29:09 2017 +0100
----------------------------------------------------------------------
apache-maven/src/bin/mvn | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/87cf1eeb/apache-maven/src/bin/mvn
----------------------------------------------------------------------
diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn
index e569633..623b5f2 100755
--- a/apache-maven/src/bin/mvn
+++ b/apache-maven/src/bin/mvn
@@ -122,7 +122,7 @@ fi
find_maven_basedir() {
(
basedir=`find_file_argument_basedir "$@"`
- wdir=`pwd`
+ wdir="${basedir}"
while [ "$wdir" != '/' ] ; do
if [ -d "$wdir"/.mvn ] ; then
basedir=$wdir
[03/27] maven git commit: [maven-release-plugin] prepare for next
development iteration
Posted by kh...@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/fd29ddeb
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/fd29ddeb
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/fd29ddeb
Branch: refs/heads/MNG-6069
Commit: fd29ddebf980b895ca3a1665aec49b3c7d17eeaf
Parents: 214540c
Author: Stephen Connolly <st...@gmail.com>
Authored: Mon Mar 20 16:55:53 2017 +0000
Committer: Stephen Connolly <st...@gmail.com>
Committed: Mon Mar 20 16:55:53 2017 +0000
----------------------------------------------------------------------
apache-maven/pom.xml | 2 +-
maven-artifact/pom.xml | 2 +-
maven-builder-support/pom.xml | 2 +-
maven-compat/pom.xml | 2 +-
maven-core/pom.xml | 2 +-
maven-embedder/pom.xml | 2 +-
maven-model-builder/pom.xml | 2 +-
maven-model/pom.xml | 2 +-
maven-plugin-api/pom.xml | 2 +-
maven-repository-metadata/pom.xml | 2 +-
maven-resolver-provider/pom.xml | 2 +-
maven-settings-builder/pom.xml | 2 +-
maven-settings/pom.xml | 2 +-
maven-slf4j-provider/pom.xml | 2 +-
pom.xml | 4 ++--
15 files changed, 16 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/fd29ddeb/apache-maven/pom.xml
----------------------------------------------------------------------
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index 7bf2dd2..a528ddb 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.5.0-beta-1</version>
+ <version>3.5.0-SNAPSHOT</version>
</parent>
<artifactId>apache-maven</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/fd29ddeb/maven-artifact/pom.xml
----------------------------------------------------------------------
diff --git a/maven-artifact/pom.xml b/maven-artifact/pom.xml
index 0d07e98..e3943c9 100644
--- a/maven-artifact/pom.xml
+++ b/maven-artifact/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.5.0-beta-1</version>
+ <version>3.5.0-SNAPSHOT</version>
</parent>
<artifactId>maven-artifact</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/fd29ddeb/maven-builder-support/pom.xml
----------------------------------------------------------------------
diff --git a/maven-builder-support/pom.xml b/maven-builder-support/pom.xml
index c303646..39eb161 100644
--- a/maven-builder-support/pom.xml
+++ b/maven-builder-support/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.5.0-beta-1</version>
+ <version>3.5.0-SNAPSHOT</version>
</parent>
<artifactId>maven-builder-support</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/fd29ddeb/maven-compat/pom.xml
----------------------------------------------------------------------
diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml
index fd0a307..bfd2b47 100644
--- a/maven-compat/pom.xml
+++ b/maven-compat/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.5.0-beta-1</version>
+ <version>3.5.0-SNAPSHOT</version>
</parent>
<artifactId>maven-compat</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/fd29ddeb/maven-core/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index beb8a16..0e20235 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.5.0-beta-1</version>
+ <version>3.5.0-SNAPSHOT</version>
</parent>
<artifactId>maven-core</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/fd29ddeb/maven-embedder/pom.xml
----------------------------------------------------------------------
diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml
index 21531a3..30ad2ce 100644
--- a/maven-embedder/pom.xml
+++ b/maven-embedder/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.5.0-beta-1</version>
+ <version>3.5.0-SNAPSHOT</version>
</parent>
<artifactId>maven-embedder</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/fd29ddeb/maven-model-builder/pom.xml
----------------------------------------------------------------------
diff --git a/maven-model-builder/pom.xml b/maven-model-builder/pom.xml
index c8ede97..0dd08ac 100644
--- a/maven-model-builder/pom.xml
+++ b/maven-model-builder/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.5.0-beta-1</version>
+ <version>3.5.0-SNAPSHOT</version>
</parent>
<artifactId>maven-model-builder</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/fd29ddeb/maven-model/pom.xml
----------------------------------------------------------------------
diff --git a/maven-model/pom.xml b/maven-model/pom.xml
index a3ed1c5..41cf168 100644
--- a/maven-model/pom.xml
+++ b/maven-model/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.5.0-beta-1</version>
+ <version>3.5.0-SNAPSHOT</version>
</parent>
<artifactId>maven-model</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/fd29ddeb/maven-plugin-api/pom.xml
----------------------------------------------------------------------
diff --git a/maven-plugin-api/pom.xml b/maven-plugin-api/pom.xml
index 2184faa..d8f802d 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-beta-1</version>
+ <version>3.5.0-SNAPSHOT</version>
</parent>
<artifactId>maven-plugin-api</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/fd29ddeb/maven-repository-metadata/pom.xml
----------------------------------------------------------------------
diff --git a/maven-repository-metadata/pom.xml b/maven-repository-metadata/pom.xml
index 3b33aba..7480de7 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-beta-1</version>
+ <version>3.5.0-SNAPSHOT</version>
</parent>
<artifactId>maven-repository-metadata</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/fd29ddeb/maven-resolver-provider/pom.xml
----------------------------------------------------------------------
diff --git a/maven-resolver-provider/pom.xml b/maven-resolver-provider/pom.xml
index 291aa93..e95cc41 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-beta-1</version>
+ <version>3.5.0-SNAPSHOT</version>
</parent>
<artifactId>maven-resolver-provider</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/fd29ddeb/maven-settings-builder/pom.xml
----------------------------------------------------------------------
diff --git a/maven-settings-builder/pom.xml b/maven-settings-builder/pom.xml
index a651a89..2d415c9 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-beta-1</version>
+ <version>3.5.0-SNAPSHOT</version>
</parent>
<artifactId>maven-settings-builder</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/fd29ddeb/maven-settings/pom.xml
----------------------------------------------------------------------
diff --git a/maven-settings/pom.xml b/maven-settings/pom.xml
index e0498ca..133ee32 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-beta-1</version>
+ <version>3.5.0-SNAPSHOT</version>
</parent>
<artifactId>maven-settings</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/fd29ddeb/maven-slf4j-provider/pom.xml
----------------------------------------------------------------------
diff --git a/maven-slf4j-provider/pom.xml b/maven-slf4j-provider/pom.xml
index 1cdfe04..81af382 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-beta-1</version>
+ <version>3.5.0-SNAPSHOT</version>
</parent>
<artifactId>maven-slf4j-provider</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/fd29ddeb/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e20acdf..a3d5f67 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@ under the License.
</parent>
<artifactId>maven</artifactId>
- <version>3.5.0-beta-1</version>
+ <version>3.5.0-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-beta-1</tag>
+ <tag>master</tag>
</scm>
<issueManagement>
<system>jira</system>
[21/27] maven git commit: Update the DOAP to include the 3.5.0 release
Posted by kh...@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/70eabfe0
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/70eabfe0
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/70eabfe0
Branch: refs/heads/MNG-6069
Commit: 70eabfe0f2bc5fe85b666ca511ec35574b23d32f
Parents: 4c6d3a3
Author: Stephen Connolly <st...@gmail.com>
Authored: Fri Apr 7 09:11:26 2017 +0100
Committer: Stephen Connolly <st...@gmail.com>
Committed: Fri Apr 7 09:11:30 2017 +0100
----------------------------------------------------------------------
doap_Maven.rdf | 11 +++++++++++
1 file changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/70eabfe0/doap_Maven.rdf
----------------------------------------------------------------------
diff --git a/doap_Maven.rdf b/doap_Maven.rdf
index 86fbd1d..7b671d7 100644
--- a/doap_Maven.rdf
+++ b/doap_Maven.rdf
@@ -33,6 +33,17 @@ under the License.
<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>
[26/27] maven git commit: MNG-6210 allow maven custom guice scopes in
.mvn/extensions
Posted by kh...@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/c2c6259d
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/c2c6259d
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/c2c6259d
Branch: refs/heads/MNG-6069
Commit: c2c6259de6f1262d9b31509b8c30844a386a4f29
Parents: ec629f7
Author: Igor Fedorenko <if...@apache.org>
Authored: Thu Apr 13 12:58:29 2017 -0700
Committer: Igor Fedorenko <if...@apache.org>
Committed: Fri Apr 14 10:38:45 2017 -0700
----------------------------------------------------------------------
.../src/main/java/org/apache/maven/cli/MavenCli.java | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/c2c6259d/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
index 877b88b..79ab45d 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
@@ -56,6 +56,7 @@ import org.apache.maven.execution.MavenExecutionRequest;
import org.apache.maven.execution.MavenExecutionRequestPopulationException;
import org.apache.maven.execution.MavenExecutionRequestPopulator;
import org.apache.maven.execution.MavenExecutionResult;
+import org.apache.maven.execution.scope.internal.MojoExecutionScopeModule;
import org.apache.maven.extension.internal.CoreExports;
import org.apache.maven.extension.internal.CoreExtensionEntry;
import org.apache.maven.lifecycle.LifecycleExecutionException;
@@ -63,6 +64,7 @@ import org.apache.maven.model.building.ModelProcessor;
import org.apache.maven.project.MavenProject;
import org.apache.maven.properties.internal.EnvironmentUtils;
import org.apache.maven.properties.internal.SystemProperties;
+import org.apache.maven.session.scope.internal.SessionScopeModule;
import org.apache.maven.shared.utils.logging.MessageBuilder;
import org.apache.maven.shared.utils.logging.MessageUtils;
import org.apache.maven.toolchain.building.DefaultToolchainsBuildingRequest;
@@ -684,20 +686,20 @@ public class MavenCli
// NOTE: To avoid inconsistencies, we'll use the TCCL exclusively for lookups
container.setLookupRealm( null );
+ Thread.currentThread().setContextClassLoader( container.getContainerRealm() );
container.setLoggerManager( plexusLoggerManager );
for ( CoreExtensionEntry extension : extensions )
{
- container.discoverComponents( extension.getClassRealm() );
+ container.discoverComponents( extension.getClassRealm(), new SessionScopeModule( container ),
+ new MojoExecutionScopeModule( container ) );
}
customizeContainer( container );
container.getLoggerManager().setThresholds( cliRequest.request.getLoggingLevel() );
- Thread.currentThread().setContextClassLoader( container.getContainerRealm() );
-
eventSpyDispatcher = container.lookup( EventSpyDispatcher.class );
DefaultEventSpyContext eventSpyContext = new DefaultEventSpyContext();
[17/27] maven git commit: [MNG-6195] Tidy up quoting and command
substitution
Posted by kh...@apache.org.
[MNG-6195] Tidy up quoting and command substitution
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/96543b7c
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/96543b7c
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/96543b7c
Branch: refs/heads/MNG-6069
Commit: 96543b7c6ea52ad7ba3bcd559c38b159f8aa4c0d
Parents: 00c82b7
Author: Stephen Connolly <st...@gmail.com>
Authored: Sun Mar 26 22:41:24 2017 +0100
Committer: Stephen Connolly <st...@gmail.com>
Committed: Sat Apr 1 11:29:09 2017 +0100
----------------------------------------------------------------------
apache-maven/src/bin/mvn | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/96543b7c/apache-maven/src/bin/mvn
----------------------------------------------------------------------
diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn
index df62f68..e569633 100755
--- a/apache-maven/src/bin/mvn
+++ b/apache-maven/src/bin/mvn
@@ -83,14 +83,14 @@ fi
# For MinGW, ensure paths are in Unix format before anything is touched
if $mingw ; then
[ -n "$MAVEN_HOME" ] &&
- MAVEN_HOME="`(cd "$MAVEN_HOME"; pwd)`"
+ MAVEN_HOME=`(cd "$MAVEN_HOME"; pwd)`
[ -n "$JAVA_HOME" ] &&
- JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
+ JAVA_HOME=`(cd "$JAVA_HOME"; pwd)`
# TODO classpath?
fi
if [ -z "$JAVA_HOME" ] ; then
- JAVACMD="`which java`"
+ JAVACMD=`which java`
else
JAVACMD="$JAVA_HOME/bin/java"
fi
@@ -122,13 +122,13 @@ fi
find_maven_basedir() {
(
basedir=`find_file_argument_basedir "$@"`
- wdir="`pwd`"
+ wdir=`pwd`
while [ "$wdir" != '/' ] ; do
if [ -d "$wdir"/.mvn ] ; then
basedir=$wdir
break
fi
- wdir="`cd "$wdir/.."; pwd`"
+ wdir=`cd "$wdir/.."; pwd`
done
echo "${basedir}"
)
@@ -136,13 +136,14 @@ find_maven_basedir() {
find_file_argument_basedir() {
(
- basedir="`pwd`"
+ basedir=`pwd`
found_file_switch=0
for arg in "$@"; do
if [ ${found_file_switch} -eq 1 ]; then
if [ -f "${arg}" ]; then
- basedir=$(dirname "$(readlink -f "${arg}")")
+ basedir=`dirname "${arg}"`
+ basedir=`cd "${basedir}" && pwd -P`
if [ ! -d "${basedir}" ]; then
echo "Directory ${basedir} extracted from the -f/--file command-line argument ${arg} does not exist" >&2
exit 1
[04/27] maven git commit: s/@since 3.5.0-alpha-2/@since 3.5.0/g
Posted by kh...@apache.org.
s/@since 3.5.0-alpha-2/@since 3.5.0/g
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/d54e6f91
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/d54e6f91
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/d54e6f91
Branch: refs/heads/MNG-6069
Commit: d54e6f91a8652cdda61a20f051f97f11d4c3c982
Parents: fd29dde
Author: Christian Schulte <sc...@apache.org>
Authored: Tue Mar 21 00:21:43 2017 +0100
Committer: Christian Schulte <sc...@apache.org>
Committed: Tue Mar 21 00:21:43 2017 +0100
----------------------------------------------------------------------
.../java/org/apache/maven/execution/ProjectDependencyGraph.java | 2 +-
.../org/apache/maven/graph/DefaultProjectDependencyGraph.java | 4 ++--
.../org/apache/maven/graph/FilteredProjectDependencyGraph.java | 2 +-
.../java/org/apache/maven/project/ProjectModelResolverTest.java | 2 +-
.../java/org/apache/maven/model/resolution/ModelResolver.java | 2 +-
.../maven/repository/internal/DefaultModelResolverTest.java | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/d54e6f91/maven-core/src/main/java/org/apache/maven/execution/ProjectDependencyGraph.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/execution/ProjectDependencyGraph.java b/maven-core/src/main/java/org/apache/maven/execution/ProjectDependencyGraph.java
index d206d73..bbc8272 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/ProjectDependencyGraph.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/ProjectDependencyGraph.java
@@ -37,7 +37,7 @@ public interface ProjectDependencyGraph
*
* @return All collected projects.
*
- * @since 3.5.0-alpha-2
+ * @since 3.5.0
*/
List<MavenProject> getAllProjects();
http://git-wip-us.apache.org/repos/asf/maven/blob/d54e6f91/maven-core/src/main/java/org/apache/maven/graph/DefaultProjectDependencyGraph.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/graph/DefaultProjectDependencyGraph.java b/maven-core/src/main/java/org/apache/maven/graph/DefaultProjectDependencyGraph.java
index effab0b..73cadf6 100644
--- a/maven-core/src/main/java/org/apache/maven/graph/DefaultProjectDependencyGraph.java
+++ b/maven-core/src/main/java/org/apache/maven/graph/DefaultProjectDependencyGraph.java
@@ -69,7 +69,7 @@ public class DefaultProjectDependencyGraph
*
* @throws DuplicateProjectException
* @throws CycleDetectedException
- * @since 3.5.0-alpha-2
+ * @since 3.5.0
*/
public DefaultProjectDependencyGraph( final List<MavenProject> allProjects,
final Collection<MavenProject> projects )
@@ -81,7 +81,7 @@ public class DefaultProjectDependencyGraph
}
/**
- * @since 3.5.0-alpha-2
+ * @since 3.5.0
*/
public List<MavenProject> getAllProjects()
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d54e6f91/maven-core/src/main/java/org/apache/maven/graph/FilteredProjectDependencyGraph.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/graph/FilteredProjectDependencyGraph.java b/maven-core/src/main/java/org/apache/maven/graph/FilteredProjectDependencyGraph.java
index ad3910d..c4f8e1a 100644
--- a/maven-core/src/main/java/org/apache/maven/graph/FilteredProjectDependencyGraph.java
+++ b/maven-core/src/main/java/org/apache/maven/graph/FilteredProjectDependencyGraph.java
@@ -65,7 +65,7 @@ class FilteredProjectDependencyGraph
}
/**
- * @since 3.5.0-alpha-2
+ * @since 3.5.0
*/
public List<MavenProject> getAllProjects()
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d54e6f91/maven-core/src/test/java/org/apache/maven/project/ProjectModelResolverTest.java
----------------------------------------------------------------------
diff --git a/maven-core/src/test/java/org/apache/maven/project/ProjectModelResolverTest.java b/maven-core/src/test/java/org/apache/maven/project/ProjectModelResolverTest.java
index c21796b..6302a82 100644
--- a/maven-core/src/test/java/org/apache/maven/project/ProjectModelResolverTest.java
+++ b/maven-core/src/test/java/org/apache/maven/project/ProjectModelResolverTest.java
@@ -44,7 +44,7 @@ import static org.codehaus.plexus.PlexusTestCase.getBasedir;
* Test cases for the project {@code ModelResolver} implementation.
*
* @author Christian Schulte
- * @since 3.5.0-alpha-2
+ * @since 3.5.0
*/
public class ProjectModelResolverTest extends AbstractMavenProjectTestCase
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d54e6f91/maven-model-builder/src/main/java/org/apache/maven/model/resolution/ModelResolver.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/resolution/ModelResolver.java b/maven-model-builder/src/main/java/org/apache/maven/model/resolution/ModelResolver.java
index 39695f7..146d453 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/resolution/ModelResolver.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/resolution/ModelResolver.java
@@ -81,7 +81,7 @@ public interface ModelResolver
* @return The source of the requested POM, never {@code null}.
*
* @throws UnresolvableModelException If the POM could not be resolved from any configured repository.
- * @since 3.5.0-alpha-2
+ * @since 3.5.0
*
* @see Dependency#clone()
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/d54e6f91/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/DefaultModelResolverTest.java
----------------------------------------------------------------------
diff --git a/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/DefaultModelResolverTest.java b/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/DefaultModelResolverTest.java
index 497cf6b..e895bbb 100644
--- a/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/DefaultModelResolverTest.java
+++ b/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/DefaultModelResolverTest.java
@@ -35,7 +35,7 @@ import org.eclipse.aether.impl.VersionRangeResolver;
* Test cases for the default {@code ModelResolver} implementation.
*
* @author Christian Schulte
- * @since 3.5.0-alpha-2
+ * @since 3.5.0
*/
public final class DefaultModelResolverTest extends AbstractRepositoryTestCase
{
[20/27] maven git commit: Minor cleanup in MavenCli.java
Posted by kh...@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/4c6d3a34
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/4c6d3a34
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/4c6d3a34
Branch: refs/heads/MNG-6069
Commit: 4c6d3a3462783507921d1a0100e3fa22ef8a98e4
Parents: a4b0b63
Author: Stefan Eicher <st...@gmail.com>
Authored: Wed Apr 5 20:52:01 2017 +0200
Committer: Karl Heinz Marbaise <kh...@apache.org>
Committed: Wed Apr 5 23:51:26 2017 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/maven/cli/MavenCli.java | 11 -----------
1 file changed, 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/4c6d3a34/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
index 004cf4e..877b88b 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
@@ -1462,17 +1462,6 @@ public class MavenCli
alternatePomFile = commandLine.getOptionValue( CLIManager.ALTERNATE_POM_FILE );
}
- File userToolchainsFile;
- if ( commandLine.hasOption( CLIManager.ALTERNATE_USER_TOOLCHAINS ) )
- {
- userToolchainsFile = new File( commandLine.getOptionValue( CLIManager.ALTERNATE_USER_TOOLCHAINS ) );
- userToolchainsFile = resolveFile( userToolchainsFile, workingDirectory );
- }
- else
- {
- userToolchainsFile = MavenCli.DEFAULT_USER_TOOLCHAINS_FILE;
- }
-
request.setBaseDirectory( baseDirectory ).setGoals( goals ).setSystemProperties(
cliRequest.systemProperties ).setUserProperties( cliRequest.userProperties ).setReactorFailureBehavior(
reactorFailureBehaviour ) // default: fail fast
[09/27] maven git commit: [MNG-6112] Central repository in the 4.0.0
super POM should declare update policy 'never'.
Posted by kh...@apache.org.
[MNG-6112] Central repository in the 4.0.0 super POM should declare update policy 'never'.
This reverts commit 13adc1bc2b6d9fc3a62ec2389996726c2edce4d8 *not changing
anything* just because someone did not react in time when this issue had been
lying around on a branch. If we would set pace for the industrie, everyone would
still be using 5.25" floppy disks and 8 bit hardware and we would tell them
that upgrading to be able to use new software would be too risky and they
better keep theire broken assembly routines until the machine goes up in
smoke.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/8400984a
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/8400984a
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/8400984a
Branch: refs/heads/MNG-6069
Commit: 8400984ac5201ae6bf06bfa88ade8a8468c76634
Parents: 0931bb2
Author: Christian Schulte <sc...@apache.org>
Authored: Sat Mar 25 20:40:05 2017 +0100
Committer: Christian Schulte <sc...@apache.org>
Committed: Sat Mar 25 20:53:06 2017 +0100
----------------------------------------------------------------------
.../main/java/org/apache/maven/bridge/MavenRepositorySystem.java | 4 ++--
.../src/main/resources/org/apache/maven/model/pom-4.0.0.xml | 3 ---
2 files changed, 2 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/8400984a/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java b/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java
index 509f302..9331710 100644
--- a/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java
+++ b/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java
@@ -573,8 +573,8 @@ public class MavenRepositorySystem
throws Exception
{
return createRepository( RepositorySystem.DEFAULT_REMOTE_REPO_URL, RepositorySystem.DEFAULT_REMOTE_REPO_ID,
- true, ArtifactRepositoryPolicy.UPDATE_POLICY_NEVER, false,
- ArtifactRepositoryPolicy.UPDATE_POLICY_NEVER,
+ true, ArtifactRepositoryPolicy.UPDATE_POLICY_DAILY, false,
+ ArtifactRepositoryPolicy.UPDATE_POLICY_DAILY,
ArtifactRepositoryPolicy.CHECKSUM_POLICY_WARN );
}
http://git-wip-us.apache.org/repos/asf/maven/blob/8400984a/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml b/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
index 9487a9a..91492a9 100644
--- a/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
+++ b/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
@@ -32,9 +32,6 @@ under the License.
<snapshots>
<enabled>false</enabled>
</snapshots>
- <releases>
- <updatePolicy>never</updatePolicy>
- </releases>
</repository>
</repositories>
[07/27] maven git commit: [MNG-6192] upgraded m-assembly-p to get
ordered entries in zip
Posted by kh...@apache.org.
[MNG-6192] upgraded m-assembly-p to get ordered entries in zip
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/f0535a40
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/f0535a40
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/f0535a40
Branch: refs/heads/MNG-6069
Commit: f0535a40e2dba47f00c5469941d3edad2a8effef
Parents: 27ab750
Author: Herv� Boutemy <hb...@apache.org>
Authored: Thu Mar 23 05:11:12 2017 +0100
Committer: Herv� Boutemy <hb...@apache.org>
Committed: Thu Mar 23 05:11:12 2017 +0100
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/f0535a40/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a3d5f67..857ce07 100644
--- a/pom.xml
+++ b/pom.xml
@@ -539,7 +539,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.6</version>
+ <version>3.0.0</version>
</plugin>
</plugins>
</pluginManagement>
[24/27] maven git commit: use "java -jar" command
Posted by kh...@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/567af0d9
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/567af0d9
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/567af0d9
Branch: refs/heads/MNG-6069
Commit: 567af0d964cf823b275300aa4671b84a28da5baa
Parents: 6a93bbe
Author: Herv� Boutemy <hb...@apache.org>
Authored: Wed Apr 12 03:59:44 2017 +0200
Committer: Herv� Boutemy <hb...@apache.org>
Committed: Wed Apr 12 03:59:44 2017 +0200
----------------------------------------------------------------------
.../apache/maven/artifact/versioning/ComparableVersion.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/567af0d9/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
----------------------------------------------------------------------
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
index e1fc5f0..105d9b5 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
@@ -470,11 +470,12 @@ public class ComparableVersion
return canonical.hashCode();
}
+ // CHECKSTYLE_OFF: LineLength
/**
* Main to test version parsing and comparison.
* <p>
- * Checks how "1.2.7" compares to "1.2-SNAPSHOT", for example, you can issue
- * <code>java -cp ${maven.repo.local}/org/apache/maven/maven-artifact/${maven.version}/maven-artifact-${maven.version}.jar org.apache.maven.artifact.versioning.ComparableVersion "1.2.7" "1.2-SNAPSHOT"</code>
+ * 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:
@@ -486,6 +487,7 @@ public class ComparableVersion
* @param args the version strings to parse and compare. You can pass arbitrary number of version strings and always
* two adjacent will be compared
*/
+ // CHECKSTYLE_ON: LineLength
public static void main( String... args )
{
System.out.println( "Display parameters as parsed by Maven (in canonical form) and comparison result:" );
[06/27] maven git commit: [MNG-6190] maven-resolver-provider's
DefaultArtifactDescriptorReader has mismatched constructor and initService
methods
Posted by kh...@apache.org.
[MNG-6190] maven-resolver-provider's DefaultArtifactDescriptorReader has mismatched constructor and initService methods
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/27ab7503
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/27ab7503
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/27ab7503
Branch: refs/heads/MNG-6069
Commit: 27ab7503a7196a40b5ed1007181c82cdcf11e03c
Parents: 13adc1b
Author: Christian Schulte <sc...@apache.org>
Authored: Tue Mar 21 04:06:02 2017 +0100
Committer: Christian Schulte <sc...@apache.org>
Committed: Tue Mar 21 19:16:44 2017 +0100
----------------------------------------------------------------------
.../internal/DefaultArtifactDescriptorReader.java | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/27ab7503/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
----------------------------------------------------------------------
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
index 1df1c12..82e1284 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
@@ -111,8 +111,9 @@ public class DefaultArtifactDescriptorReader
@Inject
DefaultArtifactDescriptorReader( RemoteRepositoryManager remoteRepositoryManager, VersionResolver versionResolver,
- ArtifactResolver artifactResolver, ModelBuilder modelBuilder,
- RepositoryEventDispatcher repositoryEventDispatcher, LoggerFactory loggerFactory )
+ VersionRangeResolver versionRangeResolver, ArtifactResolver artifactResolver,
+ ModelBuilder modelBuilder, RepositoryEventDispatcher repositoryEventDispatcher,
+ LoggerFactory loggerFactory )
{
setRemoteRepositoryManager( remoteRepositoryManager );
setVersionResolver( versionResolver );
@@ -124,17 +125,17 @@ public class DefaultArtifactDescriptorReader
public void initService( ServiceLocator locator )
{
- setLoggerFactory( locator.getService( LoggerFactory.class ) );
setRemoteRepositoryManager( locator.getService( RemoteRepositoryManager.class ) );
setVersionResolver( locator.getService( VersionResolver.class ) );
setVersionRangeResolver( locator.getService( VersionRangeResolver.class ) );
setArtifactResolver( locator.getService( ArtifactResolver.class ) );
- setRepositoryEventDispatcher( locator.getService( RepositoryEventDispatcher.class ) );
modelBuilder = locator.getService( ModelBuilder.class );
if ( modelBuilder == null )
{
setModelBuilder( new DefaultModelBuilderFactory().newInstance() );
}
+ setRepositoryEventDispatcher( locator.getService( RepositoryEventDispatcher.class ) );
+ setLoggerFactory( locator.getService( LoggerFactory.class ) );
}
public DefaultArtifactDescriptorReader setLoggerFactory( LoggerFactory loggerFactory )
[05/27] maven git commit: [MNG-6112] Central repository in the 4.0.0
super POM should declare update policy 'never'.
Posted by kh...@apache.org.
[MNG-6112] Central repository in the 4.0.0 super POM should declare update policy 'never'.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/13adc1bc
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/13adc1bc
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/13adc1bc
Branch: refs/heads/MNG-6069
Commit: 13adc1bc2b6d9fc3a62ec2389996726c2edce4d8
Parents: d54e6f9
Author: Christian Schulte <sc...@apache.org>
Authored: Tue Mar 21 00:30:28 2017 +0100
Committer: Christian Schulte <sc...@apache.org>
Committed: Tue Mar 21 00:30:28 2017 +0100
----------------------------------------------------------------------
.../main/java/org/apache/maven/bridge/MavenRepositorySystem.java | 4 ++--
.../src/main/resources/org/apache/maven/model/pom-4.0.0.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/13adc1bc/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java b/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java
index 9331710..509f302 100644
--- a/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java
+++ b/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java
@@ -573,8 +573,8 @@ public class MavenRepositorySystem
throws Exception
{
return createRepository( RepositorySystem.DEFAULT_REMOTE_REPO_URL, RepositorySystem.DEFAULT_REMOTE_REPO_ID,
- true, ArtifactRepositoryPolicy.UPDATE_POLICY_DAILY, false,
- ArtifactRepositoryPolicy.UPDATE_POLICY_DAILY,
+ true, ArtifactRepositoryPolicy.UPDATE_POLICY_NEVER, false,
+ ArtifactRepositoryPolicy.UPDATE_POLICY_NEVER,
ArtifactRepositoryPolicy.CHECKSUM_POLICY_WARN );
}
http://git-wip-us.apache.org/repos/asf/maven/blob/13adc1bc/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml b/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
index 91492a9..9487a9a 100644
--- a/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
+++ b/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
@@ -32,6 +32,9 @@ under the License.
<snapshots>
<enabled>false</enabled>
</snapshots>
+ <releases>
+ <updatePolicy>never</updatePolicy>
+ </releases>
</repository>
</repositories>
[12/27] maven git commit: added CORE_IT_PROFILES parameter
Posted by kh...@apache.org.
added CORE_IT_PROFILES parameter
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/ad514f5c
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/ad514f5c
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/ad514f5c
Branch: refs/heads/MNG-6069
Commit: ad514f5cb55d16ca116c5c529ad48dd32d5bac61
Parents: 16805f5
Author: Herv� Boutemy <hb...@apache.org>
Authored: Fri Mar 24 03:28:26 2017 +0100
Committer: Herv� Boutemy <hb...@apache.org>
Committed: Tue Mar 28 08:04:07 2017 +0200
----------------------------------------------------------------------
Jenkinsfile | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/ad514f5c/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index cc9bd92..0dae3a3 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -20,6 +20,7 @@
properties([buildDiscarder(logRotator(artifactNumToKeepStr: '5', numToKeepStr: env.BRANCH_NAME=='master'?'10':'5'))])
def tests
+def CORE_IT_PROFILES='run-its'
try {
@@ -66,7 +67,7 @@ parallel linuxJava7:{
sh "rm -rvf $WORK_DIR/apache-maven-dist.zip $WORK_DIR/it-local-repo"
unstash 'dist'
withEnv(["PATH+MAVEN=$MAVEN_NIX_J7/bin","PATH+JDK=$JAVA_NIX_J7/bin"]) {
- sh "mvn clean install -Prun-its -B -U -V -Dmaven.test.failure.ignore=true -Dmaven.repo.local=$WORK_DIR/it-local-repo -DmavenDistro=$WORK_DIR/apache-maven-dist.zip"
+ sh "mvn clean install -P$CORE_IT_PROFILES -B -U -V -Dmaven.test.failure.ignore=true -Dmaven.repo.local=$WORK_DIR/it-local-repo -DmavenDistro=$WORK_DIR/apache-maven-dist.zip"
}
junit allowEmptyResults: true, testResults:'core-it-support/**/target/*-reports/*.xml,core-it-suite/target/*-reports/*.xml'
deleteDir() // clean up after ourselves to reduce disk space
@@ -85,7 +86,7 @@ parallel linuxJava7:{
sh "rm -rvf $WORK_DIR/apache-maven-dist.zip $WORK_DIR/it-local-repo"
unstash 'dist'
withEnv(["PATH+MAVEN=$MAVEN_NIX_J8/bin","PATH+JDK=$JAVA_NIX_J8/bin"]) {
- sh "mvn clean install -Prun-its -B -U -V -Dmaven.test.failure.ignore=true -Dmaven.repo.local=$WORK_DIR/it-local-repo -DmavenDistro=$WORK_DIR/apache-maven-dist.zip"
+ sh "mvn clean install -P$CORE_IT_PROFILES -B -U -V -Dmaven.test.failure.ignore=true -Dmaven.repo.local=$WORK_DIR/it-local-repo -DmavenDistro=$WORK_DIR/apache-maven-dist.zip"
}
junit allowEmptyResults: true, testResults:'core-it-support/**/target/*-reports/*.xml,core-it-suite/target/*-reports/*.xml'
deleteDir() // clean up after ourselves to reduce disk space
@@ -115,7 +116,7 @@ parallel linuxJava7:{
withEnv(["Path+MAVEN=$MAVEN_WIN_J7\\bin","Path+JDK=$JAVA_WIN_J7\\bin","JAVA_HOME=$JAVA_WIN_J7"]) {
bat "set"
unstash 'dist'
- bat "mvn clean install -Prun-its -B -U -V -Dmaven.test.failure.ignore=true -Dmaven.repo.local=$WORK_DIR/it-local-repo -DmavenDistro=$WORK_DIR/apache-maven-dist.zip"
+ bat "mvn clean install -P$CORE_IT_PROFILES -B -U -V -Dmaven.test.failure.ignore=true -Dmaven.repo.local=$WORK_DIR/it-local-repo -DmavenDistro=$WORK_DIR/apache-maven-dist.zip"
}
junit allowEmptyResults: true, testResults:'core-it-support/**/target/*-reports/*.xml,core-it-suite/target/*-reports/*.xml'
deleteDir() // clean up after ourselves to reduce disk space
@@ -145,7 +146,7 @@ parallel linuxJava7:{
withEnv(["Path+MAVEN=$MAVEN_WIN_J8\\bin","Path+JDK=$JAVA_WIN_J8\\bin","JAVA_HOME=$JAVA_WIN_J8"]) {
bat "set"
unstash 'dist'
- bat "mvn clean install -Prun-its -B -U -V -Dmaven.test.failure.ignore=true -Dmaven.repo.local=$WORK_DIR/it-local-repo -DmavenDistro=$WORK_DIR/apache-maven-dist.zip"
+ bat "mvn clean install -P$CORE_IT_PROFILES -B -U -V -Dmaven.test.failure.ignore=true -Dmaven.repo.local=$WORK_DIR/it-local-repo -DmavenDistro=$WORK_DIR/apache-maven-dist.zip"
}
junit allowEmptyResults: true, testResults:'core-it-support/**/target/*-reports/*.xml,core-it-suite/target/*-reports/*.xml'
deleteDir() // clean up after ourselves to reduce disk space
[22/27] maven git commit: improved description of styled message API
Posted by kh...@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/08f3c76a
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/08f3c76a
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/08f3c76a
Branch: refs/heads/MNG-6069
Commit: 08f3c76a09601d85503c35743458d977a92e492d
Parents: 70eabfe
Author: Herv� Boutemy <hb...@apache.org>
Authored: Sat Apr 8 08:50:55 2017 +0200
Committer: Herv� Boutemy <hb...@apache.org>
Committed: Sat Apr 8 08:50:55 2017 +0200
----------------------------------------------------------------------
maven-embedder/src/site/apt/index.apt.vm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/08f3c76a/maven-embedder/src/site/apt/index.apt.vm
----------------------------------------------------------------------
diff --git a/maven-embedder/src/site/apt/index.apt.vm b/maven-embedder/src/site/apt/index.apt.vm
index e820765..d327717 100644
--- a/maven-embedder/src/site/apt/index.apt.vm
+++ b/maven-embedder/src/site/apt/index.apt.vm
@@ -44,5 +44,6 @@ ${project.name}
* since 3.5.0, output is colorized by default, with color disabled in batch mode: see
{{{/shared/maven-shared-utils/apidocs/org/apache/maven/shared/utils/logging/package-summary.html}styled message API}}
- for more details.
+ for more details on adding color to a plugin output or customizing colors.
+
\ No newline at end of file
[13/27] maven git commit: switch to embedded core ITs run for faster
result
Posted by kh...@apache.org.
switch to embedded core ITs run for faster result
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/94c3b600
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/94c3b600
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/94c3b600
Branch: refs/heads/MNG-6069
Commit: 94c3b600ec3290cda98a66c108ff021b7c4c482e
Parents: ad514f5
Author: Herv� Boutemy <hb...@apache.org>
Authored: Fri Mar 24 03:28:59 2017 +0100
Committer: Herv� Boutemy <hb...@apache.org>
Committed: Tue Mar 28 08:04:16 2017 +0200
----------------------------------------------------------------------
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/94c3b600/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index 0dae3a3..be4485c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -20,7 +20,7 @@
properties([buildDiscarder(logRotator(artifactNumToKeepStr: '5', numToKeepStr: env.BRANCH_NAME=='master'?'10':'5'))])
def tests
-def CORE_IT_PROFILES='run-its'
+def CORE_IT_PROFILES='run-its,embedded'
try {
[18/27] maven git commit: [maven-release-plugin] prepare release
maven-3.5.0
Posted by kh...@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/ff8f5e74
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/ff8f5e74
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/ff8f5e74
Branch: refs/heads/MNG-6069
Commit: ff8f5e7444045639af65f6095c62210b5713f426
Parents: 87cf1ee
Author: Stephen Connolly <st...@gmail.com>
Authored: Mon Apr 3 20:35:30 2017 +0100
Committer: Stephen Connolly <st...@gmail.com>
Committed: Mon Apr 3 20:35:30 2017 +0100
----------------------------------------------------------------------
apache-maven/pom.xml | 2 +-
maven-artifact/pom.xml | 2 +-
maven-builder-support/pom.xml | 2 +-
maven-compat/pom.xml | 2 +-
maven-core/pom.xml | 2 +-
maven-embedder/pom.xml | 2 +-
maven-model-builder/pom.xml | 2 +-
maven-model/pom.xml | 2 +-
maven-plugin-api/pom.xml | 2 +-
maven-repository-metadata/pom.xml | 2 +-
maven-resolver-provider/pom.xml | 2 +-
maven-settings-builder/pom.xml | 2 +-
maven-settings/pom.xml | 2 +-
maven-slf4j-provider/pom.xml | 2 +-
pom.xml | 4 ++--
15 files changed, 16 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/ff8f5e74/apache-maven/pom.xml
----------------------------------------------------------------------
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index a528ddb..8a72146 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -25,7 +25,7 @@ under the License.
<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/ff8f5e74/maven-artifact/pom.xml
----------------------------------------------------------------------
diff --git a/maven-artifact/pom.xml b/maven-artifact/pom.xml
index e3943c9..977fd34 100644
--- a/maven-artifact/pom.xml
+++ b/maven-artifact/pom.xml
@@ -25,7 +25,7 @@ under the License.
<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/ff8f5e74/maven-builder-support/pom.xml
----------------------------------------------------------------------
diff --git a/maven-builder-support/pom.xml b/maven-builder-support/pom.xml
index 39eb161..7457a4c 100644
--- a/maven-builder-support/pom.xml
+++ b/maven-builder-support/pom.xml
@@ -25,7 +25,7 @@ under the License.
<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/ff8f5e74/maven-compat/pom.xml
----------------------------------------------------------------------
diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml
index bfd2b47..9552803 100644
--- a/maven-compat/pom.xml
+++ b/maven-compat/pom.xml
@@ -25,7 +25,7 @@ under the License.
<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/ff8f5e74/maven-core/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index 0e20235..4fb86a3 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -25,7 +25,7 @@ under the License.
<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/ff8f5e74/maven-embedder/pom.xml
----------------------------------------------------------------------
diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml
index 30ad2ce..3e778b3 100644
--- a/maven-embedder/pom.xml
+++ b/maven-embedder/pom.xml
@@ -25,7 +25,7 @@ under the License.
<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/ff8f5e74/maven-model-builder/pom.xml
----------------------------------------------------------------------
diff --git a/maven-model-builder/pom.xml b/maven-model-builder/pom.xml
index 0dd08ac..3aefbc7 100644
--- a/maven-model-builder/pom.xml
+++ b/maven-model-builder/pom.xml
@@ -25,7 +25,7 @@ under the License.
<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/ff8f5e74/maven-model/pom.xml
----------------------------------------------------------------------
diff --git a/maven-model/pom.xml b/maven-model/pom.xml
index 41cf168..1ec4f89 100644
--- a/maven-model/pom.xml
+++ b/maven-model/pom.xml
@@ -25,7 +25,7 @@ under the License.
<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/ff8f5e74/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/ff8f5e74/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/ff8f5e74/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/ff8f5e74/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/ff8f5e74/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/ff8f5e74/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/ff8f5e74/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>
[15/27] maven git commit: Squashed commit of the following:
Posted by kh...@apache.org.
Squashed commit of the following:
commit 049228ce76927a6740500e1b750f0e8f201f2478
Author: rfscholte <rf...@apache.org>
Date: Mon Mar 27 20:22:46 2017 +0200
[MNG-6185] Replace doclettag explanation with annotations in AbstractMojo javadoc
Fix by Checkstyle reported issues
commit 63796a649e6e3b25a58fb567d354ca1849f48819
Author: rfscholte <rf...@apache.org>
Date: Sat Mar 25 23:15:00 2017 +0100
[MNG-6185] Replace doclettag explanation with annotations in AbstractMojo javadoc
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/00c82b7e
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/00c82b7e
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/00c82b7e
Branch: refs/heads/MNG-6069
Commit: 00c82b7e234c6ed33f76ba48a236130c5511ab3a
Parents: 0baa423
Author: rfscholte <rf...@apache.org>
Authored: Wed Mar 29 19:50:15 2017 +0200
Committer: rfscholte <rf...@apache.org>
Committed: Wed Mar 29 19:50:15 2017 +0200
----------------------------------------------------------------------
.../org/apache/maven/plugin/AbstractMojo.java | 37 +++++++++-----------
1 file changed, 17 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/00c82b7e/maven-plugin-api/src/main/java/org/apache/maven/plugin/AbstractMojo.java
----------------------------------------------------------------------
diff --git a/maven-plugin-api/src/main/java/org/apache/maven/plugin/AbstractMojo.java b/maven-plugin-api/src/main/java/org/apache/maven/plugin/AbstractMojo.java
index f85e7f3..6292116 100644
--- a/maven-plugin-api/src/main/java/org/apache/maven/plugin/AbstractMojo.java
+++ b/maven-plugin-api/src/main/java/org/apache/maven/plugin/AbstractMojo.java
@@ -27,17 +27,15 @@ import org.apache.maven.plugin.logging.SystemStreamLog;
/**
* Abstract class to provide most of the infrastructure required to implement a <code>Mojo</code> except for
* the execute method.<br>
- * The implementation should have a <code>goal</code> annotation in the class-level javadoc annotation:
+ * The implementation should have a <code>Mojo</code> annotation with the name of the goal:
* <pre>
- * /**
- * * @goal goalName
- * */
+ * @Mojo( name = "<goal-name>" )
* </pre>
* <p>
- * There are also a number of class-level javadoc annotations which can be used to control how and when the
+ * There are also a number of attributes which can be used to control how and when the
* <code>Mojo</code> is executed:
* </p>
- * <table border="1" summary="class-level doclettags">
+ * <table border="1" summary="mojo annotation attributes">
* <tr bgcolor="#CCCCCC">
* <th>Descriptor Element</th>
* <th>Annotation</th>
@@ -46,7 +44,7 @@ import org.apache.maven.plugin.logging.SystemStreamLog;
* </tr>
* <tr>
* <td>goal</td>
- * <td>@goal <goalName></td>
+ * <td>name = "<goal-name>"</td>
* <td>Yes</td>
* <td>The name for the Mojo that users will reference from the command line to execute the Mojo directly,
* or inside a POM in order to provide Mojo-specific configuration.</td>
@@ -65,7 +63,7 @@ import org.apache.maven.plugin.logging.SystemStreamLog;
* </tr>
* <tr>
* <td>configurator</td>
- * <td>@configurator <roleHint></td>
+ * <td>configurator = "<role-hint>"</td>
* <td>No</td>
* <td>The configurator type to use when injecting parameter values into this Mojo. The value is normally
* deduced from the Mojo's implementation language, but can be specified to allow a custom
@@ -77,7 +75,7 @@ import org.apache.maven.plugin.logging.SystemStreamLog;
* </tr>
* <tr>
* <td>phase</td>
- * <td>@phase <phaseName></td>
+ * <td>defaultPhase = LifecyclePhase.<phase></td>
* <td>No</td>
* <td>Binds this Mojo to a particular phase of the standard build lifecycle, if specified.
* <br>
@@ -86,7 +84,8 @@ import org.apache.maven.plugin.logging.SystemStreamLog;
* </tr>
* <tr>
* <td>execute</td>
- * <td>@execute [phase=<phaseName>|goal=<goalName>] [lifecycle=<lifecycleId>]</td>
+ * <td>@Execute
+ * ( phase=LifecyclePhase.<phase>, goal= "<goal-name>", lifecycle="<lifecycle-id>" )</td>
* <td>No</td>
* <td>When this goal is invoked, it will first invoke a parallel lifecycle, ending at the given phase.
* If a goal is provided instead of a phase, that goal will be executed in isolation.
@@ -99,7 +98,7 @@ import org.apache.maven.plugin.logging.SystemStreamLog;
* </tr>
* <tr>
* <td>requiresDependencyResolution</td>
- * <td>@requiresDependencyResolution <requiredScope></td>
+ * <td>requiresDependencyResolution = ResolutionScope.<scope></td>
* <td>No</td>
* <td>Flags this Mojo as requiring the dependencies in the specified scope (or an implied scope) to be
* resolved before it can execute.
@@ -128,6 +127,9 @@ import org.apache.maven.plugin.logging.SystemStreamLog;
* </td>
* </tr>
* </table>
+ * <p>This is only a small set of all the options. A complete list can be found at
+ * <a href="https://maven.apache.org/components/plugin-tools/maven-plugin-tools-annotations/index.html" target="_blank">
+ * Maven Plugin Tool for Annotations</a>.
*
* @see <a href="https://maven.apache.org/guides/plugin/guide-java-plugin-development.html" target="_blank">Guide to Developing Java Plugins</a>
* @see <a href="https://maven.apache.org/guides/mini/guide-configuring-plugins.html" target="_blank">Guide to Configuring Plug-ins</a>
@@ -146,9 +148,7 @@ public abstract class AbstractMojo
/** Plugin container context */
private Map pluginContext;
- /**
- * @see org.apache.maven.plugin.Mojo#setLog(org.apache.maven.plugin.logging.Log)
- */
+ @Override
public void setLog( Log log )
{
this.log = log;
@@ -167,6 +167,7 @@ public abstract class AbstractMojo
*
* @see org.apache.maven.plugin.Mojo#getLog()
*/
+ @Override
public Log getLog()
{
if ( log == null )
@@ -177,17 +178,13 @@ public abstract class AbstractMojo
return log;
}
- /**
- * @see org.apache.maven.plugin.ContextEnabled#getPluginContext()
- */
+ @Override
public Map getPluginContext()
{
return pluginContext;
}
- /**
- * @see org.apache.maven.plugin.ContextEnabled#setPluginContext(java.util.Map)
- */
+ @Override
public void setPluginContext( Map pluginContext )
{
this.pluginContext = pluginContext;
[08/27] maven git commit: [MNG-6168] Fix unclosed streams
Posted by kh...@apache.org.
[MNG-6168] Fix unclosed streams
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/0931bb2c
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/0931bb2c
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/0931bb2c
Branch: refs/heads/MNG-6069
Commit: 0931bb2cc7630cc79adb98407db13315b4a709ee
Parents: f0535a4
Author: Christian Schulte <sc...@apache.org>
Authored: Fri Mar 24 22:04:37 2017 +0100
Committer: Christian Schulte <sc...@apache.org>
Committed: Fri Mar 24 22:04:37 2017 +0100
----------------------------------------------------------------------
.../metadata/io/DefaultMetadataReader.java | 19 ++-------
.../toolchain/io/DefaultToolchainsReader.java | 19 ++-------
.../maven/model/io/DefaultModelReader.java | 18 +++------
.../maven/model/io/DefaultModelWriter.java | 27 +++++--------
.../internal/DefaultVersionRangeResolver.java | 18 +++------
.../internal/DefaultVersionResolver.java | 42 ++++++++------------
.../settings/io/DefaultSettingsReader.java | 19 ++-------
.../settings/io/DefaultSettingsWriter.java | 27 +++++--------
8 files changed, 58 insertions(+), 131 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/0931bb2c/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java b/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java
index c769f89..51a2849 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java
@@ -29,7 +29,6 @@ import org.apache.commons.lang3.Validate;
import org.apache.maven.artifact.repository.metadata.Metadata;
import org.apache.maven.artifact.repository.metadata.io.xpp3.MetadataXpp3Reader;
import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.ReaderFactory;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
@@ -58,19 +57,14 @@ public class DefaultMetadataReader
{
Validate.notNull( input, "input cannot be null" );
- try
+ try ( final Reader in = input )
{
- MetadataXpp3Reader r = new MetadataXpp3Reader();
- return r.read( input, isStrict( options ) );
+ return new MetadataXpp3Reader().read( in, isStrict( options ) );
}
catch ( XmlPullParserException e )
{
throw new MetadataParseException( e.getMessage(), e.getLineNumber(), e.getColumnNumber(), e );
}
- finally
- {
- IOUtil.close( input );
- }
}
public Metadata read( InputStream input, Map<String, ?> options )
@@ -78,19 +72,14 @@ public class DefaultMetadataReader
{
Validate.notNull( input, "input cannot be null" );
- try
+ try ( final InputStream in = input )
{
- MetadataXpp3Reader r = new MetadataXpp3Reader();
- return r.read( input, isStrict( options ) );
+ return new MetadataXpp3Reader().read( in, isStrict( options ) );
}
catch ( XmlPullParserException e )
{
throw new MetadataParseException( e.getMessage(), e.getLineNumber(), e.getColumnNumber(), e );
}
- finally
- {
- IOUtil.close( input );
- }
}
private boolean isStrict( Map<String, ?> options )
http://git-wip-us.apache.org/repos/asf/maven/blob/0931bb2c/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java b/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java
index 9b5bdd7..86a1784 100644
--- a/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java
+++ b/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java
@@ -31,7 +31,6 @@ import javax.inject.Singleton;
import org.apache.commons.lang3.Validate;
import org.apache.maven.toolchain.model.PersistedToolchains;
import org.apache.maven.toolchain.model.io.xpp3.MavenToolchainsXpp3Reader;
-import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.ReaderFactory;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
@@ -62,19 +61,14 @@ public class DefaultToolchainsReader
{
Validate.notNull( input, "input cannot be null" );
- try
+ try ( final Reader in = input )
{
- MavenToolchainsXpp3Reader r = new MavenToolchainsXpp3Reader();
- return r.read( input, isStrict( options ) );
+ return new MavenToolchainsXpp3Reader().read( in, isStrict( options ) );
}
catch ( XmlPullParserException e )
{
throw new ToolchainsParseException( e.getMessage(), e.getLineNumber(), e.getColumnNumber(), e );
}
- finally
- {
- IOUtil.close( input );
- }
}
@Override
@@ -83,19 +77,14 @@ public class DefaultToolchainsReader
{
Validate.notNull( input, "input cannot be null" );
- try
+ try ( final InputStream in = input )
{
- MavenToolchainsXpp3Reader r = new MavenToolchainsXpp3Reader();
- return r.read( input, isStrict( options ) );
+ return new MavenToolchainsXpp3Reader().read( in, isStrict( options ) );
}
catch ( XmlPullParserException e )
{
throw new ToolchainsParseException( e.getMessage(), e.getLineNumber(), e.getColumnNumber(), e );
}
- finally
- {
- IOUtil.close( input );
- }
}
private boolean isStrict( Map<String, ?> options )
http://git-wip-us.apache.org/repos/asf/maven/blob/0931bb2c/maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelReader.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelReader.java b/maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelReader.java
index 0ba6673..e07ac3b 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelReader.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelReader.java
@@ -32,8 +32,8 @@ import org.apache.maven.model.Model;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
import org.apache.maven.model.io.xpp3.MavenXpp3ReaderEx;
import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.ReaderFactory;
+import org.codehaus.plexus.util.xml.XmlStreamReader;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
/**
@@ -65,13 +65,9 @@ public class DefaultModelReader
{
Validate.notNull( input, "input cannot be null" );
- try
- {
- return read( input, isStrict( options ), getSource( options ) );
- }
- finally
+ try ( final Reader in = input )
{
- IOUtil.close( input );
+ return read( in, isStrict( options ), getSource( options ) );
}
}
@@ -81,13 +77,9 @@ public class DefaultModelReader
{
Validate.notNull( input, "input cannot be null" );
- try
- {
- return read( ReaderFactory.newXmlReader( input ), isStrict( options ), getSource( options ) );
- }
- finally
+ try ( final XmlStreamReader in = ReaderFactory.newXmlReader( input ) )
{
- IOUtil.close( input );
+ return read( in, isStrict( options ), getSource( options ) );
}
}
http://git-wip-us.apache.org/repos/asf/maven/blob/0931bb2c/maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelWriter.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelWriter.java b/maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelWriter.java
index 0d9af13..c899efa 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelWriter.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelWriter.java
@@ -30,7 +30,6 @@ import org.apache.commons.lang3.Validate;
import org.apache.maven.model.Model;
import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.WriterFactory;
/**
@@ -62,14 +61,9 @@ public class DefaultModelWriter
Validate.notNull( output, "output cannot be null" );
Validate.notNull( model, "model cannot be null" );
- try
+ try ( final Writer out = output )
{
- MavenXpp3Writer w = new MavenXpp3Writer();
- w.write( output, model );
- }
- finally
- {
- IOUtil.close( output );
+ new MavenXpp3Writer().write( out, model );
}
}
@@ -80,19 +74,16 @@ public class DefaultModelWriter
Validate.notNull( output, "output cannot be null" );
Validate.notNull( model, "model cannot be null" );
- try
+ String encoding = model.getModelEncoding();
+ // TODO Use StringUtils here
+ if ( encoding == null || encoding.length() <= 0 )
{
- String encoding = model.getModelEncoding();
- // TODO Use StringUtils here
- if ( encoding == null || encoding.length() <= 0 )
- {
- encoding = "UTF-8";
- }
- write( new OutputStreamWriter( output, encoding ), options, model );
+ encoding = "UTF-8";
}
- finally
+
+ try ( final Writer out = new OutputStreamWriter( output, encoding ) )
{
- IOUtil.close( output );
+ write( out, options, model );
}
}
http://git-wip-us.apache.org/repos/asf/maven/blob/0931bb2c/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java
----------------------------------------------------------------------
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java
index ddd3e97..c12c9e0 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java
@@ -24,7 +24,6 @@ import org.apache.maven.artifact.repository.metadata.Versioning;
import org.apache.maven.artifact.repository.metadata.io.xpp3.MetadataXpp3Reader;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
-import org.codehaus.plexus.util.IOUtil;
import org.eclipse.aether.RepositoryEvent;
import org.eclipse.aether.RepositoryEvent.EventType;
import org.eclipse.aether.RepositorySystemSession;
@@ -57,7 +56,9 @@ import org.eclipse.aether.version.VersionScheme;
import javax.inject.Inject;
import javax.inject.Named;
+
import java.io.FileInputStream;
+import java.io.InputStream;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -258,23 +259,20 @@ public class DefaultVersionRangeResolver
ArtifactRepository repository, VersionRangeResult result )
{
Versioning versioning = null;
-
- FileInputStream fis = null;
try
{
if ( metadata != null )
{
-
try ( SyncContext syncContext = syncContextFactory.newInstance( session, true ) )
{
syncContext.acquire( null, Collections.singleton( metadata ) );
if ( metadata.getFile() != null && metadata.getFile().exists() )
{
- fis = new FileInputStream( metadata.getFile() );
- org.apache.maven.artifact.repository.metadata.Metadata m =
- new MetadataXpp3Reader().read( fis, false );
- versioning = m.getVersioning();
+ try ( final InputStream in = new FileInputStream( metadata.getFile() ) )
+ {
+ versioning = new MetadataXpp3Reader().read( in, false ).getVersioning();
+ }
}
}
}
@@ -284,10 +282,6 @@ public class DefaultVersionRangeResolver
invalidMetadata( session, trace, metadata, repository, e );
result.addException( e );
}
- finally
- {
- IOUtil.close( fis );
- }
return ( versioning != null ) ? versioning : new Versioning();
}
http://git-wip-us.apache.org/repos/asf/maven/blob/0931bb2c/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
----------------------------------------------------------------------
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
index 2b0890b..c23794b 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
@@ -26,7 +26,6 @@ import org.apache.maven.artifact.repository.metadata.Versioning;
import org.apache.maven.artifact.repository.metadata.io.xpp3.MetadataXpp3Reader;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
-import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.StringUtils;
import org.eclipse.aether.RepositoryCache;
import org.eclipse.aether.RepositoryEvent;
@@ -61,9 +60,11 @@ import org.eclipse.aether.util.ConfigUtils;
import javax.inject.Inject;
import javax.inject.Named;
+
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -324,43 +325,38 @@ public class DefaultVersionResolver
ArtifactRepository repository, VersionResult result )
{
Versioning versioning = null;
-
- FileInputStream fis = null;
try
{
if ( metadata != null )
{
-
try ( SyncContext syncContext = syncContextFactory.newInstance( session, true ) )
{
syncContext.acquire( null, Collections.singleton( metadata ) );
if ( metadata.getFile() != null && metadata.getFile().exists() )
{
- fis = new FileInputStream( metadata.getFile() );
- org.apache.maven.artifact.repository.metadata.Metadata m =
- new MetadataXpp3Reader().read( fis, false );
- versioning = m.getVersioning();
-
- /*
- * NOTE: Users occasionally misuse the id "local" for remote repos which screws up the metadata
- * of the local repository. This is especially troublesome during snapshot resolution so we try
- * to handle that gracefully.
- */
- if ( versioning != null && repository instanceof LocalRepository )
+ try ( final InputStream in = new FileInputStream( metadata.getFile() ) )
{
- if ( versioning.getSnapshot() != null && versioning.getSnapshot().getBuildNumber() > 0 )
+ versioning = new MetadataXpp3Reader().read( in, false ).getVersioning();
+
+ /*
+ NOTE: Users occasionally misuse the id "local" for remote repos which screws up the metadata
+ of the local repository. This is especially troublesome during snapshot resolution so we try
+ to handle that gracefully.
+ */
+ if ( versioning != null && repository instanceof LocalRepository
+ && versioning.getSnapshot() != null
+ && versioning.getSnapshot().getBuildNumber() > 0 )
{
- Versioning repaired = new Versioning();
+ final Versioning repaired = new Versioning();
repaired.setLastUpdated( versioning.getLastUpdated() );
- Snapshot snapshot = new Snapshot();
- snapshot.setLocalCopy( true );
- repaired.setSnapshot( snapshot );
+ repaired.setSnapshot( new Snapshot() );
+ repaired.getSnapshot().setLocalCopy( true );
versioning = repaired;
-
throw new IOException( "Snapshot information corrupted with remote repository data"
+ ", please verify that no remote repository uses the id '"
+ repository.getId() + "'" );
+
}
}
}
@@ -372,10 +368,6 @@ public class DefaultVersionResolver
invalidMetadata( session, trace, metadata, repository, e );
result.addException( e );
}
- finally
- {
- IOUtil.close( fis );
- }
return ( versioning != null ) ? versioning : new Versioning();
}
http://git-wip-us.apache.org/repos/asf/maven/blob/0931bb2c/maven-settings-builder/src/main/java/org/apache/maven/settings/io/DefaultSettingsReader.java
----------------------------------------------------------------------
diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/io/DefaultSettingsReader.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/io/DefaultSettingsReader.java
index 9beee97..897f742 100644
--- a/maven-settings-builder/src/main/java/org/apache/maven/settings/io/DefaultSettingsReader.java
+++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/io/DefaultSettingsReader.java
@@ -29,7 +29,6 @@ import org.apache.commons.lang3.Validate;
import org.apache.maven.settings.Settings;
import org.apache.maven.settings.io.xpp3.SettingsXpp3Reader;
import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.ReaderFactory;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
@@ -60,19 +59,14 @@ public class DefaultSettingsReader
{
Validate.notNull( input, "input cannot be null" );
- try
+ try ( final Reader in = input )
{
- SettingsXpp3Reader r = new SettingsXpp3Reader();
- return r.read( input, isStrict( options ) );
+ return new SettingsXpp3Reader().read( in, isStrict( options ) );
}
catch ( XmlPullParserException e )
{
throw new SettingsParseException( e.getMessage(), e.getLineNumber(), e.getColumnNumber(), e );
}
- finally
- {
- IOUtil.close( input );
- }
}
@Override
@@ -81,19 +75,14 @@ public class DefaultSettingsReader
{
Validate.notNull( input, "input cannot be null" );
- try
+ try ( final InputStream in = input )
{
- SettingsXpp3Reader r = new SettingsXpp3Reader();
- return r.read( input, isStrict( options ) );
+ return new SettingsXpp3Reader().read( in, isStrict( options ) );
}
catch ( XmlPullParserException e )
{
throw new SettingsParseException( e.getMessage(), e.getLineNumber(), e.getColumnNumber(), e );
}
- finally
- {
- IOUtil.close( input );
- }
}
private boolean isStrict( Map<String, ?> options )
http://git-wip-us.apache.org/repos/asf/maven/blob/0931bb2c/maven-settings-builder/src/main/java/org/apache/maven/settings/io/DefaultSettingsWriter.java
----------------------------------------------------------------------
diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/io/DefaultSettingsWriter.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/io/DefaultSettingsWriter.java
index 877fbde..19d8b9b 100644
--- a/maven-settings-builder/src/main/java/org/apache/maven/settings/io/DefaultSettingsWriter.java
+++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/io/DefaultSettingsWriter.java
@@ -30,7 +30,6 @@ import org.apache.commons.lang3.Validate;
import org.apache.maven.settings.Settings;
import org.apache.maven.settings.io.xpp3.SettingsXpp3Writer;
import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.WriterFactory;
/**
@@ -62,14 +61,9 @@ public class DefaultSettingsWriter
Validate.notNull( output, "output cannot be null" );
Validate.notNull( settings, "settings cannot be null" );
- try
+ try ( final Writer out = output )
{
- SettingsXpp3Writer w = new SettingsXpp3Writer();
- w.write( output, settings );
- }
- finally
- {
- IOUtil.close( output );
+ new SettingsXpp3Writer().write( out, settings );
}
}
@@ -80,19 +74,16 @@ public class DefaultSettingsWriter
Validate.notNull( output, "output cannot be null" );
Validate.notNull( settings, "settings cannot be null" );
- try
+ String encoding = settings.getModelEncoding();
+ // TODO Use StringUtils here
+ if ( encoding == null || encoding.length() <= 0 )
{
- String encoding = settings.getModelEncoding();
- // TODO Use StringUtils here
- if ( encoding == null || encoding.length() <= 0 )
- {
- encoding = "UTF-8";
- }
- write( new OutputStreamWriter( output, encoding ), options, settings );
+ encoding = "UTF-8";
}
- finally
+
+ try ( final Writer out = new OutputStreamWriter( output, encoding ) )
{
- IOUtil.close( output );
+ write( out, options, settings );
}
}
[02/27] maven git commit: [maven-release-plugin] prepare release
maven-3.5.0-beta-1
Posted by kh...@apache.org.
[maven-release-plugin] prepare release maven-3.5.0-beta-1
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/214540c2
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/214540c2
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/214540c2
Branch: refs/heads/MNG-6069
Commit: 214540c2ae5431645bb927d6dc5498ebafc27359
Parents: 68e38e50
Author: Stephen Connolly <st...@gmail.com>
Authored: Mon Mar 20 16:55:36 2017 +0000
Committer: Stephen Connolly <st...@gmail.com>
Committed: Mon Mar 20 16:55:36 2017 +0000
----------------------------------------------------------------------
apache-maven/pom.xml | 2 +-
maven-artifact/pom.xml | 2 +-
maven-builder-support/pom.xml | 2 +-
maven-compat/pom.xml | 2 +-
maven-core/pom.xml | 2 +-
maven-embedder/pom.xml | 2 +-
maven-model-builder/pom.xml | 2 +-
maven-model/pom.xml | 2 +-
maven-plugin-api/pom.xml | 2 +-
maven-repository-metadata/pom.xml | 2 +-
maven-resolver-provider/pom.xml | 2 +-
maven-settings-builder/pom.xml | 2 +-
maven-settings/pom.xml | 2 +-
maven-slf4j-provider/pom.xml | 2 +-
pom.xml | 4 ++--
15 files changed, 16 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/214540c2/apache-maven/pom.xml
----------------------------------------------------------------------
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index a528ddb..7bf2dd2 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0-beta-1</version>
</parent>
<artifactId>apache-maven</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/214540c2/maven-artifact/pom.xml
----------------------------------------------------------------------
diff --git a/maven-artifact/pom.xml b/maven-artifact/pom.xml
index e3943c9..0d07e98 100644
--- a/maven-artifact/pom.xml
+++ b/maven-artifact/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0-beta-1</version>
</parent>
<artifactId>maven-artifact</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/214540c2/maven-builder-support/pom.xml
----------------------------------------------------------------------
diff --git a/maven-builder-support/pom.xml b/maven-builder-support/pom.xml
index 39eb161..c303646 100644
--- a/maven-builder-support/pom.xml
+++ b/maven-builder-support/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0-beta-1</version>
</parent>
<artifactId>maven-builder-support</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/214540c2/maven-compat/pom.xml
----------------------------------------------------------------------
diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml
index bfd2b47..fd0a307 100644
--- a/maven-compat/pom.xml
+++ b/maven-compat/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0-beta-1</version>
</parent>
<artifactId>maven-compat</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/214540c2/maven-core/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index 0e20235..beb8a16 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0-beta-1</version>
</parent>
<artifactId>maven-core</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/214540c2/maven-embedder/pom.xml
----------------------------------------------------------------------
diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml
index 30ad2ce..21531a3 100644
--- a/maven-embedder/pom.xml
+++ b/maven-embedder/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0-beta-1</version>
</parent>
<artifactId>maven-embedder</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/214540c2/maven-model-builder/pom.xml
----------------------------------------------------------------------
diff --git a/maven-model-builder/pom.xml b/maven-model-builder/pom.xml
index 0dd08ac..c8ede97 100644
--- a/maven-model-builder/pom.xml
+++ b/maven-model-builder/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0-beta-1</version>
</parent>
<artifactId>maven-model-builder</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/214540c2/maven-model/pom.xml
----------------------------------------------------------------------
diff --git a/maven-model/pom.xml b/maven-model/pom.xml
index 41cf168..a3ed1c5 100644
--- a/maven-model/pom.xml
+++ b/maven-model/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0-beta-1</version>
</parent>
<artifactId>maven-model</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/214540c2/maven-plugin-api/pom.xml
----------------------------------------------------------------------
diff --git a/maven-plugin-api/pom.xml b/maven-plugin-api/pom.xml
index d8f802d..2184faa 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-beta-1</version>
</parent>
<artifactId>maven-plugin-api</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/214540c2/maven-repository-metadata/pom.xml
----------------------------------------------------------------------
diff --git a/maven-repository-metadata/pom.xml b/maven-repository-metadata/pom.xml
index 7480de7..3b33aba 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-beta-1</version>
</parent>
<artifactId>maven-repository-metadata</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/214540c2/maven-resolver-provider/pom.xml
----------------------------------------------------------------------
diff --git a/maven-resolver-provider/pom.xml b/maven-resolver-provider/pom.xml
index e95cc41..291aa93 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-beta-1</version>
</parent>
<artifactId>maven-resolver-provider</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/214540c2/maven-settings-builder/pom.xml
----------------------------------------------------------------------
diff --git a/maven-settings-builder/pom.xml b/maven-settings-builder/pom.xml
index 2d415c9..a651a89 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-beta-1</version>
</parent>
<artifactId>maven-settings-builder</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/214540c2/maven-settings/pom.xml
----------------------------------------------------------------------
diff --git a/maven-settings/pom.xml b/maven-settings/pom.xml
index 133ee32..e0498ca 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-beta-1</version>
</parent>
<artifactId>maven-settings</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/214540c2/maven-slf4j-provider/pom.xml
----------------------------------------------------------------------
diff --git a/maven-slf4j-provider/pom.xml b/maven-slf4j-provider/pom.xml
index 81af382..1cdfe04 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-beta-1</version>
</parent>
<artifactId>maven-slf4j-provider</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/214540c2/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a3d5f67..e20acdf 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-beta-1</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-beta-1</tag>
</scm>
<issueManagement>
<system>jira</system>
[27/27] maven git commit: [MNG-6069] Migrate to non deprecated parts
of Commons CLI
Posted by kh...@apache.org.
[MNG-6069] Migrate to non deprecated parts of Commons CLI
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/7e8b0e09
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/7e8b0e09
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/7e8b0e09
Branch: refs/heads/MNG-6069
Commit: 7e8b0e090d18264f8307958dbac38b55d33416e4
Parents: c2c6259
Author: Karl Heinz Marbaise <kh...@apache.org>
Authored: Sat Mar 18 18:18:27 2017 +0100
Committer: Karl Heinz Marbaise <kh...@apache.org>
Committed: Mon May 1 16:40:53 2017 +0200
----------------------------------------------------------------------
.../java/org/apache/maven/cli/CLIManager.java | 118 ++++++++++---------
1 file changed, 60 insertions(+), 58 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/7e8b0e09/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java b/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java
index a9038bf..20376d9 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java
@@ -24,9 +24,9 @@ import java.io.PrintWriter;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
-import org.apache.commons.cli.GnuParser;
+import org.apache.commons.cli.DefaultParser;
import org.apache.commons.cli.HelpFormatter;
-import org.apache.commons.cli.OptionBuilder;
+import org.apache.commons.cli.Option;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
@@ -35,43 +35,43 @@ import org.apache.commons.cli.ParseException;
*/
public class CLIManager
{
- public static final char ALTERNATE_POM_FILE = 'f';
+ public static final String ALTERNATE_POM_FILE = "f";
- public static final char BATCH_MODE = 'B';
+ public static final String BATCH_MODE = "B";
- public static final char SET_SYSTEM_PROPERTY = 'D';
+ public static final String SET_SYSTEM_PROPERTY = "D";
- public static final char OFFLINE = 'o';
+ public static final String OFFLINE = "o";
- public static final char QUIET = 'q';
+ public static final String QUIET = "q";
- public static final char DEBUG = 'X';
+ public static final String DEBUG = "X";
- public static final char ERRORS = 'e';
+ public static final String ERRORS = "e";
- public static final char HELP = 'h';
+ public static final String HELP = "h";
- public static final char VERSION = 'v';
+ public static final String VERSION = "v";
- public static final char SHOW_VERSION = 'V';
+ public static final String SHOW_VERSION = "V";
- public static final char NON_RECURSIVE = 'N';
+ public static final String NON_RECURSIVE = "N";
- public static final char UPDATE_SNAPSHOTS = 'U';
+ public static final String UPDATE_SNAPSHOTS = "U";
- public static final char ACTIVATE_PROFILES = 'P';
+ public static final String ACTIVATE_PROFILES = "P";
public static final String SUPRESS_SNAPSHOT_UPDATES = "nsu";
- public static final char CHECKSUM_FAILURE_POLICY = 'C';
+ public static final String CHECKSUM_FAILURE_POLICY = "C";
- public static final char CHECKSUM_WARNING_POLICY = 'c';
+ public static final String CHECKSUM_WARNING_POLICY = "c";
- public static final char ALTERNATE_USER_SETTINGS = 's';
+ public static final String ALTERNATE_USER_SETTINGS = "s";
public static final String ALTERNATE_GLOBAL_SETTINGS = "gs";
- public static final char ALTERNATE_USER_TOOLCHAINS = 't';
+ public static final String ALTERNATE_USER_TOOLCHAINS = "t";
public static final String ALTERNATE_GLOBAL_TOOLCHAINS = "gt";
@@ -103,50 +103,52 @@ public class CLIManager
protected Options options;
- @SuppressWarnings( { "static-access", "checkstyle:linelength" } )
+ // CHECKSTYLE_OFF: LineLength
public CLIManager()
{
options = new Options();
- options.addOption( OptionBuilder.withLongOpt( "help" ).withDescription( "Display help information" ).create( HELP ) );
- options.addOption( OptionBuilder.withLongOpt( "file" ).hasArg().withDescription( "Force the use of an alternate POM file (or directory with pom.xml)" ).create( ALTERNATE_POM_FILE ) );
- options.addOption( OptionBuilder.withLongOpt( "define" ).hasArg().withDescription( "Define a system property" ).create( SET_SYSTEM_PROPERTY ) );
- options.addOption( OptionBuilder.withLongOpt( "offline" ).withDescription( "Work offline" ).create( OFFLINE ) );
- options.addOption( OptionBuilder.withLongOpt( "version" ).withDescription( "Display version information" ).create( VERSION ) );
- options.addOption( OptionBuilder.withLongOpt( "quiet" ).withDescription( "Quiet output - only show errors" ).create( QUIET ) );
- options.addOption( OptionBuilder.withLongOpt( "debug" ).withDescription( "Produce execution debug output" ).create( DEBUG ) );
- options.addOption( OptionBuilder.withLongOpt( "errors" ).withDescription( "Produce execution error messages" ).create( ERRORS ) );
- options.addOption( OptionBuilder.withLongOpt( "non-recursive" ).withDescription( "Do not recurse into sub-projects" ).create( NON_RECURSIVE ) );
- options.addOption( OptionBuilder.withLongOpt( "update-snapshots" ).withDescription( "Forces a check for missing releases and updated snapshots on remote repositories" ).create( UPDATE_SNAPSHOTS ) );
- options.addOption( OptionBuilder.withLongOpt( "activate-profiles" ).withDescription( "Comma-delimited list of profiles to activate" ).hasArg().create( ACTIVATE_PROFILES ) );
- options.addOption( OptionBuilder.withLongOpt( "batch-mode" ).withDescription( "Run in non-interactive (batch) mode (disables output color)" ).create( BATCH_MODE ) );
- options.addOption( OptionBuilder.withLongOpt( "no-snapshot-updates" ).withDescription( "Suppress SNAPSHOT updates" ).create( SUPRESS_SNAPSHOT_UPDATES ) );
- options.addOption( OptionBuilder.withLongOpt( "strict-checksums" ).withDescription( "Fail the build if checksums don't match" ).create( CHECKSUM_FAILURE_POLICY ) );
- options.addOption( OptionBuilder.withLongOpt( "lax-checksums" ).withDescription( "Warn if checksums don't match" ).create( CHECKSUM_WARNING_POLICY ) );
- options.addOption( OptionBuilder.withLongOpt( "settings" ).withDescription( "Alternate path for the user settings file" ).hasArg().create( ALTERNATE_USER_SETTINGS ) );
- options.addOption( OptionBuilder.withLongOpt( "global-settings" ).withDescription( "Alternate path for the global settings file" ).hasArg().create( ALTERNATE_GLOBAL_SETTINGS ) );
- options.addOption( OptionBuilder.withLongOpt( "toolchains" ).withDescription( "Alternate path for the user toolchains file" ).hasArg().create( ALTERNATE_USER_TOOLCHAINS ) );
- options.addOption( OptionBuilder.withLongOpt( "global-toolchains" ).withDescription( "Alternate path for the global toolchains file" ).hasArg().create( ALTERNATE_GLOBAL_TOOLCHAINS ) );
- options.addOption( OptionBuilder.withLongOpt( "fail-fast" ).withDescription( "Stop at first failure in reactorized builds" ).create( FAIL_FAST ) );
- options.addOption( OptionBuilder.withLongOpt( "fail-at-end" ).withDescription( "Only fail the build afterwards; allow all non-impacted builds to continue" ).create( FAIL_AT_END ) );
- options.addOption( OptionBuilder.withLongOpt( "fail-never" ).withDescription( "NEVER fail the build, regardless of project result" ).create( FAIL_NEVER ) );
- options.addOption( OptionBuilder.withLongOpt( "resume-from" ).hasArg().withDescription( "Resume reactor from specified project" ).create( RESUME_FROM ) );
- options.addOption( OptionBuilder.withLongOpt( "projects" ).withDescription( "Comma-delimited list of specified reactor projects to build instead of all projects. A project can be specified by [groupId]:artifactId or by its relative path" ).hasArg().create( PROJECT_LIST ) );
- options.addOption( OptionBuilder.withLongOpt( "also-make" ).withDescription( "If project list is specified, also build projects required by the list" ).create( ALSO_MAKE ) );
- options.addOption( OptionBuilder.withLongOpt( "also-make-dependents" ).withDescription( "If project list is specified, also build projects that depend on projects on the list" ).create( ALSO_MAKE_DEPENDENTS ) );
- options.addOption( OptionBuilder.withLongOpt( "log-file" ).hasArg().withDescription( "Log file where all build output will go (disables output color)" ).create( LOG_FILE ) );
- options.addOption( OptionBuilder.withLongOpt( "show-version" ).withDescription( "Display version information WITHOUT stopping build" ).create( SHOW_VERSION ) );
- options.addOption( OptionBuilder.withLongOpt( "encrypt-master-password" ).hasOptionalArg().withDescription( "Encrypt master security password" ).create( ENCRYPT_MASTER_PASSWORD ) );
- options.addOption( OptionBuilder.withLongOpt( "encrypt-password" ).hasOptionalArg().withDescription( "Encrypt server password" ).create( ENCRYPT_PASSWORD ) );
- options.addOption( OptionBuilder.withLongOpt( "threads" ).hasArg().withDescription( "Thread count, for instance 2.0C where C is core multiplied" ).create( THREADS ) );
- options.addOption( OptionBuilder.withLongOpt( "legacy-local-repository" ).withDescription( "Use Maven 2 Legacy Local Repository behaviour, ie no use of _remote.repositories. Can also be activated by using -Dmaven.legacyLocalRepo=true" ).create( LEGACY_LOCAL_REPOSITORY ) );
- options.addOption( OptionBuilder.withLongOpt( "builder" ).hasArg().withDescription( "The id of the build strategy to use" ).create( BUILDER ) );
+ options.addOption( Option.builder( HELP ).longOpt( "help" ).desc( "Display help information" ).build() );
+ options.addOption( Option.builder( ALTERNATE_POM_FILE ).longOpt( "file" ).hasArg().desc( "Force the use of an alternate POM file (or directory with pom.xml)" ).build() );
+ options.addOption( Option.builder( SET_SYSTEM_PROPERTY ).longOpt( "define" ).hasArgs().valueSeparator().desc( "Define a system property" ).build() );
+ options.addOption( Option.builder( OFFLINE ).longOpt( "offline" ).desc( "Work offline" ).build() );
+ options.addOption( Option.builder( VERSION ).longOpt( "version" ).desc( "Display version information" ).build() );
+ options.addOption( Option.builder( QUIET ).longOpt( "quiet" ).desc( "Quiet output - only show errors" ).build() );
+ options.addOption( Option.builder( DEBUG ).longOpt( "debug" ).desc( "Produce execution debug output" ).build() );
+ options.addOption( Option.builder( ERRORS ).longOpt( "errors" ).desc( "Produce execution error messages" ).build() );
+ options.addOption( Option.builder( NON_RECURSIVE ).longOpt( "non-recursive" ).desc( "Do not recurse into sub-projects" ).build() );
+ options.addOption( Option.builder( UPDATE_SNAPSHOTS ).longOpt( "update-snapshots" ).desc( "Forces a check for missing releases and updated snapshots on remote repositories" ).build() );
+ options.addOption( Option.builder( ACTIVATE_PROFILES ).longOpt( "activate-profiles" ).desc( "Comma-delimited list of profiles to activate" ).hasArg().build() );
+ options.addOption( Option.builder( BATCH_MODE ).longOpt( "batch-mode" ).desc( "Run in non-interactive (batch) mode (disables output color)" ).build() );
+ options.addOption( Option.builder( SUPRESS_SNAPSHOT_UPDATES ).longOpt( "no-snapshot-updates" ).desc( "Suppress SNAPSHOT updates" ).build() );
+ options.addOption( Option.builder( CHECKSUM_FAILURE_POLICY ).longOpt( "strict-checksums" ).desc( "Fail the build if checksums don't match" ).build() );
+ options.addOption( Option.builder( CHECKSUM_WARNING_POLICY ).longOpt( "lax-checksums" ).desc( "Warn if checksums don't match" ).build() );
+ options.addOption( Option.builder( ALTERNATE_USER_SETTINGS ).longOpt( "settings" ).hasArg().desc( "Alternate path for the user settings file" ).build() );
+ options.addOption( Option.builder( ALTERNATE_GLOBAL_SETTINGS ).longOpt( "global-settings" ).hasArg().desc( "Alternate path for the global settings file" ).build() );
+ options.addOption( Option.builder( ALTERNATE_USER_TOOLCHAINS ).longOpt( "toolchains" ).hasArg().desc( "Alternate path for the user toolchains file" ).hasArg().build() );
+ options.addOption( Option.builder( ALTERNATE_GLOBAL_TOOLCHAINS ).longOpt( "global-toolchains" ).desc( "Alternate path for the global toolchains file" ).hasArg().build() );
+ options.addOption( Option.builder( FAIL_FAST ).longOpt( "fail-fast" ).desc( "Stop at first failure in reactorized builds" ).build() );
+ options.addOption( Option.builder( FAIL_AT_END ).longOpt( "fail-at-end" ).desc( "Only fail the build afterwards; allow all non-impacted builds to continue" ).build() );
+ options.addOption( Option.builder( FAIL_NEVER ).longOpt( "fail-never" ).desc( "NEVER fail the build, regardless of project result" ).build() );
+ options.addOption( Option.builder( RESUME_FROM ).longOpt( "resume-from" ).hasArg().desc( "Resume reactor from specified project" ).build() );
+ options.addOption( Option.builder( PROJECT_LIST ).longOpt( "projects" ).desc( "Comma-delimited list of specified reactor projects to build instead of all projects. A project can be specified by [groupId]:artifactId or by its relative path." ).hasArg().build() );
+ options.addOption( Option.builder( ALSO_MAKE ).longOpt( "also-make" ).desc( "If project list is specified, also build projects required by the list" ).build() );
+ options.addOption( Option.builder( ALSO_MAKE_DEPENDENTS ).longOpt( "also-make-dependents" ).desc( "If project list is specified, also build projects that depend on projects on the list" ).build() );
+ options.addOption( Option.builder( LOG_FILE ).longOpt( "log-file" ).hasArg().desc( "Log file where all build output will go" ).build() );
+ options.addOption( Option.builder( SHOW_VERSION ).longOpt( "show-version" ).desc( "Display version information WITHOUT stopping build" ).build() );
+ options.addOption( Option.builder( ENCRYPT_MASTER_PASSWORD ).longOpt( "encrypt-master-password" ).optionalArg( true ).desc( "Encrypt master security password" ).build() );
+ options.addOption( Option.builder( ENCRYPT_PASSWORD ).longOpt( "encrypt-password" ).optionalArg( true ).desc( "Encrypt server password" ).build() );
+ options.addOption( Option.builder( THREADS ).longOpt( "threads" ).hasArg().desc( "Thread count, for instance 2.0C where C is core multiplied" ).build() );
+ options.addOption( Option.builder( LEGACY_LOCAL_REPOSITORY ).longOpt( "legacy-local-repository" ).desc( "Use Maven 2 Legacy Local Repository behaviour, ie no use of _remote.repositories. Can also be activated by using -Dmaven.legacyLocalRepo=true" ).build() );
+ options.addOption( Option.builder( BUILDER ).longOpt( "builder" ).hasArg().desc( "The id of the build strategy to use" ).build() );
// Adding this back in for compatibility with the verifier that hard codes this option.
- options.addOption( OptionBuilder.withLongOpt( "no-plugin-registry" ).withDescription( "Ineffective, only kept for backward compatibility" ).create( "npr" ) );
- options.addOption( OptionBuilder.withLongOpt( "check-plugin-updates" ).withDescription( "Ineffective, only kept for backward compatibility" ).create( "cpu" ) );
- options.addOption( OptionBuilder.withLongOpt( "update-plugins" ).withDescription( "Ineffective, only kept for backward compatibility" ).create( "up" ) );
- options.addOption( OptionBuilder.withLongOpt( "no-plugin-updates" ).withDescription( "Ineffective, only kept for backward compatibility" ).create( "npu" ) );
+ options.addOption( Option.builder( "npr" ).longOpt( "no-plugin-registry" ).desc( "Ineffective, only kept for backward compatibility" ).build() );
+ options.addOption( Option.builder( "cpu" ).longOpt( "check-plugin-updates" ).desc( "Ineffective, only kept for backward compatibility" ).build() );
+ options.addOption( Option.builder( "up" ).longOpt( "update-plugins" ).desc( "Ineffective, only kept for backward compatibility" ).build() );
+ options.addOption( Option.builder( "npu" ).longOpt( "no-plugin-updates" ).desc( "Ineffective, only kept for backward compatibility" ).build() );
+
}
+ // CHECKSTYLE_ON: LineLength
public CommandLine parse( String[] args )
throws ParseException
@@ -154,7 +156,7 @@ public class CLIManager
// We need to eat any quotes surrounding arguments...
String[] cleanArgs = CleanArgument.cleanArgs( args );
- CommandLineParser parser = new GnuParser();
+ CommandLineParser parser = new DefaultParser();
return parser.parse( options, cleanArgs );
}
[19/27] maven git commit: [maven-release-plugin] prepare for next
development iteration
Posted by kh...@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/a4b0b63b
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/a4b0b63b
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/a4b0b63b
Branch: refs/heads/MNG-6069
Commit: a4b0b63b62533399878c9de0656f88f100a46aa0
Parents: ff8f5e7
Author: Stephen Connolly <st...@gmail.com>
Authored: Mon Apr 3 20:35:47 2017 +0100
Committer: Stephen Connolly <st...@gmail.com>
Committed: Mon Apr 3 20:35:47 2017 +0100
----------------------------------------------------------------------
apache-maven/pom.xml | 2 +-
maven-artifact/pom.xml | 2 +-
maven-builder-support/pom.xml | 2 +-
maven-compat/pom.xml | 2 +-
maven-core/pom.xml | 2 +-
maven-embedder/pom.xml | 2 +-
maven-model-builder/pom.xml | 2 +-
maven-model/pom.xml | 2 +-
maven-plugin-api/pom.xml | 2 +-
maven-repository-metadata/pom.xml | 2 +-
maven-resolver-provider/pom.xml | 2 +-
maven-settings-builder/pom.xml | 2 +-
maven-settings/pom.xml | 2 +-
maven-slf4j-provider/pom.xml | 2 +-
pom.xml | 4 ++--
15 files changed, 16 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/a4b0b63b/apache-maven/pom.xml
----------------------------------------------------------------------
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index 8a72146..b286f74 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -25,7 +25,7 @@ under the License.
<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/a4b0b63b/maven-artifact/pom.xml
----------------------------------------------------------------------
diff --git a/maven-artifact/pom.xml b/maven-artifact/pom.xml
index 977fd34..b13482b 100644
--- a/maven-artifact/pom.xml
+++ b/maven-artifact/pom.xml
@@ -25,7 +25,7 @@ under the License.
<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/a4b0b63b/maven-builder-support/pom.xml
----------------------------------------------------------------------
diff --git a/maven-builder-support/pom.xml b/maven-builder-support/pom.xml
index 7457a4c..5eb7903 100644
--- a/maven-builder-support/pom.xml
+++ b/maven-builder-support/pom.xml
@@ -25,7 +25,7 @@ under the License.
<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/a4b0b63b/maven-compat/pom.xml
----------------------------------------------------------------------
diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml
index 9552803..8392dca 100644
--- a/maven-compat/pom.xml
+++ b/maven-compat/pom.xml
@@ -25,7 +25,7 @@ under the License.
<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/a4b0b63b/maven-core/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index 4fb86a3..71f09c0 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -25,7 +25,7 @@ under the License.
<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/a4b0b63b/maven-embedder/pom.xml
----------------------------------------------------------------------
diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml
index 3e778b3..66e09a3 100644
--- a/maven-embedder/pom.xml
+++ b/maven-embedder/pom.xml
@@ -25,7 +25,7 @@ under the License.
<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/a4b0b63b/maven-model-builder/pom.xml
----------------------------------------------------------------------
diff --git a/maven-model-builder/pom.xml b/maven-model-builder/pom.xml
index 3aefbc7..859f0b3 100644
--- a/maven-model-builder/pom.xml
+++ b/maven-model-builder/pom.xml
@@ -25,7 +25,7 @@ under the License.
<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/a4b0b63b/maven-model/pom.xml
----------------------------------------------------------------------
diff --git a/maven-model/pom.xml b/maven-model/pom.xml
index 1ec4f89..aabb25d 100644
--- a/maven-model/pom.xml
+++ b/maven-model/pom.xml
@@ -25,7 +25,7 @@ under the License.
<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/a4b0b63b/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/a4b0b63b/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/a4b0b63b/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/a4b0b63b/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/a4b0b63b/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/a4b0b63b/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/a4b0b63b/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>
[25/27] maven git commit: MNG-6209 better executeMojo thread context
classloader
Posted by kh...@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/ec629f7d
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/ec629f7d
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/ec629f7d
Branch: refs/heads/MNG-6069
Commit: ec629f7d511eb910b4e80112a9fbe85ed8786f10
Parents: 567af0d
Author: Igor Fedorenko <if...@apache.org>
Authored: Tue Apr 11 07:59:34 2017 -0700
Committer: Igor Fedorenko <if...@apache.org>
Committed: Thu Apr 13 14:12:23 2017 -0700
----------------------------------------------------------------------
.../java/org/apache/maven/plugin/DefaultBuildPluginManager.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/ec629f7d/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java b/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java
index b4f7a4d..3af1125 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java
@@ -106,8 +106,11 @@ public class DefaultBuildPluginManager
throw new PluginExecutionException( mojoExecution, project, e );
}
+ // use project realm as thread context classloader to enable components from all extensions=true plugins
+ ClassRealm tccl = mojoExecution.getPlugin().isExtensions() ? project.getClassRealm() : pluginRealm;
+
ClassLoader oldClassLoader = Thread.currentThread().getContextClassLoader();
- Thread.currentThread().setContextClassLoader( pluginRealm );
+ Thread.currentThread().setContextClassLoader( tccl );
MavenSession oldSession = legacySupport.getSession();