[maven] 01/07: Merge tag 'upstream/3.3.3'
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Thu Jul 9 09:14:22 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 349e5ae7c3dde7b8282437a4cb12247fc3273fba
Merge: 0ed1ac8 dc93d7c
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Thu Jul 9 09:09:12 2015 +0200
Merge tag 'upstream/3.3.3'
Upstream version 3.3.3
.gitignore | 1 +
NOTICE | 4 +-
README.md | 20 +-
apache-maven/README.txt | 8 +-
apache-maven/pom.xml | 4 +-
apache-maven/src/bin/mvn | 38 +-
apache-maven/src/bin/{mvn.bat => mvn.cmd} | 117 ++--
apache-maven/src/bin/mvnDebug | 161 +----
apache-maven/src/bin/mvnDebug.bat | 200 ------
apache-maven/src/bin/mvnDebug.cmd | 31 +
apache-maven/src/bin/mvnyjp | 167 +----
apache-maven/src/conf/toolchains.xml | 103 +++
apache-maven/src/main/assembly/bin.xml | 2 +-
build.xml | 2 +
doap_Maven.rdf | 267 +++-----
maven-aether-provider/pom.xml | 4 +-
.../internal/DefaultArtifactDescriptorReader.java | 14 +-
.../repository/internal/MavenWorkspaceReader.java | 17 +-
maven-artifact/pom.xml | 4 +-
{maven-settings => maven-builder-support}/pom.xml | 24 +-
.../org/apache/maven/building/DefaultProblem.java | 10 +-
.../maven/building/DefaultProblemCollector.java | 31 +-
.../java/org/apache/maven/building/FileSource.java | 41 +-
.../java/org/apache/maven/building/Problem.java | 101 +++
.../apache/maven/building/ProblemCollector.java | 59 ++
.../maven/building/ProblemCollectorFactory.java | 26 +-
.../java/org/apache/maven/building/Source.java | 17 +-
.../org/apache/maven/building/StringSource.java | 36 +-
.../java/org/apache/maven/building/UrlSource.java | 36 +-
maven-builder-support/src/site/site.xml | 36 +
.../building/DefaultProblemCollectorTest.java | 76 +++
.../apache/maven/building/DefaultProblemTest.java | 136 ++++
.../org/apache/maven/building/FileSourceTest.java | 93 +++
.../building/ProblemCollectorFactoryTest.java | 30 +-
.../apache/maven/building/StringSourceTest.java | 79 +++
.../org/apache/maven/building/UrlSourceTest.java | 87 +++
.../src/test/resources/source.txt | 1 +
maven-compat/pom.xml | 4 +-
.../repository/legacy/DefaultWagonManager.java | 44 +-
maven-core/pom.xml | 39 +-
.../maven/AbstractMavenLifecycleParticipant.java | 1 +
.../org/apache/maven/ArtifactFilterManager.java | 10 +-
.../maven/ArtifactFilterManagerDelegate.java | 3 +
.../apache/maven/DefaultArtifactFilterManager.java | 119 +---
.../main/java/org/apache/maven/DefaultMaven.java | 748 +++------------------
.../maven/DefaultProjectDependenciesResolver.java | 3 +-
.../org/apache/maven/ProjectCycleException.java | 5 +
.../apache/maven/ProjectDependenciesResolver.java | 10 +-
.../main/java/org/apache/maven/ReactorReader.java | 13 +-
.../main/java/org/apache/maven/SessionScoped.java | 3 +-
.../apache/maven/bridge/MavenRepositorySystem.java | 422 +++++++-----
.../org/apache/maven/bridge/MirrorSelector.java | 197 ------
.../maven/classrealm/DefaultClassRealmManager.java | 221 ++----
.../maven/exception/DefaultExceptionHandler.java | 3 +-
.../execution/DefaultMavenExecutionRequest.java | 197 +++++-
.../DefaultMavenExecutionRequestPopulator.java | 289 ++++----
.../execution/DefaultMavenExecutionResult.java | 15 +-
.../maven/execution/MavenExecutionRequest.java | 62 ++
.../execution/MavenExecutionRequestPopulator.java | 29 +-
.../org/apache/maven/execution/MavenSession.java | 282 ++++----
.../maven/extension/internal/CoreExports.java | 75 +++
.../extension/internal/CoreExportsProvider.java | 38 +-
.../extension/internal/CoreExtensionEntry.java | 141 ++++
.../apache/maven/graph/DefaultGraphBuilder.java | 488 ++++++++++++++
.../{ => graph}/DefaultProjectDependencyGraph.java | 4 +-
.../FilteredProjectDependencyGraph.java | 2 +-
.../GraphBuilder.java} | 14 +-
.../DefaultRepositorySystemSessionFactory.java | 271 ++++++++
.../aether}/LoggingRepositoryListener.java | 2 +-
.../maven/lifecycle/DefaultLifecycleExecutor.java | 3 +-
.../maven/lifecycle/MojoExecutionConfigurator.java | 44 ++
.../DefaultLifecycleExecutionPlanCalculator.java | 148 ++--
.../internal/DefaultMojoExecutionConfigurator.java | 108 +++
.../internal/LifecycleDependencyResolver.java | 6 +-
.../lifecycle/internal/LifecycleModuleBuilder.java | 21 +-
.../maven/lifecycle/internal/LifecycleStarter.java | 14 +-
.../lifecycle/internal/MojoDescriptorCreator.java | 8 +-
.../maven/lifecycle/internal/MojoExecutor.java | 20 +-
.../maven/lifecycle/internal/ReactorContext.java | 13 +-
.../maven/lifecycle/internal/builder/Builder.java | 6 +-
.../lifecycle/internal/builder/BuilderCommon.java | 38 +-
.../multithreaded/MultiThreadedBuilder.java | 1 +
.../maven/plugin/DefaultBuildPluginManager.java | 6 +-
.../maven/plugin/DefaultExtensionRealmCache.java | 11 +-
.../maven/plugin/DefaultPluginArtifactsCache.java | 2 +-
.../apache/maven/plugin/ExtensionRealmCache.java | 12 +-
.../apache/maven/plugin/MavenPluginManager.java | 13 +-
.../apache/maven/plugin/PluginArtifactsCache.java | 2 +-
.../maven/plugin/PluginContainerException.java | 3 +-
.../maven/plugin/PluginExecutionException.java | 3 +-
.../plugin/PluginParameterExpressionEvaluator.java | 32 +-
.../plugin/internal/DefaultLegacySupport.java | 3 +-
.../plugin/internal/DefaultMavenPluginManager.java | 294 ++++++--
.../DefaultPluginDependenciesResolver.java | 36 +-
.../version/DefaultPluginVersionRequest.java | 3 +-
.../maven/project/DefaultMavenProjectHelper.java | 3 +-
.../project/DefaultModelBuildingListener.java | 9 +-
.../maven/project/DefaultProjectBuilder.java | 32 +-
.../project/DefaultProjectBuildingHelper.java | 146 +---
.../maven/project/ExtensionDescriptorBuilder.java | 25 +-
.../org/apache/maven/project/MavenProject.java | 13 +-
.../apache/maven/project/MavenProjectHelper.java | 3 +-
.../maven/project/ProjectBuildingHelper.java | 3 +-
.../apache/maven/project/ProjectModelResolver.java | 6 +-
.../project/artifact/MavenMetadataSource.java | 2 +-
.../apache/maven/repository/RepositorySystem.java | 3 +-
.../rtinfo/internal/DefaultRuntimeInformation.java | 3 +-
.../maven/session/scope/internal/SessionScope.java | 33 +
.../apache/maven/toolchain/DefaultToolchain.java | 35 +
.../maven/toolchain/DefaultToolchainManager.java | 69 +-
.../toolchain/DefaultToolchainManagerPrivate.java | 32 +-
.../maven/toolchain/DefaultToolchainsBuilder.java | 3 +
.../maven/toolchain/RequirementMatcherFactory.java | 15 +-
.../apache/maven/toolchain/ToolchainManager.java | 24 +-
.../maven/toolchain/ToolchainManagerPrivate.java | 17 +-
.../apache/maven/toolchain/ToolchainPrivate.java | 6 +-
.../building/DefaultToolchainsBuilder.java | 138 ++++
.../building/DefaultToolchainsBuildingRequest.java | 63 ++
.../building/DefaultToolchainsBuildingResult.java | 66 ++
.../toolchain/building/ToolchainsBuilder.java | 23 +-
.../building/ToolchainsBuildingException.java | 93 +++
.../building/ToolchainsBuildingRequest.java | 64 ++
.../building/ToolchainsBuildingResult.java | 33 +-
.../toolchain/io/DefaultToolchainsReader.java | 43 +-
.../toolchain/io/ToolchainsParseException.java | 94 +++
.../maven/toolchain/io/ToolchainsReader.java | 83 +++
maven-core/src/main/mdo/extension.mdo | 65 ++
.../main/resources/META-INF/maven/extension.xml | 173 +++++
maven-core/src/site/apt/index.apt | 2 +
.../DefaultMavenExecutionRequestPopulatorTest.java | 62 ++
.../DefaultProjectDependencyGraphTest.java | 2 +-
.../maven/lifecycle/LifecycleExecutorTest.java | 5 +
.../org/apache/maven/plugin/PluginManagerTest.java | 21 +
.../DefaultToolchainManagerPrivateTest.java | 166 +++++
.../toolchain/DefaultToolchainManagerTest.java | 153 +++++
.../maven/toolchain/DefaultToolchainTest.java | 97 ++-
.../toolchain/RequirementMatcherFactoryTest.java | 6 +
.../building/DefaultToolchainsBuilderTest.java | 185 +++++
.../building/ToolchainsBuildingExceptionTest.java | 73 ++
.../project-with-build-extensions-plugin/pom.xml | 31 +
.../org/apache/maven/toolchain/global.xml | 35 +
.../resources/org/apache/maven/toolchain/user.xml | 35 +
maven-embedder/pom.xml | 18 +-
.../main/java/org/apache/maven/cli/CLIManager.java | 3 +
.../main/java/org/apache/maven/cli/CliRequest.java | 120 ++++
.../main/java/org/apache/maven/cli/MavenCli.java | 553 ++++++++++++---
.../cli/configuration/ConfigurationProcessor.java | 15 +-
.../SettingsXmlConfigurationProcessor.java | 290 ++++++++
.../internal/BootstrapCoreExtensionManager.java | 143 ++++
maven-embedder/src/main/mdo/core-extensions.mdo | 88 +++
maven-embedder/src/site/apt/index.apt.vm | 10 +-
.../java/org/apache/maven/cli/MavenCliTest.java | 58 ++
.../test/projects/config-illegal/.mvn/maven.config | 1 +
.../src/test/projects/config/.mvn/maven.config | 2 +
maven-model-builder/pom.xml | 13 +-
.../building/AbstractModelBuildingListener.java | 1 +
.../maven/model/building/DefaultModelBuilder.java | 313 ++++++---
.../model/building/DefaultModelBuilderFactory.java | 1 +
.../model/building/DefaultModelBuildingEvent.java | 3 +
.../building/DefaultModelBuildingRequest.java | 62 ++
.../model/building/DefaultModelBuildingResult.java | 7 +
.../maven/model/building/DefaultModelProblem.java | 8 +
.../building/DefaultModelProblemCollector.java | 2 +
.../model/building/DefaultModelProcessor.java | 4 +
.../maven/model/building/FileModelSource.java | 50 +-
.../model/building/FilterModelBuildingRequest.java | 60 +-
.../apache/maven/model/building/ModelBuilder.java | 13 +
.../model/building/ModelBuildingEventCatapult.java | 1 +
.../maven/model/building/ModelBuildingRequest.java | 22 +-
.../apache/maven/model/building/ModelCacheTag.java | 8 +
.../apache/maven/model/building/ModelSource.java | 23 +-
.../org/apache/maven/model/building/Result.java | 255 +++++++
.../maven/model/building/StringModelSource.java | 44 +-
.../maven/model/building/UrlModelSource.java | 46 +-
.../DefaultDependencyManagementImporter.java | 1 +
.../inheritance/DefaultInheritanceAssembler.java | 1 +
.../AbstractStringBasedModelInterpolator.java | 3 +
.../interpolation/BuildTimestampValueSource.java | 1 +
.../PathTranslatingPostProcessor.java | 1 +
.../interpolation/ProblemDetectingValueSource.java | 3 +
.../StringSearchModelInterpolator.java | 3 +
.../interpolation/UrlNormalizingPostProcessor.java | 1 +
.../apache/maven/model/io/DefaultModelReader.java | 3 +
.../apache/maven/model/io/DefaultModelWriter.java | 3 +
.../maven/model/locator/DefaultModelLocator.java | 1 +
.../DefaultDependencyManagementInjector.java | 1 +
.../DefaultPluginManagementInjector.java | 1 +
.../apache/maven/model/merge/MavenModelMerger.java | 1 +
.../normalization/DefaultModelNormalizer.java | 2 +
.../model/path/DefaultModelPathTranslator.java | 1 +
.../model/path/DefaultModelUrlNormalizer.java | 1 +
.../maven/model/path/DefaultPathTranslator.java | 1 +
.../maven/model/path/DefaultUrlNormalizer.java | 1 +
.../plugin/DefaultPluginConfigurationExpander.java | 1 +
.../plugin/DefaultReportConfigurationExpander.java | 1 +
.../model/plugin/DefaultReportingConverter.java | 1 +
.../profile/DefaultProfileActivationContext.java | 6 +
.../model/profile/DefaultProfileInjector.java | 1 +
.../model/profile/DefaultProfileSelector.java | 1 +
.../profile/activation/FileProfileActivator.java | 2 +
.../activation/JdkVersionProfileActivator.java | 2 +
.../OperatingSystemProfileActivator.java | 1 +
.../activation/PropertyProfileActivator.java | 1 +
.../resolution/UnresolvableModelException.java | 16 +
.../model/resolution/WorkspaceModelResolver.java | 14 +-
.../model/superpom/DefaultSuperPomProvider.java | 1 +
.../model/validation/DefaultModelValidator.java | 4 +-
maven-model-builder/src/site/apt/index.apt | 46 +-
.../validation/DefaultModelValidatorTest.java | 4 +-
maven-model/pom.xml | 4 +-
maven-model/src/main/mdo/maven.mdo | 8 +-
maven-plugin-api/pom.xml | 4 +-
maven-repository-metadata/pom.xml | 4 +-
maven-settings-builder/pom.xml | 15 +-
.../settings/building/DefaultSettingsBuilder.java | 14 +-
.../building/DefaultSettingsBuildingRequest.java | 12 +
.../building/DefaultSettingsBuildingResult.java | 2 +
.../settings/building/DefaultSettingsProblem.java | 7 +
.../building/DefaultSettingsProblemCollector.java | 1 +
.../settings/building/FileSettingsSource.java | 40 +-
.../maven/settings/building/SettingsSource.java | 25 +-
.../settings/building/StringSettingsSource.java | 37 +-
.../maven/settings/building/UrlSettingsSource.java | 40 +-
.../settings/crypto/DefaultSettingsDecrypter.java | 1 +
.../crypto/DefaultSettingsDecryptionRequest.java | 4 +
.../crypto/DefaultSettingsDecryptionResult.java | 5 +
.../maven/settings/io/DefaultSettingsReader.java | 3 +
.../maven/settings/io/DefaultSettingsWriter.java | 3 +
.../validation/DefaultSettingsValidator.java | 32 +-
.../validation/DefaultSettingsValidatorTest.java | 33 +
maven-settings/pom.xml | 4 +-
pom.xml | 68 +-
src/site/resources/images/maven-deps.png | Bin 58951 -> 73105 bytes
src/site/xdoc/index.xml | 52 +-
234 files changed, 8182 insertions(+), 3585 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