[maven] 01/09: Merge tag 'upstream/3.3.9'
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Thu Nov 19 19:05:17 UTC 2015
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository maven.
commit 8667a7cf197acb1765c1dd024b948cf0ffba9252
Merge: ea2b8cd 564cd9b
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Thu Nov 19 10:07:29 2015 +0100
Merge tag 'upstream/3.3.9'
Upstream version 3.3.9
README.md | 4 +-
apache-maven/pom.xml | 8 +-
apache-maven/src/bin/mvn | 30 ++-
apache-maven/src/bin/mvn.cmd | 4 +-
apache-maven/src/bin/mvnDebug | 2 +-
.../apache/maven/settings/GlobalSettingsTest.java | 14 +-
build.xml | 2 +-
doap_Maven.rdf | 24 ++-
maven-aether-provider/pom.xml | 16 +-
.../internal/ArtifactDescriptorReaderDelegate.java | 6 +-
.../internal/DefaultArtifactDescriptorReader.java | 44 ++---
.../repository/internal/DefaultModelResolver.java | 8 +-
.../internal/DefaultVersionRangeResolver.java | 57 ++----
.../internal/DefaultVersionResolver.java | 89 ++++-----
.../repository/internal/LocalSnapshotMetadata.java | 6 +-
.../internal/LocalSnapshotMetadataGenerator.java | 2 +-
.../repository/internal/MavenAetherModule.java | 2 +-
.../maven/repository/internal/MavenMetadata.java | 33 +---
.../repository/internal/MavenSnapshotMetadata.java | 2 +-
.../repository/internal/RelocatedArtifact.java | 8 +-
.../internal/RemoteSnapshotMetadata.java | 13 +-
.../internal/RemoteSnapshotMetadataGenerator.java | 2 +-
.../repository/internal/VersionsMetadata.java | 4 +-
.../internal/VersionsMetadataGenerator.java | 4 +-
.../internal/RemoteSnapshotMetadataTest.java | 82 ++++++++
.../internal/util/ConsoleTransferListener.java | 2 +-
maven-artifact/pom.xml | 12 +-
.../org/apache/maven/artifact/ArtifactUtils.java | 36 +---
.../org/apache/maven/artifact/DefaultArtifact.java | 2 +-
.../artifact/versioning/ComparableVersion.java | 5 +-
.../maven/artifact/versioning/VersionRange.java | 6 +-
.../artifact/versioning/ComparableVersionTest.java | 2 +-
maven-builder-support/pom.xml | 12 +-
.../java/org/apache/maven/building/FileSource.java | 8 +-
.../java/org/apache/maven/building/UrlSource.java | 8 +-
.../org/apache/maven/building/FileSourceTest.java | 28 +--
.../apache/maven/building/StringSourceTest.java | 23 +--
.../org/apache/maven/building/UrlSourceTest.java | 30 +--
maven-compat/pom.xml | 8 +-
.../org/apache/maven/artifact/ArtifactStatus.java | 2 +-
.../artifact/deployer/DefaultArtifactDeployer.java | 2 +-
.../repository/ArtifactRepositoryFactory.java | 14 +-
.../metadata/DefaultRepositoryMetadataManager.java | 106 ++++------
.../metadata/GroupRepositoryMetadata.java | 6 +-
.../maven/artifact/resolver/ArtifactResolver.java | 57 +++---
.../artifact/resolver/DebugResolutionListener.java | 8 +-
.../artifact/resolver/DefaultArtifactResolver.java | 99 +++++-----
.../artifact/resolver/filter/OrArtifactFilter.java | 4 +-
.../profiles/DefaultMavenProfilesBuilder.java | 18 +-
.../maven/profiles/DefaultProfileManager.java | 42 ++--
.../org/apache/maven/profiles/ProfileManager.java | 10 +-
.../maven/project/DefaultMavenProjectBuilder.java | 2 +-
.../java/org/apache/maven/project/ModelUtils.java | 22 +--
.../org/apache/maven/project/ProjectUtils.java | 2 +-
.../DefaultModelInheritanceAssembler.java | 58 +++---
.../AbstractStringBasedModelInterpolator.java | 11 +-
.../StringSearchModelInterpolator.java | 15 +-
.../maven/project/path/DefaultPathTranslator.java | 4 +-
.../project/validation/ModelValidationResult.java | 2 +-
.../org/apache/maven/repository/MetadataGraph.java | 2 +-
.../apache/maven/repository/MetadataGraphNode.java | 4 +-
.../maven/repository/MetadataResolutionResult.java | 11 +-
.../legacy/DefaultUpdateCheckManager.java | 52 ++---
.../repository/legacy/DefaultWagonManager.java | 6 +-
.../repository/legacy/LegacyRepositorySystem.java | 16 +-
.../repository/legacy/TransferListenerAdapter.java | 4 +-
.../resolver/DefaultLegacyArtifactCollector.java | 26 +--
.../legacy/resolver/LegacyArtifactCollector.java | 6 +-
.../transform/ArtifactTransformationManager.java | 2 +-
.../DefaultArtifactTransformationManager.java | 2 +-
.../resolver/transform/SnapshotTransformation.java | 12 +-
.../repository/metadata/ClasspathContainer.java | 2 +-
.../metadata/DefaultClasspathTransformation.java | 2 +-
.../metadata/DefaultGraphConflictResolver.java | 4 +-
.../maven/repository/metadata/MetadataGraph.java | 12 +-
.../usability/plugin/ExpressionDocumenter.java | 78 ++++----
.../AbstractArtifactComponentTestCase.java | 64 +++---
.../apache/maven/artifact/ArtifactUtilsTest.java | 4 +-
.../artifact/metadata/TestMetadataSource.java | 2 +-
.../resolver/ArtifactResolutionExceptionTest.java | 2 +-
.../artifact/resolver/ArtifactResolverTest.java | 11 +-
.../artifact/resolver/TestTransferListener.java | 2 +-
.../maven/artifact/testutils/TestFileManager.java | 2 +-
.../maven/project/ClasspathArtifactResolver.java | 2 +-
.../maven/project/EmptyLifecycleExecutor.java | 2 +-
.../project/EmptyLifecyclePluginAnalyzer.java | 2 +-
.../org/apache/maven/project/ModelUtilsTest.java | 1 -
.../apache/maven/project/ProjectClasspathTest.java | 1 -
.../inheritance/t00/ProjectInheritanceTest.java | 1 -
.../inheritance/t02/ProjectInheritanceTest.java | 6 +-
.../inheritance/t04/ProjectInheritanceTest.java | 1 -
.../inheritance/t05/ProjectInheritanceTest.java | 1 -
.../inheritance/t07/ProjectInheritanceTest.java | 1 -
.../inheritance/t11/ProjectInheritanceTest.java | 2 +-
.../repository/legacy/DefaultWagonManagerTest.java | 4 +-
.../maven/repository/legacy/StringWagon.java | 2 +-
.../resolver/DefaultArtifactCollectorTest.java | 59 +++---
.../conflict/AbstractConflictResolverTest.java | 26 +--
.../conflict/FarthestConflictResolverTest.java | 23 +--
.../conflict/NearestConflictResolverTest.java | 23 +--
.../conflict/NewestConflictResolverTest.java | 23 +--
.../conflict/OldestConflictResolverTest.java | 24 ++-
.../repository/metadata/TestMetadataSource.java | 10 +-
maven-core/pom.xml | 18 +-
.../maven/AbstractMavenLifecycleParticipant.java | 2 +-
.../apache/maven/DefaultArtifactFilterManager.java | 6 +-
.../main/java/org/apache/maven/DefaultMaven.java | 12 +-
.../maven/DefaultProjectDependenciesResolver.java | 8 +-
.../main/java/org/apache/maven/ReactorReader.java | 15 +-
.../java/org/apache/maven/RepositoryUtils.java | 12 +-
.../manager/DefaultArtifactHandlerManager.java | 2 +-
.../repository/DefaultRepositoryRequest.java | 2 +-
.../repository/LegacyLocalRepositoryManager.java | 7 +-
.../metadata/AbstractRepositoryMetadata.java | 57 ++----
.../metadata/io/DefaultMetadataReader.java | 16 +-
.../resolver/ArtifactResolutionRequest.java | 8 +-
.../resolver/ArtifactResolutionResult.java | 8 +-
.../resolver/DefaultResolutionErrorHandler.java | 2 +-
.../maven/artifact/resolver/ResolutionNode.java | 8 +-
.../resolver/filter/AndArtifactFilter.java | 6 +-
.../filter/CumulativeScopeArtifactFilter.java | 4 +-
.../resolver/filter/ExclusionSetFilter.java | 2 +-
.../resolver/filter/IncludesArtifactFilter.java | 4 +-
.../apache/maven/bridge/MavenRepositorySystem.java | 4 +-
.../maven/classrealm/DefaultClassRealmManager.java | 36 ++--
.../DefaultBeanConfigurationRequest.java | 11 +-
.../internal/DefaultBeanConfigurator.java | 12 +-
.../eventspy/internal/EventSpyDispatcher.java | 20 +-
.../maven/exception/DefaultExceptionHandler.java | 4 +-
.../org/apache/maven/execution/BuildSummary.java | 8 +-
.../execution/DefaultMavenExecutionRequest.java | 87 ++++----
.../DefaultMavenExecutionRequestPopulator.java | 2 +-
.../execution/DefaultMavenExecutionResult.java | 2 +-
.../org/apache/maven/execution/MavenSession.java | 6 +-
.../org/apache/maven/execution/ReactorManager.java | 33 ++--
.../apache/maven/execution/SettingsAdapter.java | 2 +-
.../scope/internal/MojoExecutionScope.java | 6 +-
.../maven/extension/internal/CoreExports.java | 2 +-
.../extension/internal/CoreExtensionEntry.java | 30 ++-
.../apache/maven/graph/DefaultGraphBuilder.java | 16 +-
.../maven/graph/DefaultProjectDependencyGraph.java | 19 +-
.../graph/FilteredProjectDependencyGraph.java | 13 +-
.../DefaultRepositorySystemSessionFactory.java | 51 +++--
.../apache/maven/lifecycle/DefaultLifecycles.java | 12 +-
.../java/org/apache/maven/lifecycle/Lifecycle.java | 14 +-
.../apache/maven/lifecycle/MavenExecutionPlan.java | 16 +-
.../lifecycle/internal/BuildListCalculator.java | 2 +-
.../DefaultLifecycleExecutionPlanCalculator.java | 10 +-
.../internal/DefaultLifecycleMappingDelegate.java | 10 +-
.../internal/DefaultLifecyclePluginAnalyzer.java | 101 +++++-----
.../DefaultLifecycleTaskSegmentCalculator.java | 2 +-
.../lifecycle/internal/ExecutionPlanItem.java | 2 +-
.../lifecycle/internal/LifecycleDebugLogger.java | 4 +-
.../internal/LifecycleDependencyResolver.java | 14 +-
.../internal/LifecyclePluginResolver.java | 2 +-
.../lifecycle/internal/MojoDescriptorCreator.java | 3 +-
.../maven/lifecycle/internal/MojoExecutor.java | 56 +++---
.../maven/lifecycle/internal/ProjectBuildList.java | 8 +-
.../maven/lifecycle/internal/ProjectIndex.java | 4 +-
.../maven/lifecycle/internal/TaskSegment.java | 4 +-
.../multithreaded/ConcurrencyDependencyGraph.java | 8 +-
.../multithreaded/MultiThreadedBuilder.java | 8 +-
.../builder/multithreaded/ThreadOutputMuxer.java | 6 +-
.../lifecycle/mapping/DefaultLifecycleMapping.java | 18 +-
.../apache/maven/lifecycle/mapping/Lifecycle.java | 48 ++++-
.../maven/lifecycle/mapping/LifecycleMojo.java | 48 +++--
.../maven/lifecycle/mapping/LifecyclePhase.java | 116 +++++++++++
.../plugin/DefaultLifecycleBindingsInjector.java | 6 +-
.../maven/plugin/DefaultBuildPluginManager.java | 2 +-
.../maven/plugin/DefaultExtensionRealmCache.java | 16 +-
.../maven/plugin/DefaultPluginArtifactsCache.java | 17 +-
.../maven/plugin/DefaultPluginDescriptorCache.java | 6 +-
.../maven/plugin/DefaultPluginRealmCache.java | 11 +-
.../apache/maven/plugin/MavenPluginValidator.java | 2 +-
.../org/apache/maven/plugin/MojoExecution.java | 2 +-
.../org/apache/maven/plugin/PluginManager.java | 2 +-
.../plugin/internal/DefaultLegacySupport.java | 4 +-
.../plugin/internal/DefaultMavenPluginManager.java | 174 +++++++---------
.../DefaultPluginDependenciesResolver.java | 2 +-
.../plugin/internal/DefaultPluginManager.java | 12 +-
.../PluginDependencyResolutionListener.java | 4 +-
.../internal/ValidatingConfigurationListener.java | 2 +-
.../internal/DefaultPluginPrefixResolver.java | 2 +-
.../internal/DefaultPluginVersionResolver.java | 8 +-
.../project/DefaultDependencyResolutionResult.java | 12 +-
.../project/DefaultModelBuildingListener.java | 36 +---
.../maven/project/DefaultProjectBuilder.java | 26 +--
.../project/DefaultProjectBuildingHelper.java | 20 +-
.../project/DefaultProjectBuildingRequest.java | 27 ++-
.../project/DefaultProjectBuildingResult.java | 2 +-
.../DefaultProjectDependenciesResolver.java | 4 +-
.../maven/project/DefaultProjectRealmCache.java | 8 +-
.../apache/maven/project/ExtensionDescriptor.java | 8 +-
.../maven/project/ExtensionDescriptorBuilder.java | 37 +---
.../org/apache/maven/project/MavenProject.java | 64 +++---
.../maven/project/ProjectBuildingException.java | 33 ++--
.../apache/maven/project/ProjectModelResolver.java | 14 +-
.../org/apache/maven/project/ProjectSorter.java | 8 +-
.../apache/maven/project/ReactorModelCache.java | 2 +-
.../org/apache/maven/project/ReactorModelPool.java | 2 +-
.../artifact/DefaultMavenMetadataCache.java | 6 +-
.../project/artifact/MavenMetadataSource.java | 18 +-
.../properties/internal/SystemProperties.java | 2 +-
.../maven/repository/ArtifactTransferEvent.java | 3 -
.../DelegatingLocalArtifactRepository.java | 4 +-
.../rtinfo/internal/DefaultRuntimeInformation.java | 61 +++---
.../maven/session/scope/internal/SessionScope.java | 4 +-
.../apache/maven/toolchain/DefaultToolchain.java | 2 +-
.../maven/toolchain/DefaultToolchainManager.java | 2 +-
.../toolchain/DefaultToolchainManagerPrivate.java | 2 +-
.../maven/toolchain/DefaultToolchainsBuilder.java | 21 +-
.../building/ToolchainsBuildingException.java | 2 +-
.../toolchain/io/DefaultToolchainsReader.java | 16 +-
.../toolchain/merge/MavenToolchainMerger.java | 2 +-
maven-core/src/main/mdo/extension.mdo | 4 +-
maven-core/src/main/mdo/toolchains.mdo | 4 +-
.../main/resources/META-INF/maven/extension.xml | 1 +
.../resources/META-INF/plexus/default-bindings.xml | 85 +-------
.../maven/MavenLifecycleParticipantTest.java | 8 +-
.../configuration/DefaultBeanConfiguratorTest.java | 6 +-
.../lifecycle/DelegatingMojoExecutionListener.java | 2 +-
.../DelegatingProjectExecutionListener.java | 2 +-
.../lifecycle/EmptyLifecyclePluginAnalyzer.java | 2 +-
.../maven/lifecycle/LifecycleExecutorTest.java | 6 +-
.../maven/lifecycle/MavenExecutionPlanTest.java | 3 -
.../multithreaded/ThreadOutputMuxerTest.java | 4 +-
.../internal/stub/CompletionServiceStub.java | 4 +-
.../internal/stub/DefaultLifecyclesStub.java | 2 +-
.../internal/stub/LifeCyclePluginAnalyzerStub.java | 2 +-
.../stub/LifecycleExecutionPlanCalculatorStub.java | 8 +-
.../stub/LifecycleTaskSegmentCalculatorStub.java | 2 +-
.../stub/ProjectDependenciesResolverStub.java | 8 +-
.../internal/stub/ProjectDependencyGraphStub.java | 8 +-
.../lifecycle/mapping/LifecyclePhaseTest.java | 73 +++++++
.../PluginParameterExpressionEvaluatorTest.java | 4 +-
.../project/DefaultMavenProjectBuilderTest.java | 3 +-
.../maven/project/EmptyLifecycleExecutor.java | 2 +-
.../maven/project/EmptyProjectBuildingHelper.java | 2 +-
.../org/apache/maven/project/MavenProjectTest.java | 2 -
.../apache/maven/project/PomConstructionTest.java | 8 +-
.../apache/maven/project/ProjectSorterTest.java | 18 +-
.../maven/project/harness/PomTestWrapper.java | 18 +-
.../project/harness/Xpp3DomAttributeIterator.java | 4 +-
.../maven/project/harness/Xpp3DomNodeIterator.java | 2 +-
.../maven/project/harness/Xpp3DomNodePointer.java | 2 +-
.../maven/repository/TestRepositorySystem.java | 4 +-
.../internal/DefaultRuntimeInformationTest.java | 2 +-
.../settings/PomConstructionWithSettingsTest.java | 45 +++--
.../apache/maven/settings/SettingsUtilsTest.java | 4 +-
.../DefaultToolchainManagerPrivateTest.java | 8 +-
.../toolchain/DefaultToolchainManagerTest.java | 10 +-
.../maven/toolchain/DefaultToolchainTest.java | 48 ++---
.../toolchain/merge/MavenToolchainMergerTest.java | 101 +++-------
maven-embedder/pom.xml | 12 +-
.../main/java/org/apache/maven/cli/CLIManager.java | 100 +---------
.../org/apache/maven/cli/CLIReportingUtils.java | 33 ++--
.../java/org/apache/maven/cli/CleanArgument.java | 122 ++++++++++++
.../main/java/org/apache/maven/cli/MavenCli.java | 220 ++++++++++-----------
.../maven/cli/event/DefaultEventSpyContext.java | 2 +-
.../maven/cli/event/ExecutionEventLogger.java | 8 +-
.../internal/BootstrapCoreExtensionManager.java | 2 +-
.../cli/logging/Slf4jConfigurationFactory.java | 16 +-
.../cli/transfer/ConsoleMavenTransferListener.java | 2 +-
maven-embedder/src/main/mdo/core-extensions.mdo | 4 +-
...rTest.java => CLIManagerDocumentationTest.java} | 11 +-
.../org/apache/maven/cli/CleanArgumentTest.java | 61 ++++++
maven-model-builder/pom.xml | 20 +-
.../maven/model/building/DefaultModelBuilder.java | 93 +++++----
.../building/DefaultModelBuildingRequest.java | 12 +-
.../model/building/DefaultModelBuildingResult.java | 35 ++--
.../building/ModelProblemCollectorRequest.java | 13 +-
.../org/apache/maven/model/building/Result.java | 10 +-
.../DefaultDependencyManagementImporter.java | 4 +-
.../inheritance/DefaultInheritanceAssembler.java | 86 ++++++--
.../AbstractStringBasedModelInterpolator.java | 6 +-
.../model/interpolation/MavenBuildTimestamp.java | 6 +-
.../StringSearchModelInterpolator.java | 6 +-
.../interpolation/UrlNormalizingPostProcessor.java | 2 +-
.../apache/maven/model/io/DefaultModelReader.java | 16 +-
.../apache/maven/model/io/DefaultModelWriter.java | 35 +---
.../DefaultDependencyManagementInjector.java | 2 +-
.../DefaultPluginManagementInjector.java | 6 +-
.../apache/maven/model/merge/MavenModelMerger.java | 105 +++-------
.../normalization/DefaultModelNormalizer.java | 8 +-
.../model/path/DefaultModelPathTranslator.java | 2 +-
.../profile/DefaultProfileActivationContext.java | 2 +-
.../model/profile/DefaultProfileInjector.java | 22 +--
.../model/profile/DefaultProfileSelector.java | 10 +-
.../profile/activation/FileProfileActivator.java | 2 +-
.../activation/JdkVersionProfileActivator.java | 6 +-
.../model/profile/activation/ProfileActivator.java | 2 +-
.../model/superpom/DefaultSuperPomProvider.java | 2 +-
.../model/validation/DefaultModelValidator.java | 12 +-
maven-model-builder/src/main/mdo/profiles.mdo | 4 +-
maven-model-builder/src/site/apt/index.apt | 7 +-
.../model/building/SimpleProblemCollector.java | 6 +-
.../DefaultInheritanceAssemblerTest.java | 133 ++++++++++---
.../AbstractModelInterpolatorTest.java | 8 +-
.../StringSearchModelInterpolatorTest.java | 22 +--
.../maven/model/merge/MavenModelMergerTest.java | 101 ++++++++++
.../activation/AbstractProfileActivatorTest.java | 8 +-
.../poms/inheritance/empty-urls-child.xml | 31 +++
.../poms/inheritance/empty-urls-expected.xml | 44 +++++
.../poms/inheritance/empty-urls-parent.xml | 42 ++++
.../resources/poms/inheritance/flat-urls-child.xml | 34 ++++
.../poms/inheritance/flat-urls-expected.xml | 50 +++++
.../poms/inheritance/flat-urls-parent.xml | 49 +++++
.../tricky-flat-artifactId-urls-child.xml | 34 ++++
.../tricky-flat-artifactId-urls-expected.xml | 50 +++++
.../tricky-flat-artifactId-urls-parent.xml | 49 +++++
.../tricky-flat-directory-urls-child.xml | 34 ++++
.../tricky-flat-directory-urls-expected.xml | 50 +++++
.../tricky-flat-directory-urls-parent.xml | 49 +++++
.../test/resources/poms/inheritance/urls-child.xml | 34 ++++
.../resources/poms/inheritance/urls-expected.xml | 50 +++++
.../resources/poms/inheritance/urls-parent.xml | 49 +++++
maven-model/pom.xml | 12 +-
.../org/apache/maven/model/merge/ModelMerger.java | 100 +++++-----
maven-model/src/main/mdo/maven.mdo | 70 +++++--
maven-plugin-api/pom.xml | 8 +-
.../maven/plugin/descriptor/MojoDescriptor.java | 4 +-
.../maven/plugin/descriptor/PluginDescriptor.java | 46 ++---
.../plugin/descriptor/PluginDescriptorBuilder.java | 10 +-
maven-plugin-api/src/main/mdo/lifecycle.mdo | 4 +-
maven-plugin-api/src/main/mdo/plugin.mdo | 4 +-
maven-repository-metadata/pom.xml | 8 +-
.../src/main/mdo/metadata.mdo | 4 +-
maven-settings-builder/pom.xml | 14 +-
.../building/SettingsBuildingException.java | 2 +-
.../settings/crypto/DefaultSettingsDecrypter.java | 6 +-
.../crypto/DefaultSettingsDecryptionRequest.java | 8 +-
.../maven/settings/io/DefaultSettingsReader.java | 16 +-
.../maven/settings/io/DefaultSettingsWriter.java | 35 +---
.../maven/settings/merge/MavenSettingsMerger.java | 6 +-
.../validation/DefaultSettingsValidator.java | 8 +-
.../validation/DefaultSettingsValidatorTest.java | 2 +-
maven-settings/pom.xml | 8 +-
maven-settings/src/main/mdo/settings.mdo | 4 +-
pom.xml | 119 ++++++-----
src/site/xdoc/index.xml | 14 +-
340 files changed, 3620 insertions(+), 2942 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