This is an automated email from the ASF dual-hosted git repository.
elharo pushed a change to branch decrypt
in repository https://gitbox.apache.org/repos/asf/maven.git
from 4ab90a4bd2 remove unused field
add 016626f1e2 Fix infuser
add 5ef46e941f Fix infuser pt 2
add 5bc14e14ea Fix build for 3.9.9
add ab08e3da02 Undo inadvert change
add d47dfb68c4 [MNG-8679] Align superpom with mvn3 (#2246)
add 9a4c067943 Bump org.codehaus.plexus:plexus-interpolation from 1.27 to
1.28
add 6abf74d9ce Bump mockitoVersion from 5.16.1 to 5.17.0
add 1f5cb78071 Bump
io.github.olamy.maven.plugins:jacoco-aggregator-maven-plugin
add a6e1b51e6d Bump org.codehaus.plexus:plexus-xml from 4.0.4 to 4.1.0
add d71841debf [MNG-8680] Bump
org.codehaus.plexus:plexus-interactivity-api from 1.3 to 1.4 (#2250)
add b2e1dcbadf [MNG-8681] Bump org.codehaus.plexus:plexus-testing from
1.4.0 to 1.5.0 (#2249)
add 9ce29a50b3 [MNG-8682] Bump
io.github.olamy.maven.plugins:jacoco-aggregator-maven-plugin (#2248)
add 85f9aa6b36 [MNG-8683] Bump org.codehaus.plexus:plexus-classworlds from
2.8.0 to 2.9.0 (#2247)
add 68693a826f [MNG-8684] Add types for processor annotation path. (#2239)
add c7f22fe0d6 [MNG-8677] Bump to Resolver 2.0.8 and more (#2158)
add b1466d866c [MNG-8685] Better support for CI systems (#2254)
add 1da418c87e [MNG-8675] Correctly deprecate Resource in the model (#2234)
add c0b9106121 [MNG-8673] SourceRoot includes and excludes should be
String (#2232)
add 2b4b74d195 [MNG-8688] Bump com.google.guava:guava from 33.4.6-jre to
33.4.7-jre (#2263)
add cdb2833b1f [MNG-8689] Bump org.junit.jupiter:junit-jupiter from 5.11.4
to 5.12.2 (#2262)
add 2f4d63b418 [MNG-8690] Bump commons-io:commons-io from 2.18.0 to 2.19.0
(#2261)
add 51e967e165 [MNG-8691] Bump org.junit:junit-bom from 5.12.1 to 5.12.2
(#2260)
add bd066adb41 [MNG-8692] Bump org.codehaus.plexus:plexus-velocity from
2.2.0 to 2.2.1 (#2259)
add af6b7066bf [MNG-8687] Restore ability to run on JIMFS (#2256)
add 61226a888a Merge branch 'master' into decrypt
No new revisions were added by this update.
Summary of changes:
.github/workflows/maven.yml | 1 -
.../org/apache/maven/api/cli/InvokerRequest.java | 18 ++++
.../org/apache/maven/api/cli/cisupport/CIInfo.java | 32 ++++---
.../main/java/org/apache/maven/api/SourceRoot.java | 12 ++-
api/maven-api-model/src/main/mdo/maven.mdo | 13 +--
.../maven/model/building/FileModelSource.java | 16 ++--
.../resources/org/apache/maven/model/pom-4.0.0.xml | 8 --
.../repository/internal/DefaultModelResolver.java | 4 +-
.../maven/cling/invoker/BaseInvokerRequest.java | 11 ++-
.../org/apache/maven/cling/invoker/BaseParser.java | 23 +++++
.../apache/maven/cling/invoker/LookupInvoker.java | 23 ++---
.../maven/cling/invoker/cisupport/CIDetector.java | 22 +++--
.../cling/invoker/cisupport/CIDetectorHelper.java | 50 +++++++++++
.../cling/invoker/cisupport/CircleCIDetector.java | 36 ++++----
.../cling/invoker/cisupport/GenericCIDetector.java | 53 ++++++++++++
.../cling/invoker/cisupport/GithubCIDetector.java | 49 ++++++-----
.../JenkinsCIDetector.java} | 42 ++++------
.../TeamcityCIDetector.java} | 42 ++++------
.../cling/invoker/cisupport/TravisCIDetector.java | 49 ++++++-----
.../maven/cling/invoker/mvn/MavenInvoker.java | 7 +-
.../cling/invoker/mvn/MavenInvokerRequest.java | 5 +-
.../maven/cling/invoker/mvn/MavenParser.java | 1 +
.../invoker/mvnenc/EncryptInvokerRequest.java | 5 +-
.../maven/cling/invoker/mvnenc/EncryptParser.java | 1 +
.../cling/invoker/mvnsh/ShellInvokerRequest.java | 5 +-
.../maven/cling/invoker/mvnsh/ShellParser.java | 1 +
...apache.maven.cling.invoker.cisupport.CIDetector | 6 ++
.../invoker/cisupport/CIDetectorHelperRunner.java | 18 ++--
.../invoker/cisupport/CIDetectorHelperTest.java | 97 ++++++++++++++++++++++
.../org/apache/maven/project/MavenProject.java | 4 +-
impl/maven-executor/pom.xml | 6 ++
.../apache/maven/cling/executor/MimirInfuser.java | 5 +-
.../org/apache/maven/impl/DefaultSourceRoot.java | 60 +++----------
.../impl/resolver/type/DefaultTypeProvider.java | 22 +++++
.../impl/resolver/validator/MavenValidator.java | 93 +++++++++++++++++++++
.../validator/MavenValidatorFactory.java} | 15 ++--
.../impl/standalone/RepositorySystemSupplier.java | 42 +++++++++-
.../resources/org/apache/maven/model/pom-4.0.0.xml | 8 --
.../testing/stubs/RepositorySystemSupplier.java | 64 +++++++++++++-
.../maven/it/MavenITmng3843PomInheritanceTest.java | 18 +---
.../MavenITmng4461ArtifactUploadMonitorTest.java | 2 +-
.../MavenITmng4829ChecksumFailureWarningTest.java | 2 +-
...avenITmng6240PluginExtensionAetherProvider.java | 4 +-
.../.mvn/maven.properties | 2 +
.../mng-5639-import-scope-pom-resolution/pom.xml | 5 --
.../maven-it-plugin-class-loader/pom.xml | 2 +-
.../maven-it-plugin-plexus-component-api/pom.xml | 2 +-
.../maven-it-plugin-plexus-utils-new/pom.xml | 2 +-
.../main/java/org/apache/maven/it/Verifier.java | 13 +++
its/pom.xml | 2 +-
pom.xml | 20 ++---
src/mdo/model.vm | 3 +
52 files changed, 739 insertions(+), 307 deletions(-)
copy impl/maven-core/src/main/java/org/apache/maven/internal/CoreRealm.java =>
api/maven-api-cli/src/main/java/org/apache/maven/api/cli/cisupport/CIInfo.java
(60%)
copy api/maven-api-core/src/main/java/org/apache/maven/api/Exclusion.java =>
impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/cisupport/CIDetector.java
(69%)
create mode 100644
impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/cisupport/CIDetectorHelper.java
copy
api/maven-api-core/src/main/java/org/apache/maven/api/services/VersionResolverResult.java
=>
impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/cisupport/CircleCIDetector.java
(56%)
create mode 100644
impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/cisupport/GenericCIDetector.java
copy
its/core-it-suite/src/test/resources/mng-8220-extension-with-di/extensions/extension3/src/main/java/org/apache/maven/its/mng8220/extension3/DumbModelParser3.java
=>
impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/cisupport/GithubCIDetector.java
(51%)
copy
impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/{ContainerCapsule.java
=> cisupport/JenkinsCIDetector.java} (55%)
copy
impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/{ContainerCapsule.java
=> cisupport/TeamcityCIDetector.java} (55%)
copy
its/core-it-suite/src/test/resources/mng-8220-extension-with-di/extensions/extension3/src/main/java/org/apache/maven/its/mng8220/extension3/DumbModelParser3.java
=>
impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/cisupport/TravisCIDetector.java
(51%)
create mode 100644
impl/maven-cli/src/main/resources/META-INF/services/org.apache.maven.cling.invoker.cisupport.CIDetector
copy
its/core-it-suite/src/test/resources/mng-3203/src/main/java/org/apache/maven/it/mng3203/App.java
=>
impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/cisupport/CIDetectorHelperRunner.java
(68%)
create mode 100644
impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/cisupport/CIDetectorHelperTest.java
create mode 100644
impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/validator/MavenValidator.java
copy
impl/maven-impl/src/main/java/org/apache/maven/impl/{cache/DefaultRequestCacheFactory.java
=> resolver/validator/MavenValidatorFactory.java} (66%)
create mode 100644
its/core-it-suite/src/test/resources/mng-5639-import-scope-pom-resolution/.mvn/maven.properties
