(maven) branch fix-apache-maven-12989-mvnup-plugin-upgrades-sho updated (3e34a57a58 -> 4ee2996aa5)

[gn...@apache.org]

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

gnodet pushed a change to branch fix-apache-maven-12989-mvnup-plugin-upgrades-sho
in repository https://gitbox.apache.org/repos/asf/maven.git


 discard 3e34a57a58 Address review feedback: extract JDK skip helper, sort POMs by path depth
 discard 11bc570a9b Fix #12989: mvnup plugin upgrades should respect project JDK version
     add d96bf89eec Fix #13004: enable deterministic profile activation for BUILD_CONSUMER
     add 7584841aa3 Fix #12991: skip shade-plugin upgrade when custom ResourceTransformers are present
     add 589c1ebfee [MNG-8749] Remove PathTranslator and UrlNormalizer from public API (#12941)
     add 5da01f83f3 Fix #12989: mvnup plugin upgrades should respect project JDK version
     add 4ee2996aa5 Address review feedback: extract JDK skip helper, sort POMs by path depth

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   (3e34a57a58)
            \
             N -- N -- N   refs/heads/fix-apache-maven-12989-mvnup-plugin-upgrades-sho (4ee2996aa5)

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:
 .../maven/api/services/model/PathTranslator.java   |  41 --
 .../maven/api/services/model/UrlNormalizer.java    |  42 --
 .../invoker/mvnup/goals/PluginUpgradeStrategy.java | 173 ++++++-
 .../mvnup/goals/PluginUpgradeShadeTest.java        | 536 +++++++++++++++++++++
 .../maven/impl/DefaultModelUrlNormalizer.java      |  11 +-
 .../apache/maven/impl/DefaultUrlNormalizer.java    |  16 +-
 .../maven/impl/model/DefaultModelBuilder.java      |  34 +-
 .../maven/impl/model/DefaultModelInterpolator.java |  17 +-
 .../impl/model/DefaultModelPathTranslator.java     |  11 +-
 .../maven/impl/model/DefaultPathTranslator.java    |  14 +-
 .../model/DefaultProfileActivationContext.java     |  13 +-
 .../maven/impl/DefaultUrlNormalizerTest.java       |  48 +-
 .../maven/impl/model/DefaultModelBuilderTest.java  | 182 ++++++-
 .../impl/model/DefaultModelPathTranslatorTest.java |   2 +-
 .../profile/AbstractProfileActivatorTest.java      |   4 +-
 .../impl/model/profile/ConditionParserTest.java    |   5 +-
 .../profile/ConditionProfileActivatorTest.java     |   5 +-
 ...rty-child.xml => consumer-os-profile-child.xml} |  14 +-
 ...profiles.xml => consumer-os-profile-parent.xml} |  50 +-
 ...d.xml => consumer-profile-artifactid-child.xml} |  14 +-
 ....xml => consumer-profile-artifactid-parent.xml} |  13 +-
 .../apache/maven/testing/plugin/MojoExtension.java |   7 +-
 .../plugin/stubs/RepositorySystemSupplier.java     |  13 +-
 ...nITgh13004ConsumerPomProfileArtifactIdTest.java | 106 ++++
 .../child/pom.xml                                  |  24 +-
 .../java/org/apache/maven/its/gh13004/Child.java   |   3 +
 .../lib}/pom.xml                                   |  12 +-
 .../java/org/apache/maven/its/gh13004/Lib.java     |   3 +
 .../pom.xml                                        |  79 +++
 29 files changed, 1228 insertions(+), 264 deletions(-)
 delete mode 100644 api/maven-api-spi/src/main/java/org/apache/maven/api/services/model/PathTranslator.java
 delete mode 100644 api/maven-api-spi/src/main/java/org/apache/maven/api/services/model/UrlNormalizer.java
 create mode 100644 impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvnup/goals/PluginUpgradeShadeTest.java
 copy impl/maven-impl/src/test/resources/poms/factory/{consumer-profile-property-child.xml => consumer-os-profile-child.xml} (71%)
 copy impl/maven-impl/src/test/resources/poms/factory/{resolved-model-with-profiles.xml => consumer-os-profile-parent.xml} (56%)
 copy impl/maven-impl/src/test/resources/poms/factory/{consumer-profile-property-child.xml => consumer-profile-artifactid-child.xml} (70%)
 copy impl/maven-impl/src/test/resources/poms/factory/{props-and-profiles-grand-parent.xml => consumer-profile-artifactid-parent.xml} (79%)
 create mode 100644 its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh13004ConsumerPomProfileArtifactIdTest.java
 copy its/core-it-suite/src/test/resources/{gh-11798-consumer-pom-profile-activation => gh-13004-consumer-pom-profile-artifactid}/child/pom.xml (68%)
 create mode 100644 its/core-it-suite/src/test/resources/gh-13004-consumer-pom-profile-artifactid/child/src/main/java/org/apache/maven/its/gh13004/Child.java
 copy its/core-it-suite/src/test/resources/{mng-8220-extension-with-di/test => gh-13004-consumer-pom-profile-artifactid/lib}/pom.xml (80%)
 create mode 100644 its/core-it-suite/src/test/resources/gh-13004-consumer-pom-profile-artifactid/lib/src/main/java/org/apache/maven/its/gh13004/Lib.java
 create mode 100644 its/core-it-suite/src/test/resources/gh-13004-consumer-pom-profile-artifactid/pom.xml