mizdebsk pushed to gradle (master). "Port to Ivy 2.4.0"
notifications at fedoraproject.org
notifications at fedoraproject.org
Mon Apr 13 10:41:39 UTC 2015
>From 0f4f33c48982aabf841f4d5ec1c39c17755248ce Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Mon, 13 Apr 2015 12:31:37 +0200
Subject: Port to Ivy 2.4.0
diff --git a/0001-Gradle-local-mode.patch b/0001-Gradle-local-mode.patch
index f56aa64..59635bd 100644
--- a/0001-Gradle-local-mode.patch
+++ b/0001-Gradle-local-mode.patch
@@ -1,7 +1,7 @@
From 966adce0b739e23161d047055f023a16568a97a6 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 01/14] Gradle local mode
+Subject: [PATCH 01/15] Gradle local mode
---
build.gradle | 1 +
diff --git a/0002-Use-Maven-Wagon-2.8.patch b/0002-Use-Maven-Wagon-2.8.patch
index 9bf035b..98fd939 100644
--- a/0002-Use-Maven-Wagon-2.8.patch
+++ b/0002-Use-Maven-Wagon-2.8.patch
@@ -1,7 +1,7 @@
From d2f61b8a0f76bc00b9d380add444e18dc9c943ea 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 02/14] Use Maven Wagon 2.8
+Subject: [PATCH 02/15] Use Maven Wagon 2.8
---
gradle/dependencies.gradle | 6 +++---
diff --git a/0003-Use-bndlib-1.50.0.patch b/0003-Use-bndlib-1.50.0.patch
index 91a0cd6..f9a49d9 100644
--- a/0003-Use-bndlib-1.50.0.patch
+++ b/0003-Use-bndlib-1.50.0.patch
@@ -1,7 +1,7 @@
From f1a001821e07b1f527254d6c90f7c580391dce1c 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 03/14] Use bndlib 1.50.0
+Subject: [PATCH 03/15] Use bndlib 1.50.0
---
subprojects/osgi/osgi.gradle | 2 +-
diff --git a/0004-Port-to-Jetty-9.patch b/0004-Port-to-Jetty-9.patch
index 4fa95a1..da6abc1 100644
--- a/0004-Port-to-Jetty-9.patch
+++ b/0004-Port-to-Jetty-9.patch
@@ -1,7 +1,7 @@
From 5ee89f3a1facbcc9f7b19024979b8e50a92cfdbd 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 04/14] Port to Jetty 9
+Subject: [PATCH 04/15] Port to Jetty 9
Initial attempt
---
diff --git a/0005-Use-jansi-1.11.patch b/0005-Use-jansi-1.11.patch
index 64fdb06..9a465b8 100644
--- a/0005-Use-jansi-1.11.patch
+++ b/0005-Use-jansi-1.11.patch
@@ -1,7 +1,7 @@
From 24464fa20b014d0f36ba45f4ab454f6d96c5d3ec 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 05/14] Use jansi 1.11
+Subject: [PATCH 05/15] Use jansi 1.11
---
subprojects/native/native.gradle | 2 +-
diff --git a/0006-Port-to-Maven-3.3.1-and-Aether-Ant-Tasks.patch b/0006-Port-to-Maven-3.3.1-and-Aether-Ant-Tasks.patch
index a290b52..fc820e5 100644
--- a/0006-Port-to-Maven-3.3.1-and-Aether-Ant-Tasks.patch
+++ b/0006-Port-to-Maven-3.3.1-and-Aether-Ant-Tasks.patch
@@ -1,7 +1,7 @@
From 69b7732e7915bb5a0cdb3c36f5879805c8d6c0e2 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/14] Port to Maven 3.3.1 and Aether Ant Tasks
+Subject: [PATCH 06/15] Port to Maven 3.3.1 and Aether Ant Tasks
---
gradle/dependencies.gradle | 59 +++++++++----
diff --git a/0007-Remove-Class-Path-from-manifest.patch b/0007-Remove-Class-Path-from-manifest.patch
index 299b61b..89f3077 100644
--- a/0007-Remove-Class-Path-from-manifest.patch
+++ b/0007-Remove-Class-Path-from-manifest.patch
@@ -1,7 +1,7 @@
From b72aa17cf0bbaa00183162176fca2b9f8639dde0 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/14] Remove Class-Path from manifest
+Subject: [PATCH 07/15] Remove Class-Path from manifest
---
.../api/internal/classpath/DefaultModuleRegistry.java | 13 +------------
diff --git a/0008-Implement-XMvn-repository-factory-method.patch b/0008-Implement-XMvn-repository-factory-method.patch
index b8cf5bc..9b060a3 100644
--- a/0008-Implement-XMvn-repository-factory-method.patch
+++ b/0008-Implement-XMvn-repository-factory-method.patch
@@ -1,7 +1,7 @@
From 7185d3f0d1617afa0125c85ef44a78e3ab832a08 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/14] Implement XMvn repository factory method
+Subject: [PATCH 08/15] Implement XMvn repository factory method
---
.../internal/artifacts/BaseRepositoryFactory.java | 3 ++
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 3166eb2..dffbcd2 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,7 +1,7 @@
From df7b9f6a8b77168de72f9643f486de79ace9f356 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/14] Use hostname command as fallback way of getting build
+Subject: [PATCH 09/15] Use hostname command as fallback way of getting build
host name
- getHostName() may fail for number of reasons, for example when
diff --git a/0010-Compatibility-with-Guava-18.0.patch b/0010-Compatibility-with-Guava-18.0.patch
index 1284040..f73b49a 100644
--- a/0010-Compatibility-with-Guava-18.0.patch
+++ b/0010-Compatibility-with-Guava-18.0.patch
@@ -1,7 +1,7 @@
From bb7fb45da9e908b1a1a7dac4ec3dd8ad7d430ce6 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/14] Compatibility with Guava 18.0
+Subject: [PATCH 10/15] Compatibility with Guava 18.0
---
.../ApplicationClassesInSystemClassLoaderWorkerFactory.java | 9 ++++-----
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 ecf986f..679f1c0 100644
--- a/0011-Add-build-dependency-on-ASM-5.0.3.patch
+++ b/0011-Add-build-dependency-on-ASM-5.0.3.patch
@@ -1,7 +1,7 @@
From 3fc163543954342052c5d1ae26735b708ee36df9 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/14] Add build dependency on ASM 5.0.3
+Subject: [PATCH 11/15] Add build dependency on ASM 5.0.3
In Fedora ASM was unbundled from Jar Jar, so it needs to be explicitly
added as dependency.
diff --git a/0012-Port-from-Simple-4-to-Jetty-9.patch b/0012-Port-from-Simple-4-to-Jetty-9.patch
index 1875373..e57ee58 100644
--- a/0012-Port-from-Simple-4-to-Jetty-9.patch
+++ b/0012-Port-from-Simple-4-to-Jetty-9.patch
@@ -1,7 +1,7 @@
From 0f832b0bd6306d69882bb955c75f7662ce87184f 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/14] Port from Simple 4 to Jetty 9
+Subject: [PATCH 12/15] Port from Simple 4 to Jetty 9
---
subprojects/javascript/javascript.gradle | 2 +-
diff --git a/0013-Use-unversioned-dependency-JAR-names.patch b/0013-Use-unversioned-dependency-JAR-names.patch
index 7063f76..aea941e 100644
--- a/0013-Use-unversioned-dependency-JAR-names.patch
+++ b/0013-Use-unversioned-dependency-JAR-names.patch
@@ -1,7 +1,7 @@
From 17405a52f097c063bda4e4aef2522524987ac0c4 Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek at redhat.com>
Date: Sat, 7 Feb 2015 15:28:03 +0100
-Subject: [PATCH 13/14] Use unversioned dependency JAR names
+Subject: [PATCH 13/15] Use unversioned dependency JAR names
---
gradle/groovyProject.gradle | 15 +++++++++++++--
diff --git a/0014-Don-t-declare-dependency-on-jarjars.patch b/0014-Don-t-declare-dependency-on-jarjars.patch
index c34144f..071a47e 100644
--- a/0014-Don-t-declare-dependency-on-jarjars.patch
+++ b/0014-Don-t-declare-dependency-on-jarjars.patch
@@ -1,7 +1,7 @@
From c978f91b03a3a916f4638e8a836fb77d7859fc8a Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek at redhat.com>
Date: Sat, 7 Feb 2015 17:43:40 +0100
-Subject: [PATCH 14/14] Don't declare dependency on jarjars
+Subject: [PATCH 14/15] Don't declare dependency on jarjars
---
.../dependency-management.gradle | 21 +--------------------
diff --git a/0015-Port-to-Ivy-2.4.0.patch b/0015-Port-to-Ivy-2.4.0.patch
new file mode 100644
index 0000000..fa67157
--- /dev/null
+++ b/0015-Port-to-Ivy-2.4.0.patch
@@ -0,0 +1,45 @@
+From 6a19e73b02bd4bac0f9a9de4cb4f230b6a8aac10 Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk at redhat.com>
+Date: Mon, 13 Apr 2015 12:27:00 +0200
+Subject: [PATCH 15/15] Port to Ivy 2.4.0
+
+---
+ .../ivyservice/ivyresolve/parser/IvyXmlModuleDescriptorParser.java | 2 +-
+ .../component/external/model/DefaultIvyModuleResolveMetaData.java | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/IvyXmlModuleDescriptorParser.java b/subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/IvyXmlModuleDescriptorParser.java
+index 7778f7b..906129c 100644
+--- a/subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/IvyXmlModuleDescriptorParser.java
++++ b/subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/IvyXmlModuleDescriptorParser.java
+@@ -1141,7 +1141,7 @@ public class IvyXmlModuleDescriptorParser extends AbstractModuleDescriptorParser
+ buffer = null;
+ state = State.INFO;
+ } else if (state == State.EXTRA_INFO) {
+- getMd().getExtraInfo().put(new NamespaceId(uri, localName), buffer == null ? "" : buffer.toString());
++ ((Map)getMd().getExtraInfo()).put(new NamespaceId(uri, localName), buffer == null ? "" : buffer.toString());
+ buffer = null;
+ state = State.INFO;
+ } else if (state == State.DESCRIPTION) {
+diff --git a/subprojects/dependency-management/src/main/java/org/gradle/internal/component/external/model/DefaultIvyModuleResolveMetaData.java b/subprojects/dependency-management/src/main/java/org/gradle/internal/component/external/model/DefaultIvyModuleResolveMetaData.java
+index a9dc49d..cddb2e2 100644
+--- a/subprojects/dependency-management/src/main/java/org/gradle/internal/component/external/model/DefaultIvyModuleResolveMetaData.java
++++ b/subprojects/dependency-management/src/main/java/org/gradle/internal/component/external/model/DefaultIvyModuleResolveMetaData.java
+@@ -29,12 +29,12 @@ public class DefaultIvyModuleResolveMetaData extends AbstractModuleComponentReso
+
+ public DefaultIvyModuleResolveMetaData(ModuleDescriptor moduleDescriptor) {
+ super(moduleDescriptor);
+- this.extraInfo = moduleDescriptor.getExtraInfo();
++ this.extraInfo = (Map)moduleDescriptor.getExtraInfo();
+ }
+
+ public DefaultIvyModuleResolveMetaData(ModuleVersionIdentifier identifier, ModuleDescriptor moduleDescriptor, ModuleComponentIdentifier componentIdentifier) {
+ super(identifier, moduleDescriptor, componentIdentifier);
+- this.extraInfo = moduleDescriptor.getExtraInfo();
++ this.extraInfo = (Map)moduleDescriptor.getExtraInfo();
+ }
+
+ public DefaultIvyModuleResolveMetaData(DependencyMetaData dependencyMetaData) {
+--
+2.1.0
+
diff --git a/gradle.spec b/gradle.spec
index 4bb107f..41312e0 100644
--- a/gradle.spec
+++ b/gradle.spec
@@ -13,7 +13,7 @@
Name: gradle
Version: 2.3
-Release: 2%{?dist}
+Release: 3%{?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.
@@ -57,6 +57,7 @@ Patch10: 0011-Add-build-dependency-on-ASM-5.0.3.patch
Patch11: 0012-Port-from-Simple-4-to-Jetty-9.patch
Patch12: 0013-Use-unversioned-dependency-JAR-names.patch
Patch13: 0014-Don-t-declare-dependency-on-jarjars.patch
+Patch14: 0015-Port-to-Ivy-2.4.0.patch
# Dependencies on build system used. In bootstrap mode we use plain
# groovyc to compile Gradle, otherwise Gradle is built with itself.
@@ -413,6 +414,7 @@ legacy automation challenges.
%patch11 -p1
%patch12 -p1
%patch13 -p1
+%patch14 -p1
# Remove bundled wrapper JAR
rm -rf gradle/wrapper/
@@ -491,7 +493,8 @@ for f in gradle-base-services gradle-base-services-groovy gradle-cli gradle-core
plugins/gradle-maven plugins/gradle-osgi plugins/gradle-platform-base \
plugins/gradle-platform-jvm plugins/gradle-platform-native plugins/gradle-plugin-development \
plugins/gradle-plugins plugins/gradle-plugin-use plugins/gradle-publish plugins/gradle-reporting \
- plugins/gradle-resources-http plugins/gradle-scala plugins/gradle-signing plugins/gradle-sonar
+ plugins/gradle-resources-http plugins/gradle-scala plugins/gradle-signing plugins/gradle-sonar \
+ plugins/gradle-language-scala plugins/gradle-platform-play
do
mod=$(basename $f)
pom=$repo/org/gradle/$mod/%{version}*/$mod-%{version}*.pom
@@ -546,6 +549,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%doc LICENSE NOTICE
%changelog
+* Mon Apr 13 2015 Mikolaj Izdebski <mizdebsk at redhat.com> - 2.3-3
+- Port to Ivy 2.4.0
+
* Wed Mar 25 2015 Mikolaj Izdebski <mizdebsk at redhat.com> - 2.3-2
- Port to Maven 3.3.1
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/gradle.git/commit/?h=master&id=0f4f33c48982aabf841f4d5ec1c39c17755248ce
More information about the scm-commits
mailing list