This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository groovy.
commit 68f0e5f15c9f9c31a5d2e1c00ed9d6bd7cf63de1
Author: Emmanuel Bourg <ebo...@apache.org>
Date: Sat Mar 10 23:24:40 2018 +0100
Refreshed the patches
---
debian/patches/01_fix_doc_gradle.diff | 4 +--
debian/patches/03_ignore_reporting_tools.diff | 2 +-
debian/patches/04_ignore_bintray.diff | 2 +-
.../06_ignore_documentation_publication.diff | 2 +-
debian/patches/08_GROOVY-8163.patch | 2 +-
debian/patches/09_ignore_buildscan.patch | 36 ++++++++++++----------
6 files changed, 25 insertions(+), 23 deletions(-)
diff --git a/debian/patches/01_fix_doc_gradle.diff
b/debian/patches/01_fix_doc_gradle.diff
index 36b9622..4a5fef0 100644
--- a/debian/patches/01_fix_doc_gradle.diff
+++ b/debian/patches/01_fix_doc_gradle.diff
@@ -109,7 +109,7 @@ Forwarded: not-needed
+}
--- a/build.gradle
+++ b/build.gradle
-@@ -59,7 +59,6 @@
+@@ -65,7 +65,6 @@
apply from: 'gradle/filter.gradle'
apply from: 'gradle/indy.gradle'
apply from: 'gradle/publish.gradle'
@@ -117,7 +117,7 @@ Forwarded: not-needed
File javaHome = new File(System.getProperty('java.home'))
logger.lifecycle "Using Java from $javaHome (version
${System.getProperty('java.version')})"
-@@ -84,9 +83,6 @@
+@@ -90,9 +89,6 @@
apply plugin: 'groovy'
apply from: "${rootProject.projectDir}/gradle/indy.gradle"
diff --git a/debian/patches/03_ignore_reporting_tools.diff
b/debian/patches/03_ignore_reporting_tools.diff
index 064ce68..50b7e66 100644
--- a/debian/patches/03_ignore_reporting_tools.diff
+++ b/debian/patches/03_ignore_reporting_tools.diff
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebo...@apache.org>
Forwarded: not-needed
--- a/build.gradle
+++ b/build.gradle
-@@ -470,7 +470,6 @@
+@@ -472,7 +472,6 @@
apply from: 'gradle/idea.gradle'
apply from: 'gradle/eclipse.gradle'
apply from: 'gradle/codehaus.gradle'
diff --git a/debian/patches/04_ignore_bintray.diff
b/debian/patches/04_ignore_bintray.diff
index 8eb348e..a334c2b 100644
--- a/debian/patches/04_ignore_bintray.diff
+++ b/debian/patches/04_ignore_bintray.diff
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebo...@apache.org>
Forwarded: not-needed
--- a/build.gradle
+++ b/build.gradle
-@@ -58,7 +58,6 @@
+@@ -64,7 +64,6 @@
apply from: 'gradle/filter.gradle'
apply from: 'gradle/indy.gradle'
diff --git a/debian/patches/06_ignore_documentation_publication.diff
b/debian/patches/06_ignore_documentation_publication.diff
index 9a85643..c179f4a 100644
--- a/debian/patches/06_ignore_documentation_publication.diff
+++ b/debian/patches/06_ignore_documentation_publication.diff
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebo...@apache.org>
Forwarded: not-needed
--- a/build.gradle
+++ b/build.gradle
-@@ -468,7 +468,6 @@
+@@ -470,7 +470,6 @@
apply from: 'gradle/upload.gradle'
apply from: 'gradle/idea.gradle'
apply from: 'gradle/eclipse.gradle'
diff --git a/debian/patches/08_GROOVY-8163.patch
b/debian/patches/08_GROOVY-8163.patch
index 088ec5f..4817104 100644
--- a/debian/patches/08_GROOVY-8163.patch
+++ b/debian/patches/08_GROOVY-8163.patch
@@ -26,7 +26,7 @@ Subject: [PATCH] GROOVY-8163: Prevent CachedField and
CachedMethod from
import org.codehaus.groovy.reflection.CachedClass;
import org.codehaus.groovy.reflection.CachedConstructor;
import org.codehaus.groovy.reflection.CachedField;
-@@ -1809,6 +1810,9 @@
+@@ -1804,6 +1805,9 @@
} catch (IllegalArgumentException e) {
// can't access the field directly but there may be a getter
mp = null;
diff --git a/debian/patches/09_ignore_buildscan.patch
b/debian/patches/09_ignore_buildscan.patch
index 7cb5656..6fa6986 100644
--- a/debian/patches/09_ignore_buildscan.patch
+++ b/debian/patches/09_ignore_buildscan.patch
@@ -3,24 +3,26 @@ Author: Emmanuel Bourg <ebo...@apache.org>
Forwarded: not-needed
--- a/build.gradle
+++ b/build.gradle
-@@ -42,20 +42,6 @@
- }
- }
-
--plugins {
-- id 'com.gradle.build-scan' version '1.6'
-- id 'me.champeau.buildscan-recipes' version '0.1.7'
+@@ -39,22 +39,6 @@
+ //classpath 'me.champeau.gradle:japicmp-gradle-plugin:0.1.1'
+ //classpath 'nl.javadude.gradle.plugins:license-gradle-plugin:0.11.0'
+ classpath "gradle.plugin.org.nosphere.apache:creadur-rat-gradle:0.1.3"
+- classpath 'com.gradle:build-scan-plugin:1.6'
+- classpath 'me.champeau.gradle:buildscan-recipes-plugin:0.1.7'
+- }
-}
-
--buildScan {
-- licenseAgreementUrl = 'https://gradle.com/terms-of-service'
-- licenseAgree = 'yes'
-- publishAlways()
-- recipe 'git-commit', baseUrl: 'https://github.com/apache/groovy/tree'
-- recipe 'teamcity', baseUrl: 'https://ci.groovy-lang.org', guest: 'true'
-- recipes 'git-status', 'teamcity', 'travis-ci'
--}
+-if (JavaVersion.current().java7Compatible) {
+- apply plugin: 'com.gradle.build-scan'
+- apply plugin: 'me.champeau.buildscan-recipes'
-
- apply from: 'gradle/filter.gradle'
- apply from: 'gradle/indy.gradle'
+- buildScan {
+- licenseAgreementUrl = 'https://gradle.com/terms-of-service'
+- licenseAgree = 'yes'
+- publishAlways()
+- recipe 'git-commit', baseUrl: 'https://github.com/apache/groovy/tree'
+- recipe 'teamcity', baseUrl: 'https://ci.groovy-lang.org', guest:
'true'
+- recipes 'git-status', 'teamcity', 'travis-ci'
+ }
+ }
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/groovy.git
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
