maven git commit: [MNG-6176] Javadoc errors prevent release with Java 8
Repository: maven Updated Branches: refs/heads/MNG-6176 [created] 7713d9bb9 [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/7713d9bb Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/7713d9bb Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/7713d9bb Branch: refs/heads/MNG-6176 Commit: 7713d9bb96029b75d3c03b94d344b6bbbaf5f6a7 Parents: 587317b Author: rfscholte Authored: Sat Mar 18 12:35:18 2017 +0100 Committer: rfscholte Committed: Sat Mar 18 12:35:18 2017 +0100 -- .../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/7713d9bb/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 https://issues.apache.org/jira/browse/MNG-5568";>MNG-5568 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 https://netbeans.org/bugzilla/show_bug.cgi?id=240845";>240845 and * https://netbeans.org/bugzilla/show_bug.cgi?id=226100";>226100 http://git-wip-us.apache.org/repos/asf/maven/blob/7713d9bb/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. - - - - org.apache.maven.plugins - maven-javadoc-plugin - - --Xdoclint:none - - - - org.codehaus.plexus @@ -143,4 +131,27 @@ under the License. + + + + javadoc8 + +!1.7 + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + +-Xdoclint:none + + + + + + + http://git-wip-us.apache.org/repos/asf/maven/blob/7713d9bb/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/7713d9bb/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/LifecycleExec
maven git commit: [MNG-6176] Javadoc errors prevent release with Java 8
Repository: maven Updated Branches: refs/heads/master da03d6b03 -> 0e7e3eeb5 [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/0e7e3eeb Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/0e7e3eeb Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/0e7e3eeb Branch: refs/heads/master Commit: 0e7e3eeb597b92f1394b24e33d5933e995ee8104 Parents: da03d6b Author: rfscholte Authored: Sat Mar 18 12:35:18 2017 +0100 Committer: rfscholte Committed: Sat Mar 18 12:55:05 2017 +0100 -- .../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/0e7e3eeb/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 https://issues.apache.org/jira/browse/MNG-5568";>MNG-5568 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 https://netbeans.org/bugzilla/show_bug.cgi?id=240845";>240845 and * https://netbeans.org/bugzilla/show_bug.cgi?id=226100";>226100 http://git-wip-us.apache.org/repos/asf/maven/blob/0e7e3eeb/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. - - - - org.apache.maven.plugins - maven-javadoc-plugin - - --Xdoclint:none - - - - org.codehaus.plexus @@ -143,4 +131,27 @@ under the License. + + + + javadoc8 + +!1.7 + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + +-Xdoclint:none + + + + + + + http://git-wip-us.apache.org/repos/asf/maven/blob/0e7e3eeb/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/0e7e3eeb/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/LifecycleExecu
[1/2] maven git commit: MNG-6078: commons-cli 1.4 released
Repository: maven Updated Branches: refs/heads/master 0e7e3eeb5 -> 52eecc406 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/52eecc40 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/52eecc40 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/52eecc40 Branch: refs/heads/master Commit: 52eecc406fdf37c1aec46ea31ab00978ed290a57 Parents: f661fc2 Author: rfscholte Authored: Mon Mar 13 23:27:35 2017 +0100 Committer: rfscholte Committed: Sat Mar 18 12:59:51 2017 +0100 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/52eecc40/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. 1.7 1.7 2.5.2 -1.4-SNAPSHOT +1.4 3.5 4.12 1.10.19
[2/2] maven git commit: [MNG-6078] Confirm commons-cli 1.4-SNAPSHOT before official release
[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/f661fc29 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/f661fc29 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/f661fc29 Branch: refs/heads/master Commit: f661fc298e80208911838f5acce9840ea1a97e3f Parents: 0e7e3ee Author: rfscholte Authored: Wed Mar 8 21:38:08 2017 +0100 Committer: rfscholte Committed: Sat Mar 18 12:59:51 2017 +0100 -- .../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/f661fc29/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 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/f661fc29/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..000 --- 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. - */ - -im
[2/2] maven git commit: [MNG-6176] Upgrade findbugs to 3.0.4 so that the site can be built with Java 7 and 8
[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/41c8b2a1 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/41c8b2a1 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/41c8b2a1 Branch: refs/heads/MNG-6176 Commit: 41c8b2a1709d2d0e8a3613930ce0fd9ae10205c9 Parents: d168622 Author: Stephen Connolly Authored: Sat Mar 18 12:32:06 2017 + Committer: Stephen Connolly Committed: Sat Mar 18 12:32:06 2017 + -- pom.xml | 5 + 1 file changed, 5 insertions(+) -- http://git-wip-us.apache.org/repos/asf/maven/blob/41c8b2a1/pom.xml -- diff --git a/pom.xml b/pom.xml index 4cb0783..0d27017 100644 --- a/pom.xml +++ b/pom.xml @@ -531,6 +531,11 @@ under the License. + + org.codehaus.mojo + findbugs-maven-plugin + 3.0.4 +
[1/2] maven git commit: [MNG-6176] Fix javadoc *errors* in maven-compat
Repository: maven Updated Branches: refs/heads/MNG-6176 7713d9bb9 -> 41c8b2a17 [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/d168622f Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/d168622f Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/d168622f Branch: refs/heads/MNG-6176 Commit: d168622f19a8345aa6b4e7d58ab157a90f06aad1 Parents: 7713d9b Author: Stephen Connolly Authored: Sat Mar 18 12:04:38 2017 + Committer: Stephen Connolly Committed: Sat Mar 18 12:31:15 2017 + -- 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/d168622f/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. - - - javadoc8 - -!1.7 - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - --Xdoclint:none - - - - - - - http://git-wip-us.apache.org/repos/asf/maven/blob/d168622f/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 DEFAULT_SCOPE 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 Oleg Gusakov http://git-wip-us.apache.org/repos/asf/maven/blob/d168622f/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! - * + * * 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/d168622f/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..fb
[04/12] maven git commit: Code improvement.
Code improvement. Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/809ba340 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/809ba340 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/809ba340 Branch: refs/heads/MNG-6176 Commit: 809ba34055c70eab31876aad03c577e925fa2e6e Parents: ab2e24f Author: Karl Heinz Marbaise Authored: Mon Mar 6 08:24:33 2017 +0100 Committer: Karl Heinz Marbaise Committed: Sat Mar 11 20:53:18 2017 +0100 -- .../resolver/DefaultArtifactResolver.java | 4 ++-- .../java/org/apache/maven/cli/MavenCli.java | 21 2 files changed, 6 insertions(+), 19 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/809ba340/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 b78846b..fc154cb 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 @@ -258,7 +258,7 @@ public class DefaultArtifactResolver throws ArtifactResolutionException, ArtifactNotFoundException { -return resolveTransitively( artifacts, originatingArtifact, Collections.EMPTY_MAP, localRepository, +return resolveTransitively( artifacts, originatingArtifact, Collections.emptyMap(), localRepository, remoteRepositories, source, filter ); } @@ -305,7 +305,7 @@ public class DefaultArtifactResolver throws ArtifactResolutionException, ArtifactNotFoundException { -return resolveTransitively( artifacts, originatingArtifact, Collections.EMPTY_MAP, localRepository, +return resolveTransitively( artifacts, originatingArtifact, Collections.emptyMap(), localRepository, remoteRepositories, source, null, listeners ); } http://git-wip-us.apache.org/repos/asf/maven/blob/809ba340/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 f3ae923..b3367c1 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 @@ -126,24 +126,11 @@ public class MavenCli public static final String MULTIMODULE_PROJECT_DIRECTORY = "maven.multiModuleProjectDirectory"; -@SuppressWarnings( "checkstyle:constantname" ) -public static final String userHome = System.getProperty( "user.home" ); +public static final String USER_HOME = System.getProperty( "user.home" ); -@SuppressWarnings( "checkstyle:constantname" ) -public static final File userMavenConfigurationHome = new File( userHome, ".m2" ); +public static final File USER_MAVEN_CONFIGURATION_HOME = new File( USER_HOME, ".m2" ); -/** - * @deprecated use {@link SettingsXmlConfigurationProcessor#DEFAULT_USER_SETTINGS_FILE} - */ -public static final File DEFAULT_USER_SETTINGS_FILE = SettingsXmlConfigurationProcessor.DEFAULT_USER_SETTINGS_FILE; - -/** - * @deprecated use {@link SettingsXmlConfigurationProcessor#DEFAULT_GLOBAL_SETTINGS_FILE} - */ -public static final File DEFAULT_GLOBAL_SETTINGS_FILE = -SettingsXmlConfigurationProcessor.DEFAULT_GLOBAL_SETTINGS_FILE; - -public static final File DEFAULT_USER_TOOLCHAINS_FILE = new File( userMavenConfigurationHome, "toolchains.xml" ); +public static final File DEFAULT_USER_TOOLCHAINS_FILE = new File( USER_MAVEN_CONFIGURATION_HOME, "toolchains.xml" ); public static final File DEFAULT_GLOBAL_TOOLCHAINS_FILE = new File( System.getProperty( "maven.conf" ), "toolchains.xml" ); @@ -1257,7 +1244,7 @@ public class MavenCli // // -- -@SuppressWarnings( "unchecked" ) List goals = commandLine.getArgList(); +List goals = commandLine.getArgList(); boolean recursive = true;
[01/12] maven git commit: [MNG-6170] NPE in cases using Multithreaded -T X versions:set -DnewVersion=1.0-SNAPSHOT o In some cases the code will return a null which should not be scheduled. [Forced Upd
Repository: maven Updated Branches: refs/heads/MNG-6176 41c8b2a17 -> 55eeb325c (forced update) [MNG-6170] NPE in cases using Multithreaded -T X versions:set -DnewVersion=1.0-SNAPSHOT o In some cases the code will return a null which should not be scheduled. Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/7cdff43a Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/7cdff43a Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/7cdff43a Branch: refs/heads/MNG-6176 Commit: 7cdff43aba436408c79d2b4afc169b9c6909235a Parents: 587317b Author: Karl Heinz Marbaise Authored: Sun Feb 12 12:59:25 2017 +0100 Committer: Karl Heinz Marbaise Committed: Sat Mar 11 12:00:24 2017 +0100 -- .../multithreaded/MultiThreadedBuilder.java | 27 1 file changed, 16 insertions(+), 11 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/7cdff43a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java -- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java index 072aec8..1414a12 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java @@ -55,6 +55,7 @@ import org.codehaus.plexus.logging.Logger; * @since 3.0 * @author Kristian Rosenvold * Builds one or more lifecycles for a full module + * NOTE: This class is not part of any public api and can be changed or deleted without prior notice. */ @Component( role = Builder.class, hint = "multithreaded" ) public class MultiThreadedBuilder @@ -67,7 +68,6 @@ public class MultiThreadedBuilder @Requirement private LifecycleModuleBuilder lifecycleModuleBuilder; - public MultiThreadedBuilder() { } @@ -142,15 +142,20 @@ public class MultiThreadedBuilder { break; } -final List newItemsThatCanBeBuilt = -analyzer.markAsFinished( projectBuild.getProject() ); -for ( MavenProject mavenProject : newItemsThatCanBeBuilt ) + +// MNG-6170: Only schedule other modules from reactor if we have more modules to build than one. +if ( analyzer.getNumberOfBuilds() > 1 ) { -ProjectSegment scheduledDependent = projectBuildList.get( mavenProject ); -logger.debug( "Scheduling: " + scheduledDependent ); -Callable cb = -createBuildCallable( rootSession, scheduledDependent, reactorContext, taskSegment, muxer ); -service.submit( cb ); +final List newItemsThatCanBeBuilt = +analyzer.markAsFinished( projectBuild.getProject() ); +for ( MavenProject mavenProject : newItemsThatCanBeBuilt ) +{ +ProjectSegment scheduledDependent = projectBuildList.get( mavenProject ); +logger.debug( "Scheduling: " + scheduledDependent ); +Callable cb = +createBuildCallable( rootSession, scheduledDependent, reactorContext, taskSegment, muxer ); +service.submit( cb ); +} } } catch ( InterruptedException e ) @@ -160,13 +165,13 @@ public class MultiThreadedBuilder } catch ( ExecutionException e ) { -// TODO MNG-5766 changes likely made this redundant +// TODO MNG-5766 changes likely made this redundant rootSession.getResult().addException( e ); break; } } -// cancel outstanding builds (if any) - this can happen if an exception is thrown in above block +// cancel outstanding builds (if any) - this can happen if an exception is thrown in above block Future unprocessed; while ( ( unprocessed = service.poll() ) != null )
[06/12] 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
[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/51cc76c3 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/51cc76c3 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/51cc76c3 Branch: refs/heads/MNG-6176 Commit: 51cc76c32625be2f807dcf2ffbeb085984729b57 Parents: 181b021 Author: Karl Heinz Marbaise Authored: Tue Sep 29 11:46:48 2015 +0200 Committer: Karl Heinz Marbaise Committed: Mon Mar 13 22:08:51 2017 +0100 -- .../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/51cc76c3/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/51cc76c3/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 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(
[02/12] maven git commit: fixed typos
fixed typos Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/24b9ef48 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/24b9ef48 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/24b9ef48 Branch: refs/heads/MNG-6176 Commit: 24b9ef48f6045c3cca7297f4b7b94d3ee71b3718 Parents: 7cdff43 Author: Hervé Boutemy Authored: Sat Mar 11 18:19:02 2017 +0100 Committer: Hervé Boutemy Committed: Sat Mar 11 18:19:02 2017 +0100 -- .../lifecycle/internal/DefaultLifecycleMappingDelegate.java | 2 +- .../maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java | 4 ++-- .../src/site/resources/design/2.1-lifecycle-refactor.graffle | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/24b9ef48/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java -- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java index 8348530..db974bc 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java @@ -79,7 +79,7 @@ public class DefaultLifecycleMappingDelegate /* * Grab plugin executions that are bound to the selected lifecycle phases from project. The effective model of * the project already contains the plugin executions induced by the project's packaging type. Remember, all - * phases of interest and only those are in the lifecyle mapping, if a phase has no value in the map, we are not + * phases of interest and only those are in the lifecycle mapping, if a phase has no value in the map, we are not * interested in any of the executions bound to it. */ http://git-wip-us.apache.org/repos/asf/maven/blob/24b9ef48/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java -- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java index 9e402e6..aec785f 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java @@ -73,7 +73,7 @@ public class DefaultLifecyclePluginAnalyzer // together and this really shows the problem of constructing a sensible default configuration but // it's all encapsulated here so it appears normalized to the POM builder. -// We are going to take the project packaging and find all plugin in the default lifecycle and create +// We are going to take the project packaging and find all plugins in the default lifecycle and create // fully populated Plugin objects, including executions with goals and default configuration taken // from the plugin.xml inside a plugin. // @@ -82,7 +82,7 @@ public class DefaultLifecyclePluginAnalyzer { if ( logger.isDebugEnabled() ) { -logger.debug( "Looking up lifecyle mappings for packaging " + packaging + " from " +logger.debug( "Looking up lifecycle mappings for packaging " + packaging + " from " + Thread.currentThread().getContextClassLoader() ); } http://git-wip-us.apache.org/repos/asf/maven/blob/24b9ef48/maven-core/src/site/resources/design/2.1-lifecycle-refactor.graffle -- diff --git a/maven-core/src/site/resources/design/2.1-lifecycle-refactor.graffle b/maven-core/src/site/resources/design/2.1-lifecycle-refactor.graffle index 722bc03..58811ba 100755 --- a/maven-core/src/site/resources/design/2.1-lifecycle-refactor.graffle +++ b/maven-core/src/site/resources/design/2.1-lifecycle-refactor.graffle @@ -3548,7 +3548,7 @@ uses plugin prefix} {\colortbl;\red255\green255\blue255;} \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc -\f0\b\fs24 \cf0 \ul \ulc0 LifecyleBindingManager} +\f0\b\fs24 \cf0 \ul \ulc0 LifecycleBindingManager}
[07/12] maven git commit: [MNG-6183] Dependency management debug message corrections.
[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/da03d6b0 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/da03d6b0 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/da03d6b0 Branch: refs/heads/MNG-6176 Commit: da03d6b03192399237750c15f96fa021977dd83b Parents: 51cc76c Author: Christian Schulte Authored: Tue Mar 14 19:20:47 2017 +0100 Committer: Christian Schulte Committed: Tue Mar 14 19:20:47 2017 +0100 -- .../DefaultProjectDependenciesResolver.java | 83 1 file changed, 31 insertions(+), 52 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/da03d6b0/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 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 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 )
[03/12] maven git commit: Fixed checkstyle reported error.
Fixed checkstyle reported error. Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/ab2e24fe Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/ab2e24fe Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/ab2e24fe Branch: refs/heads/MNG-6176 Commit: ab2e24fe3612b4f12c66e698e398fcb2b908f1aa Parents: 24b9ef4 Author: Karl Heinz Marbaise Authored: Sat Mar 11 18:40:24 2017 +0100 Committer: Karl Heinz Marbaise Committed: Sat Mar 11 18:40:24 2017 +0100 -- .../lifecycle/internal/DefaultLifecycleMappingDelegate.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/ab2e24fe/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java -- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java index db974bc..c2bf919 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java @@ -79,8 +79,8 @@ public class DefaultLifecycleMappingDelegate /* * Grab plugin executions that are bound to the selected lifecycle phases from project. The effective model of * the project already contains the plugin executions induced by the project's packaging type. Remember, all - * phases of interest and only those are in the lifecycle mapping, if a phase has no value in the map, we are not - * interested in any of the executions bound to it. + * phases of interest and only those are in the lifecycle mapping, if a phase has no value in the map, we are + * not interested in any of the executions bound to it. */ for ( Plugin plugin : project.getBuild().getPlugins() )
[09/12] maven git commit: [MNG-6078] Confirm commons-cli 1.4-SNAPSHOT before official release
[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/f661fc29 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/f661fc29 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/f661fc29 Branch: refs/heads/MNG-6176 Commit: f661fc298e80208911838f5acce9840ea1a97e3f Parents: 0e7e3ee Author: rfscholte Authored: Wed Mar 8 21:38:08 2017 +0100 Committer: rfscholte Committed: Sat Mar 18 12:59:51 2017 +0100 -- .../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/f661fc29/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 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/f661fc29/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..000 --- 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. - */ - -
[10/12] maven git commit: MNG-6078: commons-cli 1.4 released
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/52eecc40 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/52eecc40 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/52eecc40 Branch: refs/heads/MNG-6176 Commit: 52eecc406fdf37c1aec46ea31ab00978ed290a57 Parents: f661fc2 Author: rfscholte Authored: Mon Mar 13 23:27:35 2017 +0100 Committer: rfscholte Committed: Sat Mar 18 12:59:51 2017 +0100 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/52eecc40/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. 1.7 1.7 2.5.2 -1.4-SNAPSHOT +1.4 3.5 4.12 1.10.19
[11/12] maven git commit: [MNG-6176] Fix javadoc *errors* in maven-compat
[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/b12905ce Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/b12905ce Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/b12905ce Branch: refs/heads/MNG-6176 Commit: b12905ce02ec0e58b475bbc1d920a6801224c02f Parents: 52eecc4 Author: Stephen Connolly Authored: Sat Mar 18 12:04:38 2017 + Committer: Stephen Connolly Committed: Sat Mar 18 12:34:45 2017 + -- 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/b12905ce/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. - - - javadoc8 - -!1.7 - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - --Xdoclint:none - - - - - - - http://git-wip-us.apache.org/repos/asf/maven/blob/b12905ce/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 DEFAULT_SCOPE 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 Oleg Gusakov http://git-wip-us.apache.org/repos/asf/maven/blob/b12905ce/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! - * + * * 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/b12905ce/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.j
[08/12] maven git commit: [MNG-6176] Javadoc errors prevent release with Java 8
[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/0e7e3eeb Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/0e7e3eeb Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/0e7e3eeb Branch: refs/heads/MNG-6176 Commit: 0e7e3eeb597b92f1394b24e33d5933e995ee8104 Parents: da03d6b Author: rfscholte Authored: Sat Mar 18 12:35:18 2017 +0100 Committer: rfscholte Committed: Sat Mar 18 12:55:05 2017 +0100 -- .../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/0e7e3eeb/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 https://issues.apache.org/jira/browse/MNG-5568";>MNG-5568 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 https://netbeans.org/bugzilla/show_bug.cgi?id=240845";>240845 and * https://netbeans.org/bugzilla/show_bug.cgi?id=226100";>226100 http://git-wip-us.apache.org/repos/asf/maven/blob/0e7e3eeb/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. - - - - org.apache.maven.plugins - maven-javadoc-plugin - - --Xdoclint:none - - - - org.codehaus.plexus @@ -143,4 +131,27 @@ under the License. + + + + javadoc8 + +!1.7 + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + +-Xdoclint:none + + + + + + + http://git-wip-us.apache.org/repos/asf/maven/blob/0e7e3eeb/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/0e7e3eeb/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/lifec
[05/12] maven git commit: [MNG-6115] prevent JAnsi from writing temp native files to lib/ext
[MNG-6115] prevent JAnsi from writing temp native files to lib/ext Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/181b0215 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/181b0215 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/181b0215 Branch: refs/heads/MNG-6176 Commit: 181b0215aa1199e152db9d2c08b1a01436547805 Parents: 809ba34 Author: Hervé Boutemy Authored: Sun Mar 5 00:39:31 2017 +0100 Committer: Hervé Boutemy Committed: Sun Mar 12 12:12:16 2017 +0100 -- apache-maven/pom.xml| 17 ++ apache-maven/src/bin/mvn| 1 - apache-maven/src/bin/mvn.cmd| 1 - apache-maven/src/lib/jansi-native/README.txt| 7 +++ apache-maven/src/main/assembly/component.xml| 8 +++ .../java/org/apache/maven/cli/MavenCli.java | 59 6 files changed, 91 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/181b0215/apache-maven/pom.xml -- diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml index 6fc5a73..a528ddb 100644 --- a/apache-maven/pom.xml +++ b/apache-maven/pom.xml @@ -130,6 +130,22 @@ under the License. org.apache.maven.plugins +maven-dependency-plugin + + jansi + META-INF/native/** + + + +unpack-jansi-native + + unpack-dependencies + + + + + +org.apache.maven.plugins maven-compiler-plugin @@ -215,6 +231,7 @@ under the License. clean-target-dir prepare-package + true ${distributionTargetDir} http://git-wip-us.apache.org/repos/asf/maven/blob/181b0215/apache-maven/src/bin/mvn -- diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn index cfb39b0..df62f68 100755 --- a/apache-maven/src/bin/mvn +++ b/apache-maven/src/bin/mvn @@ -191,5 +191,4 @@ exec "$JAVACMD" \ -classpath "${CLASSWORLDS_JAR}" \ "-Dclassworlds.conf=${MAVEN_HOME}/bin/m2.conf" \ "-Dmaven.home=${MAVEN_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ - "-Dlibrary.jansi.path=${MAVEN_HOME}/lib/ext" \ ${CLASSWORLDS_LAUNCHER} "$@" http://git-wip-us.apache.org/repos/asf/maven/blob/181b0215/apache-maven/src/bin/mvn.cmd -- diff --git a/apache-maven/src/bin/mvn.cmd b/apache-maven/src/bin/mvn.cmd index c86662b..9d92279 100644 --- a/apache-maven/src/bin/mvn.cmd +++ b/apache-maven/src/bin/mvn.cmd @@ -178,7 +178,6 @@ set CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher "-Dclassworlds.conf=%MAVEN_HOME%\bin\m2.conf" ^ "-Dmaven.home=%MAVEN_HOME%" ^ "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^ - "-Dlibrary.jansi.path=%MAVEN_HOME%\lib\ext" ^ %CLASSWORLDS_LAUNCHER% %MAVEN_CMD_LINE_ARGS% if ERRORLEVEL 1 goto error goto end http://git-wip-us.apache.org/repos/asf/maven/blob/181b0215/apache-maven/src/lib/jansi-native/README.txt -- diff --git a/apache-maven/src/lib/jansi-native/README.txt b/apache-maven/src/lib/jansi-native/README.txt new file mode 100644 index 000..22857a6 --- /dev/null +++ b/apache-maven/src/lib/jansi-native/README.txt @@ -0,0 +1,7 @@ +This directory contains Jansi native libraries, extracted from Jansi jar. + +You can add your own extensions for platforms not natively supported by +Jansi: the libraries follow HawtJNI directory and filename conventions. +See http://fusesource.github.io/hawtjni/documentation/api/org/fusesource/hawtjni/runtime/Library.html + +See https://github.com/fusesource/jansi-native for native lib source. http://git-wip-us.apache.org/repos/asf/maven/blob/181b0215/apache-maven/src/main/assembly/component.xml -- diff --git a/apache-maven/src/main/assembly/component.xml b/apache-maven/src/main/assembly/component.xml index ca4dcb6..7b05af7 100644 --- a/apache-maven/src/main/assembly/component.xml +++ b/apache-maven/src/main/assembly/component.xml @@ -56,6 +56,14 @@ under the License. + target/dependency/META-INF/native + lib/jansi-native + +** + + 0755 + + src/bin bin http://git-wip-us.apache.org/repos/asf/maven/blob/181b0215/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java -
[12/12] maven git commit: [MNG-6176] Upgrade findbugs to 3.0.4 so that the site can be built with Java 7 and 8
[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/55eeb325 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/55eeb325 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/55eeb325 Branch: refs/heads/MNG-6176 Commit: 55eeb325cd0ddb2a093196f4804e232d45bcc54a Parents: b12905c Author: Stephen Connolly Authored: Sat Mar 18 12:32:06 2017 + Committer: Stephen Connolly Committed: Sat Mar 18 12:34:45 2017 + -- pom.xml | 5 + 1 file changed, 5 insertions(+) -- http://git-wip-us.apache.org/repos/asf/maven/blob/55eeb325/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. + + org.codehaus.mojo + findbugs-maven-plugin + 3.0.4 +
[1/2] maven git commit: [MNG-6176] Upgrade findbugs to 3.0.4 so that the site can be built with Java 7 and 8
Repository: maven Updated Branches: refs/heads/MNG-6176 [deleted] 55eeb325c refs/heads/master 52eecc406 -> 55eeb325c [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/55eeb325 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/55eeb325 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/55eeb325 Branch: refs/heads/master Commit: 55eeb325cd0ddb2a093196f4804e232d45bcc54a Parents: b12905c Author: Stephen Connolly Authored: Sat Mar 18 12:32:06 2017 + Committer: Stephen Connolly Committed: Sat Mar 18 12:34:45 2017 + -- pom.xml | 5 + 1 file changed, 5 insertions(+) -- http://git-wip-us.apache.org/repos/asf/maven/blob/55eeb325/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. + + org.codehaus.mojo + findbugs-maven-plugin + 3.0.4 +
[2/2] maven git commit: [MNG-6176] Fix javadoc *errors* in maven-compat
[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/b12905ce Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/b12905ce Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/b12905ce Branch: refs/heads/master Commit: b12905ce02ec0e58b475bbc1d920a6801224c02f Parents: 52eecc4 Author: Stephen Connolly Authored: Sat Mar 18 12:04:38 2017 + Committer: Stephen Connolly Committed: Sat Mar 18 12:34:45 2017 + -- 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/b12905ce/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. - - - javadoc8 - -!1.7 - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - --Xdoclint:none - - - - - - - http://git-wip-us.apache.org/repos/asf/maven/blob/b12905ce/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 DEFAULT_SCOPE 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 Oleg Gusakov http://git-wip-us.apache.org/repos/asf/maven/blob/b12905ce/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! - * + * * 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/b12905ce/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.jav
[maven] Git Push Summary
Repository: maven Updated Branches: refs/heads/MNG-6078 [deleted] 9ded5358e
svn commit: r1787560 - in /maven/release/trunk: maven-release-manager/src/main/ maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ maven-release-manager/src/test/java/org/apach
Author: rfscholte Date: Sat Mar 18 14:23:30 2017 New Revision: 1787560 URL: http://svn.apache.org/viewvc?rev=1787560&view=rev Log: [MRELEASE-979] Support NamingPolicies to manage Branch and Tag names Added: maven/release/trunk/maven-release-plugin/src/it/setup/maven-project-naming-stub-policy/ maven/release/trunk/maven-release-plugin/src/it/setup/maven-project-naming-stub-policy/invoker.properties maven/release/trunk/maven-release-plugin/src/it/setup/maven-project-naming-stub-policy/pom.xml maven/release/trunk/maven-release-plugin/src/it/setup/maven-project-naming-stub-policy/src/ maven/release/trunk/maven-release-plugin/src/it/setup/maven-project-naming-stub-policy/src/main/ maven/release/trunk/maven-release-plugin/src/it/setup/maven-project-naming-stub-policy/src/main/java/ maven/release/trunk/maven-release-plugin/src/it/setup/maven-project-naming-stub-policy/src/main/java/org/ maven/release/trunk/maven-release-plugin/src/it/setup/maven-project-naming-stub-policy/src/main/java/org/apache/ maven/release/trunk/maven-release-plugin/src/it/setup/maven-project-naming-stub-policy/src/main/java/org/apache/maven/ maven/release/trunk/maven-release-plugin/src/it/setup/maven-project-naming-stub-policy/src/main/java/org/apache/maven/shared/ maven/release/trunk/maven-release-plugin/src/it/setup/maven-project-naming-stub-policy/src/main/java/org/apache/maven/shared/release/ maven/release/trunk/maven-release-plugin/src/it/setup/maven-project-naming-stub-policy/src/main/java/org/apache/maven/shared/release/policy/ maven/release/trunk/maven-release-plugin/src/it/setup/maven-project-naming-stub-policy/src/main/java/org/apache/maven/shared/release/policy/stub/ maven/release/trunk/maven-release-plugin/src/it/setup/maven-project-naming-stub-policy/src/main/java/org/apache/maven/shared/release/policy/stub/StubNamingPolicy.java Modified: maven/release/trunk/maven-release-manager/src/main/components-fragment.xml maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/InputVariablesPhase.java maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/BranchInputVariablesPhaseTest.java maven/release/trunk/maven-release-plugin/pom.xml Modified: maven/release/trunk/maven-release-manager/src/main/components-fragment.xml URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/components-fragment.xml?rev=1787560&r1=1787559&r2=1787560&view=diff == --- maven/release/trunk/maven-release-manager/src/main/components-fragment.xml (original) +++ maven/release/trunk/maven-release-manager/src/main/components-fragment.xml Sat Mar 18 14:23:30 2017 @@ -229,6 +229,7 @@ org.apache.maven.shared.release.phase.InputVariablesPhase false +default Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/InputVariablesPhase.java URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/InputVariablesPhase.java?rev=1787560&r1=1787559&r2=1787560&view=diff == --- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/InputVariablesPhase.java (original) +++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/InputVariablesPhase.java Sat Mar 18 14:23:30 2017 @@ -80,6 +80,11 @@ public class InputVariablesPhase */ @Requirement private Map namingPolicies; + +/** + * The default naming policy to apply, if any + */ +private String defaultNamingPolicy; void setPrompter( Prompter prompter ) { @@ -134,9 +139,21 @@ public class InputVariablesPhase throw new ReleaseExecutionException( "Project tag cannot be selected if version is not yet mapped" ); } -String defaultTag; +String suggestedName; String scmTagNameFormat = releaseDescriptor.getScmTagNameFormat(); -if ( releaseDescriptor.getProjectNamingPolicyId() == null && scmTagNameFormat != null ) +if ( releaseDescriptor.getProjectNamingPolicyId() != null ) +{ +try +{ +suggestedName = +resolveSuggestedName( releaseDescriptor.getProjectNamingPolicyId(), releaseVersion, project ); +} +catch ( PolicyException e ) +{ +throw new ReleaseExecutionException( e.getMessage(), e ); +} +} +else if ( scmTagNameFormat != null ) { Interpolator interpolator = new StringSea
[maven] Git Push Summary
Repository: maven Updated Branches: refs/heads/MNG-6069 [deleted] 2b567a7d9
maven git commit: [MNG-6069] Migrate to non deprecated parts of Commons CLI
Repository: maven Updated Branches: refs/heads/MNG-6069 [created] b8efec709 [MNG-6069] Migrate to non deprecated parts of Commons CLI Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/b8efec70 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/b8efec70 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/b8efec70 Branch: refs/heads/MNG-6069 Commit: b8efec709cce46358da2eaa3d1c288f16ab4c8a8 Parents: 55eeb32 Author: Karl Heinz Marbaise Authored: Sat Mar 18 18:18:27 2017 +0100 Committer: Karl Heinz Marbaise Committed: Sat Mar 18 18:18:27 2017 +0100 -- .../java/org/apache/maven/cli/CLIManager.java | 118 ++- 1 file changed, 60 insertions(+), 58 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/b8efec70/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java -- diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java b/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java index a9038bf..20376d9 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java @@ -24,9 +24,9 @@ import java.io.PrintWriter; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.CommandLineParser; -import org.apache.commons.cli.GnuParser; +import org.apache.commons.cli.DefaultParser; import org.apache.commons.cli.HelpFormatter; -import org.apache.commons.cli.OptionBuilder; +import org.apache.commons.cli.Option; import org.apache.commons.cli.Options; import org.apache.commons.cli.ParseException; @@ -35,43 +35,43 @@ import org.apache.commons.cli.ParseException; */ public class CLIManager { -public static final char ALTERNATE_POM_FILE = 'f'; +public static final String ALTERNATE_POM_FILE = "f"; -public static final char BATCH_MODE = 'B'; +public static final String BATCH_MODE = "B"; -public static final char SET_SYSTEM_PROPERTY = 'D'; +public static final String SET_SYSTEM_PROPERTY = "D"; -public static final char OFFLINE = 'o'; +public static final String OFFLINE = "o"; -public static final char QUIET = 'q'; +public static final String QUIET = "q"; -public static final char DEBUG = 'X'; +public static final String DEBUG = "X"; -public static final char ERRORS = 'e'; +public static final String ERRORS = "e"; -public static final char HELP = 'h'; +public static final String HELP = "h"; -public static final char VERSION = 'v'; +public static final String VERSION = "v"; -public static final char SHOW_VERSION = 'V'; +public static final String SHOW_VERSION = "V"; -public static final char NON_RECURSIVE = 'N'; +public static final String NON_RECURSIVE = "N"; -public static final char UPDATE_SNAPSHOTS = 'U'; +public static final String UPDATE_SNAPSHOTS = "U"; -public static final char ACTIVATE_PROFILES = 'P'; +public static final String ACTIVATE_PROFILES = "P"; public static final String SUPRESS_SNAPSHOT_UPDATES = "nsu"; -public static final char CHECKSUM_FAILURE_POLICY = 'C'; +public static final String CHECKSUM_FAILURE_POLICY = "C"; -public static final char CHECKSUM_WARNING_POLICY = 'c'; +public static final String CHECKSUM_WARNING_POLICY = "c"; -public static final char ALTERNATE_USER_SETTINGS = 's'; +public static final String ALTERNATE_USER_SETTINGS = "s"; public static final String ALTERNATE_GLOBAL_SETTINGS = "gs"; -public static final char ALTERNATE_USER_TOOLCHAINS = 't'; +public static final String ALTERNATE_USER_TOOLCHAINS = "t"; public static final String ALTERNATE_GLOBAL_TOOLCHAINS = "gt"; @@ -103,50 +103,52 @@ public class CLIManager protected Options options; -@SuppressWarnings( { "static-access", "checkstyle:linelength" } ) +// CHECKSTYLE_OFF: LineLength public CLIManager() { options = new Options(); -options.addOption( OptionBuilder.withLongOpt( "help" ).withDescription( "Display help information" ).create( HELP ) ); -options.addOption( OptionBuilder.withLongOpt( "file" ).hasArg().withDescription( "Force the use of an alternate POM file (or directory with pom.xml)" ).create( ALTERNATE_POM_FILE ) ); -options.addOption( OptionBuilder.withLongOpt( "define" ).hasArg().withDescription( "Define a system property" ).create( SET_SYSTEM_PROPERTY ) ); -options.addOption( OptionBuilder.withLongOpt( "offline" ).withDescription( "Work offline" ).create( OFFLINE ) ); -options.addOption( OptionBuilder.withLongOpt( "version" ).withDescription( "Display version information" ).create( VERSION )
maven-surefire git commit: [SUREFIRE-1342] Acknowledge normal exit of JVM and drain shared memory between processes [Forced Update!]
Repository: maven-surefire Updated Branches: refs/heads/SUREFIRE-1342 377fbdc56 -> 9b489a1be (forced update) [SUREFIRE-1342] Acknowledge normal exit of JVM and drain shared memory between processes Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/9b489a1b Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/9b489a1b Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/9b489a1b Branch: refs/heads/SUREFIRE-1342 Commit: 9b489a1beaf00a3c0a5d304a4cee0f5037a7efdf Parents: d468680 Author: Tibor17 Authored: Mon Mar 13 03:10:08 2017 +0100 Committer: Tibor17 Committed: Sat Mar 18 20:45:48 2017 +0100 -- .../surefire/booterclient/ForkStarter.java | 1 + .../lazytestprovider/AbstractCommandStream.java | 8 +- .../lazytestprovider/NotifiableTestStream.java | 2 + .../lazytestprovider/TestLessInputStream.java | 49 +++- .../TestProvidingInputStream.java | 18 +-- .../booterclient/output/ForkClient.java | 1 + .../output/ThreadedStreamConsumer.java | 40 +++--- .../booterclient/MockNotifiableTestStream.java | 5 + .../TestProvidingInputStreamTest.java | 1 + .../apache/maven/surefire/booter/Command.java | 1 + .../maven/surefire/booter/CommandReader.java| 22 ++-- .../surefire/booter/MasterProcessCommand.java | 3 +- .../apache/maven/surefire/booter/Shutdown.java | 15 +++ .../booter/MasterProcessCommandTest.java| 7 ++ .../maven/surefire/booter/ForkedBooter.java | 124 +-- 15 files changed, 211 insertions(+), 86 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/9b489a1b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java -- diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java index 54d304a..b69d010 100644 --- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java @@ -644,6 +644,7 @@ public class ForkStarter } finally { +currentForkClients.remove( forkClient ); closer.close(); if ( runResult == null ) { http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/9b489a1b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/AbstractCommandStream.java -- diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/AbstractCommandStream.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/AbstractCommandStream.java index 4d6331c..3531ccf 100644 --- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/AbstractCommandStream.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/AbstractCommandStream.java @@ -41,10 +41,12 @@ public abstract class AbstractCommandStream protected abstract boolean isClosed(); /** - * Unnecessarily opposite to {@link #isClosed()} however may respect - * {@link #getLastCommand() last command} and {@link #isClosed()}. + * Opposite to {@link #isClosed()}. */ -protected abstract boolean canContinue(); +protected boolean canContinue() +{ +return !isClosed(); +} /** * Possibly waiting for next command (see {@link #nextCommand()}) unless the stream is atomically http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/9b489a1b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/NotifiableTestStream.java -- diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/NotifiableTestStream.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/NotifiableTestStream.java index 5c89173..b181de1 100644 --- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/NotifiableTestStream.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/NotifiableTestStream.java @@ -45,4 +45,6 @@ public interface NotifiableTestStrea
maven git commit: [MNG-6182] ModelResolver interface enhancements.
Repository: maven Updated Branches: refs/heads/MNG-6182 [created] 4fc5e2180 [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/4fc5e218 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/4fc5e218 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/4fc5e218 Branch: refs/heads/MNG-6182 Commit: 4fc5e2180b3f230740778b7106b79c5a9cf8619f Parents: 55eeb32 Author: Christian Schulte Authored: Sun Mar 19 03:46:29 2017 +0100 Committer: Christian Schulte Committed: Sun Mar 19 03:46:29 2017 +0100 -- .../maven/project/ProjectModelResolverTest.java | 246 +++ .../internal/DefaultModelResolverTest.java | 222 + 2 files changed, 468 insertions(+) -- http://git-wip-us.apache.org/repos/asf/maven/blob/4fc5e218/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 000..bca10aa --- /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 request
maven git commit: [MNG-6182] ModelResolver interface enhancements. [Forced Update!]
Repository: maven Updated Branches: refs/heads/MNG-6182 4fc5e2180 -> f1ccecdd8 (forced update) [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/f1ccecdd Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/f1ccecdd Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/f1ccecdd Branch: refs/heads/MNG-6182 Commit: f1ccecdd893eea0a320634a49bc6e56b776fb213 Parents: 55eeb32 Author: Christian Schulte Authored: Sun Mar 19 03:46:29 2017 +0100 Committer: Christian Schulte Committed: Sun Mar 19 04:01:34 2017 +0100 -- .../maven/project/ProjectModelResolverTest.java | 246 +++ .../internal/DefaultModelResolverTest.java | 222 + 2 files changed, 468 insertions(+) -- http://git-wip-us.apache.org/repos/asf/maven/blob/f1ccecdd/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 000..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
maven-surefire git commit: [SUREFIRE-1342] Acknowledge normal exit of JVM and drain shared memory between processes [Forced Update!]
Repository: maven-surefire Updated Branches: refs/heads/SUREFIRE-1342 9b489a1be -> 40bf72f10 (forced update) [SUREFIRE-1342] Acknowledge normal exit of JVM and drain shared memory between processes Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/40bf72f1 Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/40bf72f1 Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/40bf72f1 Branch: refs/heads/SUREFIRE-1342 Commit: 40bf72f10cc4078832cee2f7b4c2bbff923164f1 Parents: d468680 Author: Tibor17 Authored: Mon Mar 13 03:10:08 2017 +0100 Committer: Tibor17 Committed: Sun Mar 19 04:09:22 2017 +0100 -- .../surefire/booterclient/ForkStarter.java | 1 + .../lazytestprovider/AbstractCommandStream.java | 8 +- .../lazytestprovider/NotifiableTestStream.java | 2 + .../lazytestprovider/TestLessInputStream.java | 49 +++- .../TestProvidingInputStream.java | 18 +-- .../booterclient/output/ForkClient.java | 1 + .../output/ThreadedStreamConsumer.java | 40 +++--- .../booterclient/MockNotifiableTestStream.java | 5 + .../TestProvidingInputStreamTest.java | 1 + .../apache/maven/surefire/booter/Command.java | 1 + .../maven/surefire/booter/CommandReader.java| 22 ++-- .../surefire/booter/MasterProcessCommand.java | 3 +- .../apache/maven/surefire/booter/Shutdown.java | 15 +++ .../booter/MasterProcessCommandTest.java| 7 ++ .../maven/surefire/booter/ForkedBooter.java | 124 +-- .../jiras/Surefire141PluggableProvidersIT.java | 33 +++-- 16 files changed, 237 insertions(+), 93 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/40bf72f1/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java -- diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java index 54d304a..b69d010 100644 --- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java @@ -644,6 +644,7 @@ public class ForkStarter } finally { +currentForkClients.remove( forkClient ); closer.close(); if ( runResult == null ) { http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/40bf72f1/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/AbstractCommandStream.java -- diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/AbstractCommandStream.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/AbstractCommandStream.java index 4d6331c..3531ccf 100644 --- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/AbstractCommandStream.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/AbstractCommandStream.java @@ -41,10 +41,12 @@ public abstract class AbstractCommandStream protected abstract boolean isClosed(); /** - * Unnecessarily opposite to {@link #isClosed()} however may respect - * {@link #getLastCommand() last command} and {@link #isClosed()}. + * Opposite to {@link #isClosed()}. */ -protected abstract boolean canContinue(); +protected boolean canContinue() +{ +return !isClosed(); +} /** * Possibly waiting for next command (see {@link #nextCommand()}) unless the stream is atomically http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/40bf72f1/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/NotifiableTestStream.java -- diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/NotifiableTestStream.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/NotifiableTestStream.java index 5c89173..b181de1 100644 --- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/NotifiableTestStream.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/NotifiableTestStrea