Merge branch 'master' into jigsaw # Conflicts: # pom.xml
Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/16248d69 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/16248d69 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/16248d69 Branch: refs/heads/jigsaw Commit: 16248d69c116436178b7cc6ac3ee8abdc022cd76 Parents: ce4fe0f 6d9ffe3 Author: rfscholte <rfscho...@apache.org> Authored: Sun Jul 24 14:32:08 2016 +0200 Committer: rfscholte <rfscho...@apache.org> Committed: Sun Jul 24 14:32:08 2016 +0200 ---------------------------------------------------------------------- README.md | 6 +- apache-maven/README.txt | 6 +- apache-maven/pom.xml | 40 +- apache-maven/src/bin/mvn | 178 ++----- apache-maven/src/bin/mvn.cmd | 126 ++--- apache-maven/src/bin/mvnDebug | 25 +- apache-maven/src/bin/mvnDebug.cmd | 16 +- apache-maven/src/bin/mvnyjp | 23 +- apache-maven/src/conf/settings.xml | 48 +- apache-maven/src/conf/toolchains.xml | 2 +- apache-maven/src/main/assembly/component.xml | 2 +- maven-aether-provider/pom.xml | 21 +- .../internal/DefaultVersionRangeResolver.java | 50 +- .../DefaultVersionRangeResultFilter.java | 45 ++ .../internal/DefaultVersionResolver.java | 57 ++- .../internal/VersionRangeResultFilter.java | 45 ++ .../DefaultVersionRangeResolverTest.java | 455 ++++++++++++++++++ .../maven/its/mng-3092/maven-metadata.xml | 104 +++++ maven-artifact/pom.xml | 27 +- maven-builder-support/pom.xml | 4 - maven-compat/pom.xml | 51 +- .../UnknownRepositoryLayoutException.java | 3 +- .../maven/artifact/manager/WagonManager.java | 2 +- .../DefaultArtifactRepositoryFactory.java | 4 +- .../repository/layout/FlatRepositoryLayout.java | 6 +- .../artifact/resolver/ArtifactResolver.java | 62 +-- .../resolver/DefaultArtifactResolver.java | 12 +- .../profiles/activation/ProfileActivator.java | 4 +- .../org/apache/maven/project/ProjectUtils.java | 15 +- .../AbstractStringBasedModelInterpolator.java | 22 +- .../StringSearchModelInterpolator.java | 14 +- .../project/path/DefaultPathTranslator.java | 10 +- .../repository/MetadataResolutionResult.java | 26 +- .../repository/legacy/DefaultWagonManager.java | 85 ++-- .../legacy/LegacyRepositorySystem.java | 31 +- .../maven/repository/legacy/WagonManager.java | 6 +- .../repository/ArtifactRepositoryFactory.java | 6 +- .../DefaultLegacyArtifactCollector.java | 84 ++-- .../resolver/LegacyArtifactCollector.java | 9 +- .../repository/metadata/MetadataGraph.java | 3 +- .../repository/metadata/MetadataGraphEdge.java | 3 +- .../MetadataGraphTransformationException.java | 4 +- .../metadata/MetadataResolutionResult.java | 6 +- .../usability/plugin/ExpressionDocumenter.java | 18 +- maven-compat/src/site/apt/index.apt | 32 ++ .../repository/DefaultMirrorSelectorTest.java | 2 +- maven-core/pom.xml | 55 ++- .../AbstractMavenLifecycleParticipant.java | 2 +- .../metadata/io/DefaultMetadataReader.java | 16 +- .../maven/bridge/MavenRepositorySystem.java | 33 +- .../DefaultMavenExecutionRequestPopulator.java | 67 +-- .../lifecycle/LifecycleExecutionException.java | 27 +- .../internal/LifecycleDependencyResolver.java | 34 +- .../plugin/DefaultProjectArtifactsCache.java | 256 ++++++++++ .../maven/plugin/ProjectArtifactsCache.java | 90 ++++ .../internal/DefaultMavenPluginManager.java | 4 +- .../maven/project/DefaultProjectBuilder.java | 17 +- .../maven/repository/RepositorySystem.java | 15 + .../toolchain/io/DefaultToolchainsReader.java | 18 +- maven-core/src/main/mdo/toolchains.mdo | 4 +- .../main/resources/META-INF/maven/extension.xml | 10 +- .../META-INF/plexus/artifact-handlers.xml | 22 +- .../resources/META-INF/plexus/components.xml | 4 +- .../META-INF/plexus/default-bindings.xml | 30 +- maven-core/src/site/apt/artifact-handlers.apt | 6 +- maven-core/src/site/apt/core-extensions.apt.vm | 30 ++ maven-core/src/site/apt/index.apt | 4 +- maven-core/src/site/site.xml | 1 + .../DefaultProjectDependencyGraphTest.java | 6 +- .../LifecycleExecutorSubModulesTest.java | 2 +- .../project/AbstractMavenProjectTestCase.java | 13 +- .../project/DefaultMavenProjectBuilderTest.java | 4 +- .../maven/project/PomConstructionTest.java | 8 +- .../artifact/DefaultMavenMetadataCacheTest.java | 36 +- .../maven/repository/TestRepositorySystem.java | 10 +- maven-embedder/pom.xml | 76 ++- .../java/org/apache/maven/cli/CLIManager.java | 8 +- .../org/apache/maven/cli/CLIReportingUtils.java | 4 +- .../java/org/apache/maven/cli/MavenCli.java | 60 ++- .../maven/cli/event/ExecutionEventLogger.java | 117 ++--- .../cli/logging/impl/gossip/ColorRenderer.java | 122 +++++ .../impl/gossip/GossipConfiguration.java | 63 +++ .../com.planet57.gossip/config.properties | 30 ++ .../maven/slf4j-configuration.properties | 1 + maven-embedder/src/site/apt/logging.apt | 8 +- .../maven/cli/transfer/FileSizeFormatTest.java | 19 +- maven-model-builder/pom.xml | 27 +- .../model/building/DefaultModelBuilder.java | 462 ++++++++++++------- .../building/DefaultModelProblemCollector.java | 12 +- .../DefaultInheritanceAssembler.java | 5 +- .../AbstractStringBasedModelInterpolator.java | 41 +- .../maven/model/io/DefaultModelReader.java | 38 +- .../maven/model/io/DefaultModelWriter.java | 24 +- .../maven/model/merge/MavenModelMerger.java | 12 +- .../org/apache/maven/model/pom-4.0.0.xml | 53 +-- maven-model-builder/src/site/apt/index.apt | 2 +- .../DefaultInheritanceAssemblerTest.java | 10 + .../poms/inheritance/no-append-urls-child.xml | 34 ++ .../inheritance/no-append-urls-expected.xml | 50 ++ .../poms/inheritance/no-append-urls-parent.xml | 50 ++ .../maven/model/io/xpp3/package-info.java | 6 +- maven-model/src/main/mdo/maven.mdo | 134 +++++- maven-model/src/site/xdoc/navigation.xml | 35 -- maven-plugin-api/pom.xml | 8 + .../org/apache/maven/plugin/AbstractMojo.java | 8 +- .../maven/plugin/descriptor/MojoDescriptor.java | 4 +- .../settings/io/DefaultSettingsReader.java | 16 +- .../settings/io/DefaultSettingsWriter.java | 24 +- maven-settings/src/main/mdo/settings.mdo | 2 +- maven-settings/src/site/apt/index.apt | 2 +- pom.xml | 117 +++-- src/site/resources/images/maven-deps.png | Bin 70791 -> 75522 bytes src/site/site.xml | 15 - src/site/xdoc/index.xml | 21 +- src/site/xdoc/maven-deps.odg | Bin 32242 -> 34309 bytes 115 files changed, 3080 insertions(+), 1264 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/16248d69/pom.xml ---------------------------------------------------------------------- diff --cc pom.xml index fd302db,c447507..58e5fad --- a/pom.xml +++ b/pom.xml @@@ -49,11 -53,11 +53,11 @@@ under the License <commonsCliVersion>1.3.1</commonsCliVersion> <commonsLangVersion>3.4</commonsLangVersion> <junitVersion>4.12</junitVersion> - <plexusVersion>1.7</plexusVersion> + <plexusVersion>1.8-SNAPSHOT</plexusVersion> <plexusInterpolationVersion>1.22</plexusInterpolationVersion> - <plexusUtilsVersion>3.0.22</plexusUtilsVersion> + <plexusUtilsVersion>3.0.24</plexusUtilsVersion> <guavaVersion>19.0</guavaVersion> - <guiceVersion>4.0</guiceVersion> + <guiceVersion>4.1.0</guiceVersion> <sisuInjectVersion>0.3.3</sisuInjectVersion> <wagonVersion>2.10</wagonVersion> <securityDispatcherVersion>1.4</securityDispatcherVersion>
