Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/maven
Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/6755560a Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/6755560a Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/6755560a Branch: refs/heads/master Commit: 6755560a753739e3c19a0feaf103cefe8d875b01 Parents: 582ca65 8ae1a3e Author: Dan Tran <dant...@gmail.com> Authored: Mon Nov 21 16:44:45 2016 -0800 Committer: Dan Tran <dant...@gmail.com> Committed: Mon Nov 21 16:44:45 2016 -0800 ---------------------------------------------------------------------- apache-maven/pom.xml | 4 +- apache-maven/src/bin/m2.conf | 4 +- apache-maven/src/bin/mvn | 32 ++- apache-maven/src/bin/mvn.cmd | 59 +++++- apache-maven/src/conf/settings.xml | 44 +---- apache-maven/src/conf/toolchains.xml | 42 ++-- .../main/appended-resources/META-INF/LICENSE.vm | 10 +- apache-maven/src/main/assembly/component.xml | 1 - doap_Maven.rdf | 6 + .../ArtifactDescriptorReaderDelegate.java | 2 +- .../internal/MavenRepositorySystemUtils.java | 21 +- .../artifact/versioning/ArtifactVersion.java | 1 + .../artifact/versioning/ComparableVersion.java | 12 +- .../versioning/DefaultArtifactVersion.java | 1 + .../versioning/ComparableVersionTest.java | 19 +- .../apache/maven/building/ProblemCollector.java | 8 +- .../maven/building/ProblemCollectorFactory.java | 6 +- .../building/DefaultProblemCollectorTest.java | 8 +- .../maven/building/DefaultProblemTest.java | 20 +- .../building/ProblemCollectorFactoryTest.java | 4 +- .../resolver/DebugResolutionListener.java | 4 +- .../maven/project/MavenProjectBuilder.java | 3 +- .../repository/legacy/DefaultWagonManager.java | 2 +- .../DefaultLegacyArtifactCollector.java | 2 +- .../legacy/DefaultWagonManagerTest.java | 2 +- .../org/apache/maven/its/a/0.1/a-0.1.pom | 2 +- .../org/apache/maven/its/b/0.1/b-0.1.pom | 2 +- .../t12scm/maven/p0/1.0/p0-1.0.pom | 4 +- .../t12scm/maven/p1/1.0/p1-1.0.pom | 2 +- maven-core/project-builder.txt | 1 - .../org/apache/maven/ArtifactFilterManager.java | 4 +- .../java/org/apache/maven/DefaultMaven.java | 123 +++++++----- .../DefaultProjectDependenciesResolver.java | 2 +- .../src/main/java/org/apache/maven/Maven.java | 3 + .../org/apache/maven/ProjectCycleException.java | 2 +- .../java/org/apache/maven/SessionScoped.java | 4 +- .../maven/bridge/MavenRepositorySystem.java | 10 +- .../execution/DefaultMavenExecutionRequest.java | 4 +- .../DefaultMavenExecutionRequestPopulator.java | 47 +++++ .../maven/execution/MavenExecutionRequest.java | 20 +- .../MavenExecutionRequestPopulator.java | 2 +- .../apache/maven/execution/MavenSession.java | 30 +-- .../maven/execution/ProjectDependencyGraph.java | 1 + .../maven/extension/internal/CoreExports.java | 2 +- .../apache/maven/graph/DefaultGraphBuilder.java | 4 +- .../org/apache/maven/graph/GraphBuilder.java | 5 + .../DefaultRepositorySystemSessionFactory.java | 6 +- .../org/apache/maven/lifecycle/Lifecycle.java | 2 +- .../lifecycle/MojoExecutionConfigurator.java | 4 +- .../internal/LifecycleDependencyResolver.java | 10 +- .../internal/LifecyclePluginResolver.java | 12 +- .../lifecycle/internal/LifecycleStarter.java | 2 +- .../internal/ProjectArtifactFactory.java | 2 +- .../multithreaded/MultiThreadedBuilder.java | 20 +- .../mapping/DefaultLifecycleMapping.java | 2 +- .../maven/lifecycle/mapping/Lifecycle.java | 6 +- .../maven/lifecycle/mapping/LifecycleMojo.java | 14 +- .../maven/lifecycle/mapping/LifecyclePhase.java | 26 +-- .../plugin/DefaultProjectArtifactsCache.java | 32 +-- .../apache/maven/plugin/MavenPluginManager.java | 2 +- .../PluginParameterExpressionEvaluator.java | 6 +- .../maven/plugin/ProjectArtifactsCache.java | 2 +- .../internal/DefaultPluginVersionResolver.java | 8 +- .../maven/project/DefaultProjectBuilder.java | 2 +- .../project/DefaultProjectBuildingRequest.java | 7 +- .../org/apache/maven/project/MavenProject.java | 2 +- .../project/RepositorySessionDecorator.java | 2 +- .../properties/internal/SystemProperties.java | 30 ++- .../maven/repository/RepositorySystem.java | 15 -- .../settings/DefaultMavenSettingsBuilder.java | 2 +- .../maven/toolchain/DefaultToolchain.java | 10 +- .../toolchain/DefaultToolchainManager.java | 6 +- .../DefaultToolchainManagerPrivate.java | 2 +- .../toolchain/RequirementMatcherFactory.java | 4 +- .../maven/toolchain/ToolchainManager.java | 4 +- .../toolchain/ToolchainManagerPrivate.java | 2 +- .../maven/toolchain/ToolchainPrivate.java | 2 +- .../building/DefaultToolchainsBuilder.java | 16 +- .../DefaultToolchainsBuildingRequest.java | 2 +- .../DefaultToolchainsBuildingResult.java | 10 +- .../building/ToolchainsBuildingResult.java | 2 +- .../toolchain/java/DefaultJavaToolChain.java | 2 +- .../toolchain/merge/MavenToolchainMerger.java | 6 +- maven-core/src/main/mdo/toolchains.mdo | 8 +- maven-core/src/site/apt/index.apt | 23 ++- .../apt/scripting-support/marmalade-support.apt | 196 ------------------- ...faultMavenExecutionRequestPopulatorTest.java | 2 +- .../maven/lifecycle/LifecycleExecutorTest.java | 2 +- .../lifecycle/internal/stub/AboutTheStubs.html | 2 +- .../lifecycle/mapping/LifecyclePhaseTest.java | 16 +- .../apache/maven/plugin/PluginManagerTest.java | 2 +- .../project/AbstractMavenProjectTestCase.java | 13 +- .../maven/project/PomConstructionTest.java | 2 +- .../artifact/DefaultMavenMetadataCacheTest.java | 36 +--- .../maven/repository/TestRepositorySystem.java | 10 +- .../DefaultToolchainManagerPrivateTest.java | 8 +- .../building/DefaultToolchainsBuilderTest.java | 16 +- .../org/apache/maven/its/a/0.1/a-0.1.pom | 2 +- .../org/apache/maven/its/b/0.1/b-0.1.pom | 2 +- .../junit/junit/3.8.1/junit-3.8.1.pom | 2 +- .../maven-artifact-3.0-SNAPSHOT.pom | 52 ++--- .../test/test-extension/1/test-extension-1.pom | 6 +- .../1/test-lifecycle-and-artifactHandler-1.pom | 4 +- .../maven/maven-parent/5/maven-parent-5.pom | 10 +- .../plexus-classworlds-1.2-alpha-10.pom | 2 +- .../1.1.6/plexus-components-1.1.6.pom | 18 +- .../plexus-container-default-1.0-alpha-32.pom | 4 +- .../plexus/plexus/1.0.10/plexus-1.0.10.pom | 2 +- .../plexus/plexus/1.0.11/plexus-1.0.11.pom | 8 +- .../plexus/plexus/1.0.4/plexus-1.0.4.pom | 2 +- .../plexus/plexus/1.0.8/plexus-1.0.8.pom | 4 +- .../plexus/plexus/1.0.9/plexus-1.0.9.pom | 2 +- .../project-caching/1/project-caching-1.pom | 4 +- .../toolchain/model/toolchains-jdks-extend.xml | 2 +- .../org/apache/maven/cli/CLIReportingUtils.java | 17 +- .../java/org/apache/maven/cli/CliRequest.java | 4 +- .../java/org/apache/maven/cli/MavenCli.java | 36 +++- .../SettingsXmlConfigurationProcessor.java | 2 +- .../maven/slf4j-configuration.properties | 1 + maven-embedder/src/site/apt/index.apt.vm | 7 +- maven-embedder/src/site/apt/logging.apt | 2 +- .../test-maven-ext/1/test-maven-ext-1.pom | 4 +- .../1/bad-ext-plugin-dep-ver-maven-plugin-1.pom | 2 +- .../bad-ext-plugin-maven-ver-maven-plugin-1.pom | 4 +- .../1/err-loading-plugin-maven-plugin-1.pom | 2 +- .../org/apache/maven/errortest/dep/1/dep-1.pom | 2 +- .../err-resolving-ext-plugin-maven-plugin-1.pom | 2 +- .../org/apache/maven/errortest/dep/1/dep-1.pom | 2 +- .../1/test-maven-ext-dep-1.pom | 2 +- .../test-maven-ext/1/test-maven-ext-1.pom | 4 +- ...t-plugin-artifact-missing-maven-plugin-1.pom | 2 +- .../1/ext-plugin-version-err-maven-plugin-1.pom | 2 +- .../local-repo/org/test/bad-pom/1/bad-pom-1.pom | 2 +- .../java/org/apache/maven/cli/MavenCliTest.java | 8 +- .../src/test/projects/config/.mvn/maven.config | 2 +- .../model/building/DefaultModelBuilder.java | 43 ++-- .../building/DefaultModelBuildingRequest.java | 5 +- .../maven/model/building/FileModelSource.java | 8 +- .../org/apache/maven/model/building/Result.java | 2 +- .../maven/model/building/StringModelSource.java | 2 +- .../maven/model/building/UrlModelSource.java | 2 +- .../DefaultDependencyManagementImporter.java | 30 ++- .../model/superpom/DefaultSuperPomProvider.java | 3 +- .../model/validation/DefaultModelValidator.java | 167 ++++++++-------- .../maven/model/versioning/ModelVersions.java | 132 ------------- .../org/apache/maven/model/pom-4.0.0.xml | 39 ++-- .../org/apache/maven/model/pom-4.1.0.xml | 109 ----------- maven-model-builder/src/site/apt/index.apt | 2 +- .../DefaultInheritanceAssemblerTest.java | 6 +- .../maven/model/merge/MavenModelMergerTest.java | 4 +- .../validation/DefaultModelValidatorTest.java | 73 +++++-- .../module-path-not-artifactId-child.xml | 2 +- .../module-path-not-artifactId-expected.xml | 2 +- .../missing-artifactId-pluginManagement.xml | 39 ++++ .../raw-model/missing-ga-pluginManagement.xml | 39 ++++ .../missing-groupId-pluginManagement.xml | 39 ++++ .../missing-plugin-version-pluginManagement.xml | 40 ++++ maven-model/src/main/mdo/maven.mdo | 22 +-- .../descriptor/PluginDescriptorBuilder.java | 2 + .../descriptor/PluginDescriptorBuilderTest.java | 1 + maven-plugin-api/src/test/resources/plugin.xml | 1 + .../DefaultSettingsBuildingRequest.java | 7 +- .../settings/building/FileSettingsSource.java | 2 +- .../maven/settings/building/SettingsSource.java | 2 +- .../settings/building/StringSettingsSource.java | 2 +- .../settings/building/UrlSettingsSource.java | 4 +- .../settings/merge/MavenSettingsMerger.java | 5 +- .../validation/DefaultSettingsValidator.java | 2 +- maven-slf4j-provider/pom.xml | 116 +++++++++++ .../java/org/slf4j/impl/MavenSimpleLogger.java | 117 +++++++++++ .../slf4j/impl/MavenSimpleLoggerFactory.java | 44 +++++ .../src/main/script/patch-slf4j-simple.groovy | 53 +++++ maven-slf4j-provider/src/site/site.xml | 36 ++++ pom.xml | 19 +- src/site/xdoc/index.xml | 1 + 175 files changed, 1480 insertions(+), 1190 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/6755560a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/6755560a/pom.xml ----------------------------------------------------------------------
