[maven] branch master updated (92b1ccd -> 0ed1ac8)
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Thu Jul 9 06:58:01 UTC 2015
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a change to branch master
in repository maven.
from 92b1ccd Install the guice dependencies (aopalliance and javax.inject) in the /usr/share/maven/lib/ directory
adds 090a561 Imported Upstream version 3.2.5
new 9886f32 Merge tag 'upstream/3.2.5'
new 7fbda07 Refreshed the patches
new e4848dd Updated the Maven version in the substitution rules of debian/maven.buildRules
new b475e3d Depend on libeclipse-aether-java (>= 1.0)
new fe8d7ce Use the no_aop variant of sisu-guice
new 854c89a Ignore the apache-rat-plugin
new 64d99a5 Build depend on junit4 instead of junit
new ce90b84 Build depend on modello 1.8 instead of 1.4
new 82ba250 No longer build the apache-maven module
new 0ed1ac8 Install wagon-http-shared and its dependencies in /usr/share/maven/lib/
The 10 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
README.bootstrap.txt | 19 -
README.md | 38 +-
README.txt | 4 -
apache-maven/README.txt | 22 +-
apache-maven/pom.xml | 10 +-
apache-maven/src/bin/mvn | 26 +-
apache-maven/src/bin/mvn.bat | 28 +-
apache-maven/src/bin/mvnDebug | 19 +-
apache-maven/src/bin/mvnDebug.bat | 28 +-
apache-maven/src/bin/mvnyjp | 14 +-
apache-maven/src/conf/settings.xml | 26 +-
apache-maven/src/main/assembly/bin.xml | 2 -
apache-maven/src/main/assembly/src.xml | 1 +
.../apache/maven/settings/GlobalSettingsTest.java | 2 +-
build.xml | 4 +-
debian/changelog | 7 +-
debian/control | 10 +-
debian/libmaven3-core-java.poms | 2 +-
debian/maven.buildRules | 28 +-
debian/maven.ignoreRules | 4 +-
debian/maven.links | 7 +-
debian/maven.rules | 4 +-
debian/patches/add_dependencies.diff | 2 +-
debian/patches/dep_versions.diff | 50 +-
debian/patches/force_java15_compiler.diff | 32 -
debian/patches/modello-configuration.patch | 15 +
debian/patches/modello.diff | 54 -
debian/patches/plugins_version.diff | 55 +-
debian/patches/secure-maven-central-access.diff | 33 -
debian/patches/series | 5 +-
.../projects/build.properties => deploySite.sh | 7 +-
maven-aether-provider/pom.xml | 14 +-
.../internal/ArtifactDescriptorReaderDelegate.java | 153 +++
.../internal/ArtifactDescriptorUtils.java | 2 +-
.../internal/DefaultArtifactDescriptorReader.java | 176 +--
.../repository/internal/DefaultModelCache.java | 2 +-
.../repository/internal/DefaultModelResolver.java | 105 +-
.../internal/DefaultVersionRangeResolver.java | 6 +-
.../internal/DefaultVersionResolver.java | 18 +-
.../repository/internal/MavenAetherModule.java | 6 +-
.../internal/MavenRepositorySystemUtils.java | 13 +-
.../internal/RemoteSnapshotMetadata.java | 2 +-
.../maven/repository/internal/package-info.java | 4 +-
.../internal/AbstractRepositoryTestCase.java | 2 +
.../DefaultArtifactDescriptorReaderTest.java | 16 +-
.../repository/internal/RepositorySystemTest.java | 2 +-
maven-artifact/pom.xml | 15 +-
.../java/org/apache/maven/artifact/Artifact.java | 2 +-
.../maven/artifact/metadata/ArtifactMetadata.java | 2 +-
.../repository/ArtifactRepositoryPolicy.java | 4 +-
.../maven/artifact/repository/Authentication.java | 16 +-
.../AbstractArtifactResolutionException.java | 10 +-
.../resolver/ArtifactNotFoundException.java | 5 +-
.../resolver/ArtifactResolutionException.java | 1 +
.../artifact/versioning/ComparableVersion.java | 90 +-
.../versioning/DefaultArtifactVersion.java | 50 +-
maven-artifact/src/site/apt/index.apt | 16 +-
.../artifact/versioning/ComparableVersionTest.java | 45 +-
.../versioning/DefaultArtifactVersionTest.java | 74 +-
.../artifact/versioning/VersionRangeTest.java | 2 +-
maven-compat/pom.xml | 14 +-
.../apache/maven/artifact/ArtifactScopeEnum.java | 4 +-
.../installer/DefaultArtifactInstaller.java | 4 +-
.../metadata/DefaultRepositoryMetadataManager.java | 28 +-
.../repository/metadata/MetadataBridge.java | 2 +-
.../repository/metadata/MetadataUtils.java | 2 +-
.../artifact/resolver/DefaultArtifactResolver.java | 53 +-
.../resolver/filter/InversionArtifactFilter.java | 6 +-
.../artifact/resolver/filter/OrArtifactFilter.java | 10 +-
.../resolver/filter/TypeArtifactFilter.java | 6 +-
.../maven/execution/DefaultRuntimeInformation.java | 2 +-
.../maven/profiles/ProfilesConversionUtils.java | 6 +-
.../OperatingSystemProfileActivator.java | 20 +-
.../java/org/apache/maven/project/ModelUtils.java | 2 +-
.../DefaultModelInheritanceAssembler.java | 49 +-
.../interpolation/BuildTimestampValueSource.java | 4 +-
.../interpolation/RegexBasedModelInterpolator.java | 2 +-
.../StringSearchModelInterpolator.java | 2 +-
.../project/validation/ModelValidationResult.java | 3 +-
.../maven/project/validation/ModelValidator.java | 2 +-
.../maven/repository/DefaultMirrorSelector.java | 1 +
.../apache/maven/repository/MirrorSelector.java | 4 +-
.../repository/UserLocalArtifactRepository.java | 10 +-
.../legacy/DefaultUpdateCheckManager.java | 21 +-
.../repository/legacy/DefaultWagonManager.java | 34 +-
.../repository/legacy/TransferListenerAdapter.java | 6 +-
.../repository/metadata/ClasspathContainer.java | 7 +-
.../metadata/DefaultClasspathTransformation.java | 3 +-
.../maven/repository/metadata/MetadataGraph.java | 6 +-
.../repository/metadata/MetadataGraphEdge.java | 4 +-
.../repository/metadata/MetadataGraphVertex.java | 12 +-
.../usability/plugin/ExpressionDocumenter.java | 2 +
.../maven/plugin-expressions/project.paramdoc.xml | 10 +-
.../maven/plugin-expressions/rootless.paramdoc.xml | 4 +-
.../AbstractArtifactComponentTestCase.java | 12 +-
.../apache/maven/artifact/ArtifactUtilsTest.java | 2 +-
.../factory/DefaultArtifactFactoryTest.java | 8 +-
.../artifact/metadata/TestMetadataSource.java | 6 +-
.../repository/MavenArtifactRepositoryTest.java | 2 +-
.../resolver/ArtifactResolutionExceptionTest.java | 2 +-
.../artifact/resolver/ArtifactResolverTest.java | 2 +-
.../resolver/DefaultArtifactResolverTest.java | 6 +-
.../maven/artifact/resolver/TestFileWagon.java | 24 +-
.../resolver/filter/AndArtifactFilterTest.java | 2 +-
.../resolver/filter/FilterHashEqualsTest.java | 2 +-
.../resolver/filter/OrArtifactFilterTest.java | 2 +-
.../resolver/filter/ScopeArtifactFilterTest.java | 2 +-
.../manager/DefaultProfileManagerTest.java | 2 +-
.../project/AbstractMavenProjectTestCase.java | 14 +-
.../maven/project/EmptyLifecycleExecutor.java | 2 +-
.../org/apache/maven/project/ModelUtilsTest.java | 2 +-
.../apache/maven/project/ProjectClasspathTest.java | 4 +-
.../apache/maven/project/TestProjectBuilder.java | 8 +-
.../inheritance/t02/ProjectInheritanceTest.java | 42 +-
.../repository/DefaultMirrorSelectorTest.java | 26 +-
.../maven/repository/LegacyRepositoryLayout.java | 2 +-
.../repository/LegacyRepositorySystemTest.java | 40 +-
.../legacy/DefaultUpdateCheckManagerTest.java | 16 +-
.../repository/legacy/DefaultWagonManagerTest.java | 6 -
.../legacy/LegacyRepositorySystemTest.java | 8 +-
.../maven/repository/legacy/StringWagon.java | 6 +-
.../org/apache/maven/repository/legacy/WagonA.java | 2 +-
.../org/apache/maven/repository/legacy/WagonB.java | 2 +-
.../org/apache/maven/repository/legacy/WagonC.java | 2 +-
.../apache/maven/repository/legacy/WagonMock.java | 2 +-
.../conflict/AbstractConflictResolverTest.java | 36 +-
.../conflict/FarthestConflictResolverTest.java | 12 +-
.../conflict/NearestConflictResolverTest.java | 12 +-
.../conflict/NewestConflictResolverTest.java | 12 +-
.../conflict/OldestConflictResolverTest.java | 12 +-
.../DefaultClasspathTransformationTest.java | 4 +-
.../DefaultGraphConflictResolutionPolicyTest.java | 2 +-
.../metadata/DefaultGraphConflictResolverTest.java | 4 +-
.../repository/metadata/TestMetadataSource.java | 6 +-
.../resources/inheritance-repo/t12/p0/p1/pom.xml | 4 +-
.../test/resources/inheritance-repo/t12/p0/pom.xml | 6 +-
.../inheritance-repo/t12scm/p0/modules/p1/pom.xml | 2 +-
.../resources/inheritance-repo/t12scm/p0/pom.xml | 4 +-
maven-core/lifecycle-executor.txt | 6 +-
maven-core/plugin-manager.txt | 41 +-
maven-core/pom.xml | 30 +-
.../maven/AbstractMavenLifecycleParticipant.java | 18 +-
.../apache/maven/DefaultArtifactFilterManager.java | 2 +-
.../main/java/org/apache/maven/DefaultMaven.java | 421 ++++--
.../maven/DefaultProjectDependenciesResolver.java | 1 +
.../maven/DefaultProjectDependencyGraph.java | 52 +-
.../apache/maven/DuplicateProjectException.java | 6 +-
.../maven/FilteredProjectDependencyGraph.java | 4 +-
.../org/apache/maven/InternalErrorException.java | 2 +-
.../src/main/java/org/apache/maven/Maven.java | 2 +-
.../apache/maven/ProjectDependenciesResolver.java | 6 +
.../main/java/org/apache/maven/ReactorReader.java | 50 +-
.../java/org/apache/maven/RepositoryUtils.java | 13 +-
.../maven/{BuildAbort.java => SessionScoped.java} | 30 +-
.../maven/artifact/InvalidRepositoryException.java | 2 +-
.../repository/DefaultRepositoryRequest.java | 4 +-
.../repository/LegacyLocalRepositoryManager.java | 2 +-
.../repository/MavenArtifactRepository.java | 7 +-
.../maven/artifact/repository/RepositoryCache.java | 6 +-
.../artifact/repository/RepositoryRequest.java | 18 +-
.../metadata/AbstractRepositoryMetadata.java | 19 +-
.../metadata/io/DefaultMetadataReader.java | 2 +-
.../metadata/io/MetadataParseException.java | 10 +-
.../resolver/ArtifactResolutionRequest.java | 36 +-
.../resolver/ArtifactResolutionResult.java | 8 +-
.../resolver/filter/AndArtifactFilter.java | 10 +-
.../filter/CumulativeScopeArtifactFilter.java | 6 +-
.../resolver/filter/ExclusionSetFilter.java | 6 +-
.../resolver/filter/IncludesArtifactFilter.java | 6 +-
.../apache/maven/bridge/MavenRepositorySystem.java | 543 +++-----
.../org/apache/maven/bridge/MirrorSelector.java | 19 +-
.../maven/classrealm/ClassRealmConstituent.java | 14 +-
.../apache/maven/classrealm/ClassRealmManager.java | 12 +-
.../classrealm/ClassRealmManagerDelegate.java | 2 +-
.../apache/maven/classrealm/ClassRealmRequest.java | 12 +-
.../maven/classrealm/DefaultClassRealmManager.java | 9 +-
.../BasedirBeanConfigurationPathTranslator.java | 4 +-
.../configuration/BeanConfigurationException.java | 2 +-
.../BeanConfigurationPathTranslator.java | 4 +-
.../configuration/BeanConfigurationRequest.java | 32 +-
.../BeanConfigurationValuePreprocessor.java | 4 +-
.../maven/configuration/BeanConfigurator.java | 4 +-
.../DefaultBeanConfigurationRequest.java | 4 +-
.../internal/DefaultBeanConfigurator.java | 4 +-
.../java/org/apache/maven/eventspy/EventSpy.java | 6 +-
.../apache/maven/exception/ExceptionHandler.java | 2 +-
.../apache/maven/exception/ExceptionSummary.java | 2 +-
.../org/apache/maven/execution/BuildFailure.java | 6 +-
.../org/apache/maven/execution/BuildSuccess.java | 4 +-
.../org/apache/maven/execution/BuildSummary.java | 8 +-
.../execution/DefaultMavenExecutionRequest.java | 69 +-
.../DefaultMavenExecutionRequestPopulator.java | 25 +-
.../execution/DefaultMavenExecutionResult.java | 10 +-
.../org/apache/maven/execution/ExecutionEvent.java | 12 +-
.../apache/maven/execution/ExecutionListener.java | 2 +-
.../maven/execution/MavenExecutionRequest.java | 95 +-
.../execution/MavenExecutionRequestPopulator.java | 6 +-
.../maven/execution/MavenExecutionResult.java | 3 +-
.../org/apache/maven/execution/MavenSession.java | 35 +-
.../MojoExecutionEvent.java} | 55 +-
...uildSuccess.java => MojoExecutionListener.java} | 28 +-
.../maven/execution/ProjectDependencyGraph.java | 8 +-
.../maven/execution/ProjectExecutionEvent.java | 90 ++
...dSuccess.java => ProjectExecutionListener.java} | 32 +-
.../org/apache/maven/execution/ReactorManager.java | 25 +-
.../apache/maven/execution/SettingsAdapter.java | 7 -
.../scope/MojoExecutionScoped.java} | 24 +-
.../execution/scope/WeakMojoExecutionListener.java | 44 +
.../scope/internal/MojoExecutionScope.java | 190 +++
.../internal/MojoExecutionScopeCoreModule.java} | 32 +-
.../scope/internal/MojoExecutionScopeModule.java | 56 +
.../apache/maven/lifecycle/DefaultLifecycles.java | 8 +-
.../apache/maven/lifecycle/DefaultSchedules.java | 99 --
.../lifecycle/LifecycleExecutionException.java | 4 +-
.../maven/lifecycle/LifecycleMappingDelegate.java | 52 +
.../lifecycle/LifecycleNotFoundException.java | 6 +-
.../lifecycle/LifecyclePhaseNotFoundException.java | 6 +-
.../apache/maven/lifecycle/MavenExecutionPlan.java | 22 -
.../maven/lifecycle/MissingProjectException.java | 4 +-
.../maven/lifecycle/NoGoalSpecifiedException.java | 4 +-
.../java/org/apache/maven/lifecycle/Schedule.java | 143 --
.../org/apache/maven/lifecycle/Scheduling.java | 99 --
.../lifecycle/internal/BuildListCalculator.java | 1 +
.../maven/lifecycle/internal/BuildLogItem.java | 220 ---
.../internal/BuildThreadFactory.java} | 30 +-
.../internal/CompoundProjectExecutionListener.java | 72 +
.../lifecycle/internal/ConcurrentBuildLogger.java | 123 --
.../lifecycle/internal/DefaultExecutionEvent.java | 2 +-
.../internal/DefaultExecutionEventCatapult.java | 2 +-
.../DefaultLifecycleExecutionPlanCalculator.java | 120 +-
.../internal/DefaultLifecycleMappingDelegate.java | 158 +++
.../DefaultLifecycleTaskSegmentCalculator.java | 9 +-
.../internal/DefaultProjectArtifactFactory.java} | 39 +-
.../lifecycle/internal/DependencyContext.java | 2 +-
.../lifecycle/internal/ExecutionEventCatapult.java | 2 +-
.../lifecycle/internal/ExecutionPlanItem.java | 57 +-
.../apache/maven/lifecycle/internal/GoalTask.java | 2 +-
.../lifecycle/internal/LifecycleDebugLogger.java | 40 +-
.../internal/LifecycleDependencyResolver.java | 22 +-
.../lifecycle/internal/LifecycleModuleBuilder.java | 51 +-
.../maven/lifecycle/internal/LifecycleStarter.java | 120 +-
.../maven/lifecycle/internal/LifecycleTask.java | 2 +-
.../internal/LifecycleTaskSegmentCalculator.java | 4 +-
.../lifecycle/internal/LifecycleWeaveBuilder.java | 490 -------
.../lifecycle/internal/MojoDescriptorCreator.java | 2 +-
.../maven/lifecycle/internal/MojoExecutor.java | 6 +-
...eForThread.java => ProjectArtifactFactory.java} | 30 +-
.../maven/lifecycle/internal/ProjectBuildList.java | 18 +-
.../maven/lifecycle/internal/ProjectIndex.java | 3 +-
.../maven/lifecycle/internal/ProjectSegment.java | 2 +-
.../lifecycle/internal/ReactorBuildStatus.java | 3 +-
.../maven/lifecycle/internal/ReactorContext.java | 2 +-
.../maven/lifecycle/internal/TaskSegment.java | 2 +-
.../internal/ThreadConfigurationService.java | 111 --
.../lifecycle/internal/ThreadLockedArtifact.java | 320 -----
.../maven/lifecycle/internal/builder/Builder.java | 49 +
.../internal/{ => builder}/BuilderCommon.java | 11 +-
.../internal/builder/BuilderNotFoundException.java | 10 +-
.../multithreaded}/ConcurrencyDependencyGraph.java | 53 +-
.../multithreaded/MultiThreadedBuilder.java} | 49 +-
.../multithreaded}/ThreadOutputMuxer.java | 5 +-
.../singlethreaded/SingleThreadedBuilder.java | 65 +
.../maven/lifecycle/mapping/LifecycleMapping.java | 2 +-
.../plugin/DefaultLifecycleBindingsInjector.java | 4 +-
.../apache/maven/monitor/event/EventMonitor.java | 6 +-
.../java/org/apache/maven/plugin/CacheUtils.java | 4 +-
.../plugin/CompoundMojoExecutionListener.java | 64 +
.../CycleDetectedInPluginGraphException.java | 2 +-
.../maven/plugin/DebugConfigurationListener.java | 2 +-
.../maven/plugin/DefaultBuildPluginManager.java | 57 +-
.../maven/plugin/DefaultExtensionRealmCache.java | 52 +-
.../maven/plugin/DefaultPluginArtifactsCache.java | 8 +-
.../maven/plugin/DefaultPluginDescriptorCache.java | 2 +-
.../maven/plugin/DefaultPluginRealmCache.java | 4 +-
.../apache/maven/plugin/ExtensionRealmCache.java | 22 +-
.../plugin/InvalidPluginDescriptorException.java | 2 +-
.../org/apache/maven/plugin/LegacySupport.java | 8 +-
.../apache/maven/plugin/MavenPluginManager.java | 14 +-
.../org/apache/maven/plugin/MojoExecution.java | 30 +-
.../apache/maven/plugin/PluginArtifactsCache.java | 10 +-
.../apache/maven/plugin/PluginDescriptorCache.java | 2 +-
.../org/apache/maven/plugin/PluginManager.java | 4 +-
.../maven/plugin/PluginParameterException.java | 10 +-
.../plugin/PluginParameterExpressionEvaluator.java | 6 +-
.../org/apache/maven/plugin/PluginRealmCache.java | 8 +-
.../plugin/internal/DefaultLegacySupport.java | 2 +-
.../plugin/internal/DefaultMavenPluginManager.java | 17 +-
.../DefaultPluginDependenciesResolver.java | 4 +-
.../maven/plugin/internal/PlexusUtilsInjector.java | 2 +-
.../internal/PluginDependenciesResolver.java | 6 +-
.../PluginDependencyResolutionListener.java | 2 +-
.../internal/ValidatingConfigurationListener.java | 2 +-
.../maven/plugin/internal/WagonExcluder.java | 2 +-
.../plugin/prefix/DefaultPluginPrefixRequest.java | 4 +-
.../maven/plugin/prefix/PluginPrefixRequest.java | 22 +-
.../maven/plugin/prefix/PluginPrefixResolver.java | 4 +-
.../maven/plugin/prefix/PluginPrefixResult.java | 8 +-
.../internal/DefaultPluginPrefixResolver.java | 2 +-
.../prefix/internal/DefaultPluginPrefixResult.java | 2 +-
.../version/DefaultPluginVersionRequest.java | 6 +-
.../maven/plugin/version/PluginVersionRequest.java | 22 +-
.../plugin/version/PluginVersionResolver.java | 4 +-
.../maven/plugin/version/PluginVersionResult.java | 6 +-
.../internal/DefaultPluginVersionResolver.java | 3 +-
.../internal/DefaultPluginVersionResult.java | 2 +-
.../project/DefaultDependencyResolutionResult.java | 2 +-
.../maven/project/DefaultMavenProjectHelper.java | 21 +-
.../project/DefaultModelBuildingListener.java | 4 +-
.../maven/project/DefaultProjectBuilder.java | 278 +++-
.../project/DefaultProjectBuildingHelper.java | 31 +-
.../project/DefaultProjectBuildingRequest.java | 22 +-
.../project/DefaultProjectBuildingResult.java | 6 +-
.../DefaultProjectDependenciesResolver.java | 23 +-
.../maven/project/DefaultProjectRealmCache.java | 55 +-
.../maven/project/DependencyResolutionRequest.java | 14 +-
.../maven/project/DependencyResolutionResult.java | 14 +-
.../apache/maven/project/ExtensionDescriptor.java | 2 +-
.../maven/project/ExtensionDescriptorBuilder.java | 4 +-
.../org/apache/maven/project/MavenProject.java | 1442 ++++++++------------
.../org/apache/maven/project/ProjectBuilder.java | 15 +-
.../maven/project/ProjectBuildingRequest.java | 43 +-
.../maven/project/ProjectBuildingResult.java | 12 +-
.../maven/project/ProjectDependenciesResolver.java | 4 +-
.../apache/maven/project/ProjectModelResolver.java | 92 +-
.../apache/maven/project/ProjectRealmCache.java | 23 +-
.../org/apache/maven/project/ProjectSorter.java | 5 +-
.../apache/maven/project/ReactorModelCache.java | 2 +-
.../org/apache/maven/project/ReactorModelPool.java | 2 +-
...eption.java => RepositorySessionDecorator.java} | 28 +-
.../project/artifact/DefaultMetadataSource.java | 2 +-
.../project/artifact/MavenMetadataSource.java | 15 +-
.../maven/project/artifact/ProjectArtifact.java | 2 +-
.../properties/internal/EnvironmentUtils.java | 4 +-
.../properties/internal/SystemProperties.java | 38 +-
.../maven/repository/ArtifactTransferEvent.java | 4 +-
.../maven/repository/ArtifactTransferResource.java | 12 +-
.../DelegatingLocalArtifactRepository.java | 2 +-
.../maven/repository/LocalArtifactRepository.java | 4 +-
.../LocalRepositoryNotAccessibleException.java | 2 +-
.../apache/maven/repository/RepositorySystem.java | 4 +-
.../ArtifactMetadataRetrievalException.java | 2 +-
.../metadata/DefaultMetadataResolutionRequest.java | 2 +-
.../legacy/metadata/MetadataResolutionRequest.java | 22 +-
.../apache/maven/rtinfo/RuntimeInformation.java | 6 +-
.../maven/session/scope/internal/SessionScope.java | 136 ++
.../session/scope/internal/SessionScopeModule.java | 63 +
.../settings/DefaultMavenSettingsBuilder.java | 3 +-
.../apache/maven/toolchain/DefaultToolchain.java | 59 +-
.../maven/toolchain/DefaultToolchainManager.java | 2 +-
.../toolchain/DefaultToolchainManagerPrivate.java | 16 +-
.../java/org/apache/maven/toolchain/Toolchain.java | 8 +
.../apache/maven/toolchain/ToolchainFactory.java | 4 +-
.../apache/maven/toolchain/ToolchainManager.java | 2 +
.../maven/toolchain/ToolchainManagerPrivate.java | 8 +-
.../apache/maven/toolchain/ToolchainsBuilder.java | 4 +-
.../maven/toolchain/java/DefaultJavaToolChain.java | 57 +-
.../{JavaToolChain.java => JavaToolchain.java} | 5 +-
...chainFactory.java => JavaToolchainFactory.java} | 73 +-
...ltJavaToolChain.java => JavaToolchainImpl.java} | 11 +-
.../toolchain/merge/MavenToolchainMerger.java | 103 ++
maven-core/src/main/mdo/toolchains.mdo | 159 ++-
.../META-INF/plexus/artifact-handlers.xml | 18 +-
.../main/resources/META-INF/plexus/components.xml | 28 -
.../resources/META-INF/plexus/default-bindings.xml | 60 +-
.../apache/maven/messages/messages_pl.properties | 4 +-
.../src/site/apt/configuration-management.apt | 10 +-
maven-core/src/site/apt/default-bindings.apt.vm | 3 +-
.../apt/getting-to-container-configured-mojos.apt | 8 +-
maven-core/src/site/apt/index.apt | 20 +-
maven-core/src/site/apt/inheritance.apt | 22 +-
maven-core/src/site/apt/lifecycles.apt.vm | 2 +-
maven-core/src/site/apt/offline-mode.apt | 78 +-
.../src/site/apt/plugin-execution-isolation.apt | 8 +-
.../apt/scripting-support/marmalade-support.apt | 140 +-
.../maven/AbstractCoreMavenComponentTestCase.java | 81 +-
.../java/org/apache/maven/DefaultMavenTest.java} | 33 +-
.../maven/DefaultProjectDependencyGraphTest.java | 172 +++
.../maven/MavenLifecycleParticipantTest.java | 67 +-
.../maven/ProjectDependenciesResolverTest.java | 12 +-
.../maven/execution/DefaultMavenExecutionTest.java | 2 +-
.../scope/internal/MojoExecutionScopeTest.java | 122 ++
.../maven/lifecycle/DefaultSchedulesTest.java | 61 -
.../lifecycle/DelegatingMojoExecutionListener.java | 75 +
.../DelegatingProjectExecutionListener.java | 82 ++
.../maven/lifecycle/LifecycleExecutorTest.java | 175 ++-
.../maven/lifecycle/MavenExecutionPlanTest.java | 19 +-
.../lifecycle/internal/BuilderCommonTest.java | 2 +
.../internal/ConcurrencyDependencyGraphTest.java | 1 +
.../internal/ConcurrentBuildLoggerTest.java | 74 -
.../lifecycle/internal/ExecutionPlanItemTest.java | 68 -
.../LifecycleExecutionPlanCalculatorTest.java | 4 +-
.../internal/LifecycleWeaveBuilderTest.java | 139 --
.../lifecycle/internal/PhaseRecorderTest.java | 1 +
.../multithreaded}/ThreadOutputMuxerTest.java | 6 +-
.../internal/stub/DefaultLifecyclesStub.java | 7 -
.../internal/stub/DefaultSchedulesStub.java | 41 -
.../stub/LifecycleExecutionPlanCalculatorStub.java | 2 +-
.../internal/stub/ProjectDependencyGraphStub.java | 1 +
.../org/apache/maven/plugin/PluginManagerTest.java | 82 +-
.../maven/plugin/PluginParameterExceptionTest.java | 68 +-
.../project/AbstractMavenProjectTestCase.java | 14 +-
.../project/DefaultMavenProjectBuilderTest.java | 11 +-
.../maven/project/EmptyLifecycleExecutor.java | 4 +-
.../maven/project/EmptyProjectBuildingHelper.java | 2 +-
.../project/ExtensionDescriptorBuilderTest.java | 2 +-
.../org/apache/maven/project/MavenProjectTest.java | 10 +-
.../apache/maven/project/PomConstructionTest.java | 138 +-
.../apache/maven/project/ProjectBuilderTest.java | 29 +-
.../apache/maven/project/TestMetadataSource.java | 6 +-
.../artifact/DefaultMavenMetadataCacheTest.java | 2 +-
.../project/harness/Xpp3DomAttributeIterator.java | 2 +-
.../project/harness/Xpp3DomAttributePointer.java | 2 +-
.../maven/project/harness/Xpp3DomNodeIterator.java | 5 +-
.../maven/project/harness/Xpp3DomNodePointer.java | 2 +-
.../project/harness/Xpp3DomPointerFactory.java | 2 +-
.../maven/repository/LegacyRepositoryLayout.java | 2 +-
.../maven/repository/TestArtifactHandler.java | 2 +-
.../maven/repository/TestRepositorySystem.java | 25 +-
.../settings/PomConstructionWithSettingsTest.java | 2 +
.../maven/toolchain/DefaultToolchainTest.java | 65 +
.../toolchain/merge/MavenToolchainMergerTest.java | 176 +++
.../cyclic-reference/module-a}/pom.xml | 18 +-
.../cyclic-reference/module-b}/pom.xml | 18 +-
.../default-maven/cyclic-reference}/pom.xml | 13 +-
.../lifecycle-executor/mojo-configuration/pom.xml | 2 +-
.../pom.xml | 4 +-
.../java/org/apache/maven/lifecycle/test/App.java | 2 +-
.../org/apache/maven/lifecycle/test/AppTest.java | 2 +-
.../project-with-inheritance/pom.xml | 22 +-
.../pom.xml | 2 +-
.../module-a/pom.xml | 12 +
.../module-b/pom.xml | 12 +
.../pom.xml | 13 +
.../pom.xml | 4 +-
.../project-with-inheritance/pom.xml | 22 +-
.../project-with-plugin-classpath-ordering/pom.xml | 2 +-
.../sub/pom.xml | 2 +-
.../test/projects/project-builder/it0063/pom.xml | 2 +-
.../project-builder/mng-3023/consumer/pom.xml | 2 +-
.../project-builder/mng-3023/dependency/pom.xml | 4 +-
.../test/projects/project-builder/mng-3023/pom.xml | 4 +-
.../project-dependencies-resolver/it0063/pom.xml | 2 +-
.../basedir-aligned-interpolation/pom.xml | 2 +-
.../pom-with-unusual-name.xml | 2 +-
.../baseurl-interpolation/pom.xml | 2 +-
.../boolean-interpolation/pom.xml | 4 +-
.../build-extension-inheritance/pom.xml | 2 +-
.../build-extension-inheritance/sub/pom.xml | 2 +-
.../complete-model/w-parent/sub/pom.xml | 2 +-
.../complete-model/wo-parent/pom.xml | 2 +-
.../dependency-inheritance/sub/pom.xml | 2 +-
.../dependency-order/w-plugin-mngt/pom.xml | 2 +-
.../dependency-order/wo-plugin-mngt/pom.xml | 2 +-
.../distribution-management/pom.xml | 2 +-
.../dual-execution-ids/sub/pom.xml | 2 +-
.../equal-plugin-deps/pom.xml | 2 +-
.../equal-plugin-exec-ids/pom.xml | 2 +-
.../execution-configuration-join/pom.xml | 2 +-
.../full-interpolation/pom.xml | 2 +-
.../pom.xml | 2 +-
.../sub/pom.xml | 2 +-
.../limited-inheritance/pom.xml | 2 +-
.../managed-profile-dependency/pom.xml | 2 +-
.../managed-profile-dependency/sub/pom.xml | 2 +-
.../merged-filter-order/pom.xml | 2 +-
.../merged-filter-order/sub/pom.xml | 2 +-
.../w-plugin-mngt/pom.xml | 2 +-
.../w-plugin-mngt/sub/pom.xml | 2 +-
.../wo-plugin-mngt/pom.xml | 2 +-
.../wo-plugin-mngt/sub/pom.xml | 2 +-
.../w-plugin-mngt/pom.xml | 2 +-
.../w-plugin-mngt/sub/pom.xml | 2 +-
.../wo-plugin-mngt/pom.xml | 2 +-
.../wo-plugin-mngt/sub/pom.xml | 2 +-
.../merged-plugin-exec-order/w-plugin-mngt/pom.xml | 2 +-
.../w-plugin-mngt/sub/pom.xml | 2 +-
.../wo-plugin-mngt/pom.xml | 2 +-
.../wo-plugin-mngt/sub/pom.xml | 2 +-
.../resources-project-builder/micromailer/pom.xml | 2 +-
.../nested-build-dir-interpolation/pom.xml | 2 +-
.../platform-file-separator/pom.xml | 2 +-
.../plugin-config-append/no-profile/pom.xml | 2 +-
.../plugin-config-append/with-profile/pom.xml | 2 +-
.../plugin-config-attributes/w-plugin-mngt/pom.xml | 2 +-
.../plugin-config-attributes/w-profile/pom.xml | 2 +-
.../wo-plugin-mngt/pom.xml | 2 +-
.../plugin-config-merging/child/pom.xml | 2 +-
.../plugin-config-merging/pom.xml | 2 +-
.../plugin-config-order/w-plugin-mngt/pom.xml | 2 +-
.../plugin-config-order/wo-plugin-mngt/pom.xml | 2 +-
.../plugin-exec-config-order/w-plugin-mngt/pom.xml | 2 +-
.../wo-plugin-mngt/pom.xml | 2 +-
.../plugin-exec-goals-order/w-plugin-mngt/pom.xml | 2 +-
.../plugin-exec-goals-order/wo-plugin-mngt/pom.xml | 2 +-
.../plugin-exec-merging-wo-version/pom.xml | 2 +-
.../plugin-exec-merging-wo-version/sub/pom.xml | 2 +-
.../plugin-exec-merging/w-plugin-mngt/pom.xml | 2 +-
.../plugin-exec-merging/w-plugin-mngt/sub/pom.xml | 2 +-
.../plugin-exec-merging/wo-plugin-mngt/pom.xml | 2 +-
.../plugin-exec-merging/wo-plugin-mngt/sub/pom.xml | 2 +-
.../plugin-exec-order-with-lifecycle/pom.xml | 2 +-
.../plugin-exec-order/w-plugin-mngt/pom.xml | 2 +-
.../plugin-exec-order/wo-plugin-mngt/pom.xml | 2 +-
.../plugin-exec-w-and-wo-id/w-plugin-mngt/pom.xml | 2 +-
.../plugin-exec-w-and-wo-id/wo-plugin-mngt/pom.xml | 2 +-
.../plugin-inheritance-order/child/pom.xml | 2 +-
.../plugin-inheritance-order/pom.xml | 2 +-
.../plugin-management-inheritance/pom.xml | 2 +-
.../pom-encoding/latin-1/pom.xml | 2 +-
.../pom-encoding/utf-8/pom.xml | 2 +-
.../pom-inheritance/pom.xml | 2 +-
.../profile-dependencies-multiple-profiles/pom.xml | 2 +-
.../profile-injected-dependencies/pom.xml | 2 +-
.../profile-injection-order/pom.xml | 2 +-
.../profile-plugin-mng-dependencies/pom.xml | 2 +-
.../profile-plugin-mng-dependencies/sub/pom.xml | 2 +-
.../profile-plugins/pom.xml | 2 +-
.../repo-inheritance/pom.xml | 4 +-
.../jetty-parent.xml | 2 +-
.../child/pom.xml | 2 +-
.../unprefixed-expression-interpolation/pom.xml | 2 +-
.../url-append/parent/pom.xml | 2 +-
.../url-inheritance/pom.xml | 2 +-
.../url-no-decoding/pom.xml | 2 +-
.../xml-coalesce-text/pom.xml | 2 +-
.../xml-markup-interpolation/pom.xml | 2 +-
.../xml-whitespace/sub/pom.xml | 2 +-
.../settings-no-pom/settings.xml | 6 +-
.../test-pom-and-settings-interpolation/pom.xml | 2 +-
.../test/resources/META-INF/plexus/components.xml | 2 +-
.../test/resources/distributionManagement-pom.xml | 4 +-
.../resources/org/apache/maven/lifecycle/pom.xml | 22 +-
.../maven/project/workspace/buildFromFile/pom.xml | 4 +-
.../project/workspace/buildModelLineage/pom.xml | 2 +-
.../resolveParentPom/childAndParent/child/pom.xml | 2 +-
.../resolveParentPom/childAndParent/pom.xml | 2 +-
.../project/workspace/resolveParentPom/pom.xml | 2 +-
.../toolchain/model/toolchains-jdks-extend.xml} | 42 +-
.../toolchain/model/toolchains-jdks-extra.xml | 41 +-
.../maven/toolchain/model/toolchains-jdks.xml | 44 +-
.../test/resources/project-dynamism/pom-interp.xml | 10 +-
.../resources/project-dynamism/pom-relative.xml | 16 +-
.../src/test/resources/project-dynamism/pom.xml | 16 +-
.../child-which-inherits-from-super-model.xml | 2 +-
.../projects/duplicate-plugins-merged-pom.xml | 4 +-
...pom-resolves-from-property-based-repository.xml | 31 +
.../projects/versionless-managed-dependency.xml | 24 +
.../resources/withActiveByDefaultProfile-pom.xml | 4 +-
maven-embedder/pom.xml | 8 +-
.../src/examples/simple-project/settings.xml | 2 +-
.../main/java/org/apache/maven/embedder/App.java | 2 +-
.../java/org/apache/maven/embedder/AppTest.java | 2 +-
.../main/java/org/apache/maven/cli/CLIManager.java | 13 +-
.../org/apache/maven/cli/CLIReportingUtils.java | 93 +-
.../main/java/org/apache/maven/cli/MavenCli.java | 167 ++-
.../maven/cli/event/ExecutionEventLogger.java | 107 +-
.../maven/cli/logging/BaseSlf4jConfiguration.java | 2 +-
.../maven/cli/logging/Slf4jConfiguration.java | 2 +-
.../cli/logging/Slf4jConfigurationFactory.java | 16 +-
.../org/apache/maven/cli/logging/Slf4jLogger.java | 2 +-
.../maven/cli/logging/Slf4jLoggerManager.java | 3 +-
.../maven/cli/logging/Slf4jStdoutLogger.java | 8 +-
.../cli/logging/impl/Log4j2Configuration.java | 6 +-
.../cli/logging/impl/LogbackConfiguration.java | 6 +-
.../cli/logging/impl/Slf4jSimpleConfiguration.java | 6 +-
.../impl/UnsupportedSlf4jBindingConfiguration.java | 72 +
.../cli/transfer/ConsoleMavenTransferListener.java | 4 +-
.../cli/transfer/Slf4jMavenTransferListener.java | 3 +-
.../META-INF/maven/slf4j-configuration.properties | 2 +-
maven-embedder/src/site/apt/logging.apt | 6 +-
.../src/main/java/org/apache/maven/App.java | 2 +-
.../src/test/java/org/apache/maven/AppTest.java | 2 +-
.../bad-dep-version/pom.xml | 2 +-
.../bad-ext-direct-deps/project/pom.xml | 2 +-
.../bad-ext-plugin-dep-ver/plugin/pom.xml | 8 +-
.../src/main/java/org/plugin/TestPlugin.java | 2 +-
.../bad-ext-plugin-dep-ver/project/pom.xml | 4 +-
.../bad-ext-plugin-maven-ver/plugin/pom.xml | 8 +-
.../src/main/java/org/plugin/TestPlugin.java | 2 +-
.../bad-ext-plugin-maven-ver/project/pom.xml | 4 +-
.../bad-maven-version/pom.xml | 2 +-
.../bad-mg-dep-version/pom.xml | 2 +-
.../bad-non-dep-version/pom.xml | 2 +-
.../bad-profile-repo/pom.xml | 2 +-
.../src/main/java/org/plugin/TestPlugin.java | 2 +-
.../config-rdonly-mojo-param/project/pom.xml | 2 +-
.../deploy-repo-creation-err/pom.xml | 4 +-
.../err-loading-plugin/project/pom.xml | 4 +-
.../err-resolving-ext-plugin/project/pom.xml | 4 +-
.../err-resolving-project-dep/project/pom.xml | 4 +-
.../maven/test/error/mojoFailure/AppTest.java | 2 +-
.../ext-deps-resolve-err/project/pom.xml | 2 +-
.../ext-plugin-artifact-missing/project/pom.xml | 4 +-
.../main/resources/META-INF/plexus/components.xml | 2 +-
.../ext-plugin-realm-error/project/pom.xml | 2 +-
.../ext-plugin-version-err/plugin/pom.xml | 8 +-
.../src/main/java/org/plugin/TestPlugin.java | 2 +-
.../ext-plugin-version-err/project/pom.xml | 4 +-
.../ext-realm-error/ext/pom.xml | 2 +-
.../ext/src/main/java/org/ext/App.java | 2 +-
.../ext-realm-error/project/pom.xml | 2 +-
.../interp-from-project/project/pom.xml | 2 +-
.../load-extern-profiles-ioex/pom.xml | 2 +-
.../load-extern-profiles-xex/pom.xml | 2 +-
.../child1/src/main/java/org/test/App.java | 2 +-
.../child1/src/test/java/org/test/AppTest.java | 2 +-
.../missing-parent-pom/pom.xml | 4 +-
.../src/main/java/org/plugin/TestPlugin.java | 2 +-
.../mojo-config-error/plugin/pom.xml | 2 +-
.../src/main/java/org/plugin/TestPlugin.java | 2 +-
.../mojo-config-error/project/pom.xml | 4 +-
.../src/main/java/org/plugin/TestPlugin.java | 2 +-
.../mojo-exec-err/project/pom.xml | 2 +-
.../src/main/java/org/plugin/TestPlugin.java | 2 +-
.../parent-parse-ioex/child/pom.xml | 2 +-
.../parent-parse-xex/child/pom.xml | 2 +-
.../parent-parse-xex/pom.xml | 2 +-
.../profile-activator-err/pom.xml | 2 +-
.../profile-activator-lookup-err/ext/pom.xml | 2 +-
.../ext/src/main/java/org/ext/App.java | 2 +-
.../profile-activator-lookup-err/project/pom.xml | 4 +-
.../project-collision/mod1/pom.xml | 2 +-
.../project-collision/mod2/pom.xml | 2 +-
.../project-collision/pom.xml | 2 +-
.../project-cycle/dep/pom.xml | 4 +-
.../error-reporting-projects/project-cycle/pom.xml | 4 +-
.../project-dep-missing/pom.xml | 6 +-
.../maven/test/error/mojoFailure/AppTest.java | 2 +-
.../maven/test/error/mojoFailure/AppTest.java | 2 +-
.../repo-creation-err/pom.xml | 4 +-
.../test/eventing-projects/read-with-deps/pom.xml | 2 +-
.../test/extensions/META-INF/plexus/components.xml | 2 +-
.../java/org/apache/maven/cli/CLIManagerTest.java | 4 +-
.../apache/maven/cli/CLIReportingUtilsTest.java | 40 +-
.../java/org/apache/maven/cli/MavenCliTest.java | 48 +-
.../maven/cli/event/ExecutionEventLoggerTest.java | 61 -
.../src/main/java/org/codehaus/m2eclipse/App.java | 2 +-
.../test/java/org/codehaus/m2eclipse/AppTest.java | 2 +-
.../settings.xml | 4 +-
.../src/test/projects/optional-dep/pom.xml | 4 +-
.../readProject-missingModuleIgnored/pom.xml | 2 +-
.../readProject-withScmInheritance/pom.xml | 4 +-
.../src/test/resources/settings/valid-settings.xml | 2 +-
maven-model-builder/pom.xml | 10 +-
.../building/AbstractModelBuildingListener.java | 2 +-
.../maven/model/building/DefaultModelBuilder.java | 134 +-
.../model/building/DefaultModelBuilderFactory.java | 8 +-
.../model/building/DefaultModelBuildingEvent.java | 2 +-
.../building/DefaultModelBuildingRequest.java | 4 +-
.../model/building/DefaultModelBuildingResult.java | 2 +-
.../maven/model/building/DefaultModelProblem.java | 16 +-
.../building/DefaultModelProblemCollector.java | 2 +-
.../maven/model/building/FileModelSource.java | 6 +-
.../model/building/FilterModelBuildingRequest.java | 2 +-
.../apache/maven/model/building/ModelBuilder.java | 6 +-
.../maven/model/building/ModelBuildingEvent.java | 8 +-
.../model/building/ModelBuildingException.java | 14 +-
.../model/building/ModelBuildingListener.java | 4 +-
.../maven/model/building/ModelBuildingRequest.java | 4 +-
.../maven/model/building/ModelBuildingResult.java | 16 +-
.../apache/maven/model/building/ModelCache.java | 6 +-
.../org/apache/maven/model/building/ModelData.java | 32 +-
.../apache/maven/model/building/ModelProblem.java | 16 +-
.../model/building/ModelProblemCollector.java | 4 +-
.../model/building/ModelProblemCollectorExt.java | 2 +-
.../building/ModelProblemCollectorRequest.java | 4 +-
.../maven/model/building/ModelProblemUtils.java | 12 +-
.../maven/model/building/ModelProcessor.java | 1 +
.../apache/maven/model/building/ModelSource.java | 6 +-
.../apache/maven/model/building/ModelSource2.java | 2 +-
.../maven/model/building/StringModelSource.java | 8 +-
.../maven/model/building/UrlModelSource.java | 6 +-
.../DefaultDependencyManagementImporter.java | 2 +-
.../composition/DependencyManagementImporter.java | 4 +-
.../inheritance/DefaultInheritanceAssembler.java | 2 +-
.../model/inheritance/InheritanceAssembler.java | 4 +-
.../AbstractStringBasedModelInterpolator.java | 42 +-
.../interpolation/BuildTimestampValueSource.java | 26 +-
.../model/interpolation/MavenBuildTimestamp.java | 70 +
.../interpolation/ProblemDetectingValueSource.java | 2 +-
.../StringSearchModelInterpolator.java | 1 +
.../interpolation/UrlNormalizingPostProcessor.java | 2 +-
.../apache/maven/model/io/DefaultModelReader.java | 2 +-
.../apache/maven/model/io/DefaultModelWriter.java | 2 +-
.../apache/maven/model/io/ModelParseException.java | 10 +-
.../org/apache/maven/model/io/ModelWriter.java | 8 +-
.../maven/model/locator/DefaultModelLocator.java | 2 +-
.../apache/maven/model/locator/ModelLocator.java | 4 +-
.../management/DependencyManagementInjector.java | 4 +-
.../model/management/PluginManagementInjector.java | 4 +-
.../apache/maven/model/merge/MavenModelMerger.java | 8 +-
.../normalization/DefaultModelNormalizer.java | 2 +-
.../maven/model/normalization/ModelNormalizer.java | 6 +-
.../model/path/DefaultModelPathTranslator.java | 2 +-
.../model/path/DefaultModelUrlNormalizer.java | 2 +-
.../maven/model/path/DefaultPathTranslator.java | 2 +-
.../maven/model/path/DefaultUrlNormalizer.java | 2 +-
.../maven/model/path/ModelPathTranslator.java | 4 +-
.../maven/model/path/ModelUrlNormalizer.java | 4 +-
.../apache/maven/model/path/PathTranslator.java | 4 +-
.../org/apache/maven/model/path/UrlNormalizer.java | 4 +-
.../plugin/DefaultPluginConfigurationExpander.java | 2 +-
.../plugin/DefaultReportConfigurationExpander.java | 2 +-
.../model/plugin/DefaultReportingConverter.java | 5 +-
.../model/plugin/LifecycleBindingsInjector.java | 4 +-
.../model/plugin/PluginConfigurationExpander.java | 4 +-
.../model/plugin/ReportConfigurationExpander.java | 4 +-
.../maven/model/plugin/ReportingConverter.java | 4 +-
.../model/profile/DefaultProfileInjector.java | 2 +-
.../model/profile/DefaultProfileSelector.java | 16 +-
.../model/profile/ProfileActivationContext.java | 12 +-
.../maven/model/profile/ProfileInjector.java | 4 +-
.../maven/model/profile/ProfileSelector.java | 4 +-
.../profile/activation/FileProfileActivator.java | 40 +-
.../activation/JdkVersionProfileActivator.java | 21 +-
.../OperatingSystemProfileActivator.java | 21 +-
.../model/profile/activation/ProfileActivator.java | 17 +-
.../activation/PropertyProfileActivator.java | 21 +-
.../resolution/InvalidRepositoryException.java | 8 +-
.../maven/model/resolution/ModelResolver.java | 26 +
.../resolution/UnresolvableModelException.java | 12 +-
.../maven/model/superpom/SuperPomProvider.java | 4 +-
.../model/validation/DefaultModelValidator.java | 407 ++++--
.../maven/model/validation/ModelValidator.java | 6 +-
.../resources/org/apache/maven/model/pom-4.0.0.xml | 4 +-
maven-model-builder/src/site/apt/index.apt | 20 +-
...FactoryTest.java => ComplexActivationTest.java} | 31 +-
.../model/building/SimpleProblemCollector.java | 2 +-
.../AbstractModelInterpolatorTest.java | 77 +-
.../interpolation/MavenBuildTimestampTest.java | 24 +-
.../StringSearchModelInterpolatorTest.java | 16 +-
.../activation/AbstractProfileActivatorTest.java | 2 +-
.../activation/JdkVersionProfileActivatorTest.java | 2 +-
.../activation/PropertyProfileActivatorTest.java | 2 +-
.../validation/DefaultModelValidatorTest.java | 9 +-
.../src/test/resources/poms/factory/complex.xml | 49 +
.../invalid-aggregator-packaging-pom.xml | 2 +-
maven-model/pom.xml | 8 +-
.../apache/maven/model/io/xpp3/package-info.java | 3 +-
.../org/apache/maven/model/merge/ModelMerger.java | 9 +-
.../org/apache/maven/model/merge/package-info.java | 1 +
.../java/org/apache/maven/model/package-info.java | 1 +
maven-model/src/main/mdo/maven.mdo | 26 +-
.../org/apache/maven/model/ActivationFileTest.java | 2 +-
.../org/apache/maven/model/ActivationOSTest.java | 2 +-
.../apache/maven/model/ActivationPropertyTest.java | 2 +-
.../org/apache/maven/model/ActivationTest.java | 2 +-
.../java/org/apache/maven/model/BuildTest.java | 2 +-
.../org/apache/maven/model/CiManagementTest.java | 2 +-
.../org/apache/maven/model/ContributorTest.java | 2 +-
.../maven/model/DependencyManagementTest.java | 2 +-
.../org/apache/maven/model/DependencyTest.java | 2 +-
.../maven/model/DeploymentRepositoryTest.java | 2 +-
.../java/org/apache/maven/model/DeveloperTest.java | 2 +-
.../maven/model/DistributionManagementTest.java | 2 +-
.../java/org/apache/maven/model/ExclusionTest.java | 2 +-
.../java/org/apache/maven/model/ExtensionTest.java | 2 +-
.../apache/maven/model/IssueManagementTest.java | 2 +-
.../java/org/apache/maven/model/LicenseTest.java | 2 +-
.../org/apache/maven/model/MailingListTest.java | 2 +-
.../java/org/apache/maven/model/ModelTest.java | 2 +-
.../java/org/apache/maven/model/NotifierTest.java | 2 +-
.../org/apache/maven/model/OrganizationTest.java | 2 +-
.../java/org/apache/maven/model/ParentTest.java | 2 +-
.../maven/model/PluginConfigurationTest.java | 2 +-
.../apache/maven/model/PluginContainerTest.java | 2 +-
.../apache/maven/model/PluginExecutionTest.java | 2 +-
.../apache/maven/model/PluginManagementTest.java | 2 +-
.../java/org/apache/maven/model/PluginTest.java | 2 +-
.../org/apache/maven/model/PrerequisitesTest.java | 2 +-
.../java/org/apache/maven/model/ProfileTest.java | 2 +-
.../org/apache/maven/model/RelocationTest.java | 2 +-
.../org/apache/maven/model/ReportPluginTest.java | 2 +-
.../java/org/apache/maven/model/ReportSetTest.java | 2 +-
.../java/org/apache/maven/model/ReportingTest.java | 2 +-
.../apache/maven/model/RepositoryPolicyTest.java | 2 +-
.../org/apache/maven/model/RepositoryTest.java | 2 +-
.../java/org/apache/maven/model/ResourceTest.java | 2 +-
.../test/java/org/apache/maven/model/ScmTest.java | 2 +-
.../test/java/org/apache/maven/model/SiteTest.java | 2 +-
maven-plugin-api/pom.xml | 24 +-
.../apache/maven/plugin/MojoNotFoundException.java | 4 +-
.../maven/plugin/descriptor/MojoDescriptor.java | 9 +-
.../maven/plugin/descriptor/PluginDescriptor.java | 6 +-
maven-plugin-api/src/main/mdo/plugin.mdo | 16 +-
.../descriptor/PluginDescriptorBuilderTest.java | 2 +-
maven-plugin-api/src/test/resources/plugin.xml | 2 +-
maven-repository-metadata/pom.xml | 4 +-
maven-settings-builder/pom.xml | 4 +-
.../settings/building/DefaultSettingsBuilder.java | 13 +-
.../building/DefaultSettingsBuilderFactory.java | 4 +-
.../building/DefaultSettingsBuildingRequest.java | 8 +-
.../building/DefaultSettingsBuildingResult.java | 2 +-
.../settings/building/DefaultSettingsProblem.java | 4 +-
.../building/DefaultSettingsProblemCollector.java | 2 +-
.../settings/building/FileSettingsSource.java | 6 +-
.../maven/settings/building/SettingsBuilder.java | 4 +-
.../building/SettingsBuildingException.java | 6 +-
.../settings/building/SettingsBuildingRequest.java | 26 +-
.../settings/building/SettingsBuildingResult.java | 6 +-
.../maven/settings/building/SettingsProblem.java | 16 +-
.../building/SettingsProblemCollector.java | 4 +-
.../maven/settings/building/SettingsSource.java | 6 +-
.../settings/building/StringSettingsSource.java | 8 +-
.../maven/settings/building/UrlSettingsSource.java | 6 +-
.../settings/crypto/DefaultSettingsDecrypter.java | 2 +-
.../crypto/DefaultSettingsDecryptionRequest.java | 8 +-
.../crypto/DefaultSettingsDecryptionResult.java | 2 +-
.../maven/settings/crypto/SettingsDecrypter.java | 4 +-
.../settings/crypto/SettingsDecryptionRequest.java | 10 +-
.../settings/crypto/SettingsDecryptionResult.java | 12 +-
.../maven/settings/io/DefaultSettingsReader.java | 2 +-
.../maven/settings/io/DefaultSettingsWriter.java | 2 +-
.../maven/settings/io/SettingsParseException.java | 10 +-
.../apache/maven/settings/io/SettingsReader.java | 8 +-
.../apache/maven/settings/io/SettingsWriter.java | 8 +-
.../settings/validation/SettingsValidator.java | 4 +-
maven-settings/pom.xml | 4 +-
.../org/apache/maven/settings/RuntimeInfo.java | 2 +
maven-settings/src/main/mdo/settings.mdo | 20 -
pom.xml | 180 +--
821 files changed, 9103 insertions(+), 7425 deletions(-)
delete mode 100644 README.bootstrap.txt
delete mode 100644 README.txt
delete mode 100644 debian/patches/force_java15_compiler.diff
create mode 100644 debian/patches/modello-configuration.patch
delete mode 100644 debian/patches/modello.diff
delete mode 100644 debian/patches/secure-maven-central-access.diff
copy maven-core/src/test/resources/projects/build.properties => deploySite.sh (90%)
create mode 100644 maven-aether-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java
copy maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/ArtifactRepositoryLayout.java => maven-compat/src/test/java/org/apache/maven/repository/DefaultMirrorSelectorTest.java (58%)
copy maven-core/src/main/java/org/apache/maven/{BuildAbort.java => SessionScoped.java} (63%)
copy maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java => maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java (55%)
copy maven-compat/src/main/java/org/apache/maven/repository/DefaultMirrorSelector.java => maven-core/src/main/java/org/apache/maven/bridge/MirrorSelector.java (92%)
copy maven-core/src/main/java/org/apache/maven/{lifecycle/internal/DefaultExecutionEvent.java => execution/MojoExecutionEvent.java} (50%)
copy maven-core/src/main/java/org/apache/maven/execution/{BuildSuccess.java => MojoExecutionListener.java} (57%)
create mode 100644 maven-core/src/main/java/org/apache/maven/execution/ProjectExecutionEvent.java
copy maven-core/src/main/java/org/apache/maven/execution/{BuildSuccess.java => ProjectExecutionListener.java} (52%)
copy maven-core/src/main/java/org/apache/maven/{classrealm/ClassRealmManagerDelegate.java => execution/scope/MojoExecutionScoped.java} (61%)
create mode 100644 maven-core/src/main/java/org/apache/maven/execution/scope/WeakMojoExecutionListener.java
create mode 100644 maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScope.java
copy maven-core/src/main/java/org/apache/maven/{lifecycle/internal/GoalTask.java => execution/scope/internal/MojoExecutionScopeCoreModule.java} (64%)
create mode 100644 maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScopeModule.java
delete mode 100644 maven-core/src/main/java/org/apache/maven/lifecycle/DefaultSchedules.java
create mode 100644 maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleMappingDelegate.java
delete mode 100644 maven-core/src/main/java/org/apache/maven/lifecycle/Schedule.java
delete mode 100644 maven-core/src/main/java/org/apache/maven/lifecycle/Scheduling.java
delete mode 100644 maven-core/src/main/java/org/apache/maven/lifecycle/internal/BuildLogItem.java
copy maven-core/src/main/java/org/apache/maven/{eventspy/AbstractEventSpy.java => lifecycle/internal/BuildThreadFactory.java} (60%)
create mode 100644 maven-core/src/main/java/org/apache/maven/lifecycle/internal/CompoundProjectExecutionListener.java
delete mode 100644 maven-core/src/main/java/org/apache/maven/lifecycle/internal/ConcurrentBuildLogger.java
create mode 100644 maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java
copy maven-core/src/main/java/org/apache/maven/{plugin/InvalidPluginException.java => lifecycle/internal/DefaultProjectArtifactFactory.java} (50%)
delete mode 100644 maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleWeaveBuilder.java
rename maven-core/src/main/java/org/apache/maven/lifecycle/internal/{CurrentPhaseForThread.java => ProjectArtifactFactory.java} (61%)
delete mode 100644 maven-core/src/main/java/org/apache/maven/lifecycle/internal/ThreadConfigurationService.java
delete mode 100644 maven-core/src/main/java/org/apache/maven/lifecycle/internal/ThreadLockedArtifact.java
create mode 100644 maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/Builder.java
rename maven-core/src/main/java/org/apache/maven/lifecycle/internal/{ => builder}/BuilderCommon.java (94%)
copy maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/DuplicateParameterException.java => maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/BuilderNotFoundException.java (81%)
rename maven-core/src/main/java/org/apache/maven/lifecycle/internal/{ => builder/multithreaded}/ConcurrencyDependencyGraph.java (68%)
rename maven-core/src/main/java/org/apache/maven/lifecycle/internal/{LifecycleThreadedBuilder.java => builder/multithreaded/MultiThreadedBuilder.java} (80%)
rename maven-core/src/main/java/org/apache/maven/lifecycle/internal/{ => builder/multithreaded}/ThreadOutputMuxer.java (98%)
create mode 100644 maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/singlethreaded/SingleThreadedBuilder.java
create mode 100644 maven-core/src/main/java/org/apache/maven/plugin/CompoundMojoExecutionListener.java
copy maven-core/src/main/java/org/apache/maven/project/{DependencyResolutionException.java => RepositorySessionDecorator.java} (61%)
copy maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfiguration.java => maven-core/src/main/java/org/apache/maven/properties/internal/SystemProperties.java (56%)
create mode 100644 maven-core/src/main/java/org/apache/maven/session/scope/internal/SessionScope.java
create mode 100644 maven-core/src/main/java/org/apache/maven/session/scope/internal/SessionScopeModule.java
rename maven-core/src/main/java/org/apache/maven/toolchain/java/{JavaToolChain.java => JavaToolchain.java} (94%)
rename maven-core/src/main/java/org/apache/maven/toolchain/java/{DefaultJavaToolchainFactory.java => JavaToolchainFactory.java} (70%)
copy maven-core/src/main/java/org/apache/maven/toolchain/java/{DefaultJavaToolChain.java => JavaToolchainImpl.java} (90%)
create mode 100644 maven-core/src/main/java/org/apache/maven/toolchain/merge/MavenToolchainMerger.java
copy maven-core/src/{main/java/org/apache/maven/Maven.java => test/java/org/apache/maven/DefaultMavenTest.java} (57%)
create mode 100644 maven-core/src/test/java/org/apache/maven/DefaultProjectDependencyGraphTest.java
create mode 100644 maven-core/src/test/java/org/apache/maven/execution/scope/internal/MojoExecutionScopeTest.java
delete mode 100644 maven-core/src/test/java/org/apache/maven/lifecycle/DefaultSchedulesTest.java
create mode 100644 maven-core/src/test/java/org/apache/maven/lifecycle/DelegatingMojoExecutionListener.java
create mode 100644 maven-core/src/test/java/org/apache/maven/lifecycle/DelegatingProjectExecutionListener.java
delete mode 100644 maven-core/src/test/java/org/apache/maven/lifecycle/internal/ConcurrentBuildLoggerTest.java
delete mode 100644 maven-core/src/test/java/org/apache/maven/lifecycle/internal/ExecutionPlanItemTest.java
delete mode 100644 maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleWeaveBuilderTest.java
rename maven-core/src/test/java/org/apache/maven/lifecycle/internal/{ => builder/multithreaded}/ThreadOutputMuxerTest.java (96%)
delete mode 100644 maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/DefaultSchedulesStub.java
create mode 100644 maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainTest.java
create mode 100644 maven-core/src/test/java/org/apache/maven/toolchain/merge/MavenToolchainMergerTest.java
copy {maven-embedder/src/test/projects/isolated-project-getting-parent-pom/project => maven-core/src/test/projects/default-maven/cyclic-reference/module-a}/pom.xml (50%)
copy {maven-embedder/src/test/projects/isolated-project-getting-parent-pom/project => maven-core/src/test/projects/default-maven/cyclic-reference/module-b}/pom.xml (50%)
copy maven-core/src/test/{resources/projects/modelsource => projects/default-maven/cyclic-reference}/pom.xml (57%)
create mode 100644 maven-core/src/test/projects/lifecycle-listener/lifecycle-participant-reactor-dependency-injection/module-a/pom.xml
create mode 100644 maven-core/src/test/projects/lifecycle-listener/lifecycle-participant-reactor-dependency-injection/module-b/pom.xml
create mode 100644 maven-core/src/test/projects/lifecycle-listener/lifecycle-participant-reactor-dependency-injection/pom.xml
copy maven-core/src/test/{projects/project-builder/mng-3023/pom.xml => resources/org/apache/maven/toolchain/model/toolchains-jdks-extend.xml} (55%)
copy maven-aether-provider/src/site/site.xml => maven-core/src/test/resources/org/apache/maven/toolchain/model/toolchains-jdks-extra.xml (55%)
copy maven-compat/src/test/remote-repo/org/apache/maven/its/a/0.1/a-0.1.pom => maven-core/src/test/resources/org/apache/maven/toolchain/model/toolchains-jdks.xml (59%)
create mode 100644 maven-core/src/test/resources/projects/import-scope-pom-resolves-from-property-based-repository.xml
create mode 100644 maven-core/src/test/resources/projects/versionless-managed-dependency.xml
create mode 100644 maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/UnsupportedSlf4jBindingConfiguration.java
copy maven-model/src/test/java/org/apache/maven/model/ActivationOSTest.java => maven-embedder/src/test/java/org/apache/maven/cli/CLIReportingUtilsTest.java (50%)
rename maven-compat/src/test/java/org/apache/maven/artifact/testutils/MockManager.java => maven-embedder/src/test/java/org/apache/maven/cli/MavenCliTest.java (52%)
delete mode 100644 maven-embedder/src/test/java/org/apache/maven/cli/event/ExecutionEventLoggerTest.java
create mode 100644 maven-model-builder/src/main/java/org/apache/maven/model/interpolation/MavenBuildTimestamp.java
copy maven-model-builder/src/test/java/org/apache/maven/model/building/{DefaultModelBuilderFactoryTest.java => ComplexActivationTest.java} (70%)
rename maven-core/src/test/java/org/apache/maven/lifecycle/internal/ThreadConfigurationServiceTest.java => maven-model-builder/src/test/java/org/apache/maven/model/interpolation/MavenBuildTimestampTest.java (58%)
create mode 100644 maven-model-builder/src/test/resources/poms/factory/complex.xml
--
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