This is an automated email from the ASF dual-hosted git repository. gnodet pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/maven.git
from c0ac7a688a Revert "[MNG-8563] Provide a weak cache for objects from the main model (#2087)" new c8e2af96a3 [MNG-8540] Add equals/hashCode to requests new 8e4041759b [MNG-8540] Add global caching in the session new 3fde7657f5 [MNG-8540] Add a real caching API and add missing infos to ArtifactResolverResult new cb17c164d4 [MNG-8540] Change ProjectBuilder to use the Maven 4 API to resolve the main POM artifact new 6aa86c55b4 [MNG-8540] Replace ModelCache with the new cache API The 5 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: ...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 ++ .../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 +++ .../artifact/repository/ArtifactRepository.java | 6 + .../repository/LegacyRepositorySystemTest.java | 45 +++- .../extensions/BootstrapCoreExtensionManager.java | 13 +- .../repository/MavenArtifactRepository.java | 27 +++ .../apache/maven/bridge/MavenRepositorySystem.java | 24 ++ .../maven/internal/impl/DefaultProjectBuilder.java | 7 + .../apache/maven/internal/impl/DefaultSession.java | 1 + .../maven/project/DefaultProjectBuilder.java | 67 ++++-- .../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 +- .../maven/cling/executor/impl/HelperImplTest.java | 2 + .../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 +- .../maven/impl/DefaultVersionRangeResolver.java | 5 + .../apache/maven/impl/DefaultVersionResolver.java | 4 + .../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 +++++++++++++++++++ .../maven/impl/model/DefaultModelBuilder.java | 258 ++++++++++++--------- .../apache/maven/impl/model/DefaultModelCache.java | 162 ------------- .../maven/impl/resolver/DefaultModelResolver.java | 107 +++++---- .../maven/impl/cache/WeakIdentityMapTest.java | 196 ++++++++++++++++ .../impl/resolver/DefaultModelResolverTest.java | 6 +- .../apache/maven/impl/standalone/ApiRunner.java | 16 +- 64 files changed, 2282 insertions(+), 619 deletions(-) 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 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/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