This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a change to branch fix/spotless-its-formatting-steps
in repository https://gitbox.apache.org/repos/asf/maven.git
discard 50b9803bf6 Apply Spotless formatting to NIO2-migrated IT files
discard a80536919e Use property for maven-shared-resources version
discard f47201ac95 Remove unnecessary combine.children="append" and use
property for version
discard 647cbeb45d Fix Spotless config in its/core-it-suite to enforce
formatting rules
add 712b5c0791 Fix NPE in DefaultLookup.lookupOptional() when container
returns null (#12336)
add ffd7baa041 Switch default resolver transport from JDK/methanol to
Apache HttpClient (#12338)
add 6cbe5e2ff3 [#12331] Fix clean/site lifecycle bindings executing after
pom.xml goals
add 8ba0519eb4 Port #11908: Do not force metadata download for plugin
prefix resolution (#11905)
add 3769745116 Bump actions/cache from 5.0.5 to 6.0.0 (#12358)
add 6f73f5b833 Bump sisuVersion from 1.0.0 to 1.0.1 (#12365)
add 71c41f9270 [MNG-8650] Fix MAVEN_ARGS backslash stripping on Windows
(#12348)
add 10ba35b706 Fix mvnup spurious pluginManagement injection for remote
parent plugins (#12350)
add 549065b07d [#12353] Add jaxb2-maven-plugin to mvnup plugin upgrade
list (#12354)
add d7334261f2 Add mvnup SourceStrategy for migrating to <source> elements
(#12355)
add 99a624d1f1 Forward-port #11985: remove redundant required MDO attrs +
add extension coordinate validation (#11979) (#12346)
add a28f4e3851 Bump ch.qos.logback:logback-classic from 1.5.34 to 1.5.35
(#12363)
add 60dc6342b4 Fix mvn.cmd jvm.config read failing silently on Windows CI
add 7ffc6d57df [#12303] Fix CI-friendly ${revision} not interpolated for
non-build POM reads
add d821aeff3d Fix IT compilation: adapt to master's NIO2 Path API
add 7b8cc3239e Fix Spotless formatting violation in DefaultModelBuilder
add 081740dfc4 Fix Spotless formatting: merge split string literal
add 684a3fd122 Fix Spotless formatting: place exception arg on same line
as message string (#12380)
add da392652e0 [#11683] Install JUL-to-SLF4J bridge to route
java.util.logging through Maven logging
add d260f0d52e Guard JUL bridge installation with isInstalled() check
add b6eab2ad39 Bump actions/setup-java from 5.3.0 to 5.4.0
add 549cd76aa8 Bump ch.qos.logback:logback-classic from 1.5.35 to 1.5.36
add b6d28d66c5 Bump org.apache:apache from 38 to 39 (#12391)
add 974021de56 Bump ch.qos.logback:logback-classic from 1.5.36 to 1.5.37
(#12394)
add f564ce4fe2 Bump org.apache.maven:maven-parent from 48 to 49 (#12389)
add d0093f63c4 Bump org.junit:junit-bom from 6.1.0 to 6.1.1 (#12388)
add ef837a2b9c Bump actions/cache/restore from 6.0.0 to 6.1.0
add 49865f242b Bump actions/cache/save from 6.0.0 to 6.1.0
add f4eae55109 Bump net.sourceforge.pmd:pmd-core from 7.25.0 to 7.26.0
(#12403)
add da0bb4c709 Bump jlineVersion from 4.2.1 to 4.3.1 (#12407)
add 4f62c08256 Bump net.bytebuddy:byte-buddy from 1.18.10 to 1.18.11
(#12412)
add c48ad2012c Make LookupContext#closeables thread safe (#12411)
add 6f4644329f [#11449] Fix Mockito agent: use late binding @{}
interpolation and extend to failsafe plugin (#12369)
add c6deb5d59d Fix Spotless config in its/core-it-suite to enforce
formatting rules
add 441afb1be2 Remove unnecessary combine.children="append" and use
property for version
add 3bda740994 Use property for maven-shared-resources version
add 4a7d15224d Apply Spotless formatting to NIO2-migrated IT files
add de6a5ccd0b Apply Spotless formatting to gh-12303 IT resource pom files
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 (50b9803bf6)
\
N -- N -- N refs/heads/fix/spotless-its-formatting-steps
(de6a5ccd0b)
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 | 14 +-
apache-maven/pom.xml | 14 +-
apache-maven/src/assembly/maven/bin/mvn | 13 +-
apache-maven/src/assembly/maven/bin/mvn.cmd | 29 +-
api/maven-api-model/src/main/mdo/maven.mdo | 13 -
.../validation/DefaultModelValidatorTest.java | 12 +
.../raw-model/minimal-with-parent.xml} | 18 +-
.../raw-model/minimal-without-parent.xml | 22 +-
impl/maven-cli/pom.xml | 6 +-
.../apache/maven/cling/invoker/LookupContext.java | 2 +-
.../apache/maven/cling/invoker/LookupInvoker.java | 6 +
.../mvnup/goals/AbstractUpgradeStrategy.java | 8 +-
.../invoker/mvnup/goals/PluginUpgradeStrategy.java | 89 ++-
.../cling/invoker/mvnup/goals/SourceStrategy.java | 559 ++++++++++++++
.../mvnup/goals/PluginUpgradeStrategyTest.java | 137 +++-
.../invoker/mvnup/goals/SourceStrategyTest.java | 860 +++++++++++++++++++++
.../apache/maven/internal/impl/DefaultLookup.java | 4 +-
.../org/apache/maven/internal/impl/Lifecycles.java | 1 +
.../internal/DefaultPluginPrefixResolver.java | 47 +-
.../org/apache/maven/project/MavenProject.java | 1 -
.../maven/lifecycle/LifecycleExecutorTest.java | 18 +
.../pom.xml | 21 +-
.../maven/impl/model/DefaultModelBuilder.java | 24 +
.../maven/impl/model/DefaultModelValidator.java | 19 +
.../impl/model/DefaultModelValidatorTest.java | 22 +
...d-pom.xml => missing-extension-coordinates.xml} | 10 +-
.../validation/raw-model/minimal-with-parent.xml | 18 +-
...inManagement.xml => minimal-without-parent.xml} | 22 +-
...2303CIFriendlyRevisionRemoteResourcesTest.java} | 25 +-
.../it/MavenITmng7470ResolverTransportTest.java | 9 +-
.../child-b}/pom.xml | 17 +-
.../child}/pom.xml | 10 +-
.../pom.xml | 26 +-
.../resource-bundle/1.0/resource-bundle-1.0.jar | Bin 0 -> 833 bytes
.../resource-bundle/1.0/resource-bundle-1.0.pom | 9 +
.../resource-bundle}/pom.xml | 6 +-
.../resources/META-INF/maven/remote-resources.xml | 6 +
.../resource-bundle/src/main/resources/NOTICE.txt | 1 +
.../settings-template.xml} | 22 +-
its/pom.xml | 6 +-
pom.xml | 45 +-
41 files changed, 1969 insertions(+), 222 deletions(-)
copy
compat/maven-model-builder/src/test/resources/poms/{inheritance/empty-urls-child.xml
=> validation/raw-model/minimal-with-parent.xml} (75%)
copy
impl/maven-impl/src/test/resources/poms/validation/raw-model/missing-ga-pluginManagement.xml
=>
compat/maven-model-builder/src/test/resources/poms/validation/raw-model/minimal-without-parent.xml
(73%)
create mode 100644
impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnup/goals/SourceStrategy.java
create mode 100644
impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvnup/goals/SourceStrategyTest.java
copy impl/maven-core/src/test/projects/lifecycle-executor/{project-basic =>
project-with-clean-phase-execution}/pom.xml (83%)
copy
impl/maven-impl/src/test/resources/poms/validation/{missing-plugin-artifactId-pom.xml
=> missing-extension-coordinates.xml} (90%)
copy
compat/maven-model-builder/src/test/resources/poms/inheritance/empty-urls-child.xml
=>
impl/maven-impl/src/test/resources/poms/validation/raw-model/minimal-with-parent.xml
(75%)
copy
impl/maven-impl/src/test/resources/poms/validation/raw-model/{missing-ga-pluginManagement.xml
=> minimal-without-parent.xml} (73%)
copy
its/core-it-suite/src/test/java/org/apache/maven/it/{MavenITmng3814BogusProjectCycleTest.java
=> MavenITgh12303CIFriendlyRevisionRemoteResourcesTest.java} (61%)
copy its/core-it-suite/src/test/resources/{cyclic-import-scope/v3/componentB
=> gh-12303-ci-friendly-revision-remote-resources/child-b}/pom.xml (62%)
copy its/core-it-suite/src/test/resources/{cyclic-import-scope/v1/componentA
=> gh-12303-ci-friendly-revision-remote-resources/child}/pom.xml (71%)
copy {impl/maven-core/src/test/resources-project-builder/dual-execution-ids =>
its/core-it-suite/src/test/resources/gh-12303-ci-friendly-revision-remote-resources}/pom.xml
(56%)
create mode 100644
its/core-it-suite/src/test/resources/gh-12303-ci-friendly-revision-remote-resources/repo/org/apache/maven/its/gh12303/resource-bundle/1.0/resource-bundle-1.0.jar
create mode 100644
its/core-it-suite/src/test/resources/gh-12303-ci-friendly-revision-remote-resources/repo/org/apache/maven/its/gh12303/resource-bundle/1.0/resource-bundle-1.0.pom
copy its/core-it-suite/src/test/resources/{mng-7740-consumer-files =>
gh-12303-ci-friendly-revision-remote-resources/resource-bundle}/pom.xml (71%)
create mode 100644
its/core-it-suite/src/test/resources/gh-12303-ci-friendly-revision-remote-resources/resource-bundle/src/main/resources/META-INF/maven/remote-resources.xml
create mode 100644
its/core-it-suite/src/test/resources/gh-12303-ci-friendly-revision-remote-resources/resource-bundle/src/main/resources/NOTICE.txt
copy
its/core-it-suite/src/test/resources/{gh-11055-di-service-injection/src/it/settings.xml
=> gh-12303-ci-friendly-revision-remote-resources/settings-template.xml} (57%)
