This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch MNG-6169/MNG-6556
in repository https://gitbox.apache.org/repos/asf/maven.git.
discard 525b052 Upgrade to Maven JAR Plugin 2.6
omit 26fad91 Upgrade to Maven Plugin Plugin 3.6.0
omit da095c7 Upgrade to Maven Install Plugin 2.5.2
omit f6dca15 Upgrade to Maven Deploy Plugin 2.8.2
omit ae7ca38 Upgrade to Maven Surefire Plugin 3.0.0-M3
omit 3efc7de Upgrade to Maven Compiler Plugin 3.8.1
omit dbe7fd5 Upgrade to Maven Resources Plugin 3.1.0
add d3ace78 [MNG-6638] Prevent reparsing POMs in MavenMetadataSource
add 660e745 Always deploy snapshot from master (#250)
add 8524e04 fix Jenkinsfile as it is script
add a117168 oops fix branch name
add 3495521 -DdeployAtEnd=true doesn't deploy anything
add 275a971 Include Java 12 for testing
add 01405a2 [MNG-6667] Enhance the error reporting when trying to build a
modelVersion that the current Maven doesn't understand
add aed5130 [MNG-6665] toolchain.xml file should support environment
variables
add 8aaeb8a [MNG-6581] - Update to latest Modello plugin version
add 5035837 [MNG-6671] Upgrade Modello to 1.10.1
add 92b5191 Revert "Modello changes"
add 8f1cac0 [MNG-6671] Upgrade Modello to 1.11
add da05c25 Use properly quoted shell arguments with "$@"
add 25ffca0 [MNG-6672] Upgrade Maven Resolver to 1.4.0
add 3d76fae Merge branch 'MNG-6672'
add c2f13f7 [MNG-6675] Make Resolver debug log messages for projects and
plugins consistent
add c5ede2f [MNG-6680] Convert Maven Settings Builder to JSR 330
add 58de88f MNG-6681 dependency type = extension+classifier
add edf6168 [MNG-6674] Upgrade Wagon to 3.3.3
add 0bffc8a [MNG-5577] Maven Artifact module has no Plexus annotations
add 59bd396 [MNG-6686] Convert Maven Embedder to JSR 330
add 353d3ea [MNG-6685] Convert Maven Model Builder to JSR 330
add 8da81ce [MNG-6701] Document maven.repo.local property
add 84bf187 [MNG-6700] Equal compile source roots are added multiple times
add 7ba9700 [MNG-6698] Lazily compute the ManagedVersionMap
add 4fa882c [MNG-6703] DefaultUrlNormalizer doesn't normalize all
relative URIs
add 9b8ae7d [MNG-6702] Improve DefaultModelValidator performance:
add 53f04f0 [MNG-6705] Speep up Artifact version check and Parent
interpolation
add 383c8c1 [MNG-6712] Downgrade maven-resolver:1.4.0 to 1.3.3
add f7b4a65 [MNG-6549] Remove unused transitive dependencies of Guava
add ecc317b added NODE_NAME to output
add 74e8532 [MNG-6718] Upgrade to plexus-utils 3.2.1 (#271)
add 690841e [MNG-6697] New fast model interpolator not using reflection
(#261)
add 2d0c3bc [MNG-6704] MavenRepositorySystemUtils.newSession() misses
assignment
add 809cac2 [MNG-6723] MavenProject.getParentFile() not set when using
ProjectBuilder.build()
add dd0776d [MNG-6653] DefaultProjectBuildingRequest copy constructor
does not copy all fields
add 0515cb1 [MNG-6720] MultiThreadedBuilder: wait for parallel running
projects when using --fail-fast
add 93c88a2 [MNG-6725] Skip '.mavenrc' via MAVEN_SKIP_RC=1 and
'-Dmaven.skip.rc=true' on child ITs (by default on Jenkins CI).
add cb71885 IT archives
add d5b0f4c improved handlers documentation: artifact vs dependency
attributes
add 7ac4fa5 [INFRA-18812] Revert unnecessary commits after fixing
INFRA-18812
add 6c5be9c fixed ArtifactHandlerTest after commit d5b0f4ce
add 8a1f572 [MNG-6713] Fix ExclusionArtifactFilter to respect wildcard
exclusions. (#269)
add 203cfc6 [MNG-6729] StringSearchModelInterpolator introspects objects
from Java API
add b893c3e small refactoring in StringSearchModelInterpolator (removed
unused variables, removed too open modifier 'protected')
add 829a2c9 small refactoring in StringSearchModelInterpolator (removed
unnecessary 'public' modifier in private class, inlined variable declaration in
loop - not reachable after the loop)
add 88b632c [MNG-6738] Upgrade maven-resolver to 1.4.1
add b65e846 [MNG-6716] Avoid setting compileRoots
add a52e2ea [MNG-6695] Improve speed in collection merging
new 84de7f5 Upgrade to Maven Resources Plugin 3.1.0
new 252d1f4 Upgrade to Maven Compiler Plugin 3.8.1
new 0fcc700 Upgrade to Maven Surefire Plugin 3.0.0-M3
new 6b63366 Upgrade to Maven Deploy Plugin 2.8.2
new 67144f6 Upgrade to Maven Install Plugin 2.5.2
new 54995f2 Upgrade to Maven Plugin Plugin 3.6.0
new 853c085 Upgrade to Maven JAR Plugin 2.6
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 (525b052)
\
N -- N -- N refs/heads/MNG-6169/MNG-6556 (853c085)
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.
The 7 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
Jenkinsfile | 55 +-
deploySite.sh | 4 +-
maven-artifact/pom.xml | 4 -
.../org/apache/maven/artifact/ArtifactUtils.java | 40 +-
.../org/apache/maven/artifact/DefaultArtifact.java | 12 +-
.../AbstractArtifactComponentTestCase.java | 2 +-
.../manager/DefaultProfileManagerTest.java | 10 +-
.../resolver/filter/ExclusionArtifactFilter.java | 24 +-
.../multithreaded/MultiThreadedBuilder.java | 20 +-
.../DefaultPluginDependenciesResolver.java | 65 +-
.../maven/project/DefaultProjectBuilder.java | 72 +-
.../project/DefaultProjectBuildingRequest.java | 2 +
.../DefaultProjectDependenciesResolver.java | 38 +-
.../org/apache/maven/project/MavenProject.java | 6 +-
.../project/artifact/MavenMetadataSource.java | 22 +-
.../building/DefaultToolchainsBuilder.java | 105 +-
.../toolchain/io/DefaultToolchainsWriter.java | 54 +
.../maven/toolchain/io/ToolchainsWriter.java | 48 +
maven-core/src/site/apt/artifact-handlers.apt | 53 +-
.../artifact/handler/ArtifactHandlerTest.java | 8 +-
.../filter/ExclusionArtifactFilterTest.java | 123 ++
.../project/DefaultMavenProjectBuilderTest.java | 68 +-
.../org/apache/maven/project/MavenProjectTest.java | 13 +
.../apache/maven/project/ProjectBuilderTest.java | 77 ++
.../artifact/DefaultMavenMetadataCacheTest.java | 8 +-
.../project/artifact/MavenMetadataSourceTest.java | 2 +
.../building/DefaultToolchainsBuilderTest.java | 150 +-
.../project-builder/MNG-6716/project/pom.xml | 22 +
.../project-builder/MNG-6723/child/pom.xml | 11 +
.../test/projects/project-builder/MNG-6723/pom.xml | 11 +
.../projects/future-model-version-pom.xml | 8 +-
.../projects/future-schema-model-version-pom.xml | 8 +-
...gnment-child.xml => past-model-version-pom.xml} | 13 +-
maven-embedder/pom.xml | 35 +-
.../org/apache/maven/cli/CLIReportingUtils.java | 2 +-
.../main/java/org/apache/maven/cli/MavenCli.java | 35 +-
.../SettingsXmlConfigurationProcessor.java | 35 +-
.../maven/cli/event/ExecutionEventLogger.java | 12 +-
.../impl/UnsupportedSlf4jBindingConfiguration.java | 2 +-
.../cli/transfer/Slf4jMavenTransferListener.java | 4 +-
maven-embedder/src/site/apt/logging.apt | 24 +-
.../maven/cli/CLIManagerDocumentationTest.java | 7 +-
maven-model-builder/pom.xml | 13 +-
.../maven/model/building/DefaultModelBuilder.java | 54 +-
.../model/building/DefaultModelBuilderFactory.java | 4 +-
.../model/building/DefaultModelProcessor.java | 15 +-
.../DefaultDependencyManagementImporter.java | 7 +-
.../inheritance/DefaultInheritanceAssembler.java | 7 +-
.../AbstractStringBasedModelInterpolator.java | 88 +-
.../StringSearchModelInterpolator.java | 230 +--
.../StringVisitorModelInterpolator.java | 1457 ++++++++++++++++++++
.../apache/maven/model/io/DefaultModelReader.java | 7 +-
.../apache/maven/model/io/DefaultModelWriter.java | 7 +-
.../maven/model/locator/DefaultModelLocator.java | 6 +-
.../DefaultDependencyManagementInjector.java | 7 +-
.../DefaultPluginManagementInjector.java | 7 +-
.../normalization/DefaultModelNormalizer.java | 7 +-
.../model/path/DefaultModelPathTranslator.java | 11 +-
.../model/path/DefaultModelUrlNormalizer.java | 11 +-
.../maven/model/path/DefaultPathTranslator.java | 6 +-
.../maven/model/path/DefaultUrlNormalizer.java | 20 +-
.../plugin/DefaultPluginConfigurationExpander.java | 7 +-
.../plugin/DefaultReportConfigurationExpander.java | 7 +-
.../model/plugin/DefaultReportingConverter.java | 7 +-
.../model/profile/DefaultProfileInjector.java | 7 +-
.../model/profile/DefaultProfileSelector.java | 11 +-
.../profile/activation/FileProfileActivator.java | 11 +-
.../activation/JdkVersionProfileActivator.java | 7 +-
.../OperatingSystemProfileActivator.java | 7 +-
.../activation/PropertyProfileActivator.java | 7 +-
.../model/superpom/DefaultSuperPomProvider.java | 11 +-
.../model/validation/DefaultModelValidator.java | 386 ++++--
maven-model-builder/src/site/apt/index.apt | 2 +
.../DefaultInheritanceAssemblerTest.java | 19 +-
.../AbstractModelInterpolatorTest.java | 5 +-
.../StringSearchModelInterpolatorTest.java | 112 +-
.../maven/model/path/DefaultUrlNormalizerTest.java | 47 +-
.../activation/AbstractProfileActivatorTest.java | 12 +-
.../validation/DefaultModelValidatorTest.java | 17 +-
.../org/apache/maven/model/merge/ModelMerger.java | 866 ++++++------
maven-model/src/main/mdo/maven.mdo | 19 +-
.../internal/DefaultArtifactDescriptorReader.java | 1 -
.../internal/DefaultVersionResolver.java | 41 +-
.../internal/MavenRepositorySystemUtils.java | 4 +-
maven-settings-builder/pom.xml | 10 +-
.../settings/building/DefaultSettingsBuilder.java | 24 +-
.../building/DefaultSettingsBuilderFactory.java | 10 +-
.../settings/crypto/DefaultSettingsDecrypter.java | 17 +-
.../maven/settings/io/DefaultSettingsReader.java | 7 +-
.../maven/settings/io/DefaultSettingsWriter.java | 7 +-
.../validation/DefaultSettingsValidator.java | 7 +-
pom.xml | 25 +-
92 files changed, 3782 insertions(+), 1216 deletions(-)
create mode 100644
maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsWriter.java
create mode 100644
maven-core/src/main/java/org/apache/maven/toolchain/io/ToolchainsWriter.java
create mode 100644
maven-core/src/test/java/org/apache/maven/artifact/resolver/filter/ExclusionArtifactFilterTest.java
create mode 100644
maven-core/src/test/projects/project-builder/MNG-6716/project/pom.xml
create mode 100644
maven-core/src/test/projects/project-builder/MNG-6723/child/pom.xml
create mode 100644
maven-core/src/test/projects/project-builder/MNG-6723/pom.xml
copy
maven-embedder/src/test/error-reporting-projects/aggregate-mojo-failure/project/pom.xml
=> maven-core/src/test/resources/projects/future-model-version-pom.xml (83%)
copy
maven-embedder/src/test/error-reporting-projects/ext-deps-resolve-err/local-repo/org/apache/maven/errortest/test-maven-ext-dep/1/test-maven-ext-dep-1.pom
=> maven-core/src/test/resources/projects/future-schema-model-version-pom.xml
(79%)
copy
maven-core/src/test/resources/projects/{base-directory-alignment/subproject/project-which-needs-directory-alignment-child.xml
=> past-model-version-pom.xml} (76%)
create mode 100644
maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringVisitorModelInterpolator.java
