diff --git a/0001-Port-to-Gradle-4.4.1.patch b/0001-Port-to-Gradle-4.4.1.patch new file mode 100644 index 0000000..9f248fd --- /dev/null +++ b/0001-Port-to-Gradle-4.4.1.patch @@ -0,0 +1,46 @@ +From 19874894ff867819344b27fb5b718a0084f65b41 Mon Sep 17 00:00:00 2001 +From: maminjie +Date: Mon, 14 Sep 2020 12:01:02 +0800 +Subject: [PATCH] Port to Gradle 4.4.1 + +--- + .../xmvn/connector/gradle/GradleResolver.java | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +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 9e1a247..ba4a879 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 +@@ -35,6 +35,7 @@ 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.component.ArtifactType; ++import org.gradle.internal.component.external.model.ModuleDependencyMetadata; + import org.gradle.internal.component.external.model.DefaultModuleComponentArtifactMetadata; + import org.gradle.internal.component.external.model.DefaultMutableMavenModuleResolveMetadata; + import org.gradle.internal.component.external.model.FixedComponentArtifacts; +@@ -156,7 +157,7 @@ public class GradleResolver + } + + @Override +- public void listModuleVersions( DependencyMetadata arg0, BuildableModuleVersionListingResolveResult arg1 ) ++ public void listModuleVersions(ModuleDependencyMetadata dependency, BuildableModuleVersionListingResolveResult result) + { + logger.debug( "listModuleVersions() called, but it is NOT IMPLEMENTED" ); + } +@@ -288,6 +289,12 @@ public class GradleResolver + DefaultExternalResourceMetaData metadata = new DefaultExternalResourceMetaData( pomPath.toUri(), 0, 0 ); + return fileRepository.resource( pomPath.toFile(), pomPath.toUri(), metadata ); + } ++ ++ @Override ++ public LocallyAvailableExternalResource getMetaDataArtifact(ModuleDependencyMetadata dependencyMetadata, ArtifactType artifactType) ++ { ++ throw new UnsupportedOperationException(); ++ } + + @Override + public ComponentMetadataSupplier createMetadataSupplier() +-- +2.23.0 + diff --git a/xmvn.spec b/xmvn.spec index 6a64cd0..06e7e23 100644 --- a/xmvn.spec +++ b/xmvn.spec @@ -2,7 +2,7 @@ Name: xmvn Version: 3.0.0 -Release: 22 +Release: 23 Summary: Local Extensions for Apache Maven License: ASL 2.0 URL: https://fedora-java.github.io/xmvn/ @@ -16,6 +16,7 @@ Patch0003: 0001-Support-setting-Xdoclint-none-in-m-javadoc-p-3.0.0.patch Patch0004: 0001-Fix-configuration-of-aliased-plugins.patch Patch0005: 0001-Don-t-use-JAXB-for-converting-bytes-to-hex-string.patch Patch0006: 0001-Use-apache-commons-compress-for-manifest-injection-a.patch +Patch0007: 0001-Port-to-Gradle-4.4.1.patch BuildRequires: maven >= 3.5.0 maven-local apache-commons-compress beust-jcommander cglib BuildRequires: maven-dependency-plugin maven-plugin-build-helper maven-assembly-plugin @@ -248,5 +249,8 @@ cp -P ${maven_home}/bin/m2.conf %{buildroot}%{_datadir}/xmvn/bin/ %doc NOTICE %changelog +* Mon Sep 14 2020 maminjie 3.0.0-23 +- Port to Gradle 4.4.1 + * Fri Nov 22 2019 sunguoshuai - 3.0.0-22 - Package init.