mirror of
https://github.com/apache/maven.git
synced 2025-02-22 10:00:09 +00:00
[MNG-8107] Update Resolver 2.0.0-alpha-11 (#1488)
Update to Resolver 2.0.0-alpha-11 and restore renamed class. --- https://issues.apache.org/jira/browse/MNG-8107
This commit is contained in:
parent
6fddd97513
commit
8fbbbc978c
@ -111,6 +111,7 @@
|
|||||||
import org.eclipse.aether.named.providers.LocalSemaphoreNamedLockFactory;
|
import org.eclipse.aether.named.providers.LocalSemaphoreNamedLockFactory;
|
||||||
import org.eclipse.aether.named.providers.NoopNamedLockFactory;
|
import org.eclipse.aether.named.providers.NoopNamedLockFactory;
|
||||||
import org.eclipse.aether.spi.artifact.ArtifactPredicateFactory;
|
import org.eclipse.aether.spi.artifact.ArtifactPredicateFactory;
|
||||||
|
import org.eclipse.aether.spi.artifact.decorator.ArtifactDecoratorFactory;
|
||||||
import org.eclipse.aether.spi.artifact.generator.ArtifactGeneratorFactory;
|
import org.eclipse.aether.spi.artifact.generator.ArtifactGeneratorFactory;
|
||||||
import org.eclipse.aether.spi.checksums.ProvidedChecksumsSource;
|
import org.eclipse.aether.spi.checksums.ProvidedChecksumsSource;
|
||||||
import org.eclipse.aether.spi.checksums.TrustedChecksumsSource;
|
import org.eclipse.aether.spi.checksums.TrustedChecksumsSource;
|
||||||
@ -155,8 +156,6 @@
|
|||||||
* Important: Given the instance of supplier memorizes the supplier {@link RepositorySystem} instance it supplies,
|
* Important: Given the instance of supplier memorizes the supplier {@link RepositorySystem} instance it supplies,
|
||||||
* their lifecycle is shared as well: once supplied repository system is shut-down, this instance becomes closed as
|
* their lifecycle is shared as well: once supplied repository system is shut-down, this instance becomes closed as
|
||||||
* well. Any subsequent {@code getXXX} method invocation attempt will fail with {@link IllegalStateException}.
|
* well. Any subsequent {@code getXXX} method invocation attempt will fail with {@link IllegalStateException}.
|
||||||
*
|
|
||||||
* @since 1.9.15
|
|
||||||
*/
|
*/
|
||||||
public class RepositorySystemSupplier implements Supplier<RepositorySystem> {
|
public class RepositorySystemSupplier implements Supplier<RepositorySystem> {
|
||||||
private final AtomicBoolean closed = new AtomicBoolean(false);
|
private final AtomicBoolean closed = new AtomicBoolean(false);
|
||||||
@ -640,7 +639,9 @@ public final Map<String, TransporterFactory> getTransporterFactories() {
|
|||||||
protected Map<String, TransporterFactory> createTransporterFactories() {
|
protected Map<String, TransporterFactory> createTransporterFactories() {
|
||||||
HashMap<String, TransporterFactory> result = new HashMap<>();
|
HashMap<String, TransporterFactory> result = new HashMap<>();
|
||||||
result.put(FileTransporterFactory.NAME, new FileTransporterFactory());
|
result.put(FileTransporterFactory.NAME, new FileTransporterFactory());
|
||||||
result.put(ApacheTransporterFactory.NAME, new ApacheTransporterFactory(getChecksumExtractor()));
|
result.put(
|
||||||
|
ApacheTransporterFactory.NAME,
|
||||||
|
new ApacheTransporterFactory(getChecksumExtractor(), getPathProcessor()));
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -767,10 +768,18 @@ protected Map<String, DependencyCollectorDelegate> createDependencyCollectorDele
|
|||||||
HashMap<String, DependencyCollectorDelegate> result = new HashMap<>();
|
HashMap<String, DependencyCollectorDelegate> result = new HashMap<>();
|
||||||
result.put(
|
result.put(
|
||||||
DfDependencyCollector.NAME,
|
DfDependencyCollector.NAME,
|
||||||
new DfDependencyCollector(remoteRepositoryManager, artifactDescriptorReader, versionRangeResolver));
|
new DfDependencyCollector(
|
||||||
|
remoteRepositoryManager,
|
||||||
|
artifactDescriptorReader,
|
||||||
|
versionRangeResolver,
|
||||||
|
getArtifactDecoratorFactories()));
|
||||||
result.put(
|
result.put(
|
||||||
BfDependencyCollector.NAME,
|
BfDependencyCollector.NAME,
|
||||||
new BfDependencyCollector(remoteRepositoryManager, artifactDescriptorReader, versionRangeResolver));
|
new BfDependencyCollector(
|
||||||
|
remoteRepositoryManager,
|
||||||
|
artifactDescriptorReader,
|
||||||
|
versionRangeResolver,
|
||||||
|
getArtifactDecoratorFactories()));
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -882,6 +891,21 @@ protected Map<String, ArtifactGeneratorFactory> createArtifactGeneratorFactories
|
|||||||
return new HashMap<>();
|
return new HashMap<>();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private Map<String, ArtifactDecoratorFactory> artifactDecoratorFactories;
|
||||||
|
|
||||||
|
public final Map<String, ArtifactDecoratorFactory> getArtifactDecoratorFactories() {
|
||||||
|
checkClosed();
|
||||||
|
if (artifactDecoratorFactories == null) {
|
||||||
|
artifactDecoratorFactories = createArtifactDecoratorFactories();
|
||||||
|
}
|
||||||
|
return artifactDecoratorFactories;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected Map<String, ArtifactDecoratorFactory> createArtifactDecoratorFactories() {
|
||||||
|
// by default none, this is extension point
|
||||||
|
return new HashMap<>();
|
||||||
|
}
|
||||||
|
|
||||||
// Maven provided
|
// Maven provided
|
||||||
|
|
||||||
private Map<String, MetadataGeneratorFactory> metadataGeneratorFactories;
|
private Map<String, MetadataGeneratorFactory> metadataGeneratorFactories;
|
||||||
@ -1036,7 +1060,8 @@ protected RepositorySystem createRepositorySystem() {
|
|||||||
getLocalRepositoryProvider(),
|
getLocalRepositoryProvider(),
|
||||||
getSyncContextFactory(),
|
getSyncContextFactory(),
|
||||||
getRemoteRepositoryManager(),
|
getRemoteRepositoryManager(),
|
||||||
getRepositorySystemLifecycle());
|
getRepositorySystemLifecycle(),
|
||||||
|
getArtifactDecoratorFactories());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
File diff suppressed because it is too large
Load Diff
17
pom.xml
17
pom.xml
@ -182,7 +182,7 @@ under the License.
|
|||||||
<plexusInterpolationVersion>1.26</plexusInterpolationVersion>
|
<plexusInterpolationVersion>1.26</plexusInterpolationVersion>
|
||||||
<plexusTestingVersion>1.0.0</plexusTestingVersion>
|
<plexusTestingVersion>1.0.0</plexusTestingVersion>
|
||||||
<plexusXmlVersion>4.0.1</plexusXmlVersion>
|
<plexusXmlVersion>4.0.1</plexusXmlVersion>
|
||||||
<resolverVersion>2.0.0-alpha-10</resolverVersion>
|
<resolverVersion>2.0.0-alpha-11</resolverVersion>
|
||||||
<securityDispatcherVersion>2.0</securityDispatcherVersion>
|
<securityDispatcherVersion>2.0</securityDispatcherVersion>
|
||||||
<sisuVersion>0.9.0.M2</sisuVersion>
|
<sisuVersion>0.9.0.M2</sisuVersion>
|
||||||
<slf4jVersion>2.0.11</slf4jVersion>
|
<slf4jVersion>2.0.11</slf4jVersion>
|
||||||
@ -651,6 +651,21 @@ under the License.
|
|||||||
</dependencies>
|
</dependencies>
|
||||||
-->
|
-->
|
||||||
|
|
||||||
|
<repositories>
|
||||||
|
<repository>
|
||||||
|
<releases>
|
||||||
|
<enabled>true</enabled>
|
||||||
|
<updatePolicy>never</updatePolicy>
|
||||||
|
<checksumPolicy>fail</checksumPolicy>
|
||||||
|
</releases>
|
||||||
|
<snapshots>
|
||||||
|
<enabled>false</enabled>
|
||||||
|
</snapshots>
|
||||||
|
<id>maven-2102</id>
|
||||||
|
<url>https://repository.apache.org/content/repositories/maven-2102/</url>
|
||||||
|
</repository>
|
||||||
|
</repositories>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
<pluginManagement>
|
<pluginManagement>
|
||||||
<plugins>
|
<plugins>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user