[gradle] Reorganize Maven patches
Mikolaj Izdebski
mizdebsk at fedoraproject.org
Tue Nov 18 20:12:33 UTC 2014
commit 4576817ba1e271e8123d556df38004deb08eb050
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Fri Nov 7 15:28:22 2014 +0100
Reorganize Maven patches
0001-Gradle-local-mode.patch | 2 +-
...in.patch => 0002-Disable-analytics-plugin.patch | 4 +-
0002-Port-to-Maven-3.2.3.patch | 63 -------
...gon-2.7.patch => 0003-Use-Maven-Wagon-2.7.patch | 8 +-
...ib-1.50.0.patch => 0004-Use-bndlib-1.50.0.patch | 4 +-
...-to-Jetty-9.patch => 0005-Port-to-Jetty-9.patch | 8 +-
...e-jansi-1.11.patch => 0006-Use-jansi-1.11.patch | 4 +-
...-Port-to-Maven-3.1.1-and-Aether-Ant-Tasks.patch | 177 ++++++++++++++++----
gradle.spec | 17 +-
9 files changed, 165 insertions(+), 122 deletions(-)
---
diff --git a/0001-Gradle-local-mode.patch b/0001-Gradle-local-mode.patch
index bf66df8..fe0cada 100644
--- a/0001-Gradle-local-mode.patch
+++ b/0001-Gradle-local-mode.patch
@@ -1,7 +1,7 @@
From 57d2d8cad002f7188f612b3e959fe7915421afa2 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Wed, 15 Oct 2014 14:23:30 +0200
-Subject: [PATCH 1/8] Gradle local mode
+Subject: [PATCH 1/7] Gradle local mode
---
build.gradle | 1 +
diff --git a/0003-Disable-analytics-plugin.patch b/0002-Disable-analytics-plugin.patch
similarity index 83%
rename from 0003-Disable-analytics-plugin.patch
rename to 0002-Disable-analytics-plugin.patch
index c22bdc8..bf28ec7 100644
--- a/0003-Disable-analytics-plugin.patch
+++ b/0002-Disable-analytics-plugin.patch
@@ -1,7 +1,7 @@
-From 33f1597cd1e5014e03f05991c160d85efecb4c82 Mon Sep 17 00:00:00 2001
+From e7efd13bb48281e61f96fbd2a53581a874186473 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Fri, 17 Oct 2014 15:56:17 +0200
-Subject: [PATCH 3/8] Disable analytics plugin
+Subject: [PATCH 2/7] Disable analytics plugin
---
build.gradle | 1 -
diff --git a/0004-Use-Maven-Wagon-2.7.patch b/0003-Use-Maven-Wagon-2.7.patch
similarity index 82%
rename from 0004-Use-Maven-Wagon-2.7.patch
rename to 0003-Use-Maven-Wagon-2.7.patch
index 202dbc9..0b6aa23 100644
--- a/0004-Use-Maven-Wagon-2.7.patch
+++ b/0003-Use-Maven-Wagon-2.7.patch
@@ -1,14 +1,14 @@
-From c10367d4fc01dbf531e264269d4f3608c684ad87 Mon Sep 17 00:00:00 2001
+From 84c32e559bdb454d0bbbfa9416f0afd14100a383 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Mon, 20 Oct 2014 15:08:43 +0200
-Subject: [PATCH 4/8] Use Maven Wagon 2.7
+Subject: [PATCH 3/7] Use Maven Wagon 2.7
---
gradle/dependencies.gradle | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
-index d211dce..4af2e05 100755
+index 5e1d7b4..2d28eb7 100755
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -123,9 +123,9 @@ libraries.maven3 = dependencies.module("org.apache.maven:maven-core:3.0.4") {
@@ -23,7 +23,7 @@ index d211dce..4af2e05 100755
+ dependency 'org.apache.maven.wagon:wagon-http-shared:2.7 at jar'
//eather:
- dependency "org.eclipse.aether:aether-api:1.0.0.v20140518 at jar"
+ dependency "org.sonatype.aether:aether-api:1.13.1 at jar"
--
1.9.3
diff --git a/0005-Use-bndlib-1.50.0.patch b/0004-Use-bndlib-1.50.0.patch
similarity index 96%
rename from 0005-Use-bndlib-1.50.0.patch
rename to 0004-Use-bndlib-1.50.0.patch
index fd22ed2..8e212cc 100644
--- a/0005-Use-bndlib-1.50.0.patch
+++ b/0004-Use-bndlib-1.50.0.patch
@@ -1,7 +1,7 @@
-From 8daf1fdaee73903862cd9da032233030f54838b2 Mon Sep 17 00:00:00 2001
+From a41772476c1f7c1ad01b3e8053040b0f73565d2c Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Wed, 22 Oct 2014 12:35:24 +0200
-Subject: [PATCH 5/8] Use bndlib 1.50.0
+Subject: [PATCH 4/7] Use bndlib 1.50.0
---
subprojects/osgi/osgi.gradle | 2 +-
diff --git a/0006-Port-to-Jetty-9.patch b/0005-Port-to-Jetty-9.patch
similarity index 99%
rename from 0006-Port-to-Jetty-9.patch
rename to 0005-Port-to-Jetty-9.patch
index d2fb2b3..9b91a10 100644
--- a/0006-Port-to-Jetty-9.patch
+++ b/0005-Port-to-Jetty-9.patch
@@ -1,7 +1,7 @@
-From 4d6a67418194f90326371fb0f7e2540db354f13f Mon Sep 17 00:00:00 2001
+From 27514b7a8ecebc2094148008671485e39662504c Mon Sep 17 00:00:00 2001
From: Michal Srb <msrb at redhat.com>
Date: Fri, 31 Oct 2014 09:01:47 +0100
-Subject: [PATCH 6/8] Port to Jetty 9
+Subject: [PATCH 5/7] Port to Jetty 9
Initial attempt
---
@@ -18,7 +18,7 @@ Initial attempt
10 files changed, 89 insertions(+), 145 deletions(-)
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
-index 4af2e05..b26d217 100755
+index 2d28eb7..cc62877 100755
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -55,12 +55,12 @@ libraries.logback_classic = dependencies.module('ch.qos.logback:logback-classic:
@@ -37,7 +37,7 @@ index 4af2e05..b26d217 100755
dependency libraries.jetty_util
dependency libraries.servlet_api
}
-@@ -164,4 +164,4 @@ allprojects {
+@@ -163,4 +163,4 @@ allprojects {
}
}
}
diff --git a/0008-Use-jansi-1.11.patch b/0006-Use-jansi-1.11.patch
similarity index 87%
rename from 0008-Use-jansi-1.11.patch
rename to 0006-Use-jansi-1.11.patch
index 356773d..a4d8097 100644
--- a/0008-Use-jansi-1.11.patch
+++ b/0006-Use-jansi-1.11.patch
@@ -1,7 +1,7 @@
-From cf88e2f861cc651066f42d4fae4767c32d4fa916 Mon Sep 17 00:00:00 2001
+From 6770fcde85d471a5eaafedc74f7c0ba3e9ff499f Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Fri, 7 Nov 2014 15:02:11 +0100
-Subject: [PATCH 8/8] Use jansi 1.11
+Subject: [PATCH 6/7] Use jansi 1.11
---
subprojects/native/native.gradle | 2 +-
diff --git a/0007-Port-to-Aether-Ant-Tasks.patch b/0007-Port-to-Maven-3.1.1-and-Aether-Ant-Tasks.patch
similarity index 87%
rename from 0007-Port-to-Aether-Ant-Tasks.patch
rename to 0007-Port-to-Maven-3.1.1-and-Aether-Ant-Tasks.patch
index daeef4a..36aa0c2 100644
--- a/0007-Port-to-Aether-Ant-Tasks.patch
+++ b/0007-Port-to-Maven-3.1.1-and-Aether-Ant-Tasks.patch
@@ -1,42 +1,44 @@
-From 6ea2b0ea2523efeb74346b72c74e9cbb8e96f79c Mon Sep 17 00:00:00 2001
+From 7325528c5fe5c81cc08894d22d9201b8b54aea5d 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 7/8] Port to Aether Ant Tasks
+Subject: [PATCH 7/7] Port to Maven 3.1.1 and Aether Ant Tasks
---
- gradle/dependencies.gradle | 24 ++++++++++-
- .../internal/artifacts/PlexusLoggerAdapter.java | 8 ++++
+ gradle/dependencies.gradle | 57 +++++++++++++++-------
+ .../internal/maven/MavenProjectsCreator.java | 4 +-
+ subprojects/core-impl/core-impl.gradle | 7 +--
+ .../internal/artifacts/PlexusLoggerAdapter.java | 8 +++
.../groovy/org/gradle/api/plugins/MavenPlugin.java | 2 +-
.../maven/internal/CustomModelBuilder.java | 3 +-
.../maven/internal/DefaultArtifactPom.java | 3 +-
- .../maven/internal/DefaultMavenPom.java | 13 +++---
+ .../maven/internal/DefaultMavenPom.java | 13 ++---
.../publication/maven/internal/ModelFactory.java | 3 +-
- .../maven/internal/ant/AbstractMavenResolver.java | 35 +++++++++-------
- .../maven/internal/ant/BaseMavenDeployer.java | 32 +++++++-------
- .../maven/internal/ant/BaseMavenInstaller.java | 12 +++---
- .../maven/internal/ant/CustomDeployTask.java | 45 --------------------
- .../ant/CustomInstallDeployTaskSupport.java | 27 ------------
- .../maven/internal/ant/CustomInstallTask.java | 38 -----------------
+ .../maven/internal/ant/AbstractMavenResolver.java | 35 +++++++------
+ .../maven/internal/ant/BaseMavenDeployer.java | 36 ++++++++------
+ .../maven/internal/ant/BaseMavenInstaller.java | 12 ++---
+ .../maven/internal/ant/CustomDeployTask.java | 45 -----------------
+ .../ant/CustomInstallDeployTaskSupport.java | 27 ----------
+ .../maven/internal/ant/CustomInstallTask.java | 38 ---------------
.../internal/ant/EmptyMavenSettingsSupplier.java | 9 ++--
- .../maven/internal/ant/LoggingHelper.java | 43 -------------------
- .../maven/internal/ant/MavenSettingsSupplier.java | 5 ++-
+ .../maven/internal/ant/LoggingHelper.java | 43 ----------------
+ .../maven/internal/ant/MavenSettingsSupplier.java | 5 +-
.../ant/MaybeUserMavenSettingsSupplier.java | 9 ++--
.../ProjectDependencyArtifactIdExtractorHack.java | 3 +-
- .../maven/internal/ant/RepositoryBuilder.java | 12 +++---
- .../maven/internal/ant/RepositoryFactory.java | 16 +++----
- .../AbstractAntTaskBackedMavenPublisher.java | 45 ++++++--------------
- .../AntTaskBackedMavenLocalPublisher.java | 41 +++++-------------
- .../publisher/AntTaskBackedMavenPublisher.java | 49 ++++++++--------------
+ .../maven/internal/ant/RepositoryBuilder.java | 12 ++---
+ .../maven/internal/ant/RepositoryFactory.java | 16 +++---
+ .../AbstractAntTaskBackedMavenPublisher.java | 49 +++++--------------
+ .../AntTaskBackedMavenLocalPublisher.java | 41 +++++-----------
+ .../publisher/AntTaskBackedMavenPublisher.java | 49 +++++++------------
.../publisher/MavenRemoteRepositoryFactory.java | 6 +--
- .../internal/tasks/MavenPomFileGenerator.java | 8 ++--
- 25 files changed, 167 insertions(+), 324 deletions(-)
+ .../internal/tasks/MavenPomFileGenerator.java | 8 +--
+ 27 files changed, 192 insertions(+), 351 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
delete mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/ant/LoggingHelper.java
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
-index b26d217..15d035e 100755
+index cc62877..a588b90 100755
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -72,8 +72,28 @@ libraries.commons_httpclient = dependencies.module('org.apache.httpcomponents:ht
@@ -54,13 +56,13 @@ index b26d217..15d035e 100755
+ dependency "org.eclipse.aether:aether-transport-classpath:1.0.0.v20140518 at jar"
+ dependency "org.eclipse.aether:aether-transport-file:1.0.0.v20140518 at jar"
+ dependency "org.eclipse.aether:aether-transport-http:1.0.0.v20140518 at jar"
-+ dependency "org.apache.maven:maven-aether-provider:3.0.4 at jar"
-+ dependency "org.apache.maven:maven-model:3.0.4 at jar"
-+ dependency "org.apache.maven:maven-model-builder:3.0.4 at jar"
-+ dependency "org.apache.maven:maven-repository-metadata:3.0.4 at jar"
++ dependency "org.apache.maven:maven-aether-provider:3.1.1 at jar"
++ dependency "org.apache.maven:maven-model:3.1.1 at jar"
++ dependency "org.apache.maven:maven-model-builder:3.1.1 at jar"
++ dependency "org.apache.maven:maven-repository-metadata:3.1.1 at jar"
+ dependency "org.codehaus.plexus:plexus-utils:2.1 at jar"
-+ dependency "org.apache.maven:maven-settings-builder:3.0.4 at jar"
-+ dependency "org.apache.maven:maven-settings:3.0.4 at jar"
++ dependency "org.apache.maven:maven-settings-builder:3.1.1 at jar"
++ dependency "org.apache.maven:maven-settings:3.1.1 at jar"
+ dependency "org.sonatype.plexus:plexus-sec-dispatcher:1.3 at jar"
+ dependency "org.sonatype.plexus:plexus-cipher:1.7 at jar"
+ dependency "org.codehaus.plexus:plexus-interpolation:1.16 at jar"
@@ -70,6 +72,94 @@ index b26d217..15d035e 100755
}
libraries += [
+@@ -96,9 +116,9 @@ libraries += [
+ jsoup:'org.jsoup:jsoup:1.6.3'
+ ]
+
+-libraries.maven3 = dependencies.module("org.apache.maven:maven-core:3.0.4") {
+- dependency "org.apache.maven:maven-settings:3.0.4 at jar"
+- dependency "org.apache.maven:maven-settings-builder:3.0.4 at jar"
++libraries.maven3 = dependencies.module("org.apache.maven:maven-core:3.1.1") {
++ dependency "org.apache.maven:maven-settings:3.1.1 at jar"
++ dependency "org.apache.maven:maven-settings-builder:3.1.1 at jar"
+
+ //plexus:
+ dependency "org.codehaus.plexus:plexus-utils:2.0.6 at jar"
+@@ -112,27 +132,28 @@ libraries.maven3 = dependencies.module("org.apache.maven:maven-core:3.0.4") {
+ dependency "org.sonatype.plexus:plexus-sec-dispatcher:1.3 at jar"
+
+ //core:
+- dependency "org.apache.maven:maven-core:3.0.4 at jar"
+- dependency "org.apache.maven:maven-model-builder:3.0.4 at jar"
+- dependency "org.apache.maven:maven-model:3.0.4 at jar"
++ dependency "org.apache.maven:maven-core:3.1.1 at jar"
++ dependency "org.apache.maven:maven-model-builder:3.1.1 at jar"
++ dependency "org.apache.maven:maven-model:3.1.1 at jar"
+
+ //somewhat core:
+- dependency "org.apache.maven:maven-artifact:3.0.4 at jar"
+- dependency "org.apache.maven:maven-compat:3.0.4 at jar"
+- dependency "org.apache.maven:maven-repository-metadata:3.0.4 at jar"
+- dependency "org.apache.maven:maven-plugin-api:3.0.4 at jar"
+- dependency "org.apache.maven:maven-aether-provider:3.0.4 at jar"
++ dependency "org.apache.maven:maven-artifact:3.1.1 at jar"
++ dependency "org.apache.maven:maven-compat:3.1.1 at jar"
++ dependency "org.apache.maven:maven-repository-metadata:3.1.1 at jar"
++ dependency "org.apache.maven:maven-plugin-api:3.1.1 at jar"
++ dependency "org.apache.maven:maven-aether-provider:3.1.1 at jar"
+
+ dependency 'org.apache.maven.wagon:wagon-http:2.7 at jar'
+ dependency 'org.apache.maven.wagon:wagon-provider-api:2.7 at jar'
+ dependency 'org.apache.maven.wagon:wagon-http-shared:2.7 at jar'
+
+ //eather:
+- dependency "org.sonatype.aether:aether-api:1.13.1 at jar"
+- dependency "org.sonatype.aether:aether-impl:1.13.1 at jar"
+- dependency "org.sonatype.aether:aether-spi:1.13.1 at jar"
+- dependency "org.sonatype.aether:aether-util:1.13.1 at jar"
+- dependency 'org.sonatype.aether:aether-connector-wagon:1.13.1 at jar'
++ dependency "org.eclipse.aether:aether-api:1.0.0.v20140518 at jar"
++ dependency "org.eclipse.aether:aether-impl:1.0.0.v20140518 at jar"
++ dependency "org.eclipse.aether:aether-spi:1.0.0.v20140518 at jar"
++ dependency "org.eclipse.aether:aether-util:1.0.0.v20140518 at jar"
++ dependency 'org.eclipse.aether:aether-connector-basic:1.0.0.v20140518 at jar'
++ dependency 'org.eclipse.aether:aether-transport-wagon:1.0.0.v20140518 at jar'
+ }
+
+ libraries.spock = [
+diff --git a/subprojects/build-init/src/main/groovy/org/gradle/buildinit/plugins/internal/maven/MavenProjectsCreator.java b/subprojects/build-init/src/main/groovy/org/gradle/buildinit/plugins/internal/maven/MavenProjectsCreator.java
+index ddd4924..fe9914d 100644
+--- a/subprojects/build-init/src/main/groovy/org/gradle/buildinit/plugins/internal/maven/MavenProjectsCreator.java
++++ b/subprojects/build-init/src/main/groovy/org/gradle/buildinit/plugins/internal/maven/MavenProjectsCreator.java
+@@ -29,8 +29,8 @@ import org.gradle.mvn3.org.codehaus.plexus.PlexusContainerException;
+ import org.gradle.mvn3.org.codehaus.plexus.classworlds.ClassWorld;
+ import org.gradle.mvn3.org.codehaus.plexus.component.repository.exception.ComponentLookupException;
+ import org.gradle.mvn3.org.codehaus.plexus.configuration.PlexusConfigurationException;
+-import org.gradle.mvn3.org.sonatype.aether.RepositorySystemSession;
+-import org.gradle.mvn3.org.sonatype.aether.util.DefaultRepositorySystemSession;
++import org.gradle.mvn3.org.eclipse.aether.RepositorySystemSession;
++import org.gradle.mvn3.org.eclipse.aether.DefaultRepositorySystemSession;
+ import org.gradle.util.CollectionUtils;
+
+ import java.io.File;
+diff --git a/subprojects/core-impl/core-impl.gradle b/subprojects/core-impl/core-impl.gradle
+index ee4a931..548b7ef 100644
+--- a/subprojects/core-impl/core-impl.gradle
++++ b/subprojects/core-impl/core-impl.gradle
+@@ -41,9 +41,10 @@ task jarJarMaven3(type: JarJar) {
+ //unfortunately, all those need to be jarjarred.
+ // Even if some library (like aether) is not included in maven-ant-tasks it has
+ // META-INF/plexus/components.xml that to jarjarred components.
+- rule('org.apache.maven.**', 'org.gradle.mvn3.org.apache.maven. at 1')
+- rule('org.codehaus.**', 'org.gradle.mvn3.org.codehaus. at 1')
+- rule('org.sonatype.**', 'org.gradle.mvn3.org.sonatype. at 1')
++ //rule('org.apache.maven.**', 'org.gradle.mvn3.org.apache.maven. at 1')
++ //rule('org.codehaus.**', 'org.gradle.mvn3.org.codehaus. at 1')
++ //rule('org.sonatype.**', 'org.gradle.mvn3.org.sonatype. at 1')
++ //rule('org.eclipse.aether.**', 'org.gradle.mvn3.org.eclipse.aether. at 1')
+
+ avoidConflictingPlexusComponents(it)
+ }
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/PlexusLoggerAdapter.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/PlexusLoggerAdapter.java
index e02ab3b..5f213bd 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/PlexusLoggerAdapter.java
@@ -298,10 +388,10 @@ index 8daf017..98b4ccf 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..2f2c530 100644
+index 35b0e95..4fcbc4a 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
-@@ -15,12 +15,12 @@
+@@ -15,12 +15,10 @@
*/
package org.gradle.api.publication.maven.internal.ant;
@@ -309,15 +399,15 @@ index 35b0e95..2f2c530 100644
-import org.apache.maven.artifact.ant.InstallDeployTaskSupport;
-import org.apache.maven.artifact.ant.RemoteRepository;
import org.apache.tools.ant.Project;
- import org.codehaus.plexus.PlexusContainer;
- import org.codehaus.plexus.PlexusContainerException;
+-import org.codehaus.plexus.PlexusContainer;
+-import org.codehaus.plexus.PlexusContainerException;
+import org.eclipse.aether.internal.ant.tasks.AbstractDistTask;
+import org.eclipse.aether.internal.ant.tasks.Deploy;
+import org.eclipse.aether.internal.ant.types.RemoteRepository;
import org.gradle.api.artifacts.Configuration;
import org.gradle.api.artifacts.maven.MavenDeployer;
import org.gradle.api.artifacts.maven.PomFilterContainer;
-@@ -48,37 +48,41 @@ public class BaseMavenDeployer extends AbstractMavenResolver implements MavenDep
+@@ -48,37 +46,43 @@ public class BaseMavenDeployer extends AbstractMavenResolver implements MavenDep
super(pomFilterContainer, artifactPomContainer, loggingManager);
}
@@ -357,9 +447,11 @@ index 35b0e95..2f2c530 100644
+ */
}
++ /*
private List<File> getJars() {
return configuration != null ? new ArrayList<File>(configuration.resolve()) : protocolProviderJars;
}
++ */
- private void addRemoteRepositories(DeployTask deployTask) {
- deployTask.addRemoteRepository(remoteRepository);
@@ -752,10 +844,10 @@ index e3517aa..2089be6 100644
}
}
diff --git a/subprojects/maven/src/main/groovy/org/gradle/api/publish/maven/internal/publisher/AbstractAntTaskBackedMavenPublisher.java b/subprojects/maven/src/main/groovy/org/gradle/api/publish/maven/internal/publisher/AbstractAntTaskBackedMavenPublisher.java
-index 6930e63..01c12ba 100644
+index 6930e63..23cfeb0 100644
--- a/subprojects/maven/src/main/groovy/org/gradle/api/publish/maven/internal/publisher/AbstractAntTaskBackedMavenPublisher.java
+++ b/subprojects/maven/src/main/groovy/org/gradle/api/publish/maven/internal/publisher/AbstractAntTaskBackedMavenPublisher.java
-@@ -16,9 +16,9 @@
+@@ -16,28 +16,24 @@
package org.gradle.api.publish.maven.internal.publisher;
@@ -768,16 +860,27 @@ index 6930e63..01c12ba 100644
import org.gradle.api.artifacts.repositories.MavenArtifactRepository;
import org.gradle.api.logging.LogLevel;
import org.gradle.api.publication.maven.internal.ant.EmptyMavenSettingsSupplier;
-@@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory;
+ import org.gradle.api.publication.maven.internal.ant.MavenSettingsSupplier;
+-import org.gradle.api.publish.maven.InvalidMavenPublicationException;
+ import org.gradle.api.publish.maven.MavenArtifact;
+-import org.gradle.api.specs.Spec;
+ import org.gradle.internal.Factory;
+ import org.gradle.logging.LoggingManagerInternal;
+ import org.gradle.util.AntUtil;
+-import org.gradle.util.CollectionUtils;
+ import org.gradle.util.GUtil;
+ import org.slf4j.Logger;
+ import org.slf4j.LoggerFactory;
+
import java.io.File;
- import java.util.Set;
+-import java.util.Set;
-abstract public class AbstractAntTaskBackedMavenPublisher<T extends InstallDeployTaskSupport> implements MavenPublisher {
+abstract public class AbstractAntTaskBackedMavenPublisher<T extends AbstractDistTask> implements MavenPublisher {
private final Factory<LoggingManagerInternal> loggingManagerFactory;
private static Logger logger = LoggerFactory.getLogger(AbstractAntTaskBackedMavenPublisher.class);
-@@ -67,43 +67,24 @@ abstract public class AbstractAntTaskBackedMavenPublisher<T extends InstallDeplo
+@@ -67,43 +63,24 @@ abstract public class AbstractAntTaskBackedMavenPublisher<T extends InstallDeplo
abstract protected T createDeployTask();
diff --git a/gradle.spec b/gradle.spec
index 34a0372..7b7960b 100644
--- a/gradle.spec
+++ b/gradle.spec
@@ -4,7 +4,7 @@
Name: gradle
Version: 2.1
-Release: 0.27%{?dist}
+Release: 0.28%{?dist}
Summary: Build automation tool
# Some examples and integration tests are under GNU LGPL and Boost
# Software License, but are not used to create binary package.
@@ -18,12 +18,12 @@ Source2: gradle-font-metadata.xml
Source3: gradle-jquery-metadata.xml
Patch0: 0001-Gradle-local-mode.patch
-Patch1: 0002-Port-to-Maven-3.2.3.patch
-Patch2: 0003-Disable-analytics-plugin.patch
-Patch3: 0004-Use-Maven-Wagon-2.7.patch
-Patch4: 0005-Use-bndlib-1.50.0.patch
-Patch5: 0006-Port-to-Jetty-9.patch
-Patch6: 0007-Port-to-Aether-Ant-Tasks.patch
+Patch1: 0002-Disable-analytics-plugin.patch
+Patch2: 0003-Use-Maven-Wagon-2.7.patch
+Patch3: 0004-Use-bndlib-1.50.0.patch
+Patch4: 0005-Port-to-Jetty-9.patch
+Patch5: 0006-Use-jansi-1.11.patch
+Patch6: 0007-Port-to-Maven-3.1.1-and-Aether-Ant-Tasks.patch
BuildRequires: gradle-local >= 2.1-0.7
@@ -217,6 +217,9 @@ jar cfm %{buildroot}%{_datadir}/%{name}/lib/plugins/gradle-core-impl-2.1*.jar ME
%doc LICENSE NOTICE
%changelog
+* Fri Nov 7 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 2.1-0.28
+- Reorganize Maven patches
+
* Fri Nov 7 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 2.1-0.27
- Port to Aether Ant Tasks
- Use jansi 1.11
More information about the scm-commits
mailing list