This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a change to branch
dependabot/maven/com.google.guava-guava-33.3.1-jre
in repository https://gitbox.apache.org/repos/asf/maven.git
discard dd8a758ddb Bump com.google.guava:guava from 33.3.0-jre to 33.3.1-jre
add 034ef155da [MNG-8263] Remove last remnants of wrapper integration
(#1736)
add 2c6846b09b No issue, no change (#1745)
add 2d224623a3 [MNG-8120] Refactor ModelBuilder and ProjectBuilder (#1700)
add d77462e78a [MNG-8261] Remove jline-terminal-ffm direct dependency
(#1719)
add db74ba8788 [MNG-8264] Deprecate maven-toolchain-builder
add 9404145faa [MNG-8264] Deprecate maven-settings-builder
add 75738858d6 [MNG-8264] Deprecate maven-resolver-provider
add 2efeaf75f5 [MNG-8264] Deprecate maven-model-builder
add 8f34ea4ce0 More readable formatting in the warning advising users to
not publish a project having auto-named dependencies. Note: this warning is
questionable. Should it be removed?
add 6ffdc2015a Add license header to m2.conf
add e28283d81c Disable parallelism
add be6a535b83 Disable Jenkins temporarily
add 22ad0f565c Bump com.google.guava:guava from 33.3.0-jre to 33.3.1-jre
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (dd8a758ddb)
\
N -- N -- N
refs/heads/dependabot/maven/com.google.guava-guava-33.3.1-jre (22ad0f565c)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
apache-maven/pom.xml | 11 +-
apache-maven/src/assembly/component.xml | 30 -
apache-maven/src/assembly/maven/bin/m2.conf | 18 +
apache-maven/src/assembly/maven/bin/mvn | 192 ++
apache-maven/src/assembly/maven/bin/mvn.cmd | 209 ++
apache-maven/src/assembly/shared/init | 90 -
apache-maven/src/assembly/shared/init.cmd | 94 -
apache-maven/src/assembly/shared/mvnlauncher | 3 -
apache-maven/src/assembly/shared/mvnlauncher.cmd | 3 -
apache-maven/src/assembly/shared/mvnvalidate | 23 -
apache-maven/src/assembly/shared/mvnvalidate.cmd | 8 -
apache-maven/src/assembly/shared/run | 22 -
apache-maven/src/assembly/shared/run.cmd | 33 -
apache-maven/src/assembly/shared/validate | 54 -
apache-maven/src/assembly/shared/validate.cmd | 71 -
.../main/java/org/apache/maven/api/Artifact.java | 13 +-
.../org/apache/maven/api/ArtifactCoordinates.java | 6 +-
.../main/java/org/apache/maven/api/Constants.java | 2 +-
.../main/java/org/apache/maven/api/Dependency.java | 5 +-
.../apache/maven/api/DependencyCoordinates.java | 7 +-
.../main/java/org/apache/maven/api/Lifecycle.java | 1 -
.../main/java/org/apache/maven/api/PathType.java | 2 +-
.../main/java/org/apache/maven/api/Project.java | 7 +
.../main/java/org/apache/maven/api/plugin/Log.java | 8 +-
.../api/services/DependencyResolverResult.java | 2 +-
.../apache/maven/api/services/ModelBuilder.java | 7 +-
.../maven/api/services/ModelBuilderException.java | 11 +-
.../maven/api/services/ModelBuilderRequest.java | 268 +-
.../maven/api/services/ModelBuilderResult.java | 52 +-
.../apache/maven/api/services/ModelProblem.java | 5 +-
.../maven/api/services/ModelProblemCollector.java | 13 +
.../maven/api/services/ModelRepositoryHolder.java | 33 -
.../maven/api/services/ModelTransformer.java | 23 +-
.../api/services/ModelTransformerContext.java | 66 -
.../services/ModelTransformerContextBuilder.java | 43 -
.../api/services/ModelTransformerException.java | 38 -
.../org/apache/maven/api/spi/ModelTransformer.java | 1 -
Jenkinsfile => disabled-Jenkinsfile | 0
Jenkinsfile.its => disabled-Jenkinsfile.its | 0
Jenkinsfile.s390x => disabled-Jenkinsfile.s390x | 0
.../api/services/model/ModelBuildingEvent.java | 55 -
.../api/services/model/ModelBuildingListener.java | 33 -
.../maven/api/services/model}/ModelResolver.java | 3 +-
.../services/model}/ModelResolverException.java | 4 +-
.../maven/api/services/model/ModelValidator.java | 39 +-
.../maven/api/services/model/RootLocator.java | 3 +-
.../api/services/model/WorkspaceModelResolver.java | 31 -
.../maven/internal/impl/AbstractSession.java | 4 +-
.../internal/impl/AetherDependencyWrapper.java | 14 +-
.../maven/internal/impl/PathModularization.java | 7 +-
.../internal/impl/PathModularizationCache.java | 7 +-
.../java/org/apache/maven/internal/impl/Utils.java | 3 +-
.../internal/impl/model/BuildModelTransformer.java | 188 --
.../impl/model/DefaultInheritanceAssembler.java | 29 +-
.../internal/impl/model/DefaultModelBuilder.java | 2645 +++++++++++---------
.../impl/model/DefaultModelBuilderResult.java | 187 +-
.../impl/model/DefaultModelBuildingEvent.java | 33 -
.../impl/model/DefaultModelInterpolator.java | 16 +-
.../internal/impl/model/DefaultModelProblem.java | 2 +-
.../impl/model/DefaultModelProblemCollector.java | 198 --
.../impl/model/DefaultModelTransformerContext.java | 141 --
.../DefaultModelTransformerContextBuilder.java | 247 --
.../internal/impl/model/DefaultModelValidator.java | 204 +-
.../internal/impl/model/DefaultRootLocator.java | 12 +
.../maven/internal/impl/model/ModelData.java | 1 +
.../resolver/DefaultArtifactDescriptorReader.java | 25 +-
.../resolver/DefaultModelRepositoryHolder.java | 112 -
.../impl/resolver/DefaultModelResolver.java | 88 +-
.../maven/internal/impl/util}/PhasingExecutor.java | 18 +-
.../impl/resolver/DefaultModelResolverTest.java | 12 +-
.../maven/internal/impl/standalone/ApiRunner.java | 2 +-
.../impl/standalone/RepositorySystemSupplier.java | 9 +-
.../impl/standalone/TestApiStandalone.java | 12 +-
.../internal/impl/util}/PhasingExecutorTest.java | 10 +-
.../maven/AbstractCoreMavenComponentTestCase.java | 79 +-
.../project/AbstractMavenProjectTestCase.java | 28 +-
.../apache/maven/project/TestProjectBuilder.java | 16 +-
.../apache/maven/internal/impl/DefaultEvent.java | 2 +-
.../internal/impl/DefaultLifecycleRegistry.java | 39 +-
.../apache/maven/internal/impl/DefaultProject.java | 2 +-
.../maven/internal/impl/DefaultProjectBuilder.java | 2 +-
.../apache/maven/internal/impl/DefaultSession.java | 4 +-
.../maven/internal/impl/InternalMavenSession.java | 9 +
.../impl/DefaultConsumerPomBuilder.java | 150 +-
.../apache/maven/lifecycle/DefaultLifecycles.java | 2 +-
.../internal/concurrent/BuildPlanExecutor.java | 4 +-
.../project/DefaultModelBuildingListener.java | 126 -
.../maven/project/DefaultProjectBuilder.java | 809 ++----
.../org/apache/maven/project/ReactorModelPool.java | 4 +-
.../maven/AbstractCoreMavenComponentTestCase.java | 49 +-
.../java/org/apache/maven/MavenTestHelper.java | 21 +-
.../impl/ConsumerPomBuilderTest.java | 104 +-
.../maven/lifecycle/DefaultLifecyclesTest.java | 14 +-
.../maven/lifecycle/LifecycleExecutorTest.java | 2 +-
.../internal/stub/DefaultLifecyclesStub.java | 7 +-
.../stub/LifecycleExecutionPlanCalculatorStub.java | 4 -
.../org/apache/maven/model/ModelBuilderTest.java | 2 +
.../project/AbstractMavenProjectTestCase.java | 19 +-
.../project/DefaultMavenProjectBuilderTest.java | 12 +
.../apache/maven/project/PomConstructionTest.java | 22 +-
.../apache/maven/project/ProjectBuilderTest.java | 14 +-
.../settings/PomConstructionWithSettingsTest.java | 6 +-
.../project-builder/MNG-6723/.mvn/.gitkeep | 0
.../complete-model/w-parent/pom.xml | 3 +
.../complete-model/w-parent/sub/sub/pom.xml | 11 +
.../complete-model/wo-parent/sub/pom.xml | 11 +
.../plugin-exec-inheritance/pom.xml | 4 +-
.../pom-inheritance/{sub => child-1}/pom.xml | 0
.../pom-inheritance/{sub => child-2}/pom.xml | 2 +-
.../{sub => maven-inherit-plugin}/pom.xml | 0
.../{sub => maven-pax-plugin}/pom.xml | 2 +-
.../profile-module-inheritance/sub/pom.xml | 2 +-
.../sub => profile-module/module-1}/pom.xml | 8 +-
.../sub => profile-module/module-2}/pom.xml | 8 +-
.../sub => profile-module/module-3}/pom.xml | 8 +-
.../sub => profile-module/module-4}/pom.xml | 8 +-
.../sub => profile-module/module-5}/pom.xml | 8 +-
.../reporting-plugin-config/pom.xml | 2 +-
.../resources-project-builder/unc-path/pom.xml | 2 +-
.../src/test/resources/consumer/trivial/pom.xml | 2 +-
.../test/resources/projects/tree/consumer/pom.xml | 2 +-
.../src/test/resources/projects/tree/dep/pom.xml | 2 +-
.../src/test/resources/projects/tree/pom.xml | 10 +-
maven-embedder/pom.xml | 2 +-
.../META-INF/maven/slf4j-configuration.properties | 8 +-
maven-jline/pom.xml | 24 +-
.../maven/jline/JLineMessageBuilderFactory.java | 18 +-
maven-model-builder/pom.xml | 2 +-
.../building/AbstractModelBuildingListener.java | 2 +
.../maven/model/building/ArtifactModelSource.java | 2 +
.../building/BuildModelSourceTransformer.java | 2 +
.../maven/model/building/DefaultModelBuilder.java | 2 +
.../model/building/DefaultModelBuilderFactory.java | 2 +
.../model/building/DefaultModelBuildingEvent.java | 2 +
.../building/DefaultModelBuildingRequest.java | 2 +
.../model/building/DefaultModelBuildingResult.java | 2 +
.../maven/model/building/DefaultModelProblem.java | 2 +
.../building/DefaultModelProblemCollector.java | 2 +
.../model/building/DefaultModelProcessor.java | 3 +
.../model/building/DefaultTransformerContext.java | 2 +
.../building/DefaultTransformerContextBuilder.java | 7 +-
.../maven/model/building/FileModelSource.java | 2 +
.../maven/model/building/FileToRawModelMerger.java | 2 +
.../model/building/FilterModelBuildingRequest.java | 2 +
.../org/apache/maven/model/building/Graph.java | 4 +
.../apache/maven/model/building/ModelBuilder.java | 2 +
.../maven/model/building/ModelBuildingEvent.java | 2 +
.../model/building/ModelBuildingEventCatapult.java | 2 +
.../model/building/ModelBuildingException.java | 2 +
.../model/building/ModelBuildingListener.java | 2 +
.../maven/model/building/ModelBuildingRequest.java | 2 +
.../maven/model/building/ModelBuildingResult.java | 2 +
.../apache/maven/model/building/ModelCache.java | 2 +
.../apache/maven/model/building/ModelCacheTag.java | 2 +
.../org/apache/maven/model/building/ModelData.java | 2 +
.../apache/maven/model/building/ModelProblem.java | 5 +-
.../model/building/ModelProblemCollector.java | 2 +
.../model/building/ModelProblemCollectorExt.java | 3 +
.../building/ModelProblemCollectorRequest.java | 2 +
.../maven/model/building/ModelProblemUtils.java | 2 +
.../maven/model/building/ModelProcessor.java | 3 +
.../apache/maven/model/building/ModelSource2.java | 3 +
.../apache/maven/model/building/ModelSource3.java | 3 +
.../model/building/ModelSourceTransformer.java | 2 +
.../org/apache/maven/model/building/Result.java | 2 +
.../maven/model/building/TransformerContext.java | 3 +-
.../model/building/TransformerContextBuilder.java | 2 +
.../maven/model/building/TransformerException.java | 2 +
.../DefaultDependencyManagementImporter.java | 2 +
.../composition/DependencyManagementImporter.java | 2 +
.../inheritance/DefaultInheritanceAssembler.java | 2 +
.../model/inheritance/InheritanceAssembler.java | 2 +
.../AbstractStringBasedModelInterpolator.java | 2 +
.../interpolation/BuildTimestampValueSource.java | 4 +
.../DefaultModelVersionProcessor.java | 3 +
.../model/interpolation/MavenBuildTimestamp.java | 3 +
.../model/interpolation/ModelInterpolator.java | 2 +
.../model/interpolation/ModelVersionProcessor.java | 3 +
.../interpolation/ObjectBasedValueSource.java | 3 +
.../PathTranslatingPostProcessor.java | 2 +
.../interpolation/PrefixedObjectValueSource.java | 3 +
.../interpolation/ProblemDetectingValueSource.java | 2 +
.../StringVisitorModelInterpolator.java | 2 +
.../interpolation/UrlNormalizingPostProcessor.java | 2 +
.../model/interpolation/reflection/ClassMap.java | 3 +
.../reflection/IntrospectionException.java | 4 +
.../model/interpolation/reflection/MethodMap.java | 4 +
.../reflection/ReflectionValueExtractor.java | 3 +
.../apache/maven/model/io/DefaultModelReader.java | 3 +
.../apache/maven/model/io/DefaultModelWriter.java | 2 +
.../apache/maven/model/io/ModelParseException.java | 2 +
.../org/apache/maven/model/io/ModelReader.java | 2 +
.../org/apache/maven/model/io/ModelWriter.java | 2 +
.../maven/model/locator/DefaultModelLocator.java | 2 +
.../apache/maven/model/locator/ModelLocator.java | 2 +
.../DefaultDependencyManagementInjector.java | 2 +
.../DefaultPluginManagementInjector.java | 2 +
.../management/DependencyManagementInjector.java | 2 +
.../model/management/PluginManagementInjector.java | 2 +
.../apache/maven/model/merge/MavenModelMerger.java | 1 +
.../normalization/DefaultModelNormalizer.java | 2 +
.../maven/model/normalization/ModelNormalizer.java | 2 +
.../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 | 2 +
.../maven/model/path/ModelUrlNormalizer.java | 2 +
.../apache/maven/model/path/PathTranslator.java | 2 +
.../ProfileActivationFilePathInterpolator.java | 2 +
.../org/apache/maven/model/path/UrlNormalizer.java | 2 +
.../plugin/DefaultPluginConfigurationExpander.java | 2 +
.../plugin/DefaultReportConfigurationExpander.java | 2 +
.../model/plugin/LifecycleBindingsInjector.java | 2 +
.../model/plugin/PluginConfigurationExpander.java | 2 +
.../model/plugin/ReportConfigurationExpander.java | 2 +
.../profile/DefaultProfileActivationContext.java | 2 +
.../model/profile/DefaultProfileInjector.java | 2 +
.../model/profile/DefaultProfileSelector.java | 2 +
.../model/profile/ProfileActivationContext.java | 2 +
.../maven/model/profile/ProfileInjector.java | 2 +
.../maven/model/profile/ProfileSelector.java | 2 +
.../profile/activation/FileProfileActivator.java | 2 +
.../activation/JdkVersionProfileActivator.java | 2 +
.../OperatingSystemProfileActivator.java | 2 +
.../activation/PackagingProfileActivator.java | 3 +
.../model/profile/activation/ProfileActivator.java | 2 +
.../activation/PropertyProfileActivator.java | 2 +
.../resolution/InvalidRepositoryException.java | 2 +
.../maven/model/resolution/ModelResolver.java | 2 +
.../resolution/UnresolvableModelException.java | 2 +
.../model/resolution/WorkspaceModelResolver.java | 3 +
.../maven/model/root/DefaultRootLocator.java | 4 +
.../org/apache/maven/model/root/RootLocator.java | 2 +
.../model/superpom/DefaultSuperPomProvider.java | 2 +
.../maven/model/superpom/SuperPomProvider.java | 2 +
.../model/validation/DefaultModelValidator.java | 2 +
.../maven/model/validation/ModelValidator.java | 2 +
.../src/main/java/org/apache/maven/utils/Os.java | 3 +
.../java/org/apache/maven/model/BaseObject.java | 6 +-
.../artifact/repository/metadata/BaseObject.java | 6 +-
maven-resolver-provider/pom.xml | 2 +-
.../internal/ArtifactDescriptorReaderDelegate.java | 2 +
.../internal/ArtifactDescriptorUtils.java | 2 +
.../internal/DefaultArtifactDescriptorReader.java | 3 +
.../repository/internal/DefaultModelCache.java | 2 +
.../internal/DefaultModelCacheFactory.java | 3 +
.../repository/internal/DefaultModelResolver.java | 2 +
.../internal/DefaultModelVersionParser.java | 4 +
.../internal/DefaultVersionRangeResolver.java | 2 +
.../internal/DefaultVersionResolver.java | 2 +
.../internal/DefaultVersionSchemeProvider.java | 3 +
.../repository/internal/LocalSnapshotMetadata.java | 3 +
.../internal/LocalSnapshotMetadataGenerator.java | 3 +
.../internal/MavenArtifactRelocationSource.java | 2 +
.../maven/repository/internal/MavenMetadata.java | 2 +
.../internal/MavenRepositorySystemSupplier.java | 10 +-
.../internal/MavenSessionBuilderSupplier.java | 2 +
.../repository/internal/MavenSnapshotMetadata.java | 2 +
.../repository/internal/MavenWorkspaceReader.java | 3 +
.../repository/internal/ModelCacheFactory.java | 3 +
.../maven/repository/internal/PluginsMetadata.java | 3 +
.../internal/PluginsMetadataGenerator.java | 3 +
.../internal/PluginsMetadataGeneratorFactory.java | 3 +
.../repository/internal/RelocatedArtifact.java | 2 +
.../internal/RemoteSnapshotMetadata.java | 3 +
.../internal/RemoteSnapshotMetadataGenerator.java | 3 +
.../repository/internal/RequestTraceHelper.java | 2 +
.../internal/SnapshotMetadataGeneratorFactory.java | 3 +
.../repository/internal/VersionsMetadata.java | 3 +
.../internal/VersionsMetadataGenerator.java | 3 +
.../internal/VersionsMetadataGeneratorFactory.java | 3 +
.../internal/artifact/FatArtifactTraverser.java | 2 +
.../internal/artifact/MavenArtifactProperties.java | 2 +
.../maven/repository/internal/package-info.java | 3 +
...ributionManagementArtifactRelocationSource.java | 2 +
.../UserPropertiesArtifactRelocationSource.java | 2 +
.../scopes/Maven3ScopeManagerConfiguration.java | 2 +
.../scopes/Maven4ScopeManagerConfiguration.java | 2 +
.../repository/internal/type/DefaultType.java | 2 +
.../internal/type/DefaultTypeProvider.java | 1 +
maven-settings-builder/pom.xml | 2 +-
.../settings/building/DefaultSettingsBuilder.java | 2 +
.../building/DefaultSettingsBuilderFactory.java | 2 +
.../building/DefaultSettingsBuildingRequest.java | 2 +
.../building/DefaultSettingsBuildingResult.java | 2 +
.../settings/building/DefaultSettingsProblem.java | 2 +
.../building/DefaultSettingsProblemCollector.java | 2 +
.../maven/settings/building/SettingsBuilder.java | 2 +
.../building/SettingsBuildingException.java | 2 +
.../settings/building/SettingsBuildingRequest.java | 2 +
.../settings/building/SettingsBuildingResult.java | 2 +
.../maven/settings/building/SettingsProblem.java | 2 +
.../building/SettingsProblemCollector.java | 2 +
.../settings/crypto/DefaultSettingsDecrypter.java | 2 +
.../crypto/DefaultSettingsDecryptionRequest.java | 2 +
.../crypto/DefaultSettingsDecryptionResult.java | 2 +
.../crypto/MavenSecDispatcherProvider.java | 1 +
.../maven/settings/crypto/SettingsDecrypter.java | 2 +
.../settings/crypto/SettingsDecryptionRequest.java | 2 +
.../settings/crypto/SettingsDecryptionResult.java | 2 +
.../maven/settings/io/DefaultSettingsReader.java | 2 +
.../maven/settings/io/DefaultSettingsWriter.java | 2 +
.../maven/settings/io/SettingsParseException.java | 2 +
.../apache/maven/settings/io/SettingsReader.java | 2 +
.../apache/maven/settings/io/SettingsWriter.java | 2 +
.../maven/settings/merge/MavenSettingsMerger.java | 4 +-
.../validation/DefaultSettingsValidator.java | 2 +
.../settings/validation/SettingsValidator.java | 2 +
.../java/org/apache/maven/settings/BaseObject.java | 6 +-
maven-toolchain-builder/pom.xml | 2 +-
.../building/DefaultToolchainsBuilder.java | 2 +
.../building/DefaultToolchainsBuildingRequest.java | 2 +
.../building/DefaultToolchainsBuildingResult.java | 2 +
.../toolchain/building/ToolchainsBuilder.java | 2 +
.../building/ToolchainsBuildingException.java | 2 +
.../building/ToolchainsBuildingRequest.java | 2 +
.../building/ToolchainsBuildingResult.java | 2 +
.../toolchain/io/DefaultToolchainsReader.java | 2 +
.../toolchain/io/DefaultToolchainsWriter.java | 2 +
.../toolchain/io/ToolchainsParseException.java | 1 +
.../maven/toolchain/io/ToolchainsReader.java | 2 +
.../maven/toolchain/io/ToolchainsWriter.java | 2 +
.../toolchain/merge/MavenToolchainMerger.java | 2 +
.../apache/maven/toolchain/model/BaseObject.java | 6 +-
pom.xml | 19 +-
src/site/markdown/configuration.md | 12 +-
327 files changed, 3612 insertions(+), 4458 deletions(-)
create mode 100644 apache-maven/src/assembly/maven/bin/mvn
create mode 100644 apache-maven/src/assembly/maven/bin/mvn.cmd
delete mode 100755 apache-maven/src/assembly/shared/init
delete mode 100755 apache-maven/src/assembly/shared/init.cmd
delete mode 100644 apache-maven/src/assembly/shared/mvnlauncher
delete mode 100644 apache-maven/src/assembly/shared/mvnlauncher.cmd
delete mode 100644 apache-maven/src/assembly/shared/mvnvalidate
delete mode 100644 apache-maven/src/assembly/shared/mvnvalidate.cmd
delete mode 100755 apache-maven/src/assembly/shared/run
delete mode 100755 apache-maven/src/assembly/shared/run.cmd
delete mode 100644 apache-maven/src/assembly/shared/validate
delete mode 100644 apache-maven/src/assembly/shared/validate.cmd
delete mode 100644
api/maven-api-core/src/main/java/org/apache/maven/api/services/ModelRepositoryHolder.java
delete mode 100644
api/maven-api-core/src/main/java/org/apache/maven/api/services/ModelTransformerContext.java
delete mode 100644
api/maven-api-core/src/main/java/org/apache/maven/api/services/ModelTransformerContextBuilder.java
delete mode 100644
api/maven-api-core/src/main/java/org/apache/maven/api/services/ModelTransformerException.java
rename Jenkinsfile => disabled-Jenkinsfile (100%)
rename Jenkinsfile.its => disabled-Jenkinsfile.its (100%)
rename Jenkinsfile.s390x => disabled-Jenkinsfile.s390x (100%)
delete mode 100644
maven-api-impl/src/main/java/org/apache/maven/api/services/model/ModelBuildingEvent.java
delete mode 100644
maven-api-impl/src/main/java/org/apache/maven/api/services/model/ModelBuildingListener.java
rename {api/maven-api-core/src/main/java/org/apache/maven/api/services =>
maven-api-impl/src/main/java/org/apache/maven/api/services/model}/ModelResolver.java
(97%)
rename {api/maven-api-core/src/main/java/org/apache/maven/api/services =>
maven-api-impl/src/main/java/org/apache/maven/api/services/model}/ModelResolverException.java
(97%)
delete mode 100644
maven-api-impl/src/main/java/org/apache/maven/api/services/model/WorkspaceModelResolver.java
delete mode 100644
maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/BuildModelTransformer.java
delete mode 100644
maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelBuildingEvent.java
delete mode 100644
maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelProblemCollector.java
delete mode 100644
maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelTransformerContext.java
delete mode 100644
maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelTransformerContextBuilder.java
delete mode 100644
maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/DefaultModelRepositoryHolder.java
rename
{maven-core/src/main/java/org/apache/maven/lifecycle/internal/concurrent =>
maven-api-impl/src/main/java/org/apache/maven/internal/impl/util}/PhasingExecutor.java
(69%)
rename
{maven-core/src/test/java/org/apache/maven/lifecycle/internal/concurrent =>
maven-api-impl/src/test/java/org/apache/maven/internal/impl/util}/PhasingExecutorTest.java
(84%)
delete mode 100644
maven-core/src/main/java/org/apache/maven/project/DefaultModelBuildingListener.java
copy maven-compat/src/test/repository-system/maven-core-2.1.0.jar =>
maven-core/src/test/projects/project-builder/MNG-6723/.mvn/.gitkeep (100%)
create mode 100644
maven-core/src/test/resources-project-builder/complete-model/w-parent/sub/sub/pom.xml
create mode 100644
maven-core/src/test/resources-project-builder/complete-model/wo-parent/sub/pom.xml
copy maven-core/src/test/resources-project-builder/pom-inheritance/{sub =>
child-1}/pom.xml (100%)
rename maven-core/src/test/resources-project-builder/pom-inheritance/{sub =>
child-2}/pom.xml (96%)
copy
maven-core/src/test/resources-project-builder/profile-module-inheritance/{sub
=> maven-inherit-plugin}/pom.xml (100%)
copy
maven-core/src/test/resources-project-builder/profile-module-inheritance/{sub
=> maven-pax-plugin}/pom.xml (83%)
copy maven-core/src/test/resources-project-builder/{parent-inheritance/sub =>
profile-module/module-1}/pom.xml (60%)
copy maven-core/src/test/resources-project-builder/{parent-inheritance/sub =>
profile-module/module-2}/pom.xml (60%)
copy maven-core/src/test/resources-project-builder/{parent-inheritance/sub =>
profile-module/module-3}/pom.xml (60%)
copy maven-core/src/test/resources-project-builder/{parent-inheritance/sub =>
profile-module/module-4}/pom.xml (60%)
copy maven-core/src/test/resources-project-builder/{parent-inheritance/sub =>
profile-module/module-5}/pom.xml (60%)
