mizdebsk pushed to groovy (master). "Remove build dependency on cobertura"
notifications at fedoraproject.org
notifications at fedoraproject.org
Thu Mar 26 05:33:37 UTC 2015
>From b010b63c404b99340c4c7907220a6a00dc179aa0 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Thu, 26 Mar 2015 06:28:49 +0100
Subject: Remove build dependency on cobertura
diff --git a/0001-Port-to-Servlet-API-3.1.patch b/0001-Port-to-Servlet-API-3.1.patch
index 5bc6bfc..de2e2e0 100644
--- a/0001-Port-to-Servlet-API-3.1.patch
+++ b/0001-Port-to-Servlet-API-3.1.patch
@@ -1,4 +1,4 @@
-From 15f639947336944879dd675a4bcda491912a2dc6 Mon Sep 17 00:00:00 2001
+From ebd078a2f520a949fcc80ac3de6a576047f114a3 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Fri, 31 Oct 2014 12:48:44 +0100
Subject: [PATCH 1/5] Port to Servlet API 3.1
@@ -33,5 +33,5 @@ index b5add85..4857ee0 100644
}
private PrintWriter getResponseWriter() {
--
-1.9.3
+2.1.0
diff --git a/0002-Gradle-local-mode.patch b/0002-Gradle-local-mode.patch
index 3e5e4b6..dd5dfd3 100644
--- a/0002-Gradle-local-mode.patch
+++ b/0002-Gradle-local-mode.patch
@@ -1,7 +1,7 @@
-From 02feb96ca82e2b493db82377447d1c5c60ed5693 Mon Sep 17 00:00:00 2001
+From 6548032f9a87c3662788aa309cd7ee3be84c21e6 Mon Sep 17 00:00:00 2001
From: Michal Srb <msrb at redhat.com>
Date: Thu, 22 Jan 2015 13:35:59 +0100
-Subject: [PATCH 1/3] Gradle local mode
+Subject: [PATCH 2/5] Gradle local mode
---
build.gradle | 12 +++---------
@@ -11,7 +11,7 @@ Subject: [PATCH 1/3] Gradle local mode
4 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/build.gradle b/build.gradle
-index fa2f731..91319b7 100644
+index dabd498..28c93e8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,18 +7,13 @@ if (JavaVersion.current().java6Compatible) {
@@ -34,7 +34,7 @@ index fa2f731..91319b7 100644
}
File javaHome = new File(System.getProperty('java.home'))
-@@ -37,14 +32,12 @@ allprojects {
+@@ -38,14 +33,12 @@ allprojects {
group = 'org.codehaus.groovy'
version = groovyVersion
repositories {
@@ -50,7 +50,7 @@ index fa2f731..91319b7 100644
}
// todo: use the conventional "resources" directory for classpath resources
-@@ -82,6 +75,7 @@ subprojects {
+@@ -83,6 +76,7 @@ subprojects {
}
repositories {
diff --git a/0003-Bintray.patch b/0003-Bintray.patch
index 32378fd..24981fb 100644
--- a/0003-Bintray.patch
+++ b/0003-Bintray.patch
@@ -1,16 +1,16 @@
-From eccbcc11f5877a953c2b5a167f911cef3b7e80fd Mon Sep 17 00:00:00 2001
+From 04afa9d5271338a05ca7d6b168b3ed7dd301292e Mon Sep 17 00:00:00 2001
From: Michal Srb <msrb at redhat.com>
Date: Thu, 22 Jan 2015 13:42:54 +0100
-Subject: [PATCH 2/3] Bintray
+Subject: [PATCH 3/5] Bintray
---
- build.gradle | 12 ------------
+ build.gradle | 17 -----------------
gradle/docs.gradle | 16 +---------------
gradle/upload.gradle | 12 +++---------
- 3 files changed, 4 insertions(+), 36 deletions(-)
+ 3 files changed, 4 insertions(+), 41 deletions(-)
diff --git a/build.gradle b/build.gradle
-index 91319b7..4e2c572 100644
+index 28c93e8..c359151 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,10 +1,6 @@
@@ -24,7 +24,7 @@ index 91319b7..4e2c572 100644
buildscript {
repositories {
xmvn()
-@@ -113,7 +109,6 @@ ext {
+@@ -114,7 +110,6 @@ ext {
luceneVersion = '4.7.2'
openejbVersion = '1.0'
qdoxVersion = '1.12.1'
@@ -32,7 +32,7 @@ index 91319b7..4e2c572 100644
slf4jVersion = '1.7.6'
xmlunitVersion = '1.5'
xstreamVersion = '1.4.7'
-@@ -164,10 +159,6 @@ dependencies {
+@@ -155,15 +150,6 @@ dependencies {
testCompile "com.thoughtworks.qdox:qdox:$qdoxVersion"
tools "com.googlecode.jarjar:jarjar:$jarjarVersion"
@@ -40,10 +40,15 @@ index 91319b7..4e2c572 100644
- exclude(module: 'junit')
- }
- tools "redhill:simian:$simianVersion"
- tools("net.sourceforge.cobertura:cobertura:$coberturaVersion") {
- exclude(module: 'asm')
- exclude(module: 'asm')
-@@ -426,9 +417,6 @@ apply from: 'gradle/groovydoc.gradle'
+- tools("net.sourceforge.cobertura:cobertura:$coberturaVersion") {
+- exclude(module: 'asm')
+- exclude(module: 'asm')
+- exclude(module: 'ant')
+- }
+ tools "org.ow2.asm:asm-all:$asmVersion"
+ tools "com.thoughtworks.qdox:qdox:$qdoxVersion"
+ tools "biz.aQute:bnd:$bndVersion"
+@@ -417,9 +403,6 @@ apply from: 'gradle/groovydoc.gradle'
apply from: 'gradle/docs.gradle'
apply from: 'gradle/assemble.gradle'
apply from: 'gradle/upload.gradle'
diff --git a/0004-Remove-android-support.patch b/0004-Remove-android-support.patch
index 1cb5dfa..a925f88 100644
--- a/0004-Remove-android-support.patch
+++ b/0004-Remove-android-support.patch
@@ -1,7 +1,7 @@
-From b04d037d3f5db5bfe142c81d6f39895727d04161 Mon Sep 17 00:00:00 2001
+From c9bbd9130046cb98930188265ff3c2d777409174 Mon Sep 17 00:00:00 2001
From: Michal Srb <msrb at redhat.com>
Date: Thu, 22 Jan 2015 14:06:56 +0100
-Subject: [PATCH 3/3] Remove android support
+Subject: [PATCH 4/5] Remove android support
---
build.gradle | 1 -
@@ -9,10 +9,10 @@ Subject: [PATCH 3/3] Remove android support
2 files changed, 17 deletions(-)
diff --git a/build.gradle b/build.gradle
-index 4e2c572..ac47c0b 100644
+index c359151..dcd787c 100644
--- a/build.gradle
+++ b/build.gradle
-@@ -129,7 +129,6 @@ dependencies {
+@@ -130,7 +130,6 @@ dependencies {
exclude(group: 'junit', module: 'junit')
exclude(group: 'jmock', module: 'jmock')
}
diff --git a/0005-Port-to-QDox-2.0.patch b/0005-Port-to-QDox-2.0.patch
index 0f02945..8e1f274 100644
--- a/0005-Port-to-QDox-2.0.patch
+++ b/0005-Port-to-QDox-2.0.patch
@@ -1,4 +1,4 @@
-From c2f6a42198aa18ef30dc1427343a79299f7ea35f Mon Sep 17 00:00:00 2001
+From 6b5b2d584a5602f9185f13207740825000326ff2 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Wed, 19 Nov 2014 09:30:33 +0100
Subject: [PATCH 5/5] Port to QDox 2.0
@@ -8,7 +8,7 @@ Subject: [PATCH 5/5] Port to QDox 2.0
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/subprojects/groovy-docgenerator/src/main/groovy/org/codehaus/groovy/tools/DocGenerator.groovy b/subprojects/groovy-docgenerator/src/main/groovy/org/codehaus/groovy/tools/DocGenerator.groovy
-index 9b47c86..e35c464 100644
+index 06c4cdb..c2a2c29 100644
--- a/subprojects/groovy-docgenerator/src/main/groovy/org/codehaus/groovy/tools/DocGenerator.groovy
+++ b/subprojects/groovy-docgenerator/src/main/groovy/org/codehaus/groovy/tools/DocGenerator.groovy
@@ -15,11 +15,10 @@
@@ -61,5 +61,5 @@ index 9b47c86..e35c464 100644
SortedSet<DocMethod> docMethods = new TreeSet<DocMethod>(SORT_KEY_COMPARATOR)
Map<String, List<DocMethod>> inheritedMethods = new LinkedHashMap<String, List<DocMethod>>()
--
-1.9.3
+2.1.0
diff --git a/groovy.spec b/groovy.spec
index 7cf310e..771cc5b 100644
--- a/groovy.spec
+++ b/groovy.spec
@@ -4,7 +4,7 @@
Name: groovy
Version: 2.4.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Dynamic language for the Java Platform
# Some of the files are licensed under BSD and CPL terms, but the CPL has been superceded
@@ -197,6 +197,9 @@ desktop-file-install --dir %{buildroot}%{_datadir}/applications \
%doc LICENSE.txt NOTICE.txt README.adoc
%changelog
+* Thu Mar 26 2015 Mikolaj Izdebski <mizdebsk at redhat.com> - 2.4.1-2
+- Remove build dependency on cobertura
+
* Mon Mar 16 2015 Michal Srb <msrb at redhat.com> - 2.4.1-1
- Update to upstream release 2.4.1
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/groovy.git/commit/?h=master&id=b010b63c404b99340c4c7907220a6a00dc179aa0
More information about the scm-commits
mailing list