[gradle] Fix handling of unique snapshot versions
Mikolaj Izdebski
mizdebsk at fedoraproject.org
Tue Feb 3 06:35:29 UTC 2015
commit 1d50dede4cc7f84f8ac970fdb233cfb98c110f20
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Tue Feb 3 07:35:09 2015 +0100
Fix handling of unique snapshot versions
...-Port-to-Maven-3.1.1-and-Aether-Ant-Tasks.patch | 57 +++++++++++++-------
0007-Remove-Class-Path-from-manifest.patch | 2 +-
...-Implement-XMvn-repository-factory-method.patch | 2 +-
...e-command-as-fallback-way-of-getting-buil.patch | 2 +-
0010-Compatibility-with-Guava-18.0.patch | 2 +-
0011-Add-build-dependency-on-ASM-5.0.3.patch | 2 +-
0012-Port-from-Simple-4-to-Jetty-9.patch | 2 +-
7 files changed, 43 insertions(+), 26 deletions(-)
---
diff --git a/0006-Port-to-Maven-3.1.1-and-Aether-Ant-Tasks.patch b/0006-Port-to-Maven-3.1.1-and-Aether-Ant-Tasks.patch
index 4e9ea14..311e072 100644
--- a/0006-Port-to-Maven-3.1.1-and-Aether-Ant-Tasks.patch
+++ b/0006-Port-to-Maven-3.1.1-and-Aether-Ant-Tasks.patch
@@ -1,10 +1,10 @@
-From a47e49742b75a60fc4f0537d52c5a9e50f11fffd Mon Sep 17 00:00:00 2001
+From ad6585d1945f8be5cb970c3ccd512e97188dd3b1 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Fri, 31 Oct 2014 09:23:37 +0100
Subject: [PATCH 06/12] Port to Maven 3.1.1 and Aether Ant Tasks
---
- gradle/dependencies.gradle | 57 ++++++++++-----
+ gradle/dependencies.gradle | 57 +++++++++-----
.../plugins/internal/maven/Maven2Gradle.groovy | 2 +-
.../internal/maven/MavenProjectXmlWriter.java | 4 +-
.../internal/maven/MavenProjectsCreator.java | 24 +++---
@@ -14,26 +14,26 @@ Subject: [PATCH 06/12] Port to Maven 3.1.1 and Aether Ant Tasks
.../mvnsettings/DefaultMavenSettingsProvider.java | 4 +-
.../mvnsettings/MavenSettingsProvider.java | 4 +-
.../maven/internal/DefaultMavenPom.java | 6 +-
- .../maven/internal/ant/AbstractMavenResolver.java | 63 ++++++++++------
- .../maven/internal/ant/BaseMavenDeployer.java | 85 +++++++++++++++++-----
+ .../maven/internal/ant/AbstractMavenResolver.java | 63 +++++++++------
+ .../maven/internal/ant/BaseMavenDeployer.java | 91 ++++++++++++++++------
.../maven/internal/ant/BaseMavenInstaller.java | 12 +--
- .../maven/internal/ant/CustomDeployTask.java | 45 ------------
+ .../maven/internal/ant/CustomDeployTask.java | 45 -----------
.../ant/CustomInstallDeployTaskSupport.java | 27 -------
- .../maven/internal/ant/CustomInstallTask.java | 38 ----------
+ .../maven/internal/ant/CustomInstallTask.java | 38 ---------
.../internal/ant/EmptyMavenSettingsSupplier.java | 9 ++-
- .../maven/internal/ant/GradleWagonProvider.java | 38 ++++++++++
- .../maven/internal/ant/LoggingHelper.java | 43 -----------
+ .../maven/internal/ant/GradleWagonProvider.java | 38 +++++++++
+ .../maven/internal/ant/LoggingHelper.java | 43 ----------
.../maven/internal/ant/MavenSettingsSupplier.java | 4 +-
.../ant/MaybeUserMavenSettingsSupplier.java | 11 ++-
.../ProjectDependencyArtifactIdExtractorHack.java | 3 +-
.../maven/internal/ant/RepositoryBuilder.java | 24 ++++--
.../maven/internal/ant/RepositoryFactory.java | 19 +++--
- .../AbstractAntTaskBackedMavenPublisher.java | 58 +++++----------
- .../AntTaskBackedMavenLocalPublisher.java | 41 +++--------
- .../publisher/AntTaskBackedMavenPublisher.java | 49 +++++--------
+ .../AbstractAntTaskBackedMavenPublisher.java | 58 +++++---------
+ .../AntTaskBackedMavenLocalPublisher.java | 41 +++-------
+ .../publisher/AntTaskBackedMavenPublisher.java | 47 ++++-------
.../publisher/MavenRemoteRepositoryFactory.java | 6 +-
.../publisher/ValidatingMavenPublisher.java | 6 +-
- 29 files changed, 319 insertions(+), 382 deletions(-)
+ 29 files changed, 319 insertions(+), 386 deletions(-)
delete mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/ant/CustomDeployTask.java
delete mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/ant/CustomInstallDeployTaskSupport.java
delete mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/ant/CustomInstallTask.java
@@ -411,7 +411,7 @@ index 854202f..a912403 100644
}
diff --git a/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/ant/BaseMavenDeployer.java b/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/ant/BaseMavenDeployer.java
-index 35b0e95..fe7adf9 100644
+index 35b0e95..6b6b330 100644
--- a/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/ant/BaseMavenDeployer.java
+++ b/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/ant/BaseMavenDeployer.java
@@ -1,5 +1,5 @@
@@ -458,7 +458,13 @@ index 35b0e95..fe7adf9 100644
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-@@ -48,37 +62,68 @@ public class BaseMavenDeployer extends AbstractMavenResolver implements MavenDep
+@@ -42,43 +56,70 @@ public class BaseMavenDeployer extends AbstractMavenResolver implements MavenDep
+ // todo remove this property once configuration can handle normal file system dependencies
+ private List<File> protocolProviderJars = new ArrayList<File>();
+
+- private boolean uniqueVersion = true;
+-
+ public BaseMavenDeployer(PomFilterContainer pomFilterContainer, ArtifactPomContainer artifactPomContainer, LoggingManagerInternal loggingManager) {
super(pomFilterContainer, artifactPomContainer, loggingManager);
}
@@ -470,8 +476,6 @@ index 35b0e95..fe7adf9 100644
deployTask.setProject(project);
- deployTask.setUniqueVersion(isUniqueVersion());
- addProtocolProvider(deployTask);
-+ // XXX
-+ //deployTask.setUniqueVersion(isUniqueVersion());
addRemoteRepositories(deployTask);
return deployTask;
}
@@ -543,6 +547,21 @@ index 35b0e95..fe7adf9 100644
}
public RemoteRepository getRepository() {
+@@ -110,10 +151,12 @@ public class BaseMavenDeployer extends AbstractMavenResolver implements MavenDep
+ }
+
+ public boolean isUniqueVersion() {
+- return uniqueVersion;
++ return true;
+ }
+
+ public void setUniqueVersion(boolean uniqueVersion) {
+- this.uniqueVersion = uniqueVersion;
++ if (!uniqueVersion) {
++ throw new IllegalArgumentException("Non-unique snapshot versions are not supported by this version of Gradle");
++ }
+ }
+ }
diff --git a/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/ant/BaseMavenInstaller.java b/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/ant/BaseMavenInstaller.java
index a901694..19541f0 100644
--- a/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/ant/BaseMavenInstaller.java
@@ -1161,10 +1180,10 @@ index 2be6c47..645444a 100644
}
}
diff --git a/subprojects/maven/src/main/groovy/org/gradle/api/publish/maven/internal/publisher/AntTaskBackedMavenPublisher.java b/subprojects/maven/src/main/groovy/org/gradle/api/publish/maven/internal/publisher/AntTaskBackedMavenPublisher.java
-index a22dbf4..6637bf7 100644
+index a22dbf4..4d5492d 100644
--- a/subprojects/maven/src/main/groovy/org/gradle/api/publish/maven/internal/publisher/AntTaskBackedMavenPublisher.java
+++ b/subprojects/maven/src/main/groovy/org/gradle/api/publish/maven/internal/publisher/AntTaskBackedMavenPublisher.java
-@@ -16,53 +16,38 @@
+@@ -16,53 +16,36 @@
package org.gradle.api.publish.maven.internal.publisher;
@@ -1204,8 +1223,6 @@ index a22dbf4..6637bf7 100644
+ localRepository.setDir(temporaryDirFactory.create());
+ AntRepoSys repoSys = AntRepoSys.getInstance(task.getProject());
+ repoSys.setLocalRepository(localRepository);
-+ //XXX
-+ //deployTask.setUniqueVersion(true);
+ return task;
}
diff --git a/0007-Remove-Class-Path-from-manifest.patch b/0007-Remove-Class-Path-from-manifest.patch
index 25c631f..29ac1b8 100644
--- a/0007-Remove-Class-Path-from-manifest.patch
+++ b/0007-Remove-Class-Path-from-manifest.patch
@@ -1,4 +1,4 @@
-From 209700d5f2b82ffbd8781675c1f7d4e8c5ac9329 Mon Sep 17 00:00:00 2001
+From 00effce67c73eb9b48d48fe9a2ec0c3efeabb777 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Sun, 9 Nov 2014 17:52:30 +0100
Subject: [PATCH 07/12] Remove Class-Path from manifest
diff --git a/0008-Implement-XMvn-repository-factory-method.patch b/0008-Implement-XMvn-repository-factory-method.patch
index eeb838e..a203ba0 100644
--- a/0008-Implement-XMvn-repository-factory-method.patch
+++ b/0008-Implement-XMvn-repository-factory-method.patch
@@ -1,4 +1,4 @@
-From 632891dce9851d0217acf4823df88aaf380b85a6 Mon Sep 17 00:00:00 2001
+From ce564e5fbaf4ff11b62446243ccab3bbee821369 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Sun, 9 Nov 2014 21:37:37 +0100
Subject: [PATCH 08/12] Implement XMvn repository factory method
diff --git a/0009-Use-hostname-command-as-fallback-way-of-getting-buil.patch b/0009-Use-hostname-command-as-fallback-way-of-getting-buil.patch
index 78d8d85..a99f785 100644
--- a/0009-Use-hostname-command-as-fallback-way-of-getting-buil.patch
+++ b/0009-Use-hostname-command-as-fallback-way-of-getting-buil.patch
@@ -1,4 +1,4 @@
-From ffc1eabcab7f797d41f4c48706416096ed796a9b Mon Sep 17 00:00:00 2001
+From c07532c7f45111d93a991d2efdcfdb038dd253c8 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Thu, 20 Nov 2014 11:04:23 +0100
Subject: [PATCH 09/12] Use hostname command as fallback way of getting build
diff --git a/0010-Compatibility-with-Guava-18.0.patch b/0010-Compatibility-with-Guava-18.0.patch
index 0309a88..ec7d35b 100644
--- a/0010-Compatibility-with-Guava-18.0.patch
+++ b/0010-Compatibility-with-Guava-18.0.patch
@@ -1,4 +1,4 @@
-From 37fa5d7777ed9e9322ae6ded8a07cc3538841c22 Mon Sep 17 00:00:00 2001
+From 1570c89e77095d0e6f8ca6312c212fe140d9d14b Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Tue, 20 Jan 2015 11:59:22 +0100
Subject: [PATCH 10/12] Compatibility with Guava 18.0
diff --git a/0011-Add-build-dependency-on-ASM-5.0.3.patch b/0011-Add-build-dependency-on-ASM-5.0.3.patch
index b865852..c469dbd 100644
--- a/0011-Add-build-dependency-on-ASM-5.0.3.patch
+++ b/0011-Add-build-dependency-on-ASM-5.0.3.patch
@@ -1,4 +1,4 @@
-From f6d9e1dcebfec9c69020ba937b8e615c4250564d Mon Sep 17 00:00:00 2001
+From b695238b4e28681ccaa8874810a4d4c8899afa4f Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Tue, 20 Jan 2015 12:30:09 +0100
Subject: [PATCH 11/12] Add build dependency on ASM 5.0.3
diff --git a/0012-Port-from-Simple-4-to-Jetty-9.patch b/0012-Port-from-Simple-4-to-Jetty-9.patch
index f08941f..5eacd28 100644
--- a/0012-Port-from-Simple-4-to-Jetty-9.patch
+++ b/0012-Port-from-Simple-4-to-Jetty-9.patch
@@ -1,4 +1,4 @@
-From 2002e1c16a3676a860b8709766cd0fa1d221ac02 Mon Sep 17 00:00:00 2001
+From f78b7afe3d621a318b39f03417a12a2451d33321 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Fri, 30 Jan 2015 13:16:40 +0100
Subject: [PATCH 12/12] Port from Simple 4 to Jetty 9
More information about the scm-commits
mailing list