This is an automated email from the ASF dual-hosted git repository.
gnodet 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 197df7885 Merge remote-tracking branch 'origin/master' into
feature/MNG-7338-automatic-non-interactive-mode-in-ci
omit 1549a2a15 Merge remote-tracking branch 'origin/master' into
feature/MNG-7338-automatic-non-interactive-mode-in-ci
omit a0be5d6d4 [MNG-7338] Review comments
omit 366774735 Merge branch 'master' into
feature/MNG-7338-automatic-non-interactive-mode-in-ci
omit f6bb2befd [MNG-7338] Automatically activate batch-mode and make output
quiet when running in CI.
add 84e133df7 [MNG-7585] Remove duplicate classes (#1135)
add c12455431 [MNG-7698] Support comments in maven.config (#1134)
add e08c95a67 [MNG-7655] Switch to plexus-utils / plexus-xml 4 (#1093)
add ea1a28071 [MNG-7604] Removal of pom.* interpolation makes some older
plugins defunct (#1137)
add 124033bc0 [MNG-7548] Kill off "legacy" repository metadata support
(#1138)
add c79a7a027 [MNG-7740] Remove old temporary consumer*pom files from
buildDir (#1117)
add 8b652a8b3 Fix code style for code generated by velocity templates
(#1146)
add 6ab123d30 [MNG-7338] Automatically activate batch-mode and make output
quiet when running in CI.
add 782f14cc6 [MNG-7338] Review comments
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 (197df7885)
\
N -- N -- N
refs/heads/feature/MNG-7338-automatic-non-interactive-mode-in-ci (782f14cc6)
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/src/assembly/component.xml | 1 -
.../maven/api/settings/ImmutableCollections.java | 609 ---------------------
.../maven/api/toolchain/ImmutableCollections.java | 609 ---------------------
.../usability/plugin/ExpressionDocumenter.java | 7 +-
maven-core/pom.xml | 2 +-
.../internal/impl/DefaultModelXmlFactory.java | 8 +-
.../ConsumerPomArtifactTransformer.java | 21 +
.../plugin/internal/DefaultMavenPluginManager.java | 8 +-
.../main/java/org/apache/maven/cli/MavenCli.java | 3 +-
.../java/org/apache/maven/cli/MavenCliTest.java | 8 +-
.../mavenConfigProperties/.mvn/maven.config | 1 +
maven-model-builder/pom.xml | 2 +-
.../maven/model/building/ModelBuildingRequest.java | 9 +-
.../AbstractStringBasedModelInterpolator.java | 54 +-
.../interpolation/ProblemDetectingValueSource.java | 76 +++
.../StringVisitorModelInterpolator.java | 9 +-
.../AbstractModelInterpolatorTest.java | 36 +-
maven-model-transform/pom.xml | 4 +-
maven-model/pom.xml | 4 +
.../maven/model/io/xpp3/MavenXpp3ReaderEx.java | 12 +-
maven-plugin-api/pom.xml | 2 +-
.../plugin/descriptor/PluginDescriptorBuilder.java | 13 +
.../plugin/lifecycle/ImmutableCollections.java | 609 ---------------------
maven-repository-metadata/pom.xml | 4 +-
maven-resolver-provider/pom.xml | 2 +-
.../repository/internal/LocalSnapshotMetadata.java | 58 +-
.../internal/LocalSnapshotMetadataGenerator.java | 6 +-
.../repository/internal/MavenSnapshotMetadata.java | 11 +-
.../internal/RemoteSnapshotMetadata.java | 14 +-
.../internal/RemoteSnapshotMetadataGenerator.java | 6 +-
.../internal/RemoteSnapshotMetadataTest.java | 3 +-
maven-settings-builder/pom.xml | 2 +-
.../maven/settings/io/DefaultSettingsReader.java | 8 +-
.../maven/settings/io/DefaultSettingsWriter.java | 4 +-
maven-settings/pom.xml | 4 +-
.../org/apache/maven/settings/WrapperList.java | 105 ----
.../apache/maven/settings/WrapperProperties.java | 333 -----------
.../maven/settings/io/xpp3/SettingsXpp3Reader.java | 12 +-
maven-toolchain-builder/pom.xml | 2 +-
.../toolchain/io/DefaultToolchainsReader.java | 8 +-
maven-toolchain-model/pom.xml | 4 +-
.../apache/maven/toolchain/model/WrapperList.java | 105 ----
.../maven/toolchain/model/WrapperProperties.java | 333 -----------
maven-xml-impl/pom.xml | 4 +-
.../java/org/codehaus/plexus/util/xml/Xpp3Dom.java | 422 --------------
.../codehaus/plexus/util/xml/Xpp3DomBuilder.java | 98 ----
.../org/codehaus/plexus/util/xml/package-info.java | 10 -
plexus-utils/pom.xml | 166 ------
plexus-utils/site/markdown/index.md.vm | 26 -
plexus-utils/site/site.xml | 38 --
pom.xml | 12 +-
.../mdo/java}/ImmutableCollections.java | 2 +-
.../maven/model => src/mdo/java}/WrapperList.java | 2 +-
.../model => src/mdo/java}/WrapperProperties.java | 2 +-
src/mdo/merger.vm | 265 ++++-----
src/mdo/model-v3.vm | 185 +++----
src/mdo/model.vm | 144 ++---
src/mdo/reader-ex.vm | 294 ++++------
src/mdo/reader-modified.vm | 293 ++++------
src/mdo/reader.vm | 547 +++++++-----------
src/mdo/transformer.vm | 122 ++---
src/mdo/writer-ex.vm | 259 ++++-----
src/mdo/writer.vm | 210 +++----
63 files changed, 1218 insertions(+), 5014 deletions(-)
delete mode 100644
api/maven-api-settings/src/main/java/org/apache/maven/api/settings/ImmutableCollections.java
delete mode 100644
api/maven-api-toolchain/src/main/java/org/apache/maven/api/toolchain/ImmutableCollections.java
create mode 100644
maven-model-builder/src/main/java/org/apache/maven/model/interpolation/ProblemDetectingValueSource.java
delete mode 100644
maven-plugin-api/src/main/java/org/apache/maven/plugin/lifecycle/ImmutableCollections.java
delete mode 100644
maven-settings/src/main/java/org/apache/maven/settings/WrapperList.java
delete mode 100644
maven-settings/src/main/java/org/apache/maven/settings/WrapperProperties.java
delete mode 100644
maven-toolchain-model/src/main/java/org/apache/maven/toolchain/model/WrapperList.java
delete mode 100644
maven-toolchain-model/src/main/java/org/apache/maven/toolchain/model/WrapperProperties.java
delete mode 100644
maven-xml-impl/src/main/java/org/codehaus/plexus/util/xml/Xpp3Dom.java
delete mode 100644
maven-xml-impl/src/main/java/org/codehaus/plexus/util/xml/Xpp3DomBuilder.java
delete mode 100644
maven-xml-impl/src/main/java/org/codehaus/plexus/util/xml/package-info.java
delete mode 100644 plexus-utils/pom.xml
delete mode 100644 plexus-utils/site/markdown/index.md.vm
delete mode 100644 plexus-utils/site/site.xml
rename {api/maven-api-model/src/main/java/org/apache/maven/api/model =>
src/mdo/java}/ImmutableCollections.java (99%)
rename {maven-model/src/main/java/org/apache/maven/model =>
src/mdo/java}/WrapperList.java (99%)
rename {maven-model/src/main/java/org/apache/maven/model =>
src/mdo/java}/WrapperProperties.java (99%)
