[gradle] Add build dependency on ASM 5.0.3
Mikolaj Izdebski
mizdebsk at fedoraproject.org
Tue Jan 20 11:42:39 UTC 2015
commit 3ea93449e6b4abe015b6c1aa0b45889af1186594
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Tue Jan 20 12:31:38 2015 +0100
Add build dependency on ASM 5.0.3
0011-Add-build-dependency-on-ASM-5.0.3.patch | 26 ++++++++++++++++++++++++++
gradle.spec | 3 +++
2 files changed, 29 insertions(+), 0 deletions(-)
---
diff --git a/0011-Add-build-dependency-on-ASM-5.0.3.patch b/0011-Add-build-dependency-on-ASM-5.0.3.patch
new file mode 100644
index 0000000..a402b4e
--- /dev/null
+++ b/0011-Add-build-dependency-on-ASM-5.0.3.patch
@@ -0,0 +1,26 @@
+From a14fea8f06806c47bb9a54e18f6e2737f5f2c455 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/11] 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.
+---
+ buildSrc/build.gradle | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
+index 138b851..83a9006 100644
+--- a/buildSrc/build.gradle
++++ b/buildSrc/build.gradle
+@@ -41,6 +41,7 @@ dependencies {
+ //it's built from sources at: https://github.com/szczepiq/jarjar
+ //if code changes are needed in this library we need to figure out a better way of distributing them.
+ compile "org.gradle.jarjar:jarjar:1.2.1"
++ compile "org.ow2.asm:asm-all:5.0.3"
+ }
+ apply from: '../gradle/compile.gradle'
+ apply from: '../gradle/codeQuality.gradle'
+--
+2.1.0
+
diff --git a/gradle.spec b/gradle.spec
index d50b9eb..3f012f3 100644
--- a/gradle.spec
+++ b/gradle.spec
@@ -28,6 +28,7 @@ Patch7: 0008-Implement-XMvn-repository-factory-method.patch
Patch8: 0009-Use-hostname-command-as-fallback-way-of-getting-buil.patch
# TODO: forward upstream
Patch9: 0010-Compatibility-with-Guava-18.0.patch
+Patch10: 0011-Add-build-dependency-on-ASM-5.0.3.patch
# Generic build dependencies
BuildRequires: gradle-local >= 2.2
@@ -392,6 +393,7 @@ to resolve artifacts from system artifact repository.
%patch7 -p1
%patch8 -p1
%patch9 -p1
+%patch10 -p1
# Remove bundled wrapper JAR
rm -rf gradle/wrapper/
@@ -512,6 +514,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
* Tue Jan 20 2015 Mikolaj Izdebski <mizdebsk at redhat.com> - 2.2-5
- Port to Guava 18.0
+- Add build dependency on ASM 5.0.3
* Mon Nov 24 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 2.2-4
- Add support for custom Wagon providers
More information about the scm-commits
mailing list