This is an automated email from the ASF dual-hosted git repository.
elharo pushed a change to branch MNG-8241
in repository https://gitbox.apache.org/repos/asf/maven.git
from d35cfacf1f wip
add 2b726bfe1a wip
add 3347e916bc [MNG-8549] Bump net.bytebuddy:byte-buddy from 1.16.1 to
1.17.0 (#2070)
add 7b4a4bf759 [MNG-8395] Redirect the <sourceDirectory> element to
<Source> (#2061)
add cd96d11ca8 Add javadoc to DI (#2072)
add c61b255b16 ProjectManager cleanup (#2073)
add 4dfffaee5e Simplify and complete method implementation (#2075)
add 4cc254ef37 [MNG-8550] Update JLine3 to 3.29.0 (#2074)
add b2b0bbeda6 [MNG-8551] Improve early error reporting (#2076)
add 308f39905b [MNG-8554] Fix UT suite for CLI (#2078)
add 8b3e640491 [MNG-8555] Use plexus-sec-dispatcher 4.1.0
add 5cab34b638 [MNG-8241] Test comparing letters to numbers (#2081)
add 653f6f3c71 [MNG-7592] String deduplication in model building (#2083)
add 4fc8a2c241 [MNG-8530] Prompter fixes (#2086)
add 34e68c8935 [MNG-8561] SourceRoot should be more lenient wrt duplicates
(#2085)
add 16bd71adf6 [MNG-8563] Provide a weak cache for objects from the main
model (#2087)
add ff16077b22 [MNG-8564] Move to maven-compat Plexus legacy (#2088)
add 5b470215f8 Make full build upload surefire logs in case of failure.
(#2089)
add 3ac1fbc037 [MNG-8565] Thread leaks in maven-cli (#2090)
add c0ac7a688a Revert "[MNG-8563] Provide a weak cache for objects from
the main model (#2087)"
add c8e2af96a3 [MNG-8540] Add equals/hashCode to requests
add 8e4041759b [MNG-8540] Add global caching in the session
add 3fde7657f5 [MNG-8540] Add a real caching API and add missing infos to
ArtifactResolverResult
add cb17c164d4 [MNG-8540] Change ProjectBuilder to use the Maven 4 API to
resolve the main POM artifact
add 6aa86c55b4 [MNG-8540] Replace ModelCache with the new cache API
add 3bb7327c0f [MNG-8553] Resolver 2.0.6 (#2079)
add fa6a873a68 [MNG-8535] Full std stream support for executor (#2082)
add 9f824df555 Add badge for 3.x version
add dc12b858a9 Merge branch 'master' into MNG-8241
add 2a1888bf3e ASCII digits only
No new revisions were added by this update.
Summary of changes:
.github/workflows/maven.yml | 7 +
README.md | 1 +
.../java/org/apache/maven/api/cli/Invoker.java | 2 +-
.../org/apache/maven/api/cli/InvokerRequest.java | 45 +--
.../main/java/org/apache/maven/api/cli/Logger.java | 24 +-
.../main/java/org/apache/maven/api/cli/Parser.java | 9 +-
.../org/apache/maven/api/cli/ParserException.java | 52 ---
.../org/apache/maven/api/cli/ParserRequest.java | 142 ++++----
.../maven/api/cli/logging/AccumulatingLogger.java | 47 +++
.../main/java/org/apache/maven/api/Language.java | 13 +
.../main/java/org/apache/maven/api/Project.java | 27 +-
.../main/java/org/apache/maven/api/SourceRoot.java | 111 ++++++
...xtensibleEnum.java => WorkspaceRepository.java} | 25 +-
.../maven/api/cache/BatchRequestException.java | 65 ++++
.../CacheMetadata.java} | 24 +-
.../org/apache/maven/api/cache/CacheRetention.java | 66 ++++
.../MavenExecutionException.java} | 23 +-
.../org/apache/maven/api/cache/RequestCache.java | 80 +++++
.../RequestCacheFactory.java} | 26 +-
.../org/apache/maven/api/cache/RequestResult.java | 63 ++++
.../org/apache/maven/api/cache/package-info.java | 55 +++
.../ArtifactCoordinatesFactoryRequest.java | 19 ++
.../api/services/ArtifactDeployerRequest.java | 14 +
.../maven/api/services/ArtifactFactoryRequest.java | 18 +
.../api/services/ArtifactInstallerRequest.java | 11 +
.../api/services/ArtifactResolverException.java | 10 +-
.../api/services/ArtifactResolverRequest.java | 16 +-
.../maven/api/services/ArtifactResolverResult.java | 98 +++++-
.../DependencyCoordinatesFactoryRequest.java | 31 ++
.../api/services/DependencyResolverRequest.java | 31 ++
.../maven/api/services/LocalRepositoryManager.java | 18 +
.../maven/api/services/ModelBuilderRequest.java | 35 ++
.../maven/api/services/ProjectBuilderRequest.java | 17 +
.../apache/maven/api/services/ProjectManager.java | 175 +++++++---
.../org/apache/maven/api/services/Request.java | 21 ++
.../maven/api/services/SettingsBuilderRequest.java | 16 +
.../org/apache/maven/api/services/Sources.java | 19 +-
.../api/services/ToolchainsBuilderRequest.java | 13 +
.../api/services/VersionRangeResolverRequest.java | 13 +
.../maven/api/services/VersionResolverRequest.java | 13 +
.../api/services/RequestImplementationTest.java | 35 ++
.../org/apache/maven/api/services/SourcesTest.java | 8 +-
.../main/java/org/apache/maven/api/di/Inject.java | 26 ++
.../main/java/org/apache/maven/api/di/Named.java | 28 ++
.../java/org/apache/maven/api/di/Priority.java | 30 ++
.../java/org/apache/maven/api/di/Provides.java | 20 +-
.../java/org/apache/maven/api/di/Qualifier.java | 19 ++
.../main/java/org/apache/maven/api/di/Scope.java | 18 +
.../java/org/apache/maven/api/di/Singleton.java | 18 +
.../main/java/org/apache/maven/api/di/Typed.java | 35 ++
.../java/org/apache/maven/api/di/package-info.java | 21 ++
api/maven-api-model/src/main/mdo/maven.mdo | 51 ++-
.../artifact/repository/ArtifactRepository.java | 6 +
.../artifact/versioning/ComparableVersion.java | 4 +-
.../artifact/versioning/ComparableVersionTest.java | 57 ++--
compat/maven-compat/pom.xml | 10 +-
.../interactivity/LegacyPlexusInteractivity.java | 135 ++++++++
.../AbstractProjectInheritanceTestCase.java | 2 +-
.../repository/LegacyRepositorySystemTest.java | 45 ++-
.../apache/maven/model/pom/PomMemoryAnalyzer.java | 377 +++++++++++++++++++++
impl/maven-cli/pom.xml | 23 +-
.../java/org/apache/maven/cling/ClingSupport.java | 43 ++-
.../java/org/apache/maven/cling/MavenCling.java | 36 +-
.../java/org/apache/maven/cling/MavenEncCling.java | 36 +-
.../org/apache/maven/cling/MavenShellCling.java | 36 +-
.../extensions/BootstrapCoreExtensionManager.java | 13 +-
.../maven/cling/invoker/BaseInvokerRequest.java | 45 +--
.../org/apache/maven/cling/invoker/BaseParser.java | 205 ++++++++---
.../maven/cling/invoker/CommonsCliOptions.java | 4 +
.../maven/cling/invoker/ContainerCapsule.java | 3 +-
.../cling/invoker/ContainerCapsuleFactory.java | 3 +-
.../apache/maven/cling/invoker/LookupContext.java | 7 +-
.../apache/maven/cling/invoker/LookupInvoker.java | 125 ++++---
.../cling/invoker/PlexusContainerCapsule.java | 4 -
.../invoker/PlexusContainerCapsuleFactory.java | 11 +-
.../maven/cling/invoker/logging/Slf4jLogger.java | 44 +--
.../SystemLogger.java} | 39 ++-
.../maven/cling/invoker/mvn/MavenContext.java | 2 +-
.../maven/cling/invoker/mvn/MavenInvoker.java | 7 +-
.../cling/invoker/mvn/MavenInvokerRequest.java | 14 +-
.../maven/cling/invoker/mvn/MavenParser.java | 37 +-
.../invoker/mvn/resident/ResidentMavenInvoker.java | 4 +-
.../maven/cling/invoker/mvnenc/EncryptInvoker.java | 2 -
.../invoker/mvnenc/EncryptInvokerRequest.java | 14 +-
.../maven/cling/invoker/mvnenc/EncryptParser.java | 22 +-
.../maven/cling/invoker/mvnenc/goals/Init.java | 201 +++++------
.../cling/invoker/mvnsh/ShellInvokerRequest.java | 14 +-
.../maven/cling/invoker/mvnsh/ShellParser.java | 21 +-
.../BuiltinShellCommandRegistryFactory.java | 16 +-
.../cling/transfer/SimplexTransferListener.java | 19 +-
.../maven/cling/invoker/mvn/MavenInvokerTest.java | 19 +-
.../cling/invoker/mvn/MavenInvokerTestSupport.java | 53 +--
.../mvn/resident/ResidentMavenInvokerTest.java | 6 +-
.../transfer/ConsoleMavenTransferListenerTest.java | 144 ++++----
.../transfer/SimplexTransferListenerTest.java | 60 ++--
.../resources/mavenHome}/conf/maven.properties | 0
.../repository/MavenArtifactRepository.java | 27 ++
.../apache/maven/bridge/MavenRepositorySystem.java | 24 ++
.../apache/maven/internal/impl/DefaultProject.java | 1 +
.../maven/internal/impl/DefaultProjectBuilder.java | 7 +
.../maven/internal/impl/DefaultProjectManager.java | 119 +++----
.../maven/internal/impl/DefaultPrompter.java | 79 -----
.../apache/maven/internal/impl/DefaultSession.java | 1 +
.../maven/project/DefaultProjectBuilder.java | 113 ++++--
.../org/apache/maven/project/MavenProject.java | 313 ++++++++++++++---
.../main/resources/META-INF/maven/extension.xml | 6 +-
.../org/apache/maven/internal/impl/TestApi.java | 9 +-
.../impl/ConsumerPomBuilderTest.java | 41 +--
.../org/apache/maven/model/ModelBuilderTest.java | 7 +-
.../project/DefaultMavenProjectBuilderTest.java | 8 -
.../apache/maven/project/PomConstructionTest.java | 9 +-
.../apache/maven/project/ProjectBuilderTest.java | 8 -
.../settings/PomConstructionWithSettingsTest.java | 15 +-
.../main/java/org/apache/maven/di/Injector.java | 116 ++++++-
.../src/main/java/org/apache/maven/di/Key.java | 56 ++-
.../src/main/java/org/apache/maven/di/Scope.java | 46 ++-
.../org/apache/maven/di/impl/InjectorImpl.java | 28 +-
impl/maven-executor/pom.xml | 6 +
.../org/apache/maven/api/cli/ExecutorRequest.java | 90 +++--
.../executor/embedded/EmbeddedMavenExecutor.java | 168 ++++-----
.../cling/executor/forked/ForkedMavenExecutor.java | 103 ++++--
.../maven/cling/executor/internal/ToolboxTool.java | 20 +-
.../cling/executor/MavenExecutorTestSupport.java | 169 ++++++++-
.../embedded/EmbeddedMavenExecutorTest.java | 4 +-
.../executor/forked/ForkedMavenExecutorTest.java | 4 +-
.../maven/cling/executor/impl/HelperImplTest.java | 59 ++--
.../api/services/model/ModelCacheFactory.java | 40 ---
.../maven/api/services/model/ModelResolver.java | 89 +++--
.../org/apache/maven/impl/AbstractSession.java | 81 ++++-
.../apache/maven/impl/DefaultArtifactResolver.java | 215 ++++++++++--
.../maven/impl/DefaultDependencyResolver.java | 10 +-
.../maven/impl/DefaultLocalRepositoryManager.java | 19 +-
.../maven/impl/DefaultRepositoryFactory.java | 2 +-
.../org/apache/maven/impl/DefaultSourceRoot.java | 332 ++++++++++++++++++
.../maven/impl/DefaultVersionRangeResolver.java | 5 +
.../apache/maven/impl/DefaultVersionResolver.java | 4 +
.../maven/impl/ExtensibleEnumRegistries.java | 2 +-
.../org/apache/maven/impl/InternalSession.java | 28 ++
.../apache/maven/impl/cache/CachingSupplier.java | 79 +++++
.../maven/impl/cache/DefaultRequestCache.java | 167 +++++++++
.../DefaultRequestCacheFactory.java} | 14 +-
.../apache/maven/impl/cache/WeakIdentityMap.java | 239 +++++++++++++
.../org/apache/maven/impl/di/SessionScope.java | 4 +-
.../maven/impl/model/DefaultModelBuilder.java | 279 +++++++++------
.../apache/maven/impl/model/DefaultModelCache.java | 162 ---------
.../impl/model/DefaultModelPathTranslator.java | 52 ++-
.../maven/impl/resolver/DefaultModelResolver.java | 107 +++---
.../maven/impl/cache/WeakIdentityMapTest.java | 196 +++++++++++
.../impl/resolver/DefaultModelResolverTest.java | 6 +-
.../apache/maven/impl/standalone/ApiRunner.java | 16 +-
impl/maven-jline/pom.xml | 10 -
.../org/apache/maven/jline/DefaultPrompter.java | 138 ++++++++
.../java/org/apache/maven/jline/FastTerminal.java | 31 +-
.../maven/jline/JLineMessageBuilderFactory.java | 180 +---------
impl/maven-logging/pom.xml | 10 -
...Test.java => MavenITmng8561SourceRootTest.java} | 12 +-
.../org/apache/maven/it/TestSuiteOrdering.java | 1 +
.../src/test/resources/mng-8561}/.mvn/.gitkeep | 0
.../mvnapi/0.1/mvnapi-0.1.pom => mng-8561/pom.xml} | 29 +-
.../src/test/resources/mng-8561/src/res/test.a | Bin
.../src/test/resources/mng-8561/src/res/test.xml | Bin
.../main/java/org/apache/maven/it/Verifier.java | 3 +-
pom.xml | 47 ++-
163 files changed, 5934 insertions(+), 2103 deletions(-)
delete mode 100644
api/maven-api-cli/src/main/java/org/apache/maven/api/cli/ParserException.java
create mode 100644
api/maven-api-cli/src/main/java/org/apache/maven/api/cli/logging/AccumulatingLogger.java
create mode 100644
api/maven-api-core/src/main/java/org/apache/maven/api/SourceRoot.java
copy
api/maven-api-core/src/main/java/org/apache/maven/api/{ExtensibleEnum.java =>
WorkspaceRepository.java} (59%)
create mode 100644
api/maven-api-core/src/main/java/org/apache/maven/api/cache/BatchRequestException.java
copy
api/maven-api-core/src/main/java/org/apache/maven/api/{services/ArtifactResolverResult.java
=> cache/CacheMetadata.java} (66%)
create mode 100644
api/maven-api-core/src/main/java/org/apache/maven/api/cache/CacheRetention.java
copy
api/maven-api-core/src/main/java/org/apache/maven/api/{services/xml/XmlReaderException.java
=> cache/MavenExecutionException.java} (66%)
create mode 100644
api/maven-api-core/src/main/java/org/apache/maven/api/cache/RequestCache.java
copy
api/maven-api-core/src/main/java/org/apache/maven/api/{services/ArtifactDeployerException.java
=> cache/RequestCacheFactory.java} (63%)
create mode 100644
api/maven-api-core/src/main/java/org/apache/maven/api/cache/RequestResult.java
create mode 100644
api/maven-api-core/src/main/java/org/apache/maven/api/cache/package-info.java
create mode 100644
api/maven-api-di/src/main/java/org/apache/maven/api/di/package-info.java
create mode 100644
compat/maven-compat/src/main/java/org/apache/maven/internal/compat/interactivity/LegacyPlexusInteractivity.java
create mode 100644
compat/maven-model/src/test/java/org/apache/maven/model/pom/PomMemoryAnalyzer.java
copy
api/maven-api-core/src/main/java/org/apache/maven/api/services/BaseRequest.java
=>
impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/logging/Slf4jLogger.java
(50%)
rename
impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/{ProtoLogger.java
=> logging/SystemLogger.java} (59%)
copy {apache-maven/src/assembly/maven =>
impl/maven-cli/src/test/resources/mavenHome}/conf/maven.properties (100%)
delete mode 100644
impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultPrompter.java
delete mode 100644
impl/maven-impl/src/main/java/org/apache/maven/api/services/model/ModelCacheFactory.java
create mode 100644
impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultSourceRoot.java
create mode 100644
impl/maven-impl/src/main/java/org/apache/maven/impl/cache/CachingSupplier.java
create mode 100644
impl/maven-impl/src/main/java/org/apache/maven/impl/cache/DefaultRequestCache.java
rename
impl/maven-impl/src/main/java/org/apache/maven/impl/{model/DefaultModelCacheFactory.java
=> cache/DefaultRequestCacheFactory.java} (74%)
create mode 100644
impl/maven-impl/src/main/java/org/apache/maven/impl/cache/WeakIdentityMap.java
delete mode 100644
impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelCache.java
create mode 100644
impl/maven-impl/src/test/java/org/apache/maven/impl/cache/WeakIdentityMapTest.java
create mode 100644
impl/maven-jline/src/main/java/org/apache/maven/jline/DefaultPrompter.java
copy
its/core-it-suite/src/test/java/org/apache/maven/it/{MavenITmng8477MultithreadedFileActivationTest.java
=> MavenITmng8561SourceRootTest.java} (75%)
copy {impl/maven-core/src/test/projects/project-builder/MNG-6723 =>
its/core-it-suite/src/test/resources/mng-8561}/.mvn/.gitkeep (100%)
copy
its/core-it-suite/src/test/resources/{mng-4895/repo/org/apache/maven/its/mng4895/mvnapi/0.1/mvnapi-0.1.pom
=> mng-8561/pom.xml} (67%)
copy compat/maven-compat/src/test/repository-system/maven-core-2.1.0.jar =>
its/core-it-suite/src/test/resources/mng-8561/src/res/test.a (100%)
copy compat/maven-compat/src/test/repository-system/maven-core-2.1.0.jar =>
its/core-it-suite/src/test/resources/mng-8561/src/res/test.xml (100%)
