This is an automated email from the ASF dual-hosted git repository. martinkanters pushed a change to branch feature/MNG-7338-automatic-non-interactive-mode-in-ci in repository https://gitbox.apache.org/repos/asf/maven.git
omit 0e4ac27ce [MNG-7338] Automatically activate batch-mode and make output quiet when running in CI. add c0d942b56 Jenkinsfile: pickup results from ITs and Maven 3.8.x for build (#953) add 2fba4471c [MNG-7668] Update Resolver to 1.9.4 (#959) add 01ba8291c [MNG-7666] Update default binding and lifecycle plugin versions (#956) add 20f7c65a5 Execute IT tests with clean local repository add c1a900190 [MNG-7629] Change reactor reader to copy packaged artifacts and reuse them across builds if needed (#954) add 74548dde8 [MNG-7664] consolidate Velocity templates used to generate code from models (#949) add 8918c8144 [MNG-7622] Maven Transformation and Consumer POM (#907) add 38b447b85 Get rid of surefire warning (#966) add f77de570b [MNG-7646] Do not parse the whole reactor unless required by command line options (#963) add 74cf7eae8 [MNG-7543] - Upgrade JUnit Jupiter Version 5.9.1 (#837) add f153ac134 [MNG-7598] Fix compatibility issues with toolchains and settings (#971) add 009cf4a72 [maven-release-plugin] prepare release maven-4.0.0-alpha-4 add fbeefb85a [maven-release-plugin] prepare for next development iteration add 30fafa674 [MNG-7672] Fork should only execute the project and its submodules (#968) add 41429b15a [MNG-7673] IllegalArgumentException thrown for invalid checksum 'never' (#972) add dfb406c5b Fix site plugin warning (#974) add 489e4e652 [MNG-7676] Fix checksum plugin configuration (#977) add 80bd00c9b Add maven 4.0.0-alpha-4 release to doap add f9ea10688 Add bin packages to SHA512 checksumming as well (#978) add 0525d90d4 [MNG-7544] MavenMetadataSource#retrieve(MetadataResolutionRequest) does not check for null when reading from project map add 769f2f3a4 Add maven 3.9.0 release to doap add ef3cf56b5 Added missing @Deprecated/@deprecated annotations add 6e25a2674 [MNG-7686] Speed up by replacing non-pattern #replaceAll() with #replace() or precompiled patterns add 7b3845750 Normalize regex patterns add b82479bf1 [MNG-7689] Check if execution lifecycle phase is not null (#996) add b17c968a0 Close stream with try-with-resources add e2a8db3f0 Remove unneeded exclusion add 1d9dd4a36 [MNG-7679] [REGRESSION] Build fails when executing a single mojo without a POM add a35307771 [MNG-7702] Use latest deploy plugin (#1007) add b1bffd68b [MNG-7695] Update resolver to 1.9.5 (#1011) add 22d2b47c0 [MNG-7706] Deprecate 'localRepository' parameter expression (#1009) (#1012) add 85ac42dbd remove unused code (#1016) add 4e098a320 Simplify code with try with resources (#1017) add afc1a2bd8 [MNG-7713] Drop legacy-local-repository option (#1020) add da64ee9c9 [MNG-7713] Make Maven fail if option present (#1021) (#1022) add b9b6d8595 [MNG-7700] test some edge cases with leading zeroes (#1014) add 7967c204e [MNG-7683] Iterate over each dominant child (#986) add 65d95f08a [MNG-7717] Maven warns wrongly about deprecated parameter (#1031) add f41d533e7 [MNG-7716] ConcurrencyDependencyGraph deadlock if no root is selected add d86cee4f9 revert accidental commit add 9e797f5e1 let hte XML parser detect th encoding add dcc916a9e Merge branch 'master' of github.com:apache/maven add 0dd9ebc12 restore src/mdo/reader.vm (#1034) add c1dfb947b [MNG-7715] Update to resolver 1.9.6 (#1036) add 009ec5dc4 remove plexus utils dependency (#1032) add f7d3e30d1 Using Set<>() for contains() add bec19ec41 replace deprecated methods that don't properly handle encoding (#1033) add 1ffd68b80 [MNG-7720] Wrong build order of forked projects (#1040) add ea21d6f6f [MNG-7666] update documentation add 909c2cdf5 [MNG-7553] put documentation in reference site add 1922e0183 [MNG-7710] Upgrade plexus-utils to 3.5.1 (#1042) add 10128b448 Remove references to Xpp3DomBuilder and use XmlNodeBuilder instead (#1045) add bb02d120a Fix callee closing streams and readers instead of callers (#1043) add 93a0ecfd2 Additional XmlNode tests from plexus-utils (#994) add dc8ec4c97 Fix mutable api in PluginContainer (#1019) add 116ca6a3a [MNG-7709] Regression in configuration merge (#1023) add 57d5587cf [MNG-7727] Remove MavenProfilesBuilder and DefaultMavenProfilesBuilder (#1044) add 2d85d13ee MNG-7724 don't warn about unsupported SLF4J configs; no one cares (#1051) add 31cc44f1c [MNG-7723] Upgrade to Maven Resolver 1.9.7 (#1046) add 993d86374 remove unused class (#1049) add 696cf37dc update a few URLs (#1052) add 9d851eea6 [MNG-7678] Settings (v3) and Settings.Builder() cannot unset a non-null field (#983) add e9e0a5173 [MNG-7725] Update surefire to 3.0.0 in default binding add 814af33e6 Update DOAP with Maven 3.8.8 release add ade97d5a6 [MNG-7697] Fix assembly which should not include plexus-utils-3.5.0 (#1057) add 26d10a4bf [maven-release-plugin] prepare release maven-4.0.0-alpha-5 add 8052c720e [maven-release-plugin] prepare for next development iteration add f071094f3 Update DOAP with Maven 3.9.1 release add 703f814e3 [MNG-6825] Replace FileUtils with Commons IO (#1067) add cadeab53f MNG-7738 don't dump raw stack traces to System.err (#1064) add 2788849c3 Switch version to 4.0.0 for @since tags (#1068) add ae933fe68 [MNG-7720] Simplify code (#1063) add 54afd174e remove unused branches in fake (#1069) add f6bb2befd [MNG-7338] Automatically activate batch-mode and make output quiet when running in CI. 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 (0e4ac27ce) \ N -- N -- N refs/heads/feature/MNG-7338-automatic-non-interactive-mode-in-ci (f6bb2befd) 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: .github/workflows/maven.yml | 13 +- Jenkinsfile | 12 +- apache-maven/pom.xml | 30 +- apache-maven/src/assembly/component.xml | 1 + api/maven-api-core/pom.xml | 10 +- .../main/java/org/apache/maven/api/Artifact.java | 2 +- .../org/apache/maven/api/ArtifactCoordinate.java | 2 +- .../org/apache/maven/api/DependencyCoordinate.java | 2 +- .../src/main/java/org/apache/maven/api/Event.java | 2 +- .../main/java/org/apache/maven/api/EventType.java | 2 +- .../main/java/org/apache/maven/api/Exclusion.java | 2 +- .../java/org/apache/maven/api/JavaToolchain.java | 2 +- .../main/java/org/apache/maven/api/Listener.java | 2 +- .../java/org/apache/maven/api/LocalRepository.java | 2 +- .../java/org/apache/maven/api/MetadataStorage.java | 2 +- .../src/main/java/org/apache/maven/api/Node.java | 2 +- .../java/org/apache/maven/api/NodeVisitor.java | 2 +- .../main/java/org/apache/maven/api/Project.java | 2 +- .../main/java/org/apache/maven/api/Repository.java | 2 +- .../java/org/apache/maven/api/ResolutionScope.java | 2 +- .../src/main/java/org/apache/maven/api/Scope.java | 2 +- .../main/java/org/apache/maven/api/Session.java | 2 +- .../java/org/apache/maven/api/SessionData.java | 2 +- .../main/java/org/apache/maven/api/Toolchain.java | 2 +- .../src/main/java/org/apache/maven/api/Type.java | 2 +- .../main/java/org/apache/maven/api/Version.java | 2 +- .../java/org/apache/maven/api/VersionRange.java | 2 +- .../main/java/org/apache/maven/api/plugin/Log.java | 2 +- .../java/org/apache/maven/api/plugin/Mojo.java | 2 +- .../org/apache/maven/api/plugin/MojoException.java | 2 +- .../maven/api/plugin/annotations/Component.java | 2 +- .../maven/api/plugin/annotations/Execute.java | 2 +- .../plugin/annotations/InstantiationStrategy.java | 2 +- .../api/plugin/annotations/LifecyclePhase.java | 2 +- .../apache/maven/api/plugin/annotations/Mojo.java | 2 +- .../maven/api/plugin/annotations/Parameter.java | 2 +- .../api/services/ArtifactCoordinateFactory.java | 2 +- .../services/ArtifactCoordinateFactoryRequest.java | 2 +- .../maven/api/services/ArtifactDeployer.java | 2 +- .../api/services/ArtifactDeployerException.java | 2 +- .../api/services/ArtifactDeployerRequest.java | 2 +- .../apache/maven/api/services/ArtifactFactory.java | 2 +- .../maven/api/services/ArtifactFactoryRequest.java | 2 +- .../maven/api/services/ArtifactInstaller.java | 2 +- .../api/services/ArtifactInstallerException.java | 2 +- .../api/services/ArtifactInstallerRequest.java | 2 +- .../apache/maven/api/services/ArtifactManager.java | 2 +- .../maven/api/services/ArtifactResolver.java | 2 +- .../api/services/ArtifactResolverException.java | 2 +- .../api/services/ArtifactResolverRequest.java | 2 +- .../maven/api/services/ArtifactResolverResult.java | 2 +- .../org/apache/maven/api/services/BaseRequest.java | 2 +- .../apache/maven/api/services/BuilderProblem.java | 4 +- .../maven/api/services/DependencyCollector.java | 2 +- .../api/services/DependencyCollectorException.java | 2 +- .../api/services/DependencyCollectorRequest.java | 2 +- .../api/services/DependencyCollectorResult.java | 2 +- .../api/services/DependencyCoordinateFactory.java | 2 +- .../DependencyCoordinateFactoryRequest.java | 2 +- .../maven/api/services/LocalRepositoryManager.java | 2 +- .../apache/maven/api/services/LookupException.java | 2 +- .../apache/maven/api/services/MavenException.java | 2 +- .../apache/maven/api/services/MessageBuilder.java | 2 +- .../maven/api/services/MessageBuilderFactory.java | 2 +- .../apache/maven/api/services/ProjectBuilder.java | 2 +- .../api/services/ProjectBuilderException.java | 2 +- .../maven/api/services/ProjectBuilderRequest.java | 2 +- .../maven/api/services/ProjectBuilderResult.java | 2 +- .../apache/maven/api/services/ProjectManager.java | 2 +- .../org/apache/maven/api/services/Prompter.java | 2 +- .../maven/api/services/PrompterException.java | 2 +- .../maven/api/services/RepositoryFactory.java | 2 +- .../api/services/SettingsBuilderException.java | 2 +- .../java/org/apache/maven/api/services/Source.java | 2 +- .../maven/api/services/ToolchainFactory.java | 2 +- .../maven/api/services/ToolchainManager.java | 2 +- .../api/services/ToolchainManagerException.java | 2 +- .../api/services/ToolchainsBuilderException.java | 2 +- .../org/apache/maven/api/services/Transport.java | 2 +- .../maven/api/services/TransportProvider.java | 2 +- .../api/services/TransportProviderException.java | 2 +- .../apache/maven/api/services/TypeRegistry.java | 2 +- .../apache/maven/api/services/VersionParser.java | 2 +- .../maven/api/services/VersionParserException.java | 2 +- .../maven/api/services/xml/ModelXmlFactory.java | 2 +- .../maven/api/services/xml/SettingsXmlFactory.java | 2 +- .../api/services/xml/ToolchainsXmlFactory.java | 2 +- .../apache/maven/api/services/xml/XmlFactory.java | 2 +- .../maven/api/services/xml/XmlReaderException.java | 2 +- .../maven/api/services/xml/XmlReaderRequest.java | 2 +- .../maven/api/services/xml/XmlWriterException.java | 2 +- .../maven/api/services/xml/XmlWriterRequest.java | 2 +- api/maven-api-meta/pom.xml | 2 +- .../org/apache/maven/api/annotations/Consumer.java | 2 +- .../apache/maven/api/annotations/Experimental.java | 2 +- .../apache/maven/api/annotations/Generated.java | 2 +- .../apache/maven/api/annotations/Immutable.java | 2 +- .../org/apache/maven/api/annotations/Nonnull.java | 2 +- .../maven/api/annotations/NotThreadSafe.java | 2 +- .../org/apache/maven/api/annotations/Nullable.java | 2 +- .../org/apache/maven/api/annotations/Provider.java | 2 +- .../apache/maven/api/annotations/ThreadSafe.java | 2 +- .../apache/maven/api/annotations/package-info.java | 2 +- api/maven-api-model/pom.xml | 29 +- .../maven/api/model/ImmutableCollections.java | 6 +- api/maven-api-model/src/main/mdo/maven.mdo | 36 +- api/maven-api-model/src/main/mdo/model.vm | 558 ------------- api/maven-api-settings/pom.xml | 28 +- .../maven/api/settings/ImmutableCollections.java | 6 +- api/maven-api-settings/src/main/mdo/common.vm | 21 - api/maven-api-settings/src/main/mdo/model.vm | 558 ------------- api/maven-api-settings/src/main/mdo/settings.mdo | 6 +- .../apache/maven/api/settings/SettingsTest.java | 22 +- api/maven-api-toolchain/pom.xml | 30 +- .../maven/api/toolchain/ImmutableCollections.java | 6 +- api/maven-api-toolchain/src/main/mdo/common.vm | 21 - .../src/main/mdo/toolchains.mdo | 2 +- api/maven-api-xml/pom.xml | 4 +- .../java/org/apache/maven/api/xml/XmlNode.java | 2 +- api/pom.xml | 2 +- doap_Maven.rdf | 44 + maven-artifact/pom.xml | 6 +- .../java/org/apache/maven/artifact/Artifact.java | 2 +- .../org/apache/maven/artifact/DefaultArtifact.java | 3 +- .../artifact/repository/ArtifactRepository.java | 3 + .../repository/ArtifactRepositoryPolicy.java | 2 + .../layout/ArtifactRepositoryLayout.java | 8 +- .../artifact/versioning/ComparableVersion.java | 2 +- .../artifact/versioning/ComparableVersionTest.java | 35 +- maven-bom/pom.xml | 2 +- maven-builder-support/pom.xml | 2 +- maven-compat/pom.xml | 6 +- .../metadata/DefaultRepositoryMetadataManager.java | 21 +- .../repository/metadata/MetadataBridge.java | 2 +- .../profiles/DefaultMavenProfilesBuilder.java | 77 -- .../maven/profiles/DefaultProfileManager.java | 1 + .../maven/profiles/MavenProfilesBuilder.java | 34 - .../activation/JdkPrefixProfileActivator.java | 2 +- .../project/InvalidProjectModelException.java | 2 + .../inheritance/ModelInheritanceAssembler.java | 1 - .../AbstractStringBasedModelInterpolator.java | 1 + .../project/interpolation/ModelInterpolator.java | 2 + .../AbstractArtifactComponentTestCase.java | 3 +- .../artifact/deployer/ArtifactDeployerTest.java | 7 +- .../artifact/resolver/ArtifactResolverTest.java | 24 + .../resolver/TestMavenWorkspaceReader.java | 80 ++ .../project/AbstractMavenProjectTestCase.java | 6 +- .../maven/project/ClasspathArtifactResolver.java | 5 +- maven-core/pom.xml | 35 +- .../main/java/org/apache/maven/DefaultMaven.java | 22 +- .../main/java/org/apache/maven/ReactorReader.java | 398 ++++++--- .../execution/DefaultMavenExecutionRequest.java | 2 +- .../maven/execution/MavenExecutionRequest.java | 10 + .../apache/maven/graph/DefaultGraphBuilder.java | 8 +- .../maven/internal/MultilineMessageHelper.java | 5 +- .../aether/ConsumerModelSourceTransformer.java | 47 -- .../DefaultRepositorySystemSessionFactory.java | 87 +- .../maven/internal/aether/MavenDeployer.java | 58 ++ .../maven/internal/aether/MavenInstaller.java | 58 ++ .../maven/internal/aether/ResolverLifecycle.java | 4 +- .../ConsumerPomArtifactTransformer.java | 169 ++++ .../transformation/OnChangeTransformer.java | 104 +++ .../transformation/TransformedArtifact.java | 146 ++++ .../internal/LifecycleDependencyResolver.java | 10 +- .../lifecycle/internal/LifecycleModuleBuilder.java | 6 + .../lifecycle/internal/builder/BuilderCommon.java | 21 - .../multithreaded/ConcurrencyDependencyGraph.java | 4 + .../lifecycle/mapping/DefaultLifecycleMapping.java | 1 + .../providers/CleanLifecycleProvider.java | 4 +- .../providers/DefaultLifecycleProvider.java | 2 +- .../lifecycle/providers/SiteLifecycleProvider.java | 8 +- .../providers/WrapperLifecycleProvider.java | 8 +- .../AbstractLifecycleMappingProvider.java | 24 +- .../plugin/PluginParameterExpressionEvaluator.java | 8 +- .../PluginParameterExpressionEvaluatorV4.java | 6 +- ...PluginDescriptorSourcedParametersValidator.java | 65 ++ .../AbstractMavenPluginParametersValidator.java | 53 +- ...java => DeprecatedCoreExpressionValidator.java} | 47 +- .../plugin/internal/DeprecatedPluginValidator.java | 21 +- .../ReadOnlyPluginParametersValidator.java | 17 +- .../maven/project/DuplicateProjectException.java | 2 + .../maven/project/ProjectBuildingException.java | 1 + .../project/artifact/DefaultMetadataSource.java | 8 +- .../project/artifact/MavenMetadataSource.java | 48 +- .../project/artifact/ProjectArtifactMetadata.java | 2 +- .../settings/DefaultMavenSettingsBuilder.java | 9 +- .../org/apache/maven/settings/SettingsUtilsV4.java | 2 +- .../maven/toolchain/RequirementMatcherFactory.java | 2 - .../maven/toolchain/java/DefaultJavaToolChain.java | 1 + maven-core/src/site/apt/default-bindings.apt.vm | 4 + .../apt/getting-to-container-configured-mojos.apt | 2 +- maven-core/src/site/apt/offline-mode.apt | 2 +- .../src/test/java/org/apache/maven/MavenTest.java | 52 -- .../artifact/handler/ArtifactHandlerTest.java | 4 +- .../DefaultBeanConfiguratorPathTest.java | 4 +- .../configuration/DefaultBeanConfiguratorTest.java | 4 +- .../maven/internal/impl/TestRepositorySystem.java | 2 +- .../ConsumerPomArtifactTransformerTest.java} | 9 +- .../internal/LifecycleModuleBuilderTest.java | 4 +- .../project/AbstractMavenProjectTestCase.java | 6 +- .../apache/maven/project/ProjectBuilderTest.java | 2 +- .../maven/project/ProjectModelResolverTest.java | 6 +- .../apache/maven/project/TestMetadataSource.java | 6 +- .../artifact/DefaultMavenMetadataCacheTest.java | 10 +- .../maven/repository/TestRepositoryConnector.java | 2 +- .../maven/repository/TestRepositorySystem.java | 135 +-- maven-embedder/pom.xml | 6 +- .../main/java/org/apache/maven/cli/CLIManager.java | 13 +- .../main/java/org/apache/maven/cli/MavenCli.java | 40 +- .../cli/logging/Slf4jConfigurationFactory.java | 28 +- .../impl/UnsupportedSlf4jBindingConfiguration.java | 36 +- .../sisu/plexus/PlexusXmlBeanConverter.java | 13 +- .../maven/cli/CLIManagerDocumentationTest.java | 4 +- maven-model-builder/pom.xml | 66 +- .../java/org/apache/maven/feature/Features.java | 20 +- .../model/interpolation/ModelInterpolator.java | 6 +- .../apache/maven/model/merge/MavenModelMerger.java | 34 + .../normalization/DefaultModelNormalizer.java | 16 +- .../maven/model/normalization/ModelNormalizer.java | 12 +- .../model/profile/ProfileActivationContext.java | 2 +- .../activation/JdkVersionProfileActivator.java | 11 +- .../model/validation/DefaultModelValidator.java | 2 +- maven-model-transform/pom.xml | 2 +- .../maven/model/transform/ParentXMLFilter.java | 5 +- .../transform/ReactorDependencyXMLFilter.java | 5 +- .../model/transform/RelativePathXMLFilter.java | 7 +- maven-model/pom.xml | 84 +- maven-model/src/main/mdo/common.vm | 31 - maven-model/src/main/mdo/merger.vm | 380 --------- maven-model/src/main/mdo/writer.vm | 331 -------- maven-plugin-api/pom.xml | 40 +- .../maven/plugin/descriptor/PluginDescriptor.java | 5 +- .../plugin/lifecycle/ImmutableCollections.java | 6 +- maven-plugin-api/src/main/mdo/common.vm | 21 - maven-plugin-api/src/main/mdo/merger.vm | 380 --------- maven-plugin-api/src/main/mdo/model.vm | 516 ------------ maven-plugin-api/src/main/mdo/reader.vm | 899 -------------------- maven-plugin-api/src/main/mdo/writer.vm | 331 -------- maven-repository-metadata/pom.xml | 2 +- maven-resolver-provider/pom.xml | 2 +- .../internal/PluginsMetadataGenerator.java | 12 +- .../internal/DefaultModelResolverTest.java | 4 +- .../internal/RemoteSnapshotMetadataTest.java | 5 +- maven-settings-builder/pom.xml | 7 +- .../settings/building/DefaultSettingsBuilder.java | 15 +- .../maven/settings/io/DefaultSettingsReader.java | 6 +- .../maven/settings/io/DefaultSettingsWriter.java | 4 +- .../apache/maven/settings/io/SettingsReader.java | 2 +- .../apache/maven/settings/io/SettingsWriter.java | 2 +- .../maven/settings/merge/MavenSettingsMerger.java | 92 ++- .../validation/DefaultSettingsValidator.java | 26 +- .../settings/validation/SettingsValidator.java | 2 +- .../validation/DefaultSettingsValidatorTest.java | 148 ++-- maven-settings/pom.xml | 56 +- .../org/apache/maven/settings}/BaseObject.java | 4 +- maven-settings/src/main/mdo/common.vm | 21 - maven-settings/src/main/mdo/merger.vm | 379 --------- maven-settings/src/main/mdo/model-v3.vm | 255 ------ maven-settings/src/main/mdo/reader.vm | 902 --------------------- maven-settings/src/main/mdo/writer.vm | 331 -------- maven-slf4j-provider/pom.xml | 2 +- maven-slf4j-wrapper/pom.xml | 2 +- maven-toolchain-builder/pom.xml | 28 +- .../building/DefaultToolchainsBuilder.java | 18 +- .../toolchain/io/DefaultToolchainsReader.java | 6 +- .../toolchain/io/DefaultToolchainsWriter.java | 4 +- .../maven/toolchain/io/ToolchainsReader.java | 2 +- .../maven/toolchain/io/ToolchainsWriter.java | 2 +- .../toolchain/merge/MavenToolchainMerger.java | 54 +- .../building/DefaultToolchainsBuilderTest.java | 101 +-- .../toolchain/merge/MavenToolchainMergerTest.java | 104 +-- maven-toolchain-model/pom.xml | 65 +- .../apache/maven/toolchain}/model/BaseObject.java | 4 +- maven-toolchain-model/src/main/mdo/common.vm | 21 - maven-toolchain-model/src/main/mdo/model-v3.vm | 255 ------ maven-xml-impl/pom.xml | 4 +- .../maven/internal/xml/MavenXmlException.java | 39 - .../apache/maven/internal/xml/XmlNodeBuilder.java | 34 +- .../org/apache/maven/internal/xml/XmlNodeImpl.java | 27 +- .../java/org/codehaus/plexus/util/xml/Xpp3Dom.java | 5 +- .../codehaus/plexus/util/xml/Xpp3DomBuilder.java | 10 +- .../{README.md => src/site/markdown/index.md} | 2 +- .../src/site/site.xml | 0 .../maven/internal/xml/XmlNodeBuilderTest.java | 29 +- .../apache/maven/internal/xml/XmlNodeImplTest.java | 459 ++++++++++- plexus-utils/pom.xml | 4 +- .../{README.md => site/markdown/index.md.vm} | 2 +- .../src => plexus-utils}/site/site.xml | 4 +- pom.xml | 45 +- .../maven-api-model/src/main => src}/mdo/common.vm | 2 + .../src/main => src}/mdo/merger.vm | 22 +- {maven-model/src/main => src}/mdo/model-v3.vm | 17 +- .../src/main => src}/mdo/model.vm | 76 +- {maven-model/src/main => src}/mdo/reader-ex.vm | 5 +- .../mdo/reader.vm => src/mdo/reader-modified.vm | 5 +- .../src/main => src}/mdo/reader.vm | 5 +- {maven-model/src/main => src}/mdo/transformer.vm | 5 +- {maven-model/src/main => src}/mdo/writer-ex.vm | 5 +- .../src/main => src}/mdo/writer.vm | 5 +- src/site/xdoc/index.xml | 8 +- 300 files changed, 2876 insertions(+), 8011 deletions(-) delete mode 100644 api/maven-api-model/src/main/mdo/model.vm delete mode 100644 api/maven-api-settings/src/main/mdo/common.vm delete mode 100644 api/maven-api-settings/src/main/mdo/model.vm copy maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/MavenRepositorySystemUtilsTest.java => api/maven-api-settings/src/test/java/org/apache/maven/api/settings/SettingsTest.java (61%) delete mode 100644 api/maven-api-toolchain/src/main/mdo/common.vm delete mode 100644 maven-compat/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java delete mode 100644 maven-compat/src/main/java/org/apache/maven/profiles/MavenProfilesBuilder.java create mode 100644 maven-compat/src/test/java/org/apache/maven/artifact/resolver/TestMavenWorkspaceReader.java delete mode 100644 maven-core/src/main/java/org/apache/maven/internal/aether/ConsumerModelSourceTransformer.java create mode 100644 maven-core/src/main/java/org/apache/maven/internal/aether/MavenDeployer.java create mode 100644 maven-core/src/main/java/org/apache/maven/internal/aether/MavenInstaller.java create mode 100644 maven-core/src/main/java/org/apache/maven/internal/transformation/ConsumerPomArtifactTransformer.java create mode 100644 maven-core/src/main/java/org/apache/maven/internal/transformation/OnChangeTransformer.java create mode 100644 maven-core/src/main/java/org/apache/maven/internal/transformation/TransformedArtifact.java create mode 100644 maven-core/src/main/java/org/apache/maven/plugin/internal/AbstractMavenPluginDescriptorSourcedParametersValidator.java copy maven-core/src/main/java/org/apache/maven/plugin/internal/{ReadOnlyPluginParametersValidator.java => DeprecatedCoreExpressionValidator.java} (50%) delete mode 100644 maven-core/src/test/java/org/apache/maven/MavenTest.java rename maven-core/src/test/java/org/apache/maven/internal/{aether/ConsumerModelSourceTransformerTest.java => transformation/ConsumerPomArtifactTransformerTest.java} (87%) delete mode 100644 maven-model/src/main/mdo/common.vm delete mode 100644 maven-model/src/main/mdo/merger.vm delete mode 100644 maven-model/src/main/mdo/writer.vm delete mode 100644 maven-plugin-api/src/main/mdo/common.vm delete mode 100644 maven-plugin-api/src/main/mdo/merger.vm delete mode 100644 maven-plugin-api/src/main/mdo/model.vm delete mode 100644 maven-plugin-api/src/main/mdo/reader.vm delete mode 100644 maven-plugin-api/src/main/mdo/writer.vm copy {maven-model/src/main/java/org/apache/maven/model => maven-settings/src/main/java/org/apache/maven/settings}/BaseObject.java (96%) delete mode 100644 maven-settings/src/main/mdo/common.vm delete mode 100644 maven-settings/src/main/mdo/merger.vm delete mode 100644 maven-settings/src/main/mdo/model-v3.vm delete mode 100644 maven-settings/src/main/mdo/reader.vm delete mode 100644 maven-settings/src/main/mdo/writer.vm copy {maven-model/src/main/java/org/apache/maven => maven-toolchain-model/src/main/java/org/apache/maven/toolchain}/model/BaseObject.java (96%) delete mode 100644 maven-toolchain-model/src/main/mdo/common.vm delete mode 100644 maven-toolchain-model/src/main/mdo/model-v3.vm delete mode 100644 maven-xml-impl/src/main/java/org/apache/maven/internal/xml/MavenXmlException.java rename maven-xml-impl/{README.md => src/site/markdown/index.md} (94%) copy {api/maven-api-core => maven-xml-impl}/src/site/site.xml (100%) copy maven-builder-support/src/test/java/org/apache/maven/building/ProblemCollectorFactoryTest.java => maven-xml-impl/src/test/java/org/apache/maven/internal/xml/XmlNodeBuilderTest.java (58%) rename plexus-utils/{README.md => site/markdown/index.md.vm} (95%) copy {api/maven-api-meta/src => plexus-utils}/site/site.xml (91%) rename {api/maven-api-model/src/main => src}/mdo/common.vm (96%) rename {maven-toolchain-model/src/main => src}/mdo/merger.vm (94%) rename {maven-model/src/main => src}/mdo/model-v3.vm (96%) rename {api/maven-api-toolchain/src/main => src}/mdo/model.vm (86%) rename {maven-model/src/main => src}/mdo/reader-ex.vm (99%) rename maven-model/src/main/mdo/reader.vm => src/mdo/reader-modified.vm (99%) rename {maven-toolchain-model/src/main => src}/mdo/reader.vm (99%) rename {maven-model/src/main => src}/mdo/transformer.vm (98%) rename {maven-model/src/main => src}/mdo/writer-ex.vm (99%) rename {maven-toolchain-model/src/main => src}/mdo/writer.vm (99%)