97 lines
5.5 KiB
Diff
97 lines
5.5 KiB
Diff
From e580ac067b147c56e4d330915ff52429bc4ab4c3 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch>
|
|
Date: Tue, 3 May 2022 16:38:31 +0200
|
|
Subject: [PATCH 6/7] Revert "port to gradle 4.5.1"
|
|
|
|
This reverts commit be50418df8808e46ee2695da281f95497f5cf179.
|
|
---
|
|
.../xmvn/connector/gradle/GradleResolver.java | 23 +++----------------
|
|
xmvn-parent/pom.xml | 2 +-
|
|
2 files changed, 4 insertions(+), 21 deletions(-)
|
|
|
|
diff --git a/xmvn-connector-gradle/src/main/java/org/fedoraproject/xmvn/connector/gradle/GradleResolver.java b/xmvn-connector-gradle/src/main/java/org/fedoraproject/xmvn/connector/gradle/GradleResolver.java
|
|
index 7f292e00..ac6a7883 100644
|
|
--- a/xmvn-connector-gradle/src/main/java/org/fedoraproject/xmvn/connector/gradle/GradleResolver.java
|
|
+++ b/xmvn-connector-gradle/src/main/java/org/fedoraproject/xmvn/connector/gradle/GradleResolver.java
|
|
@@ -25,7 +25,6 @@ import org.gradle.api.artifacts.ComponentMetadataSupplier;
|
|
import org.gradle.api.artifacts.ModuleVersionIdentifier;
|
|
import org.gradle.api.artifacts.component.ComponentArtifactIdentifier;
|
|
import org.gradle.api.artifacts.component.ModuleComponentIdentifier;
|
|
-import org.gradle.api.internal.ExperimentalFeatures;
|
|
import org.gradle.api.internal.artifacts.ImmutableModuleIdentifierFactory;
|
|
import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.ConfiguredModuleComponentRepository;
|
|
import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.ModuleComponentRepositoryAccess;
|
|
@@ -35,13 +34,10 @@ import org.gradle.api.internal.artifacts.ivyservice.resolveengine.artifact.Resol
|
|
import org.gradle.api.internal.artifacts.repositories.AbstractArtifactRepository;
|
|
import org.gradle.api.internal.artifacts.repositories.ResolutionAwareRepository;
|
|
import org.gradle.api.internal.artifacts.repositories.resolver.MetadataFetchingCost;
|
|
-import org.gradle.api.internal.attributes.ImmutableAttributesFactory;
|
|
import org.gradle.api.internal.component.ArtifactType;
|
|
-import org.gradle.api.internal.model.NamedObjectInstantiator;
|
|
import org.gradle.internal.component.external.model.DefaultModuleComponentArtifactMetadata;
|
|
import org.gradle.internal.component.external.model.DefaultMutableMavenModuleResolveMetadata;
|
|
import org.gradle.internal.component.external.model.FixedComponentArtifacts;
|
|
-import org.gradle.internal.component.external.model.MavenDependencyDescriptor;
|
|
import org.gradle.internal.component.external.model.ModuleComponentArtifactMetadata;
|
|
import org.gradle.internal.component.external.model.ModuleComponentResolveMetadata;
|
|
import org.gradle.internal.component.external.model.ModuleDependencyMetadata;
|
|
@@ -84,27 +80,17 @@ public class GradleResolver
|
|
{
|
|
public GradleResolver( MetaDataParser<MutableMavenModuleResolveMetadata> pomParser,
|
|
ImmutableModuleIdentifierFactory moduleIdentifierFactory,
|
|
- FileResourceRepository fileRepository, ImmutableAttributesFactory immutableAttributesFactory,
|
|
- NamedObjectInstantiator objectInstantiator, ExperimentalFeatures experimentalFeatures )
|
|
+ FileResourceRepository fileRepository )
|
|
{
|
|
this.pomParser = pomParser;
|
|
this.moduleIdentifierFactory = moduleIdentifierFactory;
|
|
this.fileRepository = fileRepository;
|
|
- this.immutableAttributesFactory = immutableAttributesFactory;
|
|
- this.experimentalFeatures = experimentalFeatures;
|
|
- this.objectInstantiator = objectInstantiator;
|
|
}
|
|
|
|
private MetaDataParser<MutableMavenModuleResolveMetadata> pomParser;
|
|
|
|
private ImmutableModuleIdentifierFactory moduleIdentifierFactory;
|
|
|
|
- private ImmutableAttributesFactory immutableAttributesFactory;
|
|
-
|
|
- private ExperimentalFeatures experimentalFeatures;
|
|
-
|
|
- private NamedObjectInstantiator objectInstantiator;
|
|
-
|
|
private FileResourceRepository fileRepository;
|
|
|
|
private final Logger logger = LoggerFactory.getLogger( GradleResolver.class );
|
|
@@ -233,11 +219,8 @@ public class GradleResolver
|
|
logger.debug( "Artifact {} found, returning minimal model", artifact3 );
|
|
ModuleVersionIdentifier mvi =
|
|
moduleIdentifierFactory.moduleWithVersion( id.getGroup(), id.getModule(), id.getVersion() );
|
|
- DefaultMutableMavenModuleResolveMetadata metaData =
|
|
- new DefaultMutableMavenModuleResolveMetadata( mvi, id,
|
|
- Collections.<MavenDependencyDescriptor>emptyList(),
|
|
- immutableAttributesFactory, objectInstantiator,
|
|
- experimentalFeatures );
|
|
+ MutableModuleComponentResolveMetadata metaData =
|
|
+ DefaultMutableMavenModuleResolveMetadata.missing( mvi, id );
|
|
result.resolved( metaData.asImmutable() );
|
|
return;
|
|
}
|
|
diff --git a/xmvn-parent/pom.xml b/xmvn-parent/pom.xml
|
|
index 7ea1d9b1..67b25fbc 100644
|
|
--- a/xmvn-parent/pom.xml
|
|
+++ b/xmvn-parent/pom.xml
|
|
@@ -84,7 +84,7 @@
|
|
<atinjectVersion>1</atinjectVersion>
|
|
<ivyVersion>2.5.0-rc1</ivyVersion>
|
|
<jcommanderVersion>1.72</jcommanderVersion>
|
|
- <gradleVersion>4.5.1</gradleVersion>
|
|
+ <gradleVersion>4.4.1</gradleVersion>
|
|
<groovyVersion>2.4.12</groovyVersion>
|
|
<mavenInvokerVersion>3.0.1</mavenInvokerVersion>
|
|
<mavenResolverVersion>1.3.1</mavenResolverVersion>
|
|
--
|
|
2.36.0
|
|
|