You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2017/04/01 22:21:29 UTC
[01/28] maven git commit: [MNG-6198] Use the directory specified by
-f for searching with 'mvn'
Repository: maven
Updated Branches:
refs/heads/MNG-6169 430f70c03 -> f983adf68
[MNG-6198] Use the directory specified by -f for searching with 'mvn'
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/f983adf6
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/f983adf6
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/f983adf6
Branch: refs/heads/MNG-6169
Commit: f983adf68f605d34002765d37f4f2bf1056e2f6b
Parents: a14237d
Author: Stephen Connolly <st...@gmail.com>
Authored: Mon Mar 27 21:07:01 2017 +0100
Committer: Michael Osipov <mi...@apache.org>
Committed: Sun Apr 2 00:21:12 2017 +0200
----------------------------------------------------------------------
apache-maven/src/bin/mvn | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/f983adf6/apache-maven/src/bin/mvn
----------------------------------------------------------------------
diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn
index e569633..623b5f2 100755
--- a/apache-maven/src/bin/mvn
+++ b/apache-maven/src/bin/mvn
@@ -122,7 +122,7 @@ fi
find_maven_basedir() {
(
basedir=`find_file_argument_basedir "$@"`
- wdir=`pwd`
+ wdir="${basedir}"
while [ "$wdir" != '/' ] ; do
if [ -d "$wdir"/.mvn ] ; then
basedir=$wdir
[08/28] maven git commit: [MNG-6078] Confirm commons-cli 1.4-SNAPSHOT
before official release
Posted by mi...@apache.org.
[MNG-6078] Confirm commons-cli 1.4-SNAPSHOT before official release
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/6e499f64
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/6e499f64
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/6e499f64
Branch: refs/heads/MNG-6169
Commit: 6e499f64d5f8d3e826d548592a4c4c9ffcde5246
Parents: 3e63762
Author: rfscholte <rf...@apache.org>
Authored: Wed Mar 8 21:38:08 2017 +0100
Committer: Michael Osipov <mi...@apache.org>
Committed: Sun Apr 2 00:21:12 2017 +0200
----------------------------------------------------------------------
.../java/org/apache/maven/cli/MavenCli.java | 42 ++++++++++-
.../org/apache/maven/cli/MergedCommandLine.java | 75 --------------------
pom.xml | 2 +-
3 files changed, 42 insertions(+), 77 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/6e499f64/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
index 350fa61..004cf4e 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
@@ -23,6 +23,7 @@ import com.google.common.base.Charsets;
import com.google.common.io.Files;
import com.google.inject.AbstractModule;
import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Option;
import org.apache.commons.cli.ParseException;
import org.apache.commons.cli.UnrecognizedOptionException;
import org.apache.maven.BuildAbort;
@@ -463,7 +464,7 @@ public class MavenCli
}
else
{
- cliRequest.commandLine = new MergedCommandLine( cliManager.parse( cliRequest.args ), mavenConfig );
+ cliRequest.commandLine = cliMerge( cliManager.parse( cliRequest.args ), mavenConfig );
}
}
catch ( ParseException e )
@@ -486,6 +487,45 @@ public class MavenCli
}
}
+ private CommandLine cliMerge( CommandLine mavenArgs, CommandLine mavenConfig )
+ {
+ CommandLine.Builder commandLineBuilder = new CommandLine.Builder();
+
+ // the args are easy, cli first then config file
+ for ( String arg : mavenArgs.getArgs() )
+ {
+ commandLineBuilder.addArg( arg );
+ }
+ for ( String arg : mavenConfig.getArgs() )
+ {
+ commandLineBuilder.addArg( arg );
+ }
+
+ // now add all options, except for -D with cli first then config file
+ List<Option> setPropertyOptions = new ArrayList<>();
+ for ( Option opt : mavenArgs.getOptions() )
+ {
+ if ( String.valueOf( CLIManager.SET_SYSTEM_PROPERTY ).equals( opt.getOpt() ) )
+ {
+ setPropertyOptions.add( opt );
+ }
+ else
+ {
+ commandLineBuilder.addOption( opt );
+ }
+ }
+ for ( Option opt : mavenConfig.getOptions() )
+ {
+ commandLineBuilder.addOption( opt );
+ }
+ // finally add the CLI system properties
+ for ( Option opt : setPropertyOptions )
+ {
+ commandLineBuilder.addOption( opt );
+ }
+ return commandLineBuilder.build();
+ }
+
/**
* configure logging
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/6e499f64/maven-embedder/src/main/java/org/apache/maven/cli/MergedCommandLine.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MergedCommandLine.java b/maven-embedder/src/main/java/org/apache/maven/cli/MergedCommandLine.java
deleted file mode 100644
index cb0a587..0000000
--- a/maven-embedder/src/main/java/org/apache/maven/cli/MergedCommandLine.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package org.apache.maven.cli;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.Option;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * A {@link CommandLine} instance that represents a merged command line combining CLI arguments with those from the
- * {@code .mvn/maven.config} while reflecting the handling of {@link CLIManager#SET_SYSTEM_PROPERTY} versus all the
- * other command line options (last wins vs first wins respectively).
- */
-class MergedCommandLine
- extends CommandLine
-{
- MergedCommandLine( CommandLine commandLine, CommandLine configFile )
- {
- // such a pity that Commons CLI does not offer either a builder or a formatter and we need to extend
- // to perform the merge. A formatter would mean we could unparse and reparse (not ideal but would work).
- // A builder would be ideal for this kind of merge like processing.
- super();
- // the args are easy, cli first then config file
- for ( String arg : commandLine.getArgs() )
- {
- addArg( arg );
- }
- for ( String arg : configFile.getArgs() )
- {
- addArg( arg );
- }
- // now add all options, except for -D with cli first then config file
- List<Option> setPropertyOptions = new ArrayList<>();
- for ( Option opt : commandLine.getOptions() )
- {
- if ( String.valueOf( CLIManager.SET_SYSTEM_PROPERTY ).equals( opt.getOpt() ) )
- {
- setPropertyOptions.add( opt );
- }
- else
- {
- addOption( opt );
- }
- }
- for ( Option opt : configFile.getOptions() )
- {
- addOption( opt );
- }
- // finally add the CLI system properties
- for ( Option opt : setPropertyOptions )
- {
- addOption( opt );
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven/blob/6e499f64/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 44c361a..653471b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,7 +50,7 @@ under the License.
<maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target>
<classWorldsVersion>2.5.2</classWorldsVersion>
- <commonsCliVersion>1.3.1</commonsCliVersion>
+ <commonsCliVersion>1.4-SNAPSHOT</commonsCliVersion>
<commonsLangVersion>3.5</commonsLangVersion>
<junitVersion>4.12</junitVersion>
<mockitoVersion>1.10.19</mockitoVersion>
[18/28] maven git commit: [maven-release-plugin] prepare release
maven-3.5.0-beta-1
Posted by mi...@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/80a10e8e
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/80a10e8e
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/80a10e8e
Branch: refs/heads/MNG-6169
Commit: 80a10e8e88bc86c5ea4c61c08ec962b5d5e503a5
Parents: ffb8731
Author: Stephen Connolly <st...@gmail.com>
Authored: Mon Mar 20 16:55:36 2017 +0000
Committer: Michael Osipov <mi...@apache.org>
Committed: Sun Apr 2 00:21:12 2017 +0200
----------------------------------------------------------------------
apache-maven/pom.xml | 2 +-
maven-artifact/pom.xml | 2 +-
maven-builder-support/pom.xml | 2 +-
maven-compat/pom.xml | 2 +-
maven-core/pom.xml | 2 +-
maven-embedder/pom.xml | 2 +-
maven-model-builder/pom.xml | 2 +-
maven-model/pom.xml | 2 +-
maven-plugin-api/pom.xml | 2 +-
maven-repository-metadata/pom.xml | 2 +-
maven-resolver-provider/pom.xml | 2 +-
maven-settings-builder/pom.xml | 2 +-
maven-settings/pom.xml | 2 +-
maven-slf4j-provider/pom.xml | 2 +-
pom.xml | 4 ++--
15 files changed, 16 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/80a10e8e/apache-maven/pom.xml
----------------------------------------------------------------------
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index a528ddb..7bf2dd2 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -25,7 +25,7 @@ under the License.
<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/80a10e8e/maven-artifact/pom.xml
----------------------------------------------------------------------
diff --git a/maven-artifact/pom.xml b/maven-artifact/pom.xml
index e3943c9..0d07e98 100644
--- a/maven-artifact/pom.xml
+++ b/maven-artifact/pom.xml
@@ -25,7 +25,7 @@ under the License.
<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/80a10e8e/maven-builder-support/pom.xml
----------------------------------------------------------------------
diff --git a/maven-builder-support/pom.xml b/maven-builder-support/pom.xml
index 39eb161..c303646 100644
--- a/maven-builder-support/pom.xml
+++ b/maven-builder-support/pom.xml
@@ -25,7 +25,7 @@ under the License.
<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/80a10e8e/maven-compat/pom.xml
----------------------------------------------------------------------
diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml
index bfd2b47..fd0a307 100644
--- a/maven-compat/pom.xml
+++ b/maven-compat/pom.xml
@@ -25,7 +25,7 @@ under the License.
<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/80a10e8e/maven-core/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index 0e20235..beb8a16 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -25,7 +25,7 @@ under the License.
<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/80a10e8e/maven-embedder/pom.xml
----------------------------------------------------------------------
diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml
index 30ad2ce..21531a3 100644
--- a/maven-embedder/pom.xml
+++ b/maven-embedder/pom.xml
@@ -25,7 +25,7 @@ under the License.
<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/80a10e8e/maven-model-builder/pom.xml
----------------------------------------------------------------------
diff --git a/maven-model-builder/pom.xml b/maven-model-builder/pom.xml
index 0dd08ac..c8ede97 100644
--- a/maven-model-builder/pom.xml
+++ b/maven-model-builder/pom.xml
@@ -25,7 +25,7 @@ under the License.
<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/80a10e8e/maven-model/pom.xml
----------------------------------------------------------------------
diff --git a/maven-model/pom.xml b/maven-model/pom.xml
index 41cf168..a3ed1c5 100644
--- a/maven-model/pom.xml
+++ b/maven-model/pom.xml
@@ -25,7 +25,7 @@ under the License.
<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/80a10e8e/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/80a10e8e/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/80a10e8e/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/80a10e8e/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/80a10e8e/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/80a10e8e/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/80a10e8e/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>
[21/28] maven git commit: [MNG-6192] upgraded m-assembly-p to get
ordered entries in zip
Posted by mi...@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/f4bc3c0d
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/f4bc3c0d
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/f4bc3c0d
Branch: refs/heads/MNG-6169
Commit: f4bc3c0daac5b86767b3845540d6b10a3fcd9e74
Parents: b65d6d3
Author: Herv� Boutemy <hb...@apache.org>
Authored: Thu Mar 23 05:11:12 2017 +0100
Committer: Michael Osipov <mi...@apache.org>
Committed: Sun Apr 2 00:21:12 2017 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/f4bc3c0d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a3d5f67..857ce07 100644
--- a/pom.xml
+++ b/pom.xml
@@ -539,7 +539,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.6</version>
+ <version>3.0.0</version>
</plugin>
</plugins>
</pluginManagement>
[10/28] maven git commit: [MNG-6176] Fix javadoc *errors* in
maven-compat
Posted by mi...@apache.org.
[MNG-6176] Fix javadoc *errors* in maven-compat
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/c7f827ea
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/c7f827ea
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/c7f827ea
Branch: refs/heads/MNG-6169
Commit: c7f827eaa703d0a03932d4f8a7f1dd7ab154e98d
Parents: 773474f
Author: Stephen Connolly <st...@gmail.com>
Authored: Sat Mar 18 12:04:38 2017 +0000
Committer: Michael Osipov <mi...@apache.org>
Committed: Sun Apr 2 00:21:12 2017 +0200
----------------------------------------------------------------------
maven-compat/pom.xml | 22 --------------------
.../maven/artifact/ArtifactScopeEnum.java | 2 +-
.../resolver/ResolutionListenerForDepMgmt.java | 4 ++--
.../org/apache/maven/project/ModelUtils.java | 15 ++++++-------
.../AbstractStringBasedModelInterpolator.java | 8 ++-----
.../ModelInterpolationException.java | 4 +---
.../interpolation/ModelInterpolator.java | 2 --
.../repository/MetadataResolutionResult.java | 2 +-
.../repository/metadata/MetadataGraph.java | 4 ++--
.../apache/maven/project/ModelUtilsTest.java | 18 +++++++++-------
.../inheritance/t09/ProjectInheritanceTest.java | 8 +++----
.../repository/LegacyRepositorySystemTest.java | 1 +
.../conflict/FarthestConflictResolverTest.java | 4 ++--
.../conflict/NearestConflictResolverTest.java | 4 ++--
.../conflict/NewestConflictResolverTest.java | 4 ++--
.../conflict/OldestConflictResolverTest.java | 4 ++--
pom.xml | 4 ----
17 files changed, 41 insertions(+), 69 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/c7f827ea/maven-compat/pom.xml
----------------------------------------------------------------------
diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml
index 7af138d..bfd2b47 100644
--- a/maven-compat/pom.xml
+++ b/maven-compat/pom.xml
@@ -132,26 +132,4 @@ under the License.
</plugins>
</build>
- <profiles>
- <profile>
- <id>javadoc8</id>
- <activation>
- <jdk>!1.7</jdk>
- </activation>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <!-- There's no maintenance on maven-compat -->
- <additionalparam>-Xdoclint:none</additionalparam>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- </profile>
- </profiles>
</project>
http://git-wip-us.apache.org/repos/asf/maven/blob/c7f827ea/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactScopeEnum.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactScopeEnum.java b/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactScopeEnum.java
index 4460a07..83edd2b 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactScopeEnum.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactScopeEnum.java
@@ -20,7 +20,7 @@ package org.apache.maven.artifact;
*/
/**
- * Type safe reincarnation of Artifact scope. Also supplies the <code>DEFAULT_SCOPE<code> as well
+ * Type safe reincarnation of Artifact scope. Also supplies the {@code DEFAULT_SCOPE} as well
* as convenience method to deal with scope relationships.
*
* @author <a href="oleg@codehaus.org">Oleg Gusakov</a>
http://git-wip-us.apache.org/repos/asf/maven/blob/c7f827ea/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionListenerForDepMgmt.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionListenerForDepMgmt.java b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionListenerForDepMgmt.java
index 6ca4fe7..6cf06b1 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionListenerForDepMgmt.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionListenerForDepMgmt.java
@@ -23,7 +23,7 @@ import org.apache.maven.artifact.Artifact;
/**
* Do not use!
- * <p/>
+ * <p>
* Should only be implemented by DebugResolutionListener. Remove this
* when the ResolutionListener interface deprecation of the manageArtifact
* method (and the [yet to be done] addition of these methods to that
@@ -40,4 +40,4 @@ public interface ResolutionListenerForDepMgmt
void manageArtifactSystemPath( Artifact artifact,
Artifact replacement );
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/maven/blob/c7f827ea/maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java b/maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java
index faf224b..fb99593 100644
--- a/maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java
+++ b/maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java
@@ -40,15 +40,16 @@ public final class ModelUtils
/**
* This should be the resulting ordering of plugins after merging:
- * <p/>
+ * <p>
* Given:
- * <p/>
- * parent: X -> A -> B -> D -> E
- * child: Y -> A -> C -> D -> F
- * <p/>
+ * <pre>
+ * parent: X -> A -> B -> D -> E
+ * child: Y -> A -> C -> D -> F
+ * </pre>
* Result:
- * <p/>
- * X -> Y -> A -> B -> C -> D -> E -> F
+ * <pre>
+ * X -> Y -> A -> B -> C -> D -> E -> F
+ * </pre>
*/
public static void mergePluginLists( PluginContainer childContainer, PluginContainer parentContainer,
boolean handleAsInheritance )
http://git-wip-us.apache.org/repos/asf/maven/blob/c7f827ea/maven-compat/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java b/maven-compat/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java
index b3e94fc..913e2dd 100644
--- a/maven-compat/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java
+++ b/maven-compat/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java
@@ -103,10 +103,6 @@ public abstract class AbstractStringBasedModelInterpolator
this.pathTranslator = pathTranslator;
}
- /**
- * TODO Remove the throws clause.
- * @throws IOException This exception is not thrown any more, and needs to be removed.
- */
protected AbstractStringBasedModelInterpolator()
{
}
@@ -120,7 +116,7 @@ public abstract class AbstractStringBasedModelInterpolator
/**
* Serialize the inbound Model instance to a StringWriter, perform the regex replacement to resolve
* POM expressions, then re-parse into the resolved Model instance.
- * <br/>
+ * <p>
* <b>NOTE:</b> This will result in a different instance of Model being returned!!!
*
* @param model The inbound Model instance, to serialize and reference for expression resolution
@@ -189,7 +185,7 @@ public abstract class AbstractStringBasedModelInterpolator
* <li>If the value is null, but the context contains the expression, don't replace the expression string
* with the value, and continue to find other expressions.</li>
* <li>If the value is null, get it from the model properties.</li>
- * <li>
+ * </ul>
*/
public String interpolate( String src,
Model model,
http://git-wip-us.apache.org/repos/asf/maven/blob/c7f827ea/maven-compat/src/main/java/org/apache/maven/project/interpolation/ModelInterpolationException.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/project/interpolation/ModelInterpolationException.java b/maven-compat/src/main/java/org/apache/maven/project/interpolation/ModelInterpolationException.java
index 5b02880..ea60f16 100644
--- a/maven-compat/src/main/java/org/apache/maven/project/interpolation/ModelInterpolationException.java
+++ b/maven-compat/src/main/java/org/apache/maven/project/interpolation/ModelInterpolationException.java
@@ -21,8 +21,6 @@ package org.apache.maven.project.interpolation;
/**
* @author jdcasey
- * <p/>
- * Created on Feb 2, 2005
*/
@SuppressWarnings( "serial" )
@Deprecated
@@ -69,4 +67,4 @@ public class ModelInterpolationException
return originalMessage;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/maven/blob/c7f827ea/maven-compat/src/main/java/org/apache/maven/project/interpolation/ModelInterpolator.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/project/interpolation/ModelInterpolator.java b/maven-compat/src/main/java/org/apache/maven/project/interpolation/ModelInterpolator.java
index e1556ea..036e7f0 100644
--- a/maven-compat/src/main/java/org/apache/maven/project/interpolation/ModelInterpolator.java
+++ b/maven-compat/src/main/java/org/apache/maven/project/interpolation/ModelInterpolator.java
@@ -27,8 +27,6 @@ import java.util.Map;
/**
* @author jdcasey
- * <p/>
- * Created on Feb 2, 2005
*/
@Deprecated
public interface ModelInterpolator
http://git-wip-us.apache.org/repos/asf/maven/blob/c7f827ea/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java b/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java
index 0071ea4..28fb723 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java
@@ -163,7 +163,7 @@ public class MetadataResolutionResult
/**
* TODO this needs to accept a {@link OverConstrainedVersionException} as returned by
* {@link #getVersionRangeViolation(int)} but it's not used like that in
- * {@link DefaultLegacyArtifactCollector}
+ * {@link org.apache.maven.repository.legacy.resolver.DefaultLegacyArtifactCollector}
*/
public MetadataResolutionResult addVersionRangeViolation( Exception e )
{
http://git-wip-us.apache.org/repos/asf/maven/blob/c7f827ea/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraph.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraph.java b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraph.java
index 532cd3c..1ae008a 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraph.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraph.java
@@ -103,9 +103,9 @@ public class MetadataGraph
* construct graph from a "dirty" tree
*
* @param tree "dirty" tree root
- * @param versionedVertices true if graph nodes should be versioned (different versions -> different nodes)
+ * @param versionedVertices true if graph nodes should be versioned (different versions -> different nodes)
* @param scopedVertices true if graph nodes should be versioned and scoped
- * (different versions and/or scopes -> different nodes)
+ * (different versions and/or scopes -> different nodes)
*
*/
public MetadataGraph( MetadataTreeNode tree, boolean versionedVertices, boolean scopedVertices )
http://git-wip-us.apache.org/repos/asf/maven/blob/c7f827ea/maven-compat/src/test/java/org/apache/maven/project/ModelUtilsTest.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/test/java/org/apache/maven/project/ModelUtilsTest.java b/maven-compat/src/test/java/org/apache/maven/project/ModelUtilsTest.java
index b2750b9..402ae74 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/ModelUtilsTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/ModelUtilsTest.java
@@ -94,15 +94,19 @@ public class ModelUtilsTest
/**
* Test that this is the resulting ordering of plugins after merging:
- *
+ * <p>
* Given:
- *
- * parent: X -> A -> B -> D -> E
- * child: Y -> A -> C -> D -> F
- *
+ * </p>
+ * <pre>
+ * parent: X -> A -> B -> D -> E
+ * child: Y -> A -> C -> D -> F
+ * </pre>
+ * <p>
* Result:
- *
- * X -> Y -> A -> B -> C -> D -> E -> F
+ * </p>
+ * <pre>
+ * X -> Y -> A -> B -> C -> D -> E -> F
+ * </pre>
*/
public void testShouldPreserveChildOrderingOfPluginsAfterParentMerge()
{
http://git-wip-us.apache.org/repos/asf/maven/blob/c7f827ea/maven-compat/src/test/java/org/apache/maven/project/inheritance/t09/ProjectInheritanceTest.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t09/ProjectInheritanceTest.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t09/ProjectInheritanceTest.java
index 0dc4ccf..aa492e4 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t09/ProjectInheritanceTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t09/ProjectInheritanceTest.java
@@ -47,14 +47,14 @@ public class ProjectInheritanceTest
/**
* How the test project is set up:
*
- * 1. dependencyManagement lists dependencies on a & b,
+ * 1. dependencyManagement lists dependencies on a & b,
* with an exclusion on c in b.
* 2. the child project lists a dependency on project a only
* 3. a depends on b (which is transitive to the child project),
* and b depends on c.
*
* We should see that the resulting size of collected artifacts is two:
- * a & b only.
+ * a & b only.
*/
public void testDependencyManagementExclusionsExcludeTransitively()
throws Exception
@@ -87,7 +87,7 @@ public class ProjectInheritanceTest
* now depends upon d, which has a transitive dependency on c. Even though
* we did list an exclusion on c, it was only from within the context of
* project b. We will pick up project c in this case because no
- * restrictions were placed on d. This demonstrates that a, b, c, & d will
+ * restrictions were placed on d. This demonstrates that a, b, c, & d will
* all be collected.
*
* @throws Exception
@@ -116,4 +116,4 @@ public class ProjectInheritanceTest
assertTrue( "maven-test:t09-c is not in the project", map.containsKey( "maven-test:t09-c" ) );
assertTrue( "maven-test:t09-d is not in the project", map.containsKey( "maven-test:t09-d" ) );
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/maven/blob/c7f827ea/maven-compat/src/test/java/org/apache/maven/repository/LegacyRepositorySystemTest.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/LegacyRepositorySystemTest.java b/maven-compat/src/test/java/org/apache/maven/repository/LegacyRepositorySystemTest.java
index 96af590..17dfcfc 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/LegacyRepositorySystemTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/LegacyRepositorySystemTest.java
@@ -32,6 +32,7 @@ import org.apache.maven.model.Repository;
import org.apache.maven.model.RepositoryPolicy;
import org.apache.maven.plugin.LegacySupport;
import org.apache.maven.repository.RepositorySystem;
+import org.apache.maven.repository.legacy.LegacyRepositorySystem;
import org.codehaus.plexus.ContainerConfiguration;
import org.codehaus.plexus.PlexusConstants;
import org.codehaus.plexus.PlexusTestCase;
http://git-wip-us.apache.org/repos/asf/maven/blob/c7f827ea/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/FarthestConflictResolverTest.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/FarthestConflictResolverTest.java b/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/FarthestConflictResolverTest.java
index 5ca3a47..363c7a2 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/FarthestConflictResolverTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/FarthestConflictResolverTest.java
@@ -44,7 +44,7 @@ public class FarthestConflictResolverTest
* Tests that <code>a:2.0</code> wins in the scenario:
* <pre>
* a:1.0
- * b:1.0 -> a:2.0
+ * b:1.0 -> a:2.0
* </pre>
*/
public void testDepth()
@@ -59,7 +59,7 @@ public class FarthestConflictResolverTest
/**
* Tests that <code>a:2.0</code> wins in the scenario:
* <pre>
- * b:1.0 -> a:2.0
+ * b:1.0 -> a:2.0
* a:1.0
* </pre>
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/c7f827ea/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NearestConflictResolverTest.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NearestConflictResolverTest.java b/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NearestConflictResolverTest.java
index 69d93d2..23683d5 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NearestConflictResolverTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NearestConflictResolverTest.java
@@ -44,7 +44,7 @@ public class NearestConflictResolverTest
* Tests that <code>a:1.0</code> wins in the scenario:
* <pre>
* a:1.0
- * b:1.0 -> a:2.0
+ * b:1.0 -> a:2.0
* </pre>
*/
public void testDepth()
@@ -59,7 +59,7 @@ public class NearestConflictResolverTest
/**
* Tests that <code>a:1.0</code> wins in the scenario:
* <pre>
- * b:1.0 -> a:2.0
+ * b:1.0 -> a:2.0
* a:1.0
* </pre>
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/c7f827ea/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NewestConflictResolverTest.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NewestConflictResolverTest.java b/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NewestConflictResolverTest.java
index c98f1e1..4cfffc6 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NewestConflictResolverTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NewestConflictResolverTest.java
@@ -44,7 +44,7 @@ public class NewestConflictResolverTest
* Tests that <code>a:2.0</code> wins in the scenario:
* <pre>
* a:1.0
- * b:1.0 -> a:2.0
+ * b:1.0 -> a:2.0
* </pre>
*/
public void testDepth()
@@ -59,7 +59,7 @@ public class NewestConflictResolverTest
/**
* Tests that <code>a:2.0</code> wins in the scenario:
* <pre>
- * b:1.0 -> a:2.0
+ * b:1.0 -> a:2.0
* a:1.0
* </pre>
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/c7f827ea/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/OldestConflictResolverTest.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/OldestConflictResolverTest.java b/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/OldestConflictResolverTest.java
index cef78f9..8744de2 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/OldestConflictResolverTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/OldestConflictResolverTest.java
@@ -44,7 +44,7 @@ public class OldestConflictResolverTest
* Tests that <code>a:1.0</code> wins in the scenario:
* <pre>
* a:1.0
- * b:1.0 -> a:2.0
+ * b:1.0 -> a:2.0
* </pre>
*/
public void testDepth()
@@ -60,7 +60,7 @@ public class OldestConflictResolverTest
/**
* Tests that <code>a:1.0</code> wins in the scenario:
* <pre>
- * b:1.0 -> a:2.0
+ * b:1.0 -> a:2.0
* a:1.0
* </pre>
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/c7f827ea/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4ce8a79..8a64bae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -650,10 +650,6 @@ under the License.
<reports>
<report>aggregate</report>
</reports>
- <configuration>
- <!-- There's no maintenance on maven-compat -->
- <additionalparam>-Xdoclint:none</additionalparam>
- </configuration>
</reportSet>
</reportSets>
</plugin>
[09/28] maven git commit: MNG-6078: commons-cli 1.4 released
Posted by mi...@apache.org.
MNG-6078: commons-cli 1.4 released
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/773474fd
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/773474fd
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/773474fd
Branch: refs/heads/MNG-6169
Commit: 773474fd07e00c43871279d10343d3b9be4fd74c
Parents: 6e499f6
Author: rfscholte <rf...@apache.org>
Authored: Mon Mar 13 23:27:35 2017 +0100
Committer: Michael Osipov <mi...@apache.org>
Committed: Sun Apr 2 00:21:12 2017 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/773474fd/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 653471b..4ce8a79 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,7 +50,7 @@ under the License.
<maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target>
<classWorldsVersion>2.5.2</classWorldsVersion>
- <commonsCliVersion>1.4-SNAPSHOT</commonsCliVersion>
+ <commonsCliVersion>1.4</commonsCliVersion>
<commonsLangVersion>3.5</commonsLangVersion>
<junitVersion>4.12</junitVersion>
<mockitoVersion>1.10.19</mockitoVersion>
[23/28] maven git commit: [MNG-6112] Central repository in the 4.0.0
super POM should declare update policy 'never'.
Posted by mi...@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/934a1596
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/934a1596
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/934a1596
Branch: refs/heads/MNG-6169
Commit: 934a1596148fe90760feed23905d7e42520d68a9
Parents: 3a6a901
Author: Christian Schulte <sc...@apache.org>
Authored: Sat Mar 25 20:40:05 2017 +0100
Committer: Michael Osipov <mi...@apache.org>
Committed: Sun Apr 2 00:21:12 2017 +0200
----------------------------------------------------------------------
.../main/java/org/apache/maven/bridge/MavenRepositorySystem.java | 4 ++--
.../src/main/resources/org/apache/maven/model/pom-4.0.0.xml | 3 ---
2 files changed, 2 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/934a1596/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java b/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java
index 509f302..9331710 100644
--- a/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java
+++ b/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java
@@ -573,8 +573,8 @@ public class MavenRepositorySystem
throws Exception
{
return createRepository( RepositorySystem.DEFAULT_REMOTE_REPO_URL, RepositorySystem.DEFAULT_REMOTE_REPO_ID,
- true, ArtifactRepositoryPolicy.UPDATE_POLICY_NEVER, false,
- ArtifactRepositoryPolicy.UPDATE_POLICY_NEVER,
+ true, ArtifactRepositoryPolicy.UPDATE_POLICY_DAILY, false,
+ ArtifactRepositoryPolicy.UPDATE_POLICY_DAILY,
ArtifactRepositoryPolicy.CHECKSUM_POLICY_WARN );
}
http://git-wip-us.apache.org/repos/asf/maven/blob/934a1596/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml b/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
index 9487a9a..91492a9 100644
--- a/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
+++ b/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
@@ -32,9 +32,6 @@ under the License.
<snapshots>
<enabled>false</enabled>
</snapshots>
- <releases>
- <updatePolicy>never</updatePolicy>
- </releases>
</repository>
</repositories>
[03/28] maven git commit: trying to make Jenkinsfile easier to
understand
Posted by mi...@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/92db20e5
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/92db20e5
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/92db20e5
Branch: refs/heads/MNG-6169
Commit: 92db20e5bd130669524b08d86ee0d9c759292efa
Parents: 0261208
Author: Herv� Boutemy <hb...@apache.org>
Authored: Fri Mar 24 03:25:17 2017 +0100
Committer: Michael Osipov <mi...@apache.org>
Committed: Sun Apr 2 00:21:12 2017 +0200
----------------------------------------------------------------------
Jenkinsfile | 41 +++++++++++++++++++++++++++--------------
1 file changed, 27 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/92db20e5/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index 123a246..cc9bd92 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -22,24 +22,32 @@ properties([buildDiscarder(logRotator(artifactNumToKeepStr: '5', numToKeepStr: e
def tests
try {
+
node('ubuntu') {
- stage 'Checkout'
- def MAVEN_BUILD=tool name: 'Maven 3.3.9', type: 'hudson.tasks.Maven$MavenInstallation'
- echo "Driving build and unit tests using Maven $MAVEN_BUILD"
- def JAVA7_HOME=tool name: 'JDK 1.7 (latest)', type: 'hudson.model.JDK'
- echo "Running build and unit tests with Java $JAVA7_HOME"
dir('build') {
- checkout scm
- def WORK_DIR=pwd()
- stage 'Build / Unit Test'
- withEnv(["PATH+MAVEN=$MAVEN_BUILD/bin","PATH+JDK=$JAVA7_HOME/bin"]) {
- sh "mvn clean verify -B -U -e -fae -V -Dmaven.test.failure.ignore=true -Dmaven.repo.local=$WORK_DIR/.repository"
+ stage('Checkout') {
+ checkout scm
}
- dir ('apache-maven/target') {
- sh "mv apache-maven-*-bin.zip apache-maven-dist.zip"
- stash includes: 'apache-maven-dist.zip', name: 'dist'
+
+ def WORK_DIR=pwd()
+
+ stage('Build / Unit Test') {
+ def MAVEN_BUILD=tool name: 'Maven 3.3.9', type: 'hudson.tasks.Maven$MavenInstallation'
+ echo "Driving build and unit tests using Maven $MAVEN_BUILD"
+ def JAVA7_HOME=tool name: 'JDK 1.7 (latest)', type: 'hudson.model.JDK'
+ echo "Running build and unit tests with Java $JAVA7_HOME"
+
+ withEnv(["PATH+MAVEN=$MAVEN_BUILD/bin","PATH+JDK=$JAVA7_HOME/bin"]) {
+ sh "mvn clean verify -B -U -e -fae -V -Dmaven.test.failure.ignore=true -Dmaven.repo.local=$WORK_DIR/.repository"
+ }
+
+ dir ('apache-maven/target') {
+ sh "mv apache-maven-*-bin.zip apache-maven-dist.zip"
+ stash includes: 'apache-maven-dist.zip', name: 'dist'
+ }
+ junit allowEmptyResults: true, testResults:'**/target/*-reports/*.xml'
}
- junit allowEmptyResults: true, testResults:'**/target/*-reports/*.xml'
+
tests = resolveScm source: [$class: 'GitSCMSource', credentialsId: '', excludes: '', gitTool: 'Default', id: '_', ignoreOnPushNotifications: false, includes: '*', remote: 'https://git-wip-us.apache.org/repos/asf/maven-integration-testing.git'], targets: [BRANCH_NAME, 'master']
}
}
@@ -51,6 +59,7 @@ parallel linuxJava7:{
echo "Driving integration tests using Maven $MAVEN_NIX_J7"
def JAVA_NIX_J7=tool name: 'JDK 1.7 (latest)', type: 'hudson.model.JDK'
echo "Running integration tests with Java $JAVA_NIX_J7"
+
dir('test') {
def WORK_DIR=pwd()
checkout tests
@@ -69,6 +78,7 @@ parallel linuxJava7:{
echo "Driving integration tests using Maven $MAVEN_NIX_J8"
def JAVA_NIX_J8=tool name: 'JDK 1.8 (latest)', type: 'hudson.model.JDK'
echo "Running integration tests with Java $JAVA_NIX_J8"
+
dir('test') {
def WORK_DIR=pwd()
checkout tests
@@ -93,6 +103,7 @@ parallel linuxJava7:{
JAVA_WIN_J7=pwd()
}
echo "Running integration tests with Java $JAVA_WIN_J7"
+
// need a short path or we hit 256 character limit for paths
// using EXECUTOR_NUMBER guarantees that concurrent builds on same agent
// will not trample each other
@@ -122,6 +133,7 @@ parallel linuxJava7:{
JAVA_WIN_J8=pwd()
}
echo "Running integration tests with Java $JAVA_WIN_J8"
+
// need a short path or we hit 256 character limit for paths
// using EXECUTOR_NUMBER guarantees that concurrent builds on same agent
// will not trample each other
@@ -140,6 +152,7 @@ parallel linuxJava7:{
}
}
}
+
} finally {
node('ubuntu') {
emailext 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'
[06/28] maven git commit: [MNG-6183] Dependency management debug
message corrections.
Posted by mi...@apache.org.
[MNG-6183] Dependency management debug message corrections.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/aaae0b25
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/aaae0b25
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/aaae0b25
Branch: refs/heads/MNG-6169
Commit: aaae0b25a7bc9ad0ebebdcb017fa70f5a605d4c8
Parents: f48c9f9
Author: Christian Schulte <sc...@apache.org>
Authored: Tue Mar 14 19:20:47 2017 +0100
Committer: Michael Osipov <mi...@apache.org>
Committed: Sun Apr 2 00:21:12 2017 +0200
----------------------------------------------------------------------
.../DefaultProjectDependenciesResolver.java | 83 ++++++++------------
1 file changed, 31 insertions(+), 52 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/aaae0b25/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
index 21dfaa2..5a803af 100644
--- a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
+++ b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
@@ -29,8 +29,6 @@ import org.apache.maven.artifact.Artifact;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.DependencyManagement;
import org.apache.maven.model.Exclusion;
-import org.apache.maven.model.InputLocation;
-import org.apache.maven.model.InputSource;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.logging.Logger;
@@ -39,7 +37,6 @@ import org.eclipse.aether.DefaultRepositorySystemSession;
import org.eclipse.aether.RepositorySystem;
import org.eclipse.aether.RepositorySystemSession;
import org.eclipse.aether.RequestTrace;
-import org.eclipse.aether.artifact.ArtifactProperties;
import org.eclipse.aether.artifact.ArtifactType;
import org.eclipse.aether.artifact.ArtifactTypeRegistry;
import org.eclipse.aether.collection.CollectRequest;
@@ -239,8 +236,6 @@ public class DefaultProjectDependenciesResolver
private String indent = "";
- private Map<String, Dependency> managed;
-
public GraphLogger( MavenProject project )
{
this.project = project;
@@ -258,29 +253,48 @@ public class DefaultProjectDependenciesResolver
buffer.append( art );
buffer.append( ':' ).append( dep.getScope() );
- String premanagedScope = DependencyManagerUtils.getPremanagedScope( node );
- if ( premanagedScope != null && !premanagedScope.equals( dep.getScope() ) )
+ // TODO We currently cannot tell which <dependencyManagement> section contained the management
+ // information. When resolver 1.1 provides this information, these log messages should be updated
+ // to contain it.
+ if ( ( node.getManagedBits() & DependencyNode.MANAGED_SCOPE ) == DependencyNode.MANAGED_SCOPE )
{
- buffer.append( " (scope managed from " ).append( premanagedScope );
- appendManagementSource( buffer, art, "scope" );
+ final String premanagedScope = DependencyManagerUtils.getPremanagedScope( node );
+ buffer.append( " (scope managed from " );
+ buffer.append( StringUtils.defaultString( premanagedScope, "default" ) );
buffer.append( ')' );
}
- String premanagedVersion = DependencyManagerUtils.getPremanagedVersion( node );
- if ( premanagedVersion != null && !premanagedVersion.equals( art.getVersion() ) )
+ if ( ( node.getManagedBits() & DependencyNode.MANAGED_VERSION ) == DependencyNode.MANAGED_VERSION )
{
- buffer.append( " (version managed from " ).append( premanagedVersion );
- appendManagementSource( buffer, art, "version" );
+ final String premanagedVersion = DependencyManagerUtils.getPremanagedVersion( node );
+ buffer.append( " (version managed from " );
+ buffer.append( StringUtils.defaultString( premanagedVersion, "default" ) );
buffer.append( ')' );
}
- Boolean premanagedOptional = DependencyManagerUtils.getPremanagedOptional( node );
- if ( premanagedOptional != null && !premanagedOptional.equals( dep.getOptional() ) )
+ if ( ( node.getManagedBits() & DependencyNode.MANAGED_OPTIONAL ) == DependencyNode.MANAGED_OPTIONAL )
{
- buffer.append( " (optionality managed from " ).append( premanagedOptional );
- appendManagementSource( buffer, art, "optional" );
+ final Boolean premanagedOptional = DependencyManagerUtils.getPremanagedOptional( node );
+ buffer.append( " (optionality managed from " );
+ buffer.append( StringUtils.defaultString( premanagedOptional, "default" ) );
buffer.append( ')' );
}
+
+ if ( ( node.getManagedBits() & DependencyNode.MANAGED_EXCLUSIONS )
+ == DependencyNode.MANAGED_EXCLUSIONS )
+ {
+ // TODO As of resolver 1.1, use DependencyManagerUtils.getPremanagedExclusions( node ).
+ // The resolver 1.0.x releases do not record premanaged state of exclusions.
+ buffer.append( " (exclusions managed)" );
+ }
+
+ if ( ( node.getManagedBits() & DependencyNode.MANAGED_PROPERTIES )
+ == DependencyNode.MANAGED_PROPERTIES )
+ {
+ // TODO As of resolver 1.1, use DependencyManagerUtils.getPremanagedProperties( node ).
+ // The resolver 1.0.x releases do not record premanaged state of properties.
+ buffer.append( " (properties managed)" );
+ }
}
else
{
@@ -301,41 +315,6 @@ public class DefaultProjectDependenciesResolver
return true;
}
- private void appendManagementSource( StringBuilder buffer, org.eclipse.aether.artifact.Artifact artifact,
- String field )
- {
- if ( managed == null )
- {
- managed = new HashMap<>();
- if ( project.getDependencyManagement() != null )
- {
- for ( Dependency dep : project.getDependencyManagement().getDependencies() )
- {
- managed.put( dep.getManagementKey(), dep );
- }
- }
- }
-
- String key =
- ArtifactIdUtils.toVersionlessId( artifact.getGroupId(), artifact.getArtifactId(),
- artifact.getProperty( ArtifactProperties.TYPE, "jar" ),
- artifact.getClassifier() );
-
- Dependency dependency = managed.get( key );
- if ( dependency != null )
- {
- InputLocation location = dependency.getLocation( field );
- if ( location != null )
- {
- InputSource source = location.getSource();
- if ( source != null )
- {
- buffer.append( " by " ).append( source.getModelId() );
- }
- }
- }
- }
-
}
}
[26/28] maven git commit: switch to embedded core ITs run for faster
result
Posted by mi...@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/fa11274b
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/fa11274b
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/fa11274b
Branch: refs/heads/MNG-6169
Commit: fa11274b0b039d95d32d606aacf834e44c0a6ffd
Parents: af414f8
Author: Herv� Boutemy <hb...@apache.org>
Authored: Fri Mar 24 03:28:59 2017 +0100
Committer: Michael Osipov <mi...@apache.org>
Committed: Sun Apr 2 00:21:12 2017 +0200
----------------------------------------------------------------------
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/fa11274b/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index 0dae3a3..be4485c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -20,7 +20,7 @@
properties([buildDiscarder(logRotator(artifactNumToKeepStr: '5', numToKeepStr: env.BRANCH_NAME=='master'?'10':'5'))])
def tests
-def CORE_IT_PROFILES='run-its'
+def CORE_IT_PROFILES='run-its,embedded'
try {
[05/28] maven git commit: [MNG-6090] CI friendly properties break
submodule builds [MNG-6057] Problem with CI friendly usage of ${..} reactor
order is changed o Based on the missing replacement of the versions
${revision} ${changelist} or ${sha1} wit
Posted by mi...@apache.org.
[MNG-6090] CI friendly properties break submodule builds
[MNG-6057] Problem with CI friendly usage of ${..} reactor order is changed
o Based on the missing replacement of the versions ${revision}
${changelist} or ${sha1} within the parent element the order
of the reactor changes.
[MNG-5895] Problem with CI friendly usage of ${..} which is already
defined via property in pom file.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/f48c9f98
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/f48c9f98
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/f48c9f98
Branch: refs/heads/MNG-6169
Commit: f48c9f98583ae9d1503f1f0ca8a796be9e2a4657
Parents: 430f70c
Author: Karl Heinz Marbaise <kh...@apache.org>
Authored: Tue Sep 29 11:46:48 2015 +0200
Committer: Michael Osipov <mi...@apache.org>
Committed: Sun Apr 2 00:21:12 2017 +0200
----------------------------------------------------------------------
.../resolver/DefaultArtifactResolver.java | 3 +-
.../model/building/DefaultModelBuilder.java | 35 ++++++++++++++++++--
.../AbstractStringBasedModelInterpolator.java | 20 +++++++++++
.../model/validation/DefaultModelValidator.java | 7 ++--
4 files changed, 59 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/f48c9f98/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
index fc154cb..915ee72 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
@@ -376,7 +376,7 @@ public class DefaultArtifactResolver
ArtifactFilter resolutionFilter = request.getResolutionFilter();
RepositorySystemSession session = getSession( request.getLocalRepository() );
- // TODO hack because metadata isn't generated in m2e correctly and i want to run the maven i have in the
+ // TODO: hack because metadata isn't generated in m2e correctly and i want to run the maven i have in the
// workspace
if ( source == null )
{
@@ -506,6 +506,7 @@ public class DefaultArtifactResolver
if ( result.hasMetadataResolutionExceptions() || result.hasVersionRangeViolations()
|| result.hasCircularDependencyExceptions() )
{
+ logger.info( "Failure detected." );
return result;
}
http://git-wip-us.apache.org/repos/asf/maven/blob/f48c9f98/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
index 4ebb033..463bf1c 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
@@ -62,6 +62,8 @@ import org.apache.maven.model.superpom.SuperPomProvider;
import org.apache.maven.model.validation.ModelValidator;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
+import org.codehaus.plexus.interpolation.MapBasedValueSource;
+import org.codehaus.plexus.interpolation.StringSearchInterpolator;
import java.io.File;
import java.io.IOException;
@@ -766,13 +768,40 @@ public class DefaultModelBuilder
// save profile activations before interpolation, since they are evaluated with limited scope
Map<String, Activation> originalActivations = getProfileActivations( model, true );
- Model result = modelInterpolator.interpolateModel( model, model.getProjectDirectory(), request, problems );
- result.setPomFile( model.getPomFile() );
+ Model interpolatedModel =
+ modelInterpolator.interpolateModel( model, model.getProjectDirectory(), request, problems );
+ if ( interpolatedModel.getParent() != null )
+ {
+ StringSearchInterpolator ssi = new StringSearchInterpolator();
+ ssi.addValueSource( new MapBasedValueSource( request.getUserProperties() ) );
+
+ ssi.addValueSource( new MapBasedValueSource( model.getProperties() ) );
+
+ ssi.addValueSource( new MapBasedValueSource( request.getSystemProperties() ) );
+
+ try
+ {
+ String interpolated = ssi.interpolate( interpolatedModel.getParent().getVersion() );
+ interpolatedModel.getParent().setVersion( interpolated );
+ }
+ catch ( Exception e )
+ {
+ ModelProblemCollectorRequest mpcr =
+ new ModelProblemCollectorRequest( Severity.ERROR,
+ Version.BASE ).setMessage( "Failed to interpolate field: "
+ + interpolatedModel.getParent().getVersion()
+ + " on class: " ).setException( e );
+ problems.add( mpcr );
+ }
+
+
+ }
+ interpolatedModel.setPomFile( model.getPomFile() );
// restore profiles with file activation to their value before full interpolation
injectProfileActivations( model, originalActivations );
- return result;
+ return interpolatedModel;
}
private ModelData readParent( Model childModel, ModelSource childSource, ModelBuildingRequest request,
http://git-wip-us.apache.org/repos/asf/maven/blob/f48c9f98/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java
index cee376f..b47edbe 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java
@@ -56,6 +56,12 @@ import org.codehaus.plexus.interpolation.ValueSource;
public abstract class AbstractStringBasedModelInterpolator
implements ModelInterpolator
{
+ public static final String SHA1_PROPERTY = "sha1";
+
+ public static final String CHANGELIST_PROPERTY = "changelist";
+
+ public static final String REVISION_PROPERTY = "revision";
+
private static final List<String> PROJECT_PREFIXES = Arrays.asList( "pom.", "project." );
private static final Collection<String> TRANSLATED_PATH_EXPRESSIONS;
@@ -165,6 +171,20 @@ public abstract class AbstractStringBasedModelInterpolator
valueSources.add( new MapBasedValueSource( config.getUserProperties() ) );
+ // Overwrite existing values in model properties. Otherwise it's not possible
+ // to define the version via command line: mvn -Drevision=6.5.7 ...
+ if ( config.getSystemProperties().containsKey( REVISION_PROPERTY ) )
+ {
+ modelProperties.put( REVISION_PROPERTY, config.getSystemProperties().get( REVISION_PROPERTY ) );
+ }
+ if ( config.getSystemProperties().containsKey( CHANGELIST_PROPERTY ) )
+ {
+ modelProperties.put( CHANGELIST_PROPERTY, config.getSystemProperties().get( CHANGELIST_PROPERTY ) );
+ }
+ if ( config.getSystemProperties().containsKey( SHA1_PROPERTY ) )
+ {
+ modelProperties.put( SHA1_PROPERTY, config.getSystemProperties().get( SHA1_PROPERTY ) );
+ }
valueSources.add( new MapBasedValueSource( modelProperties ) );
valueSources.add( new MapBasedValueSource( config.getSystemProperties() ) );
http://git-wip-us.apache.org/repos/asf/maven/blob/f48c9f98/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java b/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
index 59b0532..e790f21 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
@@ -53,6 +53,7 @@ import org.apache.maven.model.building.ModelProblem.Severity;
import org.apache.maven.model.building.ModelProblem.Version;
import org.apache.maven.model.building.ModelProblemCollector;
import org.apache.maven.model.building.ModelProblemCollectorRequest;
+import org.apache.maven.model.interpolation.AbstractStringBasedModelInterpolator;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.util.StringUtils;
@@ -806,8 +807,10 @@ public class DefaultModelValidator
// revision
// sha1
//
- if ( string.trim().contains( "${changelist}" ) || string.trim().contains( "${revision}" )
- || string.trim().contains( "${sha1}" ) )
+ string = string.trim();
+ if ( string.contains( "${" + AbstractStringBasedModelInterpolator.CHANGELIST_PROPERTY + "}" )
+ || string.contains( "${" + AbstractStringBasedModelInterpolator.REVISION_PROPERTY + "}" )
+ || string.contains( "${" + AbstractStringBasedModelInterpolator.SHA1_PROPERTY + "}" ) )
{
return true;
}
[17/28] maven git commit: s/@since 3.5.0-alpha-2/@since 3.5.0/g
Posted by mi...@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/3223ecaa
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/3223ecaa
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/3223ecaa
Branch: refs/heads/MNG-6169
Commit: 3223ecaaf2ff9fccd769f3e4cb5ed5f00468a1ca
Parents: b83d779
Author: Christian Schulte <sc...@apache.org>
Authored: Tue Mar 21 00:21:43 2017 +0100
Committer: Michael Osipov <mi...@apache.org>
Committed: Sun Apr 2 00:21:12 2017 +0200
----------------------------------------------------------------------
.../java/org/apache/maven/execution/ProjectDependencyGraph.java | 2 +-
.../org/apache/maven/graph/DefaultProjectDependencyGraph.java | 4 ++--
.../org/apache/maven/graph/FilteredProjectDependencyGraph.java | 2 +-
.../java/org/apache/maven/project/ProjectModelResolverTest.java | 2 +-
.../java/org/apache/maven/model/resolution/ModelResolver.java | 2 +-
.../maven/repository/internal/DefaultModelResolverTest.java | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/3223ecaa/maven-core/src/main/java/org/apache/maven/execution/ProjectDependencyGraph.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/execution/ProjectDependencyGraph.java b/maven-core/src/main/java/org/apache/maven/execution/ProjectDependencyGraph.java
index d206d73..bbc8272 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/ProjectDependencyGraph.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/ProjectDependencyGraph.java
@@ -37,7 +37,7 @@ public interface ProjectDependencyGraph
*
* @return All collected projects.
*
- * @since 3.5.0-alpha-2
+ * @since 3.5.0
*/
List<MavenProject> getAllProjects();
http://git-wip-us.apache.org/repos/asf/maven/blob/3223ecaa/maven-core/src/main/java/org/apache/maven/graph/DefaultProjectDependencyGraph.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/graph/DefaultProjectDependencyGraph.java b/maven-core/src/main/java/org/apache/maven/graph/DefaultProjectDependencyGraph.java
index effab0b..73cadf6 100644
--- a/maven-core/src/main/java/org/apache/maven/graph/DefaultProjectDependencyGraph.java
+++ b/maven-core/src/main/java/org/apache/maven/graph/DefaultProjectDependencyGraph.java
@@ -69,7 +69,7 @@ public class DefaultProjectDependencyGraph
*
* @throws DuplicateProjectException
* @throws CycleDetectedException
- * @since 3.5.0-alpha-2
+ * @since 3.5.0
*/
public DefaultProjectDependencyGraph( final List<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/3223ecaa/maven-core/src/main/java/org/apache/maven/graph/FilteredProjectDependencyGraph.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/graph/FilteredProjectDependencyGraph.java b/maven-core/src/main/java/org/apache/maven/graph/FilteredProjectDependencyGraph.java
index ad3910d..c4f8e1a 100644
--- a/maven-core/src/main/java/org/apache/maven/graph/FilteredProjectDependencyGraph.java
+++ b/maven-core/src/main/java/org/apache/maven/graph/FilteredProjectDependencyGraph.java
@@ -65,7 +65,7 @@ class FilteredProjectDependencyGraph
}
/**
- * @since 3.5.0-alpha-2
+ * @since 3.5.0
*/
public List<MavenProject> getAllProjects()
{
http://git-wip-us.apache.org/repos/asf/maven/blob/3223ecaa/maven-core/src/test/java/org/apache/maven/project/ProjectModelResolverTest.java
----------------------------------------------------------------------
diff --git a/maven-core/src/test/java/org/apache/maven/project/ProjectModelResolverTest.java b/maven-core/src/test/java/org/apache/maven/project/ProjectModelResolverTest.java
index c21796b..6302a82 100644
--- a/maven-core/src/test/java/org/apache/maven/project/ProjectModelResolverTest.java
+++ b/maven-core/src/test/java/org/apache/maven/project/ProjectModelResolverTest.java
@@ -44,7 +44,7 @@ import static org.codehaus.plexus.PlexusTestCase.getBasedir;
* Test cases for the project {@code ModelResolver} implementation.
*
* @author Christian Schulte
- * @since 3.5.0-alpha-2
+ * @since 3.5.0
*/
public class ProjectModelResolverTest extends AbstractMavenProjectTestCase
{
http://git-wip-us.apache.org/repos/asf/maven/blob/3223ecaa/maven-model-builder/src/main/java/org/apache/maven/model/resolution/ModelResolver.java
----------------------------------------------------------------------
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/3223ecaa/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
{
[22/28] maven git commit: [MNG-6168] Fix unclosed streams
Posted by mi...@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/3a6a901f
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/3a6a901f
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/3a6a901f
Branch: refs/heads/MNG-6169
Commit: 3a6a901fabe48296f932d1563d757a8892fec842
Parents: f4bc3c0
Author: Christian Schulte <sc...@apache.org>
Authored: Fri Mar 24 22:04:37 2017 +0100
Committer: Michael Osipov <mi...@apache.org>
Committed: Sun Apr 2 00:21:12 2017 +0200
----------------------------------------------------------------------
.../metadata/io/DefaultMetadataReader.java | 19 ++-------
.../toolchain/io/DefaultToolchainsReader.java | 19 ++-------
.../maven/model/io/DefaultModelReader.java | 18 +++------
.../maven/model/io/DefaultModelWriter.java | 27 +++++--------
.../internal/DefaultVersionRangeResolver.java | 18 +++------
.../internal/DefaultVersionResolver.java | 42 ++++++++------------
.../settings/io/DefaultSettingsReader.java | 19 ++-------
.../settings/io/DefaultSettingsWriter.java | 27 +++++--------
8 files changed, 58 insertions(+), 131 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/3a6a901f/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java b/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java
index c769f89..51a2849 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java
@@ -29,7 +29,6 @@ import org.apache.commons.lang3.Validate;
import org.apache.maven.artifact.repository.metadata.Metadata;
import org.apache.maven.artifact.repository.metadata.io.xpp3.MetadataXpp3Reader;
import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.ReaderFactory;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
@@ -58,19 +57,14 @@ public class DefaultMetadataReader
{
Validate.notNull( input, "input cannot be null" );
- try
+ try ( final Reader in = input )
{
- MetadataXpp3Reader r = new MetadataXpp3Reader();
- return r.read( input, isStrict( options ) );
+ return new MetadataXpp3Reader().read( in, isStrict( options ) );
}
catch ( XmlPullParserException e )
{
throw new MetadataParseException( e.getMessage(), e.getLineNumber(), e.getColumnNumber(), e );
}
- finally
- {
- IOUtil.close( input );
- }
}
public Metadata read( InputStream input, Map<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/3a6a901f/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java b/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java
index 9b5bdd7..86a1784 100644
--- a/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java
+++ b/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java
@@ -31,7 +31,6 @@ import javax.inject.Singleton;
import org.apache.commons.lang3.Validate;
import org.apache.maven.toolchain.model.PersistedToolchains;
import org.apache.maven.toolchain.model.io.xpp3.MavenToolchainsXpp3Reader;
-import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.ReaderFactory;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
@@ -62,19 +61,14 @@ public class DefaultToolchainsReader
{
Validate.notNull( input, "input cannot be null" );
- 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/3a6a901f/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/3a6a901f/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/3a6a901f/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/3a6a901f/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/3a6a901f/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/3a6a901f/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 );
}
}
[04/28] maven git commit: [maven-release-plugin] prepare for next
development iteration
Posted by mi...@apache.org.
[maven-release-plugin] prepare for next development iteration
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/b83d779a
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/b83d779a
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/b83d779a
Branch: refs/heads/MNG-6169
Commit: b83d779aad23152662d8ffab4d0ccabcf3c9592f
Parents: 80a10e8
Author: Stephen Connolly <st...@gmail.com>
Authored: Mon Mar 20 16:55:53 2017 +0000
Committer: Michael Osipov <mi...@apache.org>
Committed: Sun Apr 2 00:21:12 2017 +0200
----------------------------------------------------------------------
apache-maven/pom.xml | 2 +-
maven-artifact/pom.xml | 2 +-
maven-builder-support/pom.xml | 2 +-
maven-compat/pom.xml | 2 +-
maven-core/pom.xml | 2 +-
maven-embedder/pom.xml | 2 +-
maven-model-builder/pom.xml | 2 +-
maven-model/pom.xml | 2 +-
maven-plugin-api/pom.xml | 2 +-
maven-repository-metadata/pom.xml | 2 +-
maven-resolver-provider/pom.xml | 2 +-
maven-settings-builder/pom.xml | 2 +-
maven-settings/pom.xml | 2 +-
maven-slf4j-provider/pom.xml | 2 +-
pom.xml | 4 ++--
15 files changed, 16 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/b83d779a/apache-maven/pom.xml
----------------------------------------------------------------------
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index 7bf2dd2..a528ddb 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -25,7 +25,7 @@ under the License.
<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/b83d779a/maven-artifact/pom.xml
----------------------------------------------------------------------
diff --git a/maven-artifact/pom.xml b/maven-artifact/pom.xml
index 0d07e98..e3943c9 100644
--- a/maven-artifact/pom.xml
+++ b/maven-artifact/pom.xml
@@ -25,7 +25,7 @@ under the License.
<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/b83d779a/maven-builder-support/pom.xml
----------------------------------------------------------------------
diff --git a/maven-builder-support/pom.xml b/maven-builder-support/pom.xml
index c303646..39eb161 100644
--- a/maven-builder-support/pom.xml
+++ b/maven-builder-support/pom.xml
@@ -25,7 +25,7 @@ under the License.
<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/b83d779a/maven-compat/pom.xml
----------------------------------------------------------------------
diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml
index fd0a307..bfd2b47 100644
--- a/maven-compat/pom.xml
+++ b/maven-compat/pom.xml
@@ -25,7 +25,7 @@ under the License.
<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/b83d779a/maven-core/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index beb8a16..0e20235 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -25,7 +25,7 @@ under the License.
<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/b83d779a/maven-embedder/pom.xml
----------------------------------------------------------------------
diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml
index 21531a3..30ad2ce 100644
--- a/maven-embedder/pom.xml
+++ b/maven-embedder/pom.xml
@@ -25,7 +25,7 @@ under the License.
<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/b83d779a/maven-model-builder/pom.xml
----------------------------------------------------------------------
diff --git a/maven-model-builder/pom.xml b/maven-model-builder/pom.xml
index c8ede97..0dd08ac 100644
--- a/maven-model-builder/pom.xml
+++ b/maven-model-builder/pom.xml
@@ -25,7 +25,7 @@ under the License.
<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/b83d779a/maven-model/pom.xml
----------------------------------------------------------------------
diff --git a/maven-model/pom.xml b/maven-model/pom.xml
index a3ed1c5..41cf168 100644
--- a/maven-model/pom.xml
+++ b/maven-model/pom.xml
@@ -25,7 +25,7 @@ under the License.
<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/b83d779a/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/b83d779a/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/b83d779a/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/b83d779a/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/b83d779a/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/b83d779a/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/b83d779a/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>
[24/28] maven git commit: added CORE_IT_PROFILES parameter
Posted by mi...@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/af414f8c
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/af414f8c
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/af414f8c
Branch: refs/heads/MNG-6169
Commit: af414f8cefa0877dc47bacac250487aa4ba61710
Parents: 92db20e
Author: Herv� Boutemy <hb...@apache.org>
Authored: Fri Mar 24 03:28:26 2017 +0100
Committer: Michael Osipov <mi...@apache.org>
Committed: Sun Apr 2 00:21:12 2017 +0200
----------------------------------------------------------------------
Jenkinsfile | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/af414f8c/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index cc9bd92..0dae3a3 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -20,6 +20,7 @@
properties([buildDiscarder(logRotator(artifactNumToKeepStr: '5', numToKeepStr: env.BRANCH_NAME=='master'?'10':'5'))])
def tests
+def CORE_IT_PROFILES='run-its'
try {
@@ -66,7 +67,7 @@ parallel linuxJava7:{
sh "rm -rvf $WORK_DIR/apache-maven-dist.zip $WORK_DIR/it-local-repo"
unstash 'dist'
withEnv(["PATH+MAVEN=$MAVEN_NIX_J7/bin","PATH+JDK=$JAVA_NIX_J7/bin"]) {
- sh "mvn clean install -Prun-its -B -U -V -Dmaven.test.failure.ignore=true -Dmaven.repo.local=$WORK_DIR/it-local-repo -DmavenDistro=$WORK_DIR/apache-maven-dist.zip"
+ sh "mvn clean install -P$CORE_IT_PROFILES -B -U -V -Dmaven.test.failure.ignore=true -Dmaven.repo.local=$WORK_DIR/it-local-repo -DmavenDistro=$WORK_DIR/apache-maven-dist.zip"
}
junit allowEmptyResults: true, testResults:'core-it-support/**/target/*-reports/*.xml,core-it-suite/target/*-reports/*.xml'
deleteDir() // clean up after ourselves to reduce disk space
@@ -85,7 +86,7 @@ parallel linuxJava7:{
sh "rm -rvf $WORK_DIR/apache-maven-dist.zip $WORK_DIR/it-local-repo"
unstash 'dist'
withEnv(["PATH+MAVEN=$MAVEN_NIX_J8/bin","PATH+JDK=$JAVA_NIX_J8/bin"]) {
- sh "mvn clean install -Prun-its -B -U -V -Dmaven.test.failure.ignore=true -Dmaven.repo.local=$WORK_DIR/it-local-repo -DmavenDistro=$WORK_DIR/apache-maven-dist.zip"
+ sh "mvn clean install -P$CORE_IT_PROFILES -B -U -V -Dmaven.test.failure.ignore=true -Dmaven.repo.local=$WORK_DIR/it-local-repo -DmavenDistro=$WORK_DIR/apache-maven-dist.zip"
}
junit allowEmptyResults: true, testResults:'core-it-support/**/target/*-reports/*.xml,core-it-suite/target/*-reports/*.xml'
deleteDir() // clean up after ourselves to reduce disk space
@@ -115,7 +116,7 @@ parallel linuxJava7:{
withEnv(["Path+MAVEN=$MAVEN_WIN_J7\\bin","Path+JDK=$JAVA_WIN_J7\\bin","JAVA_HOME=$JAVA_WIN_J7"]) {
bat "set"
unstash 'dist'
- bat "mvn clean install -Prun-its -B -U -V -Dmaven.test.failure.ignore=true -Dmaven.repo.local=$WORK_DIR/it-local-repo -DmavenDistro=$WORK_DIR/apache-maven-dist.zip"
+ bat "mvn clean install -P$CORE_IT_PROFILES -B -U -V -Dmaven.test.failure.ignore=true -Dmaven.repo.local=$WORK_DIR/it-local-repo -DmavenDistro=$WORK_DIR/apache-maven-dist.zip"
}
junit allowEmptyResults: true, testResults:'core-it-support/**/target/*-reports/*.xml,core-it-suite/target/*-reports/*.xml'
deleteDir() // clean up after ourselves to reduce disk space
@@ -145,7 +146,7 @@ parallel linuxJava7:{
withEnv(["Path+MAVEN=$MAVEN_WIN_J8\\bin","Path+JDK=$JAVA_WIN_J8\\bin","JAVA_HOME=$JAVA_WIN_J8"]) {
bat "set"
unstash 'dist'
- bat "mvn clean install -Prun-its -B -U -V -Dmaven.test.failure.ignore=true -Dmaven.repo.local=$WORK_DIR/it-local-repo -DmavenDistro=$WORK_DIR/apache-maven-dist.zip"
+ bat "mvn clean install -P$CORE_IT_PROFILES -B -U -V -Dmaven.test.failure.ignore=true -Dmaven.repo.local=$WORK_DIR/it-local-repo -DmavenDistro=$WORK_DIR/apache-maven-dist.zip"
}
junit allowEmptyResults: true, testResults:'core-it-support/**/target/*-reports/*.xml,core-it-suite/target/*-reports/*.xml'
deleteDir() // clean up after ourselves to reduce disk space
[19/28] maven git commit: [MNG-6112] Central repository in the 4.0.0
super POM should declare update policy 'never'.
Posted by mi...@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/04d540c6
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/04d540c6
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/04d540c6
Branch: refs/heads/MNG-6169
Commit: 04d540c62bad1d8be09c805cf02442e6a088289b
Parents: 3223eca
Author: Christian Schulte <sc...@apache.org>
Authored: Tue Mar 21 00:30:28 2017 +0100
Committer: Michael Osipov <mi...@apache.org>
Committed: Sun Apr 2 00:21:12 2017 +0200
----------------------------------------------------------------------
.../main/java/org/apache/maven/bridge/MavenRepositorySystem.java | 4 ++--
.../src/main/resources/org/apache/maven/model/pom-4.0.0.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/04d540c6/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java b/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java
index 9331710..509f302 100644
--- a/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java
+++ b/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java
@@ -573,8 +573,8 @@ public class MavenRepositorySystem
throws Exception
{
return createRepository( RepositorySystem.DEFAULT_REMOTE_REPO_URL, RepositorySystem.DEFAULT_REMOTE_REPO_ID,
- true, ArtifactRepositoryPolicy.UPDATE_POLICY_DAILY, false,
- ArtifactRepositoryPolicy.UPDATE_POLICY_DAILY,
+ true, ArtifactRepositoryPolicy.UPDATE_POLICY_NEVER, false,
+ ArtifactRepositoryPolicy.UPDATE_POLICY_NEVER,
ArtifactRepositoryPolicy.CHECKSUM_POLICY_WARN );
}
http://git-wip-us.apache.org/repos/asf/maven/blob/04d540c6/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml b/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
index 91492a9..9487a9a 100644
--- a/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
+++ b/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
@@ -32,6 +32,9 @@ under the License.
<snapshots>
<enabled>false</enabled>
</snapshots>
+ <releases>
+ <updatePolicy>never</updatePolicy>
+ </releases>
</repository>
</repositories>
[27/28] maven git commit: [MNG-6195] Tidy up quoting and command
substitution
Posted by mi...@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/a14237d0
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/a14237d0
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/a14237d0
Branch: refs/heads/MNG-6169
Commit: a14237d07e4b1ff8d89b983f6ba74276b354dc2c
Parents: 9aabe2a
Author: Stephen Connolly <st...@gmail.com>
Authored: Sun Mar 26 22:41:24 2017 +0100
Committer: Michael Osipov <mi...@apache.org>
Committed: Sun Apr 2 00:21:12 2017 +0200
----------------------------------------------------------------------
apache-maven/src/bin/mvn | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/a14237d0/apache-maven/src/bin/mvn
----------------------------------------------------------------------
diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn
index df62f68..e569633 100755
--- a/apache-maven/src/bin/mvn
+++ b/apache-maven/src/bin/mvn
@@ -83,14 +83,14 @@ fi
# For MinGW, ensure paths are in Unix format before anything is touched
if $mingw ; then
[ -n "$MAVEN_HOME" ] &&
- MAVEN_HOME="`(cd "$MAVEN_HOME"; pwd)`"
+ MAVEN_HOME=`(cd "$MAVEN_HOME"; pwd)`
[ -n "$JAVA_HOME" ] &&
- JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
+ JAVA_HOME=`(cd "$JAVA_HOME"; pwd)`
# TODO classpath?
fi
if [ -z "$JAVA_HOME" ] ; then
- JAVACMD="`which java`"
+ JAVACMD=`which java`
else
JAVACMD="$JAVA_HOME/bin/java"
fi
@@ -122,13 +122,13 @@ fi
find_maven_basedir() {
(
basedir=`find_file_argument_basedir "$@"`
- wdir="`pwd`"
+ wdir=`pwd`
while [ "$wdir" != '/' ] ; do
if [ -d "$wdir"/.mvn ] ; then
basedir=$wdir
break
fi
- wdir="`cd "$wdir/.."; pwd`"
+ wdir=`cd "$wdir/.."; pwd`
done
echo "${basedir}"
)
@@ -136,13 +136,14 @@ find_maven_basedir() {
find_file_argument_basedir() {
(
- basedir="`pwd`"
+ basedir=`pwd`
found_file_switch=0
for arg in "$@"; do
if [ ${found_file_switch} -eq 1 ]; then
if [ -f "${arg}" ]; then
- basedir=$(dirname "$(readlink -f "${arg}")")
+ basedir=`dirname "${arg}"`
+ basedir=`cd "${basedir}" && pwd -P`
if [ ! -d "${basedir}" ]; then
echo "Directory ${basedir} extracted from the -f/--file command-line argument ${arg} does not exist" >&2
exit 1
[12/28] maven git commit: [MNG-6182] ModelResolver interface
enhancements.
Posted by mi...@apache.org.
[MNG-6182] ModelResolver interface enhancements.
o Added unit tests for the 'ModelResolver' interface.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/d0159094
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/d0159094
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/d0159094
Branch: refs/heads/MNG-6169
Commit: d01590944c59471ac438839142ce9ff0b6789a62
Parents: da0aec8
Author: Christian Schulte <sc...@apache.org>
Authored: Sun Mar 19 03:46:29 2017 +0100
Committer: Michael Osipov <mi...@apache.org>
Committed: Sun Apr 2 00:21:12 2017 +0200
----------------------------------------------------------------------
.../maven/project/ProjectModelResolverTest.java | 246 +++++++++++++++++++
.../internal/DefaultModelResolverTest.java | 222 +++++++++++++++++
2 files changed, 468 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/d0159094/maven-core/src/test/java/org/apache/maven/project/ProjectModelResolverTest.java
----------------------------------------------------------------------
diff --git a/maven-core/src/test/java/org/apache/maven/project/ProjectModelResolverTest.java b/maven-core/src/test/java/org/apache/maven/project/ProjectModelResolverTest.java
new file mode 100644
index 0000000..c21796b
--- /dev/null
+++ b/maven-core/src/test/java/org/apache/maven/project/ProjectModelResolverTest.java
@@ -0,0 +1,246 @@
+package org.apache.maven.project;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.io.File;
+import java.util.Collections;
+import java.util.List;
+
+import org.apache.maven.artifact.InvalidRepositoryException;
+import org.apache.maven.model.Dependency;
+import org.apache.maven.model.Parent;
+import org.apache.maven.model.resolution.ModelResolver;
+import org.apache.maven.model.resolution.UnresolvableModelException;
+import org.apache.maven.repository.internal.MavenRepositorySystemUtils;
+import org.eclipse.aether.DefaultRepositorySystemSession;
+import org.eclipse.aether.RepositorySystem;
+import org.eclipse.aether.impl.RemoteRepositoryManager;
+import org.eclipse.aether.repository.RemoteRepository;
+
+import static junit.framework.TestCase.assertEquals;
+import static junit.framework.TestCase.assertNotNull;
+import static junit.framework.TestCase.assertTrue;
+import static junit.framework.TestCase.fail;
+import static org.codehaus.plexus.PlexusTestCase.getBasedir;
+
+/**
+ * Test cases for the project {@code ModelResolver} implementation.
+ *
+ * @author Christian Schulte
+ * @since 3.5.0-alpha-2
+ */
+public class ProjectModelResolverTest extends AbstractMavenProjectTestCase
+{
+
+ /**
+ * Creates a new {@code ProjectModelResolverTest} instance.
+ */
+ public ProjectModelResolverTest()
+ {
+ super();
+ }
+
+ public void testResolveParentThrowsUnresolvableModelExceptionWhenNotFound() throws Exception
+ {
+ final Parent parent = new Parent();
+ parent.setGroupId( "org.apache" );
+ parent.setArtifactId( "apache" );
+ parent.setVersion( "0" );
+
+ try
+ {
+ this.newModelResolver().resolveModel( parent );
+ fail( "Expected 'UnresolvableModelException' not thrown." );
+ }
+ catch ( final UnresolvableModelException e )
+ {
+ assertNotNull( e.getMessage() );
+ assertTrue( e.getMessage().startsWith( "Could not find artifact org.apache:apache:pom:0 in central" ) );
+ }
+ }
+
+ public void testResolveParentThrowsUnresolvableModelExceptionWhenNoMatchingVersionFound() throws Exception
+ {
+ final Parent parent = new Parent();
+ parent.setGroupId( "org.apache" );
+ parent.setArtifactId( "apache" );
+ parent.setVersion( "[2.0,2.1)" );
+
+ try
+ {
+ this.newModelResolver().resolveModel( parent );
+ fail( "Expected 'UnresolvableModelException' not thrown." );
+ }
+ catch ( final UnresolvableModelException e )
+ {
+ assertEquals( "No versions matched the requested parent version range '[2.0,2.1)'",
+ e.getMessage() );
+
+ }
+ }
+
+ public void testResolveParentThrowsUnresolvableModelExceptionWhenUsingRangesWithoutUpperBound() throws Exception
+ {
+ final Parent parent = new Parent();
+ parent.setGroupId( "org.apache" );
+ parent.setArtifactId( "apache" );
+ parent.setVersion( "[1,)" );
+
+ try
+ {
+ this.newModelResolver().resolveModel( parent );
+ fail( "Expected 'UnresolvableModelException' not thrown." );
+ }
+ catch ( final UnresolvableModelException e )
+ {
+ assertEquals( "The requested parent version range '[1,)' does not specify an upper bound",
+ e.getMessage() );
+
+ }
+ }
+
+ public void testResolveParentSuccessfullyResolvesExistingParentWithoutRange() throws Exception
+ {
+ final Parent parent = new Parent();
+ parent.setGroupId( "org.apache" );
+ parent.setArtifactId( "apache" );
+ parent.setVersion( "1" );
+
+ assertNotNull( this.newModelResolver().resolveModel( parent ) );
+ assertEquals( "1", parent.getVersion() );
+ }
+
+ public void testResolveParentSuccessfullyResolvesExistingParentUsingHighestVersion() throws Exception
+ {
+ final Parent parent = new Parent();
+ parent.setGroupId( "org.apache" );
+ parent.setArtifactId( "apache" );
+ parent.setVersion( "(,2.0)" );
+
+ assertNotNull( this.newModelResolver().resolveModel( parent ) );
+ assertEquals( "1", parent.getVersion() );
+ }
+
+ public void testResolveDependencyThrowsUnresolvableModelExceptionWhenNotFound() throws Exception
+ {
+ final Dependency dependency = new Dependency();
+ dependency.setGroupId( "org.apache" );
+ dependency.setArtifactId( "apache" );
+ dependency.setVersion( "0" );
+
+ try
+ {
+ this.newModelResolver().resolveModel( dependency );
+ fail( "Expected 'UnresolvableModelException' not thrown." );
+ }
+ catch ( final UnresolvableModelException e )
+ {
+ assertNotNull( e.getMessage() );
+ assertTrue( e.getMessage().startsWith( "Could not find artifact org.apache:apache:pom:0 in central" ) );
+ }
+ }
+
+ public void testResolveDependencyThrowsUnresolvableModelExceptionWhenNoMatchingVersionFound() throws Exception
+ {
+ final Dependency dependency = new Dependency();
+ dependency.setGroupId( "org.apache" );
+ dependency.setArtifactId( "apache" );
+ dependency.setVersion( "[2.0,2.1)" );
+
+ try
+ {
+ this.newModelResolver().resolveModel( dependency );
+ fail( "Expected 'UnresolvableModelException' not thrown." );
+ }
+ catch ( final UnresolvableModelException e )
+ {
+ assertEquals( "No versions matched the requested dependency version range '[2.0,2.1)'",
+ e.getMessage() );
+
+ }
+ }
+
+ public void testResolveDependencyThrowsUnresolvableModelExceptionWhenUsingRangesWithoutUpperBound() throws Exception
+ {
+ final Dependency dependency = new Dependency();
+ dependency.setGroupId( "org.apache" );
+ dependency.setArtifactId( "apache" );
+ dependency.setVersion( "[1,)" );
+
+ try
+ {
+ this.newModelResolver().resolveModel( dependency );
+ fail( "Expected 'UnresolvableModelException' not thrown." );
+ }
+ catch ( final UnresolvableModelException e )
+ {
+ assertEquals( "The requested dependency version range '[1,)' does not specify an upper bound",
+ e.getMessage() );
+
+ }
+ }
+
+ public void testResolveDependencySuccessfullyResolvesExistingDependencyWithoutRange() throws Exception
+ {
+ final Dependency dependency = new Dependency();
+ dependency.setGroupId( "org.apache" );
+ dependency.setArtifactId( "apache" );
+ dependency.setVersion( "1" );
+
+ assertNotNull( this.newModelResolver().resolveModel( dependency ) );
+ assertEquals( "1", dependency.getVersion() );
+ }
+
+ public void testResolveDependencySuccessfullyResolvesExistingDependencyUsingHighestVersion() throws Exception
+ {
+ final Dependency dependency = new Dependency();
+ dependency.setGroupId( "org.apache" );
+ dependency.setArtifactId( "apache" );
+ dependency.setVersion( "(,2.0)" );
+
+ assertNotNull( this.newModelResolver().resolveModel( dependency ) );
+ assertEquals( "1", dependency.getVersion() );
+ }
+
+ private ModelResolver newModelResolver() throws Exception
+ {
+ final File localRepo = new File( this.getLocalRepository().getBasedir() );
+ final DefaultRepositorySystemSession repoSession = MavenRepositorySystemUtils.newSession();
+ repoSession.setLocalRepositoryManager( new LegacyLocalRepositoryManager( localRepo ) );
+
+ return new ProjectModelResolver( repoSession, null, lookup( RepositorySystem.class ),
+ lookup( RemoteRepositoryManager.class ),
+ this.getRemoteRepositories(),
+ ProjectBuildingRequest.RepositoryMerging.REQUEST_DOMINANT, null );
+
+ }
+
+ private List<RemoteRepository> getRemoteRepositories()
+ throws InvalidRepositoryException
+ {
+ final File repoDir = new File( getBasedir(), "src/test/remote-repo" ).getAbsoluteFile();
+ final RemoteRepository remoteRepository =
+ new RemoteRepository.Builder( org.apache.maven.repository.RepositorySystem.DEFAULT_REMOTE_REPO_ID,
+ "default", repoDir.toURI().toASCIIString() ).build();
+
+ return Collections.singletonList( remoteRepository );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven/blob/d0159094/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
new file mode 100644
index 0000000..497cf6b
--- /dev/null
+++ b/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/DefaultModelResolverTest.java
@@ -0,0 +1,222 @@
+package org.apache.maven.repository.internal;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.net.MalformedURLException;
+import java.util.Arrays;
+
+import org.apache.maven.model.Dependency;
+import org.apache.maven.model.Parent;
+import org.apache.maven.model.resolution.ModelResolver;
+import org.apache.maven.model.resolution.UnresolvableModelException;
+import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
+import org.eclipse.aether.impl.ArtifactResolver;
+import org.eclipse.aether.impl.RemoteRepositoryManager;
+import org.eclipse.aether.impl.VersionRangeResolver;
+
+/**
+ * Test cases for the default {@code ModelResolver} implementation.
+ *
+ * @author Christian Schulte
+ * @since 3.5.0-alpha-2
+ */
+public final class DefaultModelResolverTest extends AbstractRepositoryTestCase
+{
+
+ /**
+ * Creates a new {@code DefaultModelResolverTest} instance.
+ */
+ public DefaultModelResolverTest()
+ {
+ super();
+ }
+
+ public void testResolveParentThrowsUnresolvableModelExceptionWhenNotFound() throws Exception
+ {
+ final Parent parent = new Parent();
+ parent.setGroupId( "ut.simple" );
+ parent.setArtifactId( "artifact" );
+ parent.setVersion( "0" );
+
+ try
+ {
+ this.newModelResolver().resolveModel( parent );
+ fail( "Expected 'UnresolvableModelException' not thrown." );
+ }
+ catch ( final UnresolvableModelException e )
+ {
+ assertNotNull( e.getMessage() );
+ assertTrue( e.getMessage().startsWith( "Could not find artifact ut.simple:artifact:pom:0 in repo" ) );
+ }
+ }
+
+ public void testResolveParentThrowsUnresolvableModelExceptionWhenNoMatchingVersionFound() throws Exception
+ {
+ final Parent parent = new Parent();
+ parent.setGroupId( "ut.simple" );
+ parent.setArtifactId( "artifact" );
+ parent.setVersion( "[2.0,2.1)" );
+
+ try
+ {
+ this.newModelResolver().resolveModel( parent );
+ fail( "Expected 'UnresolvableModelException' not thrown." );
+ }
+ catch ( final UnresolvableModelException e )
+ {
+ assertEquals( "No versions matched the requested parent version range '[2.0,2.1)'",
+ e.getMessage() );
+
+ }
+ }
+
+ public void testResolveParentThrowsUnresolvableModelExceptionWhenUsingRangesWithoutUpperBound() throws Exception
+ {
+ final Parent parent = new Parent();
+ parent.setGroupId( "ut.simple" );
+ parent.setArtifactId( "artifact" );
+ parent.setVersion( "[1.0,)" );
+
+ try
+ {
+ this.newModelResolver().resolveModel( parent );
+ fail( "Expected 'UnresolvableModelException' not thrown." );
+ }
+ catch ( final UnresolvableModelException e )
+ {
+ assertEquals( "The requested parent version range '[1.0,)' does not specify an upper bound",
+ e.getMessage() );
+
+ }
+ }
+
+ public void testResolveParentSuccessfullyResolvesExistingParentWithoutRange() throws Exception
+ {
+ final Parent parent = new Parent();
+ parent.setGroupId( "ut.simple" );
+ parent.setArtifactId( "artifact" );
+ parent.setVersion( "1.0" );
+
+ assertNotNull( this.newModelResolver().resolveModel( parent ) );
+ assertEquals( "1.0", parent.getVersion() );
+ }
+
+ public void testResolveParentSuccessfullyResolvesExistingParentUsingHighestVersion() throws Exception
+ {
+ final Parent parent = new Parent();
+ parent.setGroupId( "ut.simple" );
+ parent.setArtifactId( "artifact" );
+ parent.setVersion( "(,2.0)" );
+
+ assertNotNull( this.newModelResolver().resolveModel( parent ) );
+ assertEquals( "1.0", parent.getVersion() );
+ }
+
+ public void testResolveDependencyThrowsUnresolvableModelExceptionWhenNotFound() throws Exception
+ {
+ final Dependency dependency = new Dependency();
+ dependency.setGroupId( "ut.simple" );
+ dependency.setArtifactId( "artifact" );
+ dependency.setVersion( "0" );
+
+ try
+ {
+ this.newModelResolver().resolveModel( dependency );
+ fail( "Expected 'UnresolvableModelException' not thrown." );
+ }
+ catch ( final UnresolvableModelException e )
+ {
+ assertNotNull( e.getMessage() );
+ assertTrue( e.getMessage().startsWith( "Could not find artifact ut.simple:artifact:pom:0 in repo" ) );
+ }
+ }
+
+ public void testResolveDependencyThrowsUnresolvableModelExceptionWhenNoMatchingVersionFound() throws Exception
+ {
+ final Dependency dependency = new Dependency();
+ dependency.setGroupId( "ut.simple" );
+ dependency.setArtifactId( "artifact" );
+ dependency.setVersion( "[2.0,2.1)" );
+
+ try
+ {
+ this.newModelResolver().resolveModel( dependency );
+ fail( "Expected 'UnresolvableModelException' not thrown." );
+ }
+ catch ( final UnresolvableModelException e )
+ {
+ assertEquals( "No versions matched the requested dependency version range '[2.0,2.1)'",
+ e.getMessage() );
+
+ }
+ }
+
+ public void testResolveDependencyThrowsUnresolvableModelExceptionWhenUsingRangesWithoutUpperBound() throws Exception
+ {
+ final Dependency dependency = new Dependency();
+ dependency.setGroupId( "ut.simple" );
+ dependency.setArtifactId( "artifact" );
+ dependency.setVersion( "[1.0,)" );
+
+ try
+ {
+ this.newModelResolver().resolveModel( dependency );
+ fail( "Expected 'UnresolvableModelException' not thrown." );
+ }
+ catch ( final UnresolvableModelException e )
+ {
+ assertEquals( "The requested dependency version range '[1.0,)' does not specify an upper bound",
+ e.getMessage() );
+
+ }
+ }
+
+ public void testResolveDependencySuccessfullyResolvesExistingDependencyWithoutRange() throws Exception
+ {
+ final Dependency dependency = new Dependency();
+ dependency.setGroupId( "ut.simple" );
+ dependency.setArtifactId( "artifact" );
+ dependency.setVersion( "1.0" );
+
+ assertNotNull( this.newModelResolver().resolveModel( dependency ) );
+ assertEquals( "1.0", dependency.getVersion() );
+ }
+
+ public void testResolveDependencySuccessfullyResolvesExistingDependencyUsingHighestVersion() throws Exception
+ {
+ final Dependency dependency = new Dependency();
+ dependency.setGroupId( "ut.simple" );
+ dependency.setArtifactId( "artifact" );
+ dependency.setVersion( "(,2.0)" );
+
+ assertNotNull( this.newModelResolver().resolveModel( dependency ) );
+ assertEquals( "1.0", dependency.getVersion() );
+ }
+
+ private ModelResolver newModelResolver() throws ComponentLookupException, MalformedURLException
+ {
+ return new DefaultModelResolver( this.session, null, this.getClass().getName(),
+ lookup( ArtifactResolver.class ), lookup( VersionRangeResolver.class ),
+ lookup( RemoteRepositoryManager.class ),
+ Arrays.asList( newTestRepository() ) );
+
+ }
+
+}
[16/28] maven git commit: Make it possible to run unit tests from an
IDE
Posted by mi...@apache.org.
Make it possible to run unit tests from an IDE
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/ffb87318
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/ffb87318
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/ffb87318
Branch: refs/heads/MNG-6169
Commit: ffb87318a0c29435cdef7ee183de8249550c5c2f
Parents: ef6167e
Author: Stephen Connolly <st...@gmail.com>
Authored: Sun Mar 19 21:54:31 2017 +0000
Committer: Michael Osipov <mi...@apache.org>
Committed: Sun Apr 2 00:21:12 2017 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/maven/cli/CLIReportingUtils.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/ffb87318/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java b/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
index c5faef5..52f2053 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
@@ -28,6 +28,7 @@ import java.util.Date;
import java.util.Locale;
import java.util.Properties;
+import org.apache.commons.lang3.StringUtils;
import org.codehaus.plexus.util.Os;
import org.slf4j.Logger;
@@ -94,7 +95,7 @@ public final class CLIReportingUtils
{
msg += " (";
msg += ( rev != null ? rev : "" );
- if ( timestamp != null )
+ if ( StringUtils.isNotBlank( timestamp ) )
{
String ts = formatTimestamp( Long.valueOf( timestamp ) );
msg += ( rev != null ? "; " : "" ) + ts;
[25/28] maven git commit: INFRA have been changing JDK labels again
Posted by mi...@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/02612084
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/02612084
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/02612084
Branch: refs/heads/MNG-6169
Commit: 02612084453bf4cfd2f48ad15c39a91373fa8d83
Parents: 934a159
Author: Stephen Connolly <st...@gmail.com>
Authored: Mon Mar 27 16:22:29 2017 +0100
Committer: Michael Osipov <mi...@apache.org>
Committed: Sun Apr 2 00:21:12 2017 +0200
----------------------------------------------------------------------
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/02612084/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index 2ac2644..123a246 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -117,7 +117,7 @@ parallel linuxJava7:{
MAVEN_WIN_J8=pwd()
}
echo "Driving integration tests using Maven $MAVEN_WIN_J8"
- def JAVA_WIN_J8=tool name: 'JDK 1.8 (unlimited security) 64-bit Windows only', type: 'hudson.model.JDK'
+ def JAVA_WIN_J8=tool name: 'JDK 1.8.0_121 (unlimited security) 64-bit Windows only', type: 'hudson.model.JDK'
dir(JAVA_WIN_J8) {
JAVA_WIN_J8=pwd()
}
[02/28] maven git commit: Squashed commit of the following:
Posted by mi...@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/9aabe2a7
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/9aabe2a7
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/9aabe2a7
Branch: refs/heads/MNG-6169
Commit: 9aabe2a7adf89bc1de0c9cd9f3bb4486c0e4ebd5
Parents: 00afbaa
Author: rfscholte <rf...@apache.org>
Authored: Wed Mar 29 19:50:15 2017 +0200
Committer: Michael Osipov <mi...@apache.org>
Committed: Sun Apr 2 00:21:12 2017 +0200
----------------------------------------------------------------------
.../org/apache/maven/plugin/AbstractMojo.java | 37 +++++++++-----------
1 file changed, 17 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/9aabe2a7/maven-plugin-api/src/main/java/org/apache/maven/plugin/AbstractMojo.java
----------------------------------------------------------------------
diff --git a/maven-plugin-api/src/main/java/org/apache/maven/plugin/AbstractMojo.java b/maven-plugin-api/src/main/java/org/apache/maven/plugin/AbstractMojo.java
index f85e7f3..6292116 100644
--- a/maven-plugin-api/src/main/java/org/apache/maven/plugin/AbstractMojo.java
+++ b/maven-plugin-api/src/main/java/org/apache/maven/plugin/AbstractMojo.java
@@ -27,17 +27,15 @@ import org.apache.maven.plugin.logging.SystemStreamLog;
/**
* Abstract class to provide most of the infrastructure required to implement a <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;
[13/28] maven git commit: updated parent pom: fixes issue with
m-assembly-p bug
Posted by mi...@apache.org.
updated parent pom: fixes issue with m-assembly-p bug
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/b4027263
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/b4027263
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/b4027263
Branch: refs/heads/MNG-6169
Commit: b4027263e9f3d14603f789c066ad2e6597961ba2
Parents: d015909
Author: Herv� Boutemy <hb...@apache.org>
Authored: Sun Mar 19 10:38:18 2017 +0100
Committer: Michael Osipov <mi...@apache.org>
Committed: Sun Apr 2 00:21:12 2017 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/b4027263/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index bb95b7d..1d34ffe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
- <version>27</version>
+ <version>30</version>
<relativePath>../pom/maven/pom.xml</relativePath>
</parent>
[14/28] maven git commit: fixed site generation: downgraded parent
pom, upgraded m-assembly-p
Posted by mi...@apache.org.
fixed site generation: downgraded parent pom, upgraded m-assembly-p
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/d1eb1ba3
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/d1eb1ba3
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/d1eb1ba3
Branch: refs/heads/MNG-6169
Commit: d1eb1ba3612f529baf82006e7da6569f42c6dd9a
Parents: b402726
Author: Herv� Boutemy <hb...@apache.org>
Authored: Sun Mar 19 14:44:33 2017 +0100
Committer: Michael Osipov <mi...@apache.org>
Committed: Sun Apr 2 00:21:12 2017 +0200
----------------------------------------------------------------------
pom.xml | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/d1eb1ba3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 1d34ffe..a3d5f67 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
- <version>30</version>
+ <version>27</version>
<relativePath>../pom/maven/pom.xml</relativePath>
</parent>
@@ -536,6 +536,11 @@ under the License.
<artifactId>findbugs-maven-plugin</artifactId>
<version>3.0.4</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.6</version>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
[15/28] maven git commit: [MNG-6189] warn if maven-site-plugin
reportPlugins is configured
Posted by mi...@apache.org.
[MNG-6189] warn if maven-site-plugin reportPlugins is configured
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/ef6167e5
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/ef6167e5
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/ef6167e5
Branch: refs/heads/MNG-6169
Commit: ef6167e587477275b044444808eebc1b3bc8ba15
Parents: d1eb1ba
Author: Herv� Boutemy <hb...@apache.org>
Authored: Sun Mar 19 17:04:04 2017 +0100
Committer: Michael Osipov <mi...@apache.org>
Committed: Sun Apr 2 00:21:12 2017 +0200
----------------------------------------------------------------------
.../maven/model/plugin/DefaultReportingConverter.java | 13 +++++++++++--
.../apache/maven/model/plugin/ReportingConverter.java | 5 +++--
2 files changed, 14 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/ef6167e5/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportingConverter.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportingConverter.java b/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportingConverter.java
index d918d9e..8bfa580 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportingConverter.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportingConverter.java
@@ -28,12 +28,16 @@ import org.apache.maven.model.ReportSet;
import org.apache.maven.model.Reporting;
import org.apache.maven.model.building.ModelBuildingRequest;
import org.apache.maven.model.building.ModelProblemCollector;
+import org.apache.maven.model.building.ModelProblemCollectorRequest;
+import org.apache.maven.model.building.ModelProblem.Severity;
+import org.apache.maven.model.building.ModelProblem.Version;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.xml.Xpp3Dom;
/**
- * Handles conversion of the legacy reporting section into the configuration of the new Maven Site Plugin.
+ * Handles conversion of the <code><reporting></code> section into the configuration of Maven Site Plugin 3.x,
+ * i.e. <code>reportPlugins</code> and <code>outputDirectory</code> parameters.
*
* @author Benjamin Bentmann
*/
@@ -87,7 +91,12 @@ public class DefaultReportingConverter
if ( reportPlugins != null )
{
- // new-style report configuration already present, assume user handled entire conversion
+ // new-style report configuration already present: warn since this new style has been deprecated
+ // in favor of classical reporting section MSITE-647 / MSITE-684
+ problems.add( new ModelProblemCollectorRequest( Severity.WARNING, Version.BASE )
+ .setMessage( "Reporting configuration should be done in <reporting> section, "
+ + "not in maven-site-plugin <configuration> as reportPlugins parameter." )
+ .setLocation( sitePlugin.getLocation( "configuration" ) ) );
return;
}
http://git-wip-us.apache.org/repos/asf/maven/blob/ef6167e5/maven-model-builder/src/main/java/org/apache/maven/model/plugin/ReportingConverter.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/plugin/ReportingConverter.java b/maven-model-builder/src/main/java/org/apache/maven/model/plugin/ReportingConverter.java
index c5ea338..e6d8898 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/plugin/ReportingConverter.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/plugin/ReportingConverter.java
@@ -24,7 +24,8 @@ import org.apache.maven.model.building.ModelBuildingRequest;
import org.apache.maven.model.building.ModelProblemCollector;
/**
- * Handles conversion of the legacy reporting section into the configuration of the new Maven Site Plugin.
+ * Handles conversion of the <code><reporting></code> section into the configuration of Maven Site Plugin 3.x,
+ * i.e. <code>reportPlugins</code> and <code>outputDirectory</code> parameters.
*
* @author Benjamin Bentmann
*/
@@ -32,7 +33,7 @@ public interface ReportingConverter
{
/**
- * Converts values from model's reporting section into the configuration for the new Maven Site Plugin.
+ * Converts values from model's reporting section into the configuration for Maven Site Plugin 3.x.
*
* @param model The model whose reporting section should be converted, must not be <code>null</code>.
* @param request The model building request that holds further settings, must not be {@code null}.
[28/28] maven git commit: use new "Maven 3 (latest)" and "JDK 1.x
(latest)" Ubuntu+win aliases
Posted by mi...@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/00afbaa5
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/00afbaa5
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/00afbaa5
Branch: refs/heads/MNG-6169
Commit: 00afbaa53fb73a0dc6639387a8f93d72398994b9
Parents: fa11274
Author: Herv� Boutemy <hb...@apache.org>
Authored: Sun Mar 26 10:27:59 2017 +0200
Committer: Michael Osipov <mi...@apache.org>
Committed: Sun Apr 2 00:21:12 2017 +0200
----------------------------------------------------------------------
Jenkinsfile | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/00afbaa5/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index be4485c..b6c7e19 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -56,7 +56,7 @@ node('ubuntu') {
stage 'Integration Test'
parallel linuxJava7:{
node('ubuntu') {
- def MAVEN_NIX_J7=tool name: 'Maven 3.3.9', type: 'hudson.tasks.Maven$MavenInstallation'
+ def MAVEN_NIX_J7=tool name: 'Maven 3 (latest)', type: 'hudson.tasks.Maven$MavenInstallation'
echo "Driving integration tests using Maven $MAVEN_NIX_J7"
def JAVA_NIX_J7=tool name: 'JDK 1.7 (latest)', type: 'hudson.model.JDK'
echo "Running integration tests with Java $JAVA_NIX_J7"
@@ -75,7 +75,7 @@ parallel linuxJava7:{
}
},linuxJava8: {
node('ubuntu') {
- def MAVEN_NIX_J8=tool name: 'Maven 3.3.9', type: 'hudson.tasks.Maven$MavenInstallation'
+ def MAVEN_NIX_J8=tool name: 'Maven 3 (latest)', type: 'hudson.tasks.Maven$MavenInstallation'
echo "Driving integration tests using Maven $MAVEN_NIX_J8"
def JAVA_NIX_J8=tool name: 'JDK 1.8 (latest)', type: 'hudson.model.JDK'
echo "Running integration tests with Java $JAVA_NIX_J8"
@@ -94,12 +94,12 @@ parallel linuxJava7:{
}
}, winJava7: {
node('Windows') {
- def MAVEN_WIN_J7=tool name: 'Maven 3.3.9 (Windows)', type: 'hudson.tasks.Maven$MavenInstallation'
+ def MAVEN_WIN_J7=tool name: 'Maven 3 (latest)', type: 'hudson.tasks.Maven$MavenInstallation'
dir(MAVEN_WIN_J7) {
MAVEN_WIN_J7=pwd()
}
echo "Driving integration tests using Maven $MAVEN_WIN_J7"
- def JAVA_WIN_J7=tool name: 'JDK 1.7 (unlimited security) 64-bit Windows only', type: 'hudson.model.JDK'
+ def JAVA_WIN_J7=tool name: 'JDK 1.7 (latest)', type: 'hudson.model.JDK'
dir(JAVA_WIN_J7) {
JAVA_WIN_J7=pwd()
}
@@ -124,12 +124,12 @@ parallel linuxJava7:{
}
}, winJava8: {
node('Windows') {
- def MAVEN_WIN_J8=tool name: 'Maven 3.3.9 (Windows)', type: 'hudson.tasks.Maven$MavenInstallation'
+ def MAVEN_WIN_J8=tool name: 'Maven 3 (latest)', type: 'hudson.tasks.Maven$MavenInstallation'
dir(MAVEN_WIN_J8) {
MAVEN_WIN_J8=pwd()
}
echo "Driving integration tests using Maven $MAVEN_WIN_J8"
- def JAVA_WIN_J8=tool name: 'JDK 1.8.0_121 (unlimited security) 64-bit Windows only', type: 'hudson.model.JDK'
+ def JAVA_WIN_J8=tool name: 'JDK 1.8 (latest)', type: 'hudson.model.JDK'
dir(JAVA_WIN_J8) {
JAVA_WIN_J8=pwd()
}
[11/28] maven git commit: [MNG-6176] Upgrade findbugs to 3.0.4 so
that the site can be built with Java 7 and 8
Posted by mi...@apache.org.
[MNG-6176] Upgrade findbugs to 3.0.4 so that the site can be built with Java 7 and 8
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/da0aec82
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/da0aec82
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/da0aec82
Branch: refs/heads/MNG-6169
Commit: da0aec82a23f4519651d8c740b65749fb9d4d37e
Parents: c7f827e
Author: Stephen Connolly <st...@gmail.com>
Authored: Sat Mar 18 12:32:06 2017 +0000
Committer: Michael Osipov <mi...@apache.org>
Committed: Sun Apr 2 00:21:12 2017 +0200
----------------------------------------------------------------------
pom.xml | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/da0aec82/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8a64bae..bb95b7d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -531,6 +531,11 @@ under the License.
</lifecycleMappingMetadata>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>3.0.4</version>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
[20/28] maven git commit: [MNG-6190] maven-resolver-provider's
DefaultArtifactDescriptorReader has mismatched constructor and initService
methods
Posted by mi...@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/b65d6d34
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/b65d6d34
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/b65d6d34
Branch: refs/heads/MNG-6169
Commit: b65d6d34b82d57fe7bb69a49caa8850b803c0ef3
Parents: 04d540c
Author: Christian Schulte <sc...@apache.org>
Authored: Tue Mar 21 04:06:02 2017 +0100
Committer: Michael Osipov <mi...@apache.org>
Committed: Sun Apr 2 00:21:12 2017 +0200
----------------------------------------------------------------------
.../internal/DefaultArtifactDescriptorReader.java | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/b65d6d34/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
----------------------------------------------------------------------
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
index 1df1c12..82e1284 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
@@ -111,8 +111,9 @@ public class DefaultArtifactDescriptorReader
@Inject
DefaultArtifactDescriptorReader( RemoteRepositoryManager remoteRepositoryManager, VersionResolver versionResolver,
- ArtifactResolver artifactResolver, ModelBuilder modelBuilder,
- RepositoryEventDispatcher repositoryEventDispatcher, LoggerFactory loggerFactory )
+ VersionRangeResolver versionRangeResolver, ArtifactResolver artifactResolver,
+ ModelBuilder modelBuilder, RepositoryEventDispatcher repositoryEventDispatcher,
+ LoggerFactory loggerFactory )
{
setRemoteRepositoryManager( remoteRepositoryManager );
setVersionResolver( versionResolver );
@@ -124,17 +125,17 @@ public class DefaultArtifactDescriptorReader
public void initService( ServiceLocator locator )
{
- setLoggerFactory( locator.getService( LoggerFactory.class ) );
setRemoteRepositoryManager( locator.getService( RemoteRepositoryManager.class ) );
setVersionResolver( locator.getService( VersionResolver.class ) );
setVersionRangeResolver( locator.getService( VersionRangeResolver.class ) );
setArtifactResolver( locator.getService( ArtifactResolver.class ) );
- setRepositoryEventDispatcher( locator.getService( RepositoryEventDispatcher.class ) );
modelBuilder = locator.getService( ModelBuilder.class );
if ( modelBuilder == null )
{
setModelBuilder( new DefaultModelBuilderFactory().newInstance() );
}
+ setRepositoryEventDispatcher( locator.getService( RepositoryEventDispatcher.class ) );
+ setLoggerFactory( locator.getService( LoggerFactory.class ) );
}
public DefaultArtifactDescriptorReader setLoggerFactory( LoggerFactory loggerFactory )
[07/28] maven git commit: [MNG-6176] Javadoc errors prevent release
with Java 8
Posted by mi...@apache.org.
[MNG-6176] Javadoc errors prevent release with Java 8
Upgrade to modello-1.9.1
Fix javadoc errors in tests
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/3e637625
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/3e637625
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/3e637625
Branch: refs/heads/MNG-6169
Commit: 3e63762503dadbc530238042a32b697e7dcad5bc
Parents: aaae0b2
Author: rfscholte <rf...@apache.org>
Authored: Sat Mar 18 12:35:18 2017 +0100
Committer: Michael Osipov <mi...@apache.org>
Committed: Sun Apr 2 00:21:12 2017 +0200
----------------------------------------------------------------------
.../versioning/ComparableVersionTest.java | 2 +-
maven-compat/pom.xml | 35 +++++++++++++-------
.../LifecycleExecutionPlanCalculatorTest.java | 2 +-
.../LifecycleExecutionPlanCalculatorStub.java | 2 +-
.../stub/ProjectDependencyGraphStub.java | 5 +--
.../org/apache/maven/cli/CleanArgumentTest.java | 2 +-
.../DefaultInheritanceAssemblerTest.java | 2 +-
.../AbstractModelInterpolatorTest.java | 2 +-
pom.xml | 6 +++-
9 files changed, 37 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/3e637625/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java
----------------------------------------------------------------------
diff --git a/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java b/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java
index aea98dd..875b43e 100644
--- a/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java
+++ b/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java
@@ -185,7 +185,7 @@ public class ComparableVersionTest
/**
* Test <a href="https://issues.apache.org/jira/browse/MNG-5568">MNG-5568</a> edge case
- * which was showing transitive inconsistency: since A > B and B > C then we should have A > C
+ * which was showing transitive inconsistency: since A > B and B > C then we should have A > C
* otherwise sorting a list of ComparableVersions() will in some cases throw runtime exception;
* see Netbeans issues <a href="https://netbeans.org/bugzilla/show_bug.cgi?id=240845">240845</a> and
* <a href="https://netbeans.org/bugzilla/show_bug.cgi?id=226100">226100</a>
http://git-wip-us.apache.org/repos/asf/maven/blob/3e637625/maven-compat/pom.xml
----------------------------------------------------------------------
diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml
index 2d0ecad..7af138d 100644
--- a/maven-compat/pom.xml
+++ b/maven-compat/pom.xml
@@ -113,18 +113,6 @@ under the License.
</dependencies>
<build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <!-- There's no maintenance on maven-compat -->
- <additionalparam>-Xdoclint:none</additionalparam>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.plexus</groupId>
@@ -143,4 +131,27 @@ under the License.
</plugin>
</plugins>
</build>
+
+ <profiles>
+ <profile>
+ <id>javadoc8</id>
+ <activation>
+ <jdk>!1.7</jdk>
+ </activation>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <!-- There's no maintenance on maven-compat -->
+ <additionalparam>-Xdoclint:none</additionalparam>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ </profile>
+ </profiles>
</project>
http://git-wip-us.apache.org/repos/asf/maven/blob/3e637625/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculatorTest.java
----------------------------------------------------------------------
diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculatorTest.java b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculatorTest.java
index a9af566..0e1c3c7 100644
--- a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculatorTest.java
+++ b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculatorTest.java
@@ -25,7 +25,7 @@ import org.apache.maven.lifecycle.internal.stub.PluginVersionResolverStub;
import org.apache.maven.lifecycle.internal.stub.ProjectDependencyGraphStub;
/**
- * @author Kristian Rosenvold>
+ * @author Kristian Rosenvold
*/
public class LifecycleExecutionPlanCalculatorTest
extends AbstractCoreMavenComponentTestCase
http://git-wip-us.apache.org/repos/asf/maven/blob/3e637625/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/LifecycleExecutionPlanCalculatorStub.java
----------------------------------------------------------------------
diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/LifecycleExecutionPlanCalculatorStub.java b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/LifecycleExecutionPlanCalculatorStub.java
index 43aa47c..90de4d8 100644
--- a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/LifecycleExecutionPlanCalculatorStub.java
+++ b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/LifecycleExecutionPlanCalculatorStub.java
@@ -88,7 +88,7 @@ public class LifecycleExecutionPlanCalculatorStub
public final static MojoDescriptor SITE_DEPLOY = createMojoDescriptor( "site-deploy" );
/**
- * @deprecated instead use {@link #getNumberOfExecutions()}
+ * @deprecated instead use {@link #getNumberOfExecutions(ProjectBuildList)}
*/
@Deprecated
public int getNumberOfExceutions( ProjectBuildList projectBuildList )
http://git-wip-us.apache.org/repos/asf/maven/blob/3e637625/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/ProjectDependencyGraphStub.java
----------------------------------------------------------------------
diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/ProjectDependencyGraphStub.java b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/ProjectDependencyGraphStub.java
index 7af756d..8df5055 100644
--- a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/ProjectDependencyGraphStub.java
+++ b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/ProjectDependencyGraphStub.java
@@ -42,14 +42,15 @@ import java.util.List;
/**
* A stub dependency graph that is custom made for testing concurrent build graph evaluations.
- * <p/>
+ * <p>
* Implements a graph as follows:
* A has no dependencies
* B depends on A
* C depends on A
- * X depends on B & C
+ * X depends on B & C
* Y depends on B
* Z depends on C
+ * </p>
*
* @author Kristian Rosenvold
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/3e637625/maven-embedder/src/test/java/org/apache/maven/cli/CleanArgumentTest.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/java/org/apache/maven/cli/CleanArgumentTest.java b/maven-embedder/src/test/java/org/apache/maven/cli/CleanArgumentTest.java
index 874170e..7e2b489 100644
--- a/maven-embedder/src/test/java/org/apache/maven/cli/CleanArgumentTest.java
+++ b/maven-embedder/src/test/java/org/apache/maven/cli/CleanArgumentTest.java
@@ -24,7 +24,7 @@ import static org.junit.Assert.assertEquals;
import org.junit.Test;
/**
- * @author Karl Heinz Marbaise <kh...@apache.org>
+ * @author Karl Heinz Marbaise
*/
public class CleanArgumentTest
{
http://git-wip-us.apache.org/repos/asf/maven/blob/3e637625/maven-model-builder/src/test/java/org/apache/maven/model/inheritance/DefaultInheritanceAssemblerTest.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/inheritance/DefaultInheritanceAssemblerTest.java b/maven-model-builder/src/test/java/org/apache/maven/model/inheritance/DefaultInheritanceAssemblerTest.java
index 1b47ec1..372d0a9 100644
--- a/maven-model-builder/src/test/java/org/apache/maven/model/inheritance/DefaultInheritanceAssemblerTest.java
+++ b/maven-model-builder/src/test/java/org/apache/maven/model/inheritance/DefaultInheritanceAssemblerTest.java
@@ -89,7 +89,7 @@ public class DefaultInheritanceAssemblerTest
}
/**
- * Flat directory structure: parent & child POMs in sibling directories, child directory == artifactId.
+ * Flat directory structure: parent & child POMs in sibling directories, child directory == artifactId.
* @throws Exception
*/
public void testFlatUrls()
http://git-wip-us.apache.org/repos/asf/maven/blob/3e637625/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/AbstractModelInterpolatorTest.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/AbstractModelInterpolatorTest.java b/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/AbstractModelInterpolatorTest.java
index d8b54b8..aa09cb0 100644
--- a/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/AbstractModelInterpolatorTest.java
+++ b/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/AbstractModelInterpolatorTest.java
@@ -68,7 +68,7 @@ public abstract class AbstractModelInterpolatorTest
}
/**
- * @deprecated instead use {@link #assertCollectorState()}
+ * @deprecated instead use {@link #assertCollectorState(int, int, int, SimpleProblemCollector)}
*/
@Deprecated
protected void assertColllectorState( int numFatals, int numErrors, int numWarnings,
http://git-wip-us.apache.org/repos/asf/maven/blob/3e637625/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d2b4633..44c361a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,7 +63,7 @@ under the License.
<wagonVersion>2.12</wagonVersion>
<securityDispatcherVersion>1.4</securityDispatcherVersion>
<cipherVersion>1.7</cipherVersion>
- <modelloVersion>1.9.0</modelloVersion>
+ <modelloVersion>1.9.1</modelloVersion>
<jxpathVersion>1.3</jxpathVersion>
<resolverVersion>1.0.3</resolverVersion>
<slf4jVersion>1.7.22</slf4jVersion>
@@ -650,6 +650,10 @@ under the License.
<reports>
<report>aggregate</report>
</reports>
+ <configuration>
+ <!-- There's no maintenance on maven-compat -->
+ <additionalparam>-Xdoclint:none</additionalparam>
+ </configuration>
</reportSet>
</reportSets>
</plugin>