[maven] 06/24: Merge tag 'upstream/3.5.0'
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Tue May 23 21:54:58 UTC 2017
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch maven-3.5
in repository maven.
commit 2e450d49d6bd6b4851fe95c4e28120fb9faa5926
Merge: 92e7cbc 5cab7ac
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Tue May 16 00:15:40 2017 +0200
Merge tag 'upstream/3.5.0'
Upstream version 3.5.0
Jenkinsfile | 162 +++++++++++
README.md | 12 +-
apache-maven/README.txt | 24 +-
apache-maven/pom.xml | 136 +++++++--
apache-maven/src/bin/m2.conf | 4 +-
apache-maven/src/bin/mvn | 227 ++++++---------
apache-maven/src/bin/mvn.cmd | 196 +++++++------
apache-maven/src/bin/mvnDebug | 27 +-
apache-maven/src/bin/mvnDebug.cmd | 16 +-
apache-maven/src/bin/mvnyjp | 25 +-
.../src/conf/logging/simplelogger.properties | 8 +-
apache-maven/src/conf/settings.xml | 2 +-
apache-maven/src/conf/toolchains.xml | 4 +-
apache-maven/src/lib/jansi-native/README.txt | 7 +
.../main/appended-resources/META-INF/LICENSE.vm | 2 -
apache-maven/src/main/assembly/bin.xml | 74 +----
.../src/main/assembly/{bin.xml => component.xml} | 22 +-
.../src/main/assembly/dir.xml | 24 +-
apache-maven/src/main/assembly/src.xml | 3 +-
build.xml | 307 --------------------
doap_Maven.rdf | 17 ++
maven-artifact/pom.xml | 29 +-
.../java/org/apache/maven/artifact/Artifact.java | 2 +-
.../org/apache/maven/artifact/DefaultArtifact.java | 12 +-
.../artifact/repository/ArtifactRepository.java | 1 -
.../repository/ArtifactRepositoryPolicy.java | 2 +-
.../AbstractArtifactResolutionException.java | 10 +-
.../resolver/CyclicDependencyException.java | 2 +-
.../MultipleArtifactsNotFoundException.java | 3 +-
.../artifact/versioning/ComparableVersion.java | 12 +-
.../versioning/DefaultArtifactVersion.java | 4 +-
.../maven/artifact/versioning/Restriction.java | 6 +-
.../maven/artifact/versioning/VersionRange.java | 15 +-
.../java/org/apache/maven/repository/Proxy.java | 6 +-
.../legacy/metadata/ArtifactMetadata.java | 8 +-
.../artifact/versioning/ComparableVersionTest.java | 2 +-
.../artifact/versioning/VersionRangeTest.java | 4 +-
maven-builder-support/pom.xml | 2 +-
.../org/apache/maven/building/DefaultProblem.java | 2 +-
maven-compat/pom.xml | 56 +++-
.../apache/maven/artifact/ArtifactScopeEnum.java | 4 +-
.../artifact/UnknownRepositoryLayoutException.java | 2 +-
.../artifact/installer/ArtifactInstaller.java | 2 +-
.../artifact/manager/DefaultWagonManager.java | 2 +-
.../maven/artifact/manager/WagonManager.java | 2 +-
.../repository/DefaultArtifactRepository.java | 8 +-
.../DefaultArtifactRepositoryFactory.java | 4 +-
.../repository/layout/FlatRepositoryLayout.java | 6 +-
.../metadata/DefaultRepositoryMetadataManager.java | 10 +-
.../SnapshotArtifactRepositoryMetadata.java | 2 +-
.../maven/artifact/resolver/ArtifactResolver.java | 62 ++--
.../artifact/resolver/DebugResolutionListener.java | 6 +-
.../artifact/resolver/DefaultArtifactResolver.java | 17 +-
.../resolver/ResolutionListenerForDepMgmt.java | 6 +-
.../artifact/versioning/ManagedVersionMap.java | 4 +-
.../maven/profiles/DefaultProfileManager.java | 2 +-
.../profiles/activation/ProfileActivator.java | 4 +-
.../apache/maven/project/MavenProjectBuilder.java | 5 +-
.../java/org/apache/maven/project/ModelUtils.java | 15 +-
.../org/apache/maven/project/ProjectUtils.java | 15 +-
.../DefaultModelInheritanceAssembler.java | 14 +-
.../inheritance/ModelInheritanceAssembler.java | 2 +-
.../AbstractStringBasedModelInterpolator.java | 34 ++-
.../interpolation/ModelInterpolationException.java | 4 +-
.../project/interpolation/ModelInterpolator.java | 2 -
.../interpolation/RegexBasedModelInterpolator.java | 2 +-
.../StringSearchModelInterpolator.java | 14 +-
.../maven/project/path/DefaultPathTranslator.java | 10 +-
.../project/validation/ModelValidationResult.java | 2 +-
.../org/apache/maven/repository/MetadataGraph.java | 5 -
.../repository/MetadataResolutionRequest.java | 18 ++
.../maven/repository/MetadataResolutionResult.java | 34 ++-
.../legacy/DefaultUpdateCheckManager.java | 61 ++--
.../repository/legacy/DefaultWagonManager.java | 97 ++++---
.../repository/legacy/LegacyRepositorySystem.java | 57 ++--
.../maven/repository/legacy/WagonManager.java | 6 +-
.../repository/ArtifactRepositoryFactory.java | 6 +-
.../DefaultArtifactRepositoryFactory.java | 2 +-
.../resolver/DefaultLegacyArtifactCollector.java | 102 ++++---
.../legacy/resolver/LegacyArtifactCollector.java | 9 +-
.../conflict/DefaultConflictResolverFactory.java | 2 +-
.../resolver/conflict/NewestConflictResolver.java | 2 +-
.../resolver/conflict/OldestConflictResolver.java | 2 +-
.../transform/AbstractVersionTransformation.java | 6 +-
.../maven/repository/metadata/MetadataGraph.java | 11 +-
.../repository/metadata/MetadataGraphEdge.java | 3 +-
.../MetadataGraphTransformationException.java | 4 +-
.../repository/metadata/MetadataGraphVertex.java | 10 +-
.../metadata/MetadataResolutionResult.java | 4 -
.../usability/plugin/ExpressionDocumenter.java | 18 +-
maven-compat/src/main/mdo/profiles.mdo | 4 +-
.../src/site/apt/index.apt | 13 +-
.../project/LegacyLocalRepositoryManager.java | 2 +-
.../org/apache/maven/project/ModelUtilsTest.java | 18 +-
.../AbstractProjectInheritanceTestCase.java | 2 +-
.../inheritance/t00/ProjectInheritanceTest.java | 2 +-
.../inheritance/t01/ProjectInheritanceTest.java | 2 +-
.../inheritance/t02/ProjectInheritanceTest.java | 2 +-
.../inheritance/t03/ProjectInheritanceTest.java | 2 +-
.../inheritance/t04/ProjectInheritanceTest.java | 2 +-
.../inheritance/t05/ProjectInheritanceTest.java | 2 +-
.../inheritance/t06/ProjectInheritanceTest.java | 2 +-
.../inheritance/t07/ProjectInheritanceTest.java | 2 +-
.../inheritance/t08/ProjectInheritanceTest.java | 2 +-
.../inheritance/t09/ProjectInheritanceTest.java | 10 +-
.../inheritance/t10/ProjectInheritanceTest.java | 4 +-
.../inheritance/t11/ProjectInheritanceTest.java | 4 +-
.../inheritance/t12scm/ProjectInheritanceTest.java | 2 +-
.../repository/DefaultMirrorSelectorTest.java | 2 +-
.../repository/LegacyRepositorySystemTest.java | 1 +
.../repository/legacy/DefaultWagonManagerTest.java | 2 +-
.../resolver/DefaultArtifactCollectorTest.java | 4 +-
.../conflict/FarthestConflictResolverTest.java | 4 +-
.../conflict/NearestConflictResolverTest.java | 4 +-
.../conflict/NewestConflictResolverTest.java | 4 +-
.../conflict/OldestConflictResolverTest.java | 4 +-
maven-core/lifecycle-executor.txt | 2 +-
maven-core/plugin-manager.txt | 2 +-
maven-core/pom.xml | 52 ++--
maven-core/project-builder.txt | 1 -
.../maven/AbstractMavenLifecycleParticipant.java | 4 +-
.../apache/maven/DefaultArtifactFilterManager.java | 2 +-
.../main/java/org/apache/maven/DefaultMaven.java | 64 +++--
.../src/main/java/org/apache/maven/Maven.java | 3 +
.../main/java/org/apache/maven/SessionScoped.java | 4 +-
.../DependencyResolutionRequiredException.java | 2 +-
.../repository/MavenArtifactRepository.java | 20 +-
.../metadata/AbstractRepositoryMetadata.java | 6 +-
.../repository/metadata/RepositoryMetadata.java | 2 +-
.../metadata/io/DefaultMetadataReader.java | 19 +-
.../resolver/ArtifactResolutionResult.java | 27 +-
.../maven/artifact/resolver/ResolutionNode.java | 4 +-
.../resolver/filter/ExcludesArtifactFilter.java | 2 +-
.../resolver/filter/IncludesArtifactFilter.java | 2 +-
.../DefaultBeanConfigurationRequest.java | 6 +-
.../java/org/apache/maven/eventspy/EventSpy.java | 2 +-
.../execution/DefaultMavenExecutionRequest.java | 6 +-
.../maven/execution/MavenExecutionRequest.java | 26 +-
.../org/apache/maven/execution/MavenSession.java | 2 +
.../apache/maven/execution/MojoExecutionEvent.java | 4 +-
.../maven/execution/MojoExecutionListener.java | 4 +-
.../maven/execution/ProjectDependencyGraph.java | 10 +
.../maven/execution/ProjectExecutionEvent.java | 4 +-
.../maven/execution/ProjectExecutionListener.java | 4 +-
.../execution/scope/WeakMojoExecutionListener.java | 8 +-
.../apache/maven/graph/DefaultGraphBuilder.java | 109 +++----
.../maven/graph/DefaultProjectDependencyGraph.java | 32 +++
.../graph/FilteredProjectDependencyGraph.java | 8 +
.../java/org/apache/maven/graph/GraphBuilder.java | 5 +
.../DefaultRepositorySystemSessionFactory.java | 14 +-
.../maven/lifecycle/DefaultLifecycleExecutor.java | 4 +-
.../apache/maven/lifecycle/DefaultLifecycles.java | 2 +-
.../lifecycle/LifecycleExecutionException.java | 28 +-
.../apache/maven/lifecycle/MavenExecutionPlan.java | 12 +-
.../maven/lifecycle/MojoExecutionConfigurator.java | 5 +-
.../lifecycle/internal/BuildListCalculator.java | 3 +-
.../DefaultLifecycleExecutionPlanCalculator.java | 8 +-
.../internal/DefaultLifecycleMappingDelegate.java | 4 +-
.../internal/DefaultLifecyclePluginAnalyzer.java | 8 +-
.../DefaultLifecycleTaskSegmentCalculator.java | 6 +-
.../lifecycle/internal/DependencyContext.java | 9 +-
.../lifecycle/internal/ExecutionPlanItem.java | 5 +-
.../apache/maven/lifecycle/internal/GoalTask.java | 5 +-
.../lifecycle/internal/LifecycleDebugLogger.java | 5 +-
.../internal/LifecycleDependencyResolver.java | 6 +-
.../internal/LifecycleExecutionPlanCalculator.java | 1 -
.../lifecycle/internal/LifecycleModuleBuilder.java | 7 +-
.../internal/LifecyclePluginResolver.java | 15 +-
.../maven/lifecycle/internal/LifecycleTask.java | 5 +-
.../internal/LifecycleTaskSegmentCalculator.java | 6 +-
.../lifecycle/internal/MojoDescriptorCreator.java | 9 +-
.../maven/lifecycle/internal/MojoExecutor.java | 5 +-
.../maven/lifecycle/internal/PhaseRecorder.java | 3 +-
.../lifecycle/internal/ProjectArtifactFactory.java | 4 +-
.../maven/lifecycle/internal/ProjectBuildList.java | 7 +-
.../maven/lifecycle/internal/ProjectIndex.java | 7 +-
.../maven/lifecycle/internal/ProjectSegment.java | 18 +-
.../maven/lifecycle/internal/TaskSegment.java | 6 +-
.../maven/lifecycle/internal/builder/Builder.java | 5 +-
.../lifecycle/internal/builder/BuilderCommon.java | 4 +-
.../multithreaded/ConcurrencyDependencyGraph.java | 5 +-
.../multithreaded/MultiThreadedBuilder.java | 47 ++--
.../builder/multithreaded/ThreadOutputMuxer.java | 12 +-
.../apache/maven/lifecycle/mapping/Lifecycle.java | 17 +-
.../maven/lifecycle/mapping/LifecyclePhase.java | 2 +-
.../maven/plugin/DebugConfigurationListener.java | 2 +-
.../maven/plugin/DefaultBuildPluginManager.java | 4 +-
.../apache/maven/plugin/ExtensionRealmCache.java | 4 +-
.../org/apache/maven/plugin/MojoExecution.java | 2 +-
.../maven/plugin/PluginParameterException.java | 6 +-
.../plugin/PluginParameterExpressionEvaluator.java | 32 +--
.../plugin/internal/DefaultMavenPluginManager.java | 12 +-
.../maven/plugin/version/PluginVersionRequest.java | 2 +-
.../internal/DefaultPluginVersionResolver.java | 6 +-
.../maven/project/DefaultProjectBuilder.java | 132 +++++----
.../project/DefaultProjectBuildingHelper.java | 2 +-
.../project/DefaultProjectBuildingRequest.java | 22 +-
.../project/DefaultProjectBuildingResult.java | 4 +-
.../DefaultProjectDependenciesResolver.java | 93 +++---
.../DuplicateArtifactAttachmentException.java | 2 +-
.../org/apache/maven/project/MavenProject.java | 45 ++-
.../apache/maven/project/MavenProjectHelper.java | 2 +-
.../maven/project/ProjectBuildingRequest.java | 16 +-
.../apache/maven/project/ProjectModelResolver.java | 85 ++++--
.../org/apache/maven/project/ProjectSorter.java | 2 +-
.../maven/project/RepositorySessionDecorator.java | 2 +-
.../project/artifact/ActiveProjectArtifact.java | 2 +-
.../project/artifact/MavenMetadataSource.java | 10 +-
.../maven/project/artifact/ProjectArtifact.java | 4 +-
.../properties/internal/SystemProperties.java | 32 ++-
.../maven/repository/ArtifactTransferEvent.java | 14 +-
.../DelegatingLocalArtifactRepository.java | 9 +
.../legacy/metadata/AbstractArtifactMetadata.java | 2 +-
.../legacy/metadata/ArtifactMetadataSource.java | 6 +-
.../legacy/metadata/MetadataResolutionRequest.java | 2 +-
.../settings/DefaultMavenSettingsBuilder.java | 4 +-
.../maven/toolchain/DefaultToolchainManager.java | 2 +-
.../apache/maven/toolchain/ToolchainManager.java | 6 +-
.../apache/maven/toolchain/ToolchainPrivate.java | 2 +-
.../toolchain/io/DefaultToolchainsReader.java | 19 +-
maven-core/src/main/mdo/toolchains.mdo | 6 +-
.../main/resources/META-INF/maven/extension.xml | 23 +-
.../META-INF/plexus/artifact-handlers.xml | 25 --
.../org/apache/maven/messages/messages.properties | 34 ---
.../apache/maven/messages/messages_de.properties | 34 ---
.../apache/maven/messages/messages_el.properties | 33 ---
.../apache/maven/messages/messages_en.properties | 23 --
.../apache/maven/messages/messages_es.properties | 33 ---
.../apache/maven/messages/messages_fr.properties | 33 ---
.../apache/maven/messages/messages_ja.properties | 34 ---
.../apache/maven/messages/messages_ko.properties | 34 ---
.../apache/maven/messages/messages_nl.properties | 33 ---
.../apache/maven/messages/messages_no.properties | 33 ---
.../apache/maven/messages/messages_pl.properties | 33 ---
.../maven/messages/messages_zh_CN.properties | 34 ---
maven-core/src/site/apt/artifact-handlers.apt | 4 -
.../src/site/apt/configuration-management.apt | 8 +-
.../src/site/apt/core-extensions.apt.vm | 26 +-
maven-core/src/site/apt/default-bindings.apt.vm | 7 -
maven-core/src/site/apt/index.apt | 23 +-
maven-core/src/site/apt/offline-mode.apt | 4 +-
.../src/site/apt/plugin-execution-isolation.apt | 4 +-
.../apt/scripting-support/marmalade-support.apt | 196 -------------
.../design/2.1-lifecycle-refactor.graffle | 2 +-
maven-core/src/site/site.xml | 1 +
.../maven/AbstractCoreMavenComponentTestCase.java | 1 +
.../graph/DefaultProjectDependencyGraphTest.java | 8 +-
.../lifecycle/LifecycleExecutorSubModulesTest.java | 2 +-
.../maven/lifecycle/LifecycleExecutorTest.java | 5 +
.../LifecycleExecutionPlanCalculatorTest.java | 2 +-
.../lifecycle/internal/ProjectBuildListTest.java | 2 +-
.../lifecycle/internal/stub/AboutTheStubs.html | 2 +-
.../stub/LifecycleExecutionPlanCalculatorStub.java | 13 +-
.../internal/stub/ProjectDependencyGraphStub.java | 12 +-
.../org/apache/maven/plugin/PluginManagerTest.java | 8 +-
.../plugin/internal/DefaultLegacySupportTest.java | 2 +-
.../project/AbstractMavenProjectTestCase.java | 11 +
.../project/DefaultMavenProjectBuilderTest.java | 132 ++++++++-
.../maven/project/EmptyProjectBuildingHelper.java | 2 +-
.../project/LegacyLocalRepositoryManager.java | 2 +-
.../apache/maven/project/PomConstructionTest.java | 52 ++--
.../maven/project/ProjectModelResolverTest.java | 246 ++++++++++++++++
.../apache/maven/project/ProjectSorterTest.java | 10 +-
.../project/artifact/MavenMetadataSourceTest.java | 2 +-
.../maven/repository/TestRepositoryConnector.java | 38 +++
.../toolchain/merge/MavenToolchainMergerTest.java | 4 +-
.../org/apache/maven/lifecycle/test/AppTest.java | 2 +-
.../remote-repo/org/apache/apache/1/apache-1.pom | 82 ++++++
.../org/apache/apache/maven-metadata.xml | 13 +
.../{w-plugin-mngt => w-plugin-mgmt}/pom.xml | 0
.../{wo-plugin-mngt => wo-plugin-mgmt}/pom.xml | 0
.../test/resources-project-builder/foo/sub/pom.xml | 4 -
.../{w-plugin-mngt => w-plugin-mgmt}/pom.xml | 0
.../{w-plugin-mngt => w-plugin-mgmt}/sub/pom.xml | 0
.../{wo-plugin-mngt => wo-plugin-mgmt}/pom.xml | 0
.../{wo-plugin-mngt => wo-plugin-mgmt}/sub/pom.xml | 0
.../{w-plugin-mngt => w-plugin-mgmt}/pom.xml | 0
.../{w-plugin-mngt => w-plugin-mgmt}/sub/pom.xml | 0
.../{wo-plugin-mngt => wo-plugin-mgmt}/pom.xml | 0
.../{wo-plugin-mngt => wo-plugin-mgmt}/sub/pom.xml | 0
.../{w-plugin-mngt => w-plugin-mgmt}/pom.xml | 0
.../{w-plugin-mngt => w-plugin-mgmt}/sub/pom.xml | 0
.../{wo-plugin-mngt => wo-plugin-mgmt}/pom.xml | 0
.../{wo-plugin-mngt => wo-plugin-mgmt}/sub/pom.xml | 0
.../{w-plugin-mngt => w-plugin-mgmt}/pom.xml | 0
.../{wo-plugin-mngt => wo-plugin-mgmt}/pom.xml | 0
.../{w-plugin-mngt => w-plugin-mgmt}/pom.xml | 0
.../{wo-plugin-mngt => wo-plugin-mgmt}/pom.xml | 0
.../{w-plugin-mngt => w-plugin-mgmt}/pom.xml | 0
.../{wo-plugin-mngt => wo-plugin-mgmt}/pom.xml | 0
.../{w-plugin-mngt => w-plugin-mgmt}/pom.xml | 0
.../{wo-plugin-mngt => wo-plugin-mgmt}/pom.xml | 0
.../{w-plugin-mngt => w-plugin-mgmt}/pom.xml | 0
.../{w-plugin-mngt => w-plugin-mgmt}/sub/pom.xml | 0
.../{wo-plugin-mngt => wo-plugin-mgmt}/pom.xml | 0
.../{wo-plugin-mngt => wo-plugin-mgmt}/sub/pom.xml | 0
.../{w-plugin-mngt => w-plugin-mgmt}/pom.xml | 0
.../{wo-plugin-mngt => wo-plugin-mgmt}/pom.xml | 0
.../{w-plugin-mngt => w-plugin-mgmt}/pom.xml | 0
.../{wo-plugin-mngt => wo-plugin-mgmt}/pom.xml | 0
.../plugin-inheritance-order/pom.xml | 2 +-
.../pom-inheritance/sub/pom.xml | 2 +-
.../prerequisites-inheritance/child/pom.xml | 2 +-
.../repo-inheritance/pom.xml | 2 +-
.../pom.xml | 0
.../pom.xml | 0
.../{dep-mngt => dep-mgmt}/pom.xml | 0
.../xml-coalesce-text/pom.xml | 2 +-
.../apache/maven/maven-parent/5/maven-parent-5.pom | 2 +-
.../pom.xml | 12 +
.../pom.xml | 11 +
.../parent-version-range-external-valid/pom.xml | 11 +
.../child/pom.xml | 12 +
.../pom.xml | 7 +
.../child/pom.xml | 11 +
.../pom.xml | 7 +
.../parent-version-range-local-valid/child/pom.xml | 11 +
.../parent-version-range-local-valid/pom.xml | 7 +
maven-embedder/pom.xml | 41 ++-
.../java/org/apache/maven/embedder/AppTest.java | 2 +-
.../main/java/org/apache/maven/cli/CLIManager.java | 10 +-
.../org/apache/maven/cli/CLIReportingUtils.java | 41 ++-
.../java/org/apache/maven/cli/CleanArgument.java | 2 +-
.../main/java/org/apache/maven/cli/MavenCli.java | 263 +++++++++++++----
.../SettingsXmlConfigurationProcessor.java | 4 +-
.../maven/cli/event/ExecutionEventLogger.java | 129 +++++----
.../impl/UnsupportedSlf4jBindingConfiguration.java | 2 +-
.../transfer/AbstractMavenTransferListener.java | 209 ++++++++++++--
.../cli/transfer/ConsoleMavenTransferListener.java | 112 +++++---
.../cli/transfer/Slf4jMavenTransferListener.java | 38 +--
.../src/main/resources/META-INF/MANIFEST.MF | 7 -
.../META-INF/maven/slf4j-configuration.properties | 3 +-
maven-embedder/src/site/apt/index.apt.vm | 12 +-
maven-embedder/src/site/apt/logging.apt | 8 +-
.../src/test/java/org/apache/maven/AppTest.java | 2 +-
.../maven/test/error/mojoFailure/AppTest.java | 2 +-
.../child1/src/test/java/org/test/AppTest.java | 2 +-
.../src/main/java/org/plugin/TestPlugin.java | 2 +-
.../maven/test/error/mojoFailure/AppTest.java | 2 +-
.../maven/test/error/mojoFailure/AppTest.java | 2 +-
.../maven/cli/CLIManagerDocumentationTest.java | 2 +-
.../org/apache/maven/cli/CleanArgumentTest.java | 2 +-
.../java/org/apache/maven/cli/MavenCliTest.java | 130 ++++++++-
.../maven/cli/transfer/FileSizeFormatTest.java | 313 +++++++++++++++++++++
.../test/java/org/codehaus/m2eclipse/AppTest.java | 2 +-
.../mavenConfigProperties/.mvn/maven.config | 3 +
maven-model-builder/pom.xml | 31 +-
.../maven/model/building/DefaultModelBuilder.java | 117 +++++---
.../building/DefaultModelBuildingRequest.java | 5 +-
.../maven/model/building/DefaultModelProblem.java | 2 +-
.../apache/maven/model/building/ModelBuilder.java | 4 -
.../model/building/ModelBuildingListener.java | 2 +-
.../maven/model/building/ModelBuildingRequest.java | 6 +-
.../maven/model/building/ModelProblemUtils.java | 2 +-
.../org/apache/maven/model/building/Result.java | 23 +-
.../DefaultDependencyManagementImporter.java | 12 +-
.../inheritance/DefaultInheritanceAssembler.java | 68 ++++-
.../AbstractStringBasedModelInterpolator.java | 20 ++
.../model/interpolation/ModelInterpolator.java | 2 -
.../StringSearchModelInterpolator.java | 2 +-
.../apache/maven/model/io/DefaultModelReader.java | 18 +-
.../apache/maven/model/io/DefaultModelWriter.java | 27 +-
.../apache/maven/model/merge/MavenModelMerger.java | 6 +-
.../model/plugin/DefaultReportingConverter.java | 13 +-
.../maven/model/plugin/ReportingConverter.java | 5 +-
.../maven/model/resolution/ModelResolver.java | 32 +++
.../model/validation/DefaultModelValidator.java | 189 +++++++------
maven-model-builder/src/main/mdo/profiles.mdo | 4 +-
maven-model-builder/src/site/apt/index.apt | 33 ++-
.../DefaultInheritanceAssemblerTest.java | 43 ++-
.../AbstractModelInterpolatorTest.java | 18 +-
.../validation/DefaultModelValidatorTest.java | 73 ++++-
.../module-path-not-artifactId-child.xml | 40 ++-
.../module-path-not-artifactId-expected.xml | 58 ++++
.../module-path-not-artifactId-parent.xml | 51 ++--
.../missing-artifactId-pluginManagement.xml | 33 ++-
.../raw-model/missing-ga-pluginManagement.xml | 33 ++-
.../raw-model/missing-groupId-pluginManagement.xml | 33 ++-
.../missing-plugin-version-pluginManagement.xml | 34 ++-
maven-model/pom.xml | 2 +-
.../apache/maven/model/io/xpp3/package-info.java | 6 +-
.../org/apache/maven/model/merge/ModelMerger.java | 4 +-
maven-model/src/main/mdo/maven.mdo | 52 ++--
maven-model/src/site/xdoc/navigation.xml | 35 ---
maven-plugin-api/pom.xml | 2 +-
.../java/org/apache/maven/plugin/AbstractMojo.java | 70 +++--
.../org/apache/maven/plugin/ContextEnabled.java | 3 +-
.../main/java/org/apache/maven/plugin/Mojo.java | 11 +-
.../maven/plugin/MojoExecutionException.java | 3 +-
.../apache/maven/plugin/MojoFailureException.java | 3 +-
.../apache/maven/plugin/MojoNotFoundException.java | 2 +-
.../maven/plugin/descriptor/MojoDescriptor.java | 15 +-
.../maven/plugin/descriptor/PluginDescriptor.java | 4 +-
.../plugin/descriptor/PluginDescriptorBuilder.java | 4 +-
.../java/org/apache/maven/plugin/logging/Log.java | 27 +-
.../maven/plugin/logging/SystemStreamLog.java | 2 +-
maven-plugin-api/src/main/mdo/lifecycle.mdo | 2 +-
.../descriptor/PluginDescriptorBuilderTest.java | 1 +
maven-plugin-api/src/test/resources/plugin.xml | 1 +
maven-repository-metadata/pom.xml | 2 +-
maven-repository-metadata/src/site/apt/index.apt | 2 +-
.../pom.xml | 33 ++-
.../internal/ArtifactDescriptorReaderDelegate.java | 14 +-
.../internal/ArtifactDescriptorUtils.java | 0
.../internal/DefaultArtifactDescriptorReader.java | 15 +-
.../repository/internal/DefaultModelCache.java | 0
.../repository/internal/DefaultModelResolver.java | 86 ++++--
.../internal/DefaultVersionRangeResolver.java | 18 +-
.../internal/DefaultVersionResolver.java | 42 ++-
.../repository/internal/LocalSnapshotMetadata.java | 0
.../internal/LocalSnapshotMetadataGenerator.java | 0
.../repository/internal/MavenAetherModule.java | 4 +
.../maven/repository/internal/MavenMetadata.java | 0
.../internal/MavenRepositorySystemUtils.java | 14 +-
.../repository/internal/MavenResolverModule.java | 44 ++-
.../repository/internal/MavenSnapshotMetadata.java | 0
.../repository/internal/MavenWorkspaceReader.java | 0
.../repository/internal/RelocatedArtifact.java | 0
.../internal/RemoteSnapshotMetadata.java | 0
.../internal/RemoteSnapshotMetadataGenerator.java | 0
.../internal/SnapshotMetadataGeneratorFactory.java | 0
.../repository/internal/VersionsMetadata.java | 0
.../internal/VersionsMetadataGenerator.java | 0
.../internal/VersionsMetadataGeneratorFactory.java | 0
.../maven/repository/internal/package-info.java | 6 +-
.../src/site/apt/index.apt | 4 +-
.../src/site/site.xml | 0
.../internal/AbstractRepositoryTestCase.java | 0
.../DefaultArtifactDescriptorReaderTest.java | 0
.../internal/DefaultModelResolverTest.java | 222 +++++++++++++++
.../internal/DefaultVersionResolverTest.java | 0
.../internal/MavenRepositorySystemUtilsTest.java | 0
.../internal/RemoteSnapshotMetadataTest.java | 0
.../repository/internal/RepositorySystemTest.java | 2 +-
.../internal/util/ConsoleRepositoryListener.java | 0
.../internal/util/ConsoleTransferListener.java | 0
.../07.20.3-SNAPSHOT/maven-metadata.xml | 0
.../dep-mng5459/0.4.0-SNAPSHOT/maven-metadata.xml | 0
.../artifact/1.0/artifact-1.0-classifier.zip | 0
.../repo/ut/simple/artifact/1.0/artifact-1.0.pom | 0
.../repo/ut/simple/artifact/1.0/artifact-1.0.zip | 0
.../repo/ut/simple/artifact/maven-metadata.xml | 0
.../ut/simple/dependency/1.0/dependency-1.0.pom | 0
.../repo/ut/simple/dependency/maven-metadata.xml | 0
.../repo/ut/simple/parent/1.0/parent-1.0.pom | 0
.../repo/ut/simple/parent/maven-metadata.xml | 0
maven-settings-builder/pom.xml | 2 +-
.../building/DefaultSettingsBuildingRequest.java | 7 +-
.../settings/building/DefaultSettingsProblem.java | 2 +-
.../maven/settings/io/DefaultSettingsReader.java | 19 +-
.../maven/settings/io/DefaultSettingsWriter.java | 27 +-
maven-settings/pom.xml | 2 +-
maven-settings/src/main/mdo/settings.mdo | 8 +-
maven-settings/src/site/apt/index.apt | 2 +-
maven-slf4j-provider/pom.xml | 116 ++++++++
.../java/org/slf4j/impl/MavenSimpleLogger.java | 115 ++++++++
.../org/slf4j/impl/MavenSimpleLoggerFactory.java | 30 +-
.../src/main/script/patch-slf4j-simple.groovy | 53 ++++
.../src/site/site.xml | 0
pom.xml | 167 ++++++-----
src/site/resources/images/maven-deps.png | Bin 73105 -> 69010 bytes
src/site/site.xml | 8 +-
src/site/xdoc/index.xml | 68 +++--
src/site/xdoc/maven-deps.odg | Bin 0 -> 18600 bytes
464 files changed, 5371 insertions(+), 3524 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven.git
More information about the pkg-java-commits
mailing list