You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by cs...@apache.org on 2021/12/02 19:56:52 UTC

[maven] branch do-not-keep-parameters-map updated (47c728c -> 88135f3)

This is an automated email from the ASF dual-hosted git repository.

cstamas pushed a change to branch do-not-keep-parameters-map
in repository https://gitbox.apache.org/repos/asf/maven.git.


    from 47c728c  Fix MojoDescriptor
     add 8852b87  [MNG-7270] Switch to shell alternative to "which"
     add ffc2b99  [MNG-6389] Move the toolchains model to a separate artifactId
     add 274388f  [MNG-7303] - Replace Throwable.initCause() with constructor.
     add 4c21e11  [MNG-7298] - Avoid redundant conditions.
     add bb0fed9  [MNG-6914] rename .mvn hidden directory in source to mvn
     add bf59026  [MNG-6914] rename MAVEN_LAUNCHER to LAUNCHER_CLASS (from LAUNCHER_JAR)
     add 5be4192  [MNG-6914] drop tar.gz archives for wrapper install distributions
     add b58d8b3  [MNG-6914] move mvnw scripts from maven/shared to wrapper/shared
     add ede86ab  [MNG-6914] move apache-maven-wrapper to its own separate Maven module
     add 2f81b7d  [MNG-6914] move assembly descriptors to src/assembly
     add f46a913  fix javadoc errors
     add 2c37a7a  Simplify args help
     add 965aaa5  [MNG-7314] - Refactoring - Remove unused MavenExecutionResult
     add 8784812  [MNG-7312] Revert ThreadLocal approach from MNG-6843 and MNG-7251
     add a5f1bca  improve documentation
     add 712199a  (doc) hacktoberfest
     add a748596  [MNG-7329] Upgrade maven-enforcer-plugin
     add 0a72185  [MNG-7331] Upgrade Jansi to 2.4.0
     add f43f9f8  [MNG-7332] No longer support --define
     add 9dbd8e7  Update DOAP with Maven 3.8.4 release
     add 98a6c4f  [MNG-7340] Option fail-on-severity takes one argument
     add ae8aebe  [MNG-7182] Use the MX xpp parser instead of a STAX transformation (#486)
     add c9c6844  Update organization of Martin Kanters
     add 3a06530  Remove duplicate call to longOpt (#626)
     add c5e27c3  Merge remote-tracking branch 'origin/master' into do-not-keep-parameters-map
     add 8e399f8  [MNG-6776] Inconsistent list of parameters for MojoDescriptor (testcase)
     add 88135f3  Merge branch 'MNG-6776-tc' of https://github.com/slachiewicz/maven into do-not-keep-parameters-map

No new revisions were added by this update.

Summary of changes:
 .asf.yaml                                          |   1 +
 .github/workflows/maven.yml                        |  15 +-
 Jenkinsfile                                        |   6 +-
 Jenkinsfile.its                                    |   2 +-
 .../pom.xml                                        |  27 +-
 .../src/assembly}/bin.xml                          |  22 +-
 .../src/assembly}/script.xml                       |  26 +-
 .../src/assembly}/script/download                  |   0
 .../src/assembly}/script/download.cmd              |   0
 .../shared/mvn}/wrapper/maven-wrapper.properties   |   0
 .../src/assembly/shared/mvnwDebug                  |   0
 .../src/assembly/shared/mvnwDebug.cmd              |   0
 .../src/assembly/shared/mvnwlauncher               |   2 +-
 .../src/assembly/shared/mvnwlauncher.cmd           |   2 +-
 .../src/assembly}/source.xml                       |  31 +-
 .../src/assembly}/source/download                  |   0
 .../src/assembly}/source/download.cmd              |   0
 .../mvn}/wrapper/MavenWrapperDownloader.java       |   0
 apache-maven-wrapper/src/site/apt/index.apt.vm     |  58 +++
 .../src/site/site.xml                              |   0
 apache-maven/pom.xml                               |  12 +-
 apache-maven/src/assembly/{maven => }/bin.xml      |   2 +-
 .../src/assembly/{maven => }/component.xml         |   0
 apache-maven/src/assembly/{maven => }/dir.xml      |   2 +-
 apache-maven/src/assembly/shared/init              |   2 +-
 apache-maven/src/assembly/shared/mvnlauncher       |   2 +-
 apache-maven/src/assembly/shared/mvnlauncher.cmd   |   2 +-
 apache-maven/src/assembly/shared/run               |   2 +-
 apache-maven/src/assembly/shared/run.cmd           |   2 +-
 apache-maven/src/assembly/{maven => }/src.xml      |   0
 doap_Maven.rdf                                     |   9 +
 .../org/apache/maven/artifact/ArtifactUtils.java   |   9 +-
 .../artifact/repository/ArtifactRepository.java    |  19 +-
 .../MultipleArtifactsNotFoundException.java        |   7 +-
 .../maven/artifact/versioning/VersionRange.java    |   5 +-
 .../legacy/metadata/ArtifactMetadata.java          |  13 +-
 maven-bom/pom.xml                                  |  22 +
 .../apache/maven/building/ProblemCollector.java    |   2 +-
 .../java/org/apache/maven/building/Source.java     |   1 +
 .../apache/maven/artifact/ArtifactScopeEnum.java   |   5 +-
 .../maven/artifact/manager/WagonManager.java       |   3 +
 .../metadata/DefaultRepositoryMetadataManager.java |   2 +-
 .../resolver/DefaultLegacyArtifactCollector.java   |   2 +-
 .../repository/metadata/MetadataGraphVertex.java   |   2 +-
 maven-core/pom.xml                                 |  14 +-
 .../maven/AbstractMavenLifecycleParticipant.java   |   9 +
 .../org/apache/maven/ArtifactFilterManager.java    |   4 +
 .../main/java/org/apache/maven/DefaultMaven.java   |   6 +-
 .../apache/maven/ProjectDependenciesResolver.java  |   8 +
 .../ArtifactMetadataRetrievalException.java        |  16 +-
 .../metadata/RepositoryMetadataManager.java        |   2 +
 .../resolver/ArtifactResolutionResult.java         |   3 +
 .../maven/artifact/resolver/ResolutionNode.java    |   4 +-
 .../apache/maven/bridge/MavenRepositorySystem.java |   4 +-
 .../apache/maven/classrealm/ClassRealmRequest.java |   1 +
 .../aether/ConsumerModelSourceTransformer.java     |  97 +---
 .../DefaultRepositorySystemSessionFactory.java     |  30 +-
 .../maven/project/ExtensionDescriptorBuilder.java  |   2 +-
 .../org/apache/maven/project/MavenProject.java     |  87 ++--
 .../ArtifactMetadataRetrievalException.java        |  16 +-
 .../settings/DefaultMavenSettingsBuilder.java      |   2 +-
 .../org/apache/maven/project/MavenProjectTest.java |  43 --
 .../maven/toolchain/DefaultToolchainTest.java      |  48 +-
 .../main/java/org/apache/maven/cli/CLIManager.java |   8 +-
 .../main/java/org/apache/maven/cli/MavenCli.java   |  10 +-
 .../building/AbstractModelSourceTransformer.java   | 205 --------
 .../building/BuildModelSourceTransformer.java      |  53 +-
 .../building/DefaultBuildPomXMLFilterFactory.java  |   6 +-
 .../maven/model/building/DefaultModelBuilder.java  |   6 +-
 .../building/DefaultModelSourceTransformer.java    |  10 +-
 .../model/building/ModelSourceTransformer.java     |   8 +-
 .../org/apache/maven/model/building/Result.java    |   2 +-
 .../apache/maven/model/io/DefaultModelReader.java  | 105 ++--
 .../DefaultInheritanceAssemblerTest.java           |  15 +-
 maven-model-transform/pom.xml                      |   4 +
 .../model/transform/AbstractEventXMLFilter.java    | 285 -----------
 .../model/transform/BuildToRawPomXMLFilter.java    |  58 ---
 .../transform/BuildToRawPomXMLFilterFactory.java   |  64 +--
 .../transform/BuildToRawPomXMLFilterListener.java  |  42 --
 .../maven/model/transform/CiFriendlyXMLFilter.java |  70 +--
 .../maven/model/transform/DependencyKey.java       |  87 ----
 .../maven/model/transform/FastForwardFilter.java   |  96 ++--
 .../maven/model/transform/ModulesXMLFilter.java    |  82 +--
 .../maven/model/transform/ParentXMLFilter.java     | 226 ++++-----
 .../model/transform/RawToConsumerPomXMLFilter.java |  62 ---
 .../RawToConsumerPomXMLFilterFactory.java          |  22 +-
 .../transform/ReactorDependencyXMLFilter.java      | 186 +++----
 .../model/transform/RelativePathXMLFilter.java     |  99 ++--
 .../model/transform/pull/BufferingParser.java      | 563 +++++++++++++++++++++
 .../model/transform/pull/NodeBufferingParser.java  |  81 +++
 .../maven/model/transform/pull/XmlUtils.java       | 132 +++++
 .../model/transform/sax/AbstractSAXFilter.java     | 143 ------
 .../model/transform/sax/CommentRenormalizer.java   | 108 ----
 .../maven/model/transform/sax/Factories.java       |  79 ---
 .../apache/maven/model/transform/sax/SAXEvent.java |  34 --
 .../maven/model/transform/sax/SAXEventFactory.java | 144 ------
 .../maven/model/transform/sax/SAXEventUtils.java   |  49 --
 .../model/transform/AbstractXMLFilterTests.java    | 180 +------
 .../model/transform/CiFriendlyXMLFilterTest.java   |  24 +-
 .../model/transform/ConsumerPomXMLFilterTest.java  |  29 +-
 .../model/transform/ModulesXMLFilterTest.java      |  14 +-
 .../maven/model/transform/ParentXMLFilterTest.java | 115 +++--
 .../transform/ReactorDependencyXMLFilterTest.java  |  32 +-
 .../model/transform/RelativePathXMLFilterTest.java |   9 +-
 .../model/transform/sax/ChainedFilterTest.java     | 148 ------
 .../transform/sax/CommentRenormalizerTest.java     |  64 ---
 .../model/transform/sax/SAXEventUtilsTest.java     |  41 --
 .../org/apache/maven/model/merge/ModelMerger.java  |   2 +-
 .../plugin/descriptor/MojoDescriptorTest.java      |  36 ++
 maven-toolchain-builder/pom.xml                    |  70 +++
 .../building/DefaultToolchainsBuilder.java         |   0
 .../building/DefaultToolchainsBuildingRequest.java |   0
 .../building/DefaultToolchainsBuildingResult.java  |   0
 .../toolchain/building/ToolchainsBuilder.java      |   0
 .../building/ToolchainsBuildingException.java      |   0
 .../building/ToolchainsBuildingRequest.java        |   0
 .../building/ToolchainsBuildingResult.java         |   0
 .../toolchain/io/DefaultToolchainsReader.java      |   0
 .../toolchain/io/DefaultToolchainsWriter.java      |   0
 .../toolchain/io/ToolchainsParseException.java     |   0
 .../maven/toolchain/io/ToolchainsReader.java       |   0
 .../maven/toolchain/io/ToolchainsWriter.java       |   0
 .../toolchain/merge/MavenToolchainMerger.java      |   0
 .../building/DefaultToolchainsBuilderTest.java     |   2 +-
 .../building/ToolchainsBuildingExceptionTest.java  |   8 +-
 .../toolchain/merge/MavenToolchainMergerTest.java  |   0
 .../org/apache/maven/toolchain/global.xml          |   0
 .../toolchain/model/toolchains-jdks-extend.xml     |   0
 .../toolchain/model/toolchains-jdks-extra.xml      |   0
 .../maven/toolchain/model/toolchains-jdks.xml      |   0
 .../resources/org/apache/maven/toolchain/user.xml  |   0
 maven-toolchain-model/pom.xml                      |  59 +++
 .../src/main/mdo/toolchains.mdo                    |   0
 .../apache/maven/wrapper/BootstrapMainStarter.java |   2 +
 .../java/org/apache/maven/wrapper/Downloader.java  |   2 +
 .../java/org/apache/maven/wrapper/Installer.java   |   2 +
 .../org/apache/maven/wrapper/MavenWrapperMain.java |   2 +
 .../org/apache/maven/wrapper/WrapperExecutor.java  |   3 +
 maven-wrapper/src/site/apt/index.apt               |   4 +-
 pom.xml                                            |  16 +-
 src/site/xdoc/index.xml                            |   2 +-
 src/site/xdoc/maven-deps.odg                       | Bin 22491 -> 22633 bytes
 142 files changed, 1872 insertions(+), 2853 deletions(-)
 rename apache-maven/maven-wrapper.pom => apache-maven-wrapper/pom.xml (74%)
 rename {apache-maven/src/assembly/wrapper => apache-maven-wrapper/src/assembly}/bin.xml (82%)
 rename {apache-maven/src/assembly/wrapper => apache-maven-wrapper/src/assembly}/script.xml (76%)
 rename {apache-maven/src/assembly/wrapper => apache-maven-wrapper/src/assembly}/script/download (100%)
 rename {apache-maven/src/assembly/wrapper => apache-maven-wrapper/src/assembly}/script/download.cmd (100%)
 rename {apache-maven/src/assembly/wrapper/shared/.mvn => apache-maven-wrapper/src/assembly/shared/mvn}/wrapper/maven-wrapper.properties (100%)
 rename {apache-maven => apache-maven-wrapper}/src/assembly/shared/mvnwDebug (100%)
 rename {apache-maven => apache-maven-wrapper}/src/assembly/shared/mvnwDebug.cmd (100%)
 rename {apache-maven => apache-maven-wrapper}/src/assembly/shared/mvnwlauncher (54%)
 rename {apache-maven => apache-maven-wrapper}/src/assembly/shared/mvnwlauncher.cmd (54%)
 rename {apache-maven/src/assembly/wrapper => apache-maven-wrapper/src/assembly}/source.xml (73%)
 rename {apache-maven/src/assembly/wrapper => apache-maven-wrapper/src/assembly}/source/download (100%)
 rename {apache-maven/src/assembly/wrapper => apache-maven-wrapper/src/assembly}/source/download.cmd (100%)
 rename {apache-maven/src/assembly/wrapper/source/.mvn => apache-maven-wrapper/src/assembly/source/mvn}/wrapper/MavenWrapperDownloader.java (100%)
 create mode 100644 apache-maven-wrapper/src/site/apt/index.apt.vm
 copy {apache-maven => apache-maven-wrapper}/src/site/site.xml (100%)
 rename apache-maven/src/assembly/{maven => }/bin.xml (93%)
 rename apache-maven/src/assembly/{maven => }/component.xml (100%)
 rename apache-maven/src/assembly/{maven => }/dir.xml (93%)
 rename apache-maven/src/assembly/{maven => }/src.xml (100%)
 delete mode 100644 maven-model-transform/src/main/java/org/apache/maven/model/transform/AbstractEventXMLFilter.java
 delete mode 100644 maven-model-transform/src/main/java/org/apache/maven/model/transform/BuildToRawPomXMLFilter.java
 delete mode 100644 maven-model-transform/src/main/java/org/apache/maven/model/transform/BuildToRawPomXMLFilterListener.java
 delete mode 100644 maven-model-transform/src/main/java/org/apache/maven/model/transform/DependencyKey.java
 delete mode 100644 maven-model-transform/src/main/java/org/apache/maven/model/transform/RawToConsumerPomXMLFilter.java
 create mode 100644 maven-model-transform/src/main/java/org/apache/maven/model/transform/pull/BufferingParser.java
 create mode 100644 maven-model-transform/src/main/java/org/apache/maven/model/transform/pull/NodeBufferingParser.java
 create mode 100644 maven-model-transform/src/main/java/org/apache/maven/model/transform/pull/XmlUtils.java
 delete mode 100644 maven-model-transform/src/main/java/org/apache/maven/model/transform/sax/AbstractSAXFilter.java
 delete mode 100644 maven-model-transform/src/main/java/org/apache/maven/model/transform/sax/CommentRenormalizer.java
 delete mode 100644 maven-model-transform/src/main/java/org/apache/maven/model/transform/sax/Factories.java
 delete mode 100644 maven-model-transform/src/main/java/org/apache/maven/model/transform/sax/SAXEvent.java
 delete mode 100644 maven-model-transform/src/main/java/org/apache/maven/model/transform/sax/SAXEventFactory.java
 delete mode 100644 maven-model-transform/src/main/java/org/apache/maven/model/transform/sax/SAXEventUtils.java
 delete mode 100644 maven-model-transform/src/test/java/org/apache/maven/model/transform/sax/ChainedFilterTest.java
 delete mode 100644 maven-model-transform/src/test/java/org/apache/maven/model/transform/sax/CommentRenormalizerTest.java
 delete mode 100644 maven-model-transform/src/test/java/org/apache/maven/model/transform/sax/SAXEventUtilsTest.java
 create mode 100644 maven-plugin-api/src/test/java/org/apache/maven/plugin/descriptor/MojoDescriptorTest.java
 create mode 100644 maven-toolchain-builder/pom.xml
 rename {maven-core => maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilder.java (100%)
 rename {maven-core => maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuildingRequest.java (100%)
 rename {maven-core => maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuildingResult.java (100%)
 rename {maven-core => maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuilder.java (100%)
 rename {maven-core => maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingException.java (100%)
 rename {maven-core => maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingRequest.java (100%)
 rename {maven-core => maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingResult.java (100%)
 rename {maven-core => maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java (100%)
 rename {maven-core => maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsWriter.java (100%)
 rename {maven-core => maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/io/ToolchainsParseException.java (100%)
 rename {maven-core => maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/io/ToolchainsReader.java (100%)
 rename {maven-core => maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/io/ToolchainsWriter.java (100%)
 rename {maven-core => maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/merge/MavenToolchainMerger.java (100%)
 rename {maven-core => maven-toolchain-builder}/src/test/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilderTest.java (100%)
 rename {maven-core => maven-toolchain-builder}/src/test/java/org/apache/maven/toolchain/building/ToolchainsBuildingExceptionTest.java (100%)
 rename {maven-core => maven-toolchain-builder}/src/test/java/org/apache/maven/toolchain/merge/MavenToolchainMergerTest.java (100%)
 rename {maven-core => maven-toolchain-builder}/src/test/resources/org/apache/maven/toolchain/global.xml (100%)
 rename {maven-core => maven-toolchain-builder}/src/test/resources/org/apache/maven/toolchain/model/toolchains-jdks-extend.xml (100%)
 rename {maven-core => maven-toolchain-builder}/src/test/resources/org/apache/maven/toolchain/model/toolchains-jdks-extra.xml (100%)
 rename {maven-core => maven-toolchain-builder}/src/test/resources/org/apache/maven/toolchain/model/toolchains-jdks.xml (100%)
 rename {maven-core => maven-toolchain-builder}/src/test/resources/org/apache/maven/toolchain/user.xml (100%)
 create mode 100644 maven-toolchain-model/pom.xml
 rename {maven-core => maven-toolchain-model}/src/main/mdo/toolchains.mdo (100%)