This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository groovy.
commit ee3a617fe4fa2c1bfb7c32bf07beaeb8415f616c
Author: Emmanuel Bourg <ebo...@apache.org>
Date: Sat Mar 10 23:59:03 2018 +0100
Refreshed the patches
---
debian/changelog | 2 +-
debian/patches/01_fix_doc_gradle.diff | 6 +++---
debian/patches/03_ignore_reporting_tools.diff | 2 +-
debian/patches/04_ignore_bintray.diff | 2 +-
debian/patches/06_ignore_documentation_publication.diff | 2 +-
debian/patches/09_ignore_buildscan.patch | 8 +++++---
debian/patches/transition_Gradle_3.1.patch | 6 +++---
7 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index bae3e6b..ed4c69b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-groovy (2.4.12-1) UNRELEASED; urgency=medium
+groovy (2.4.13-1) UNRELEASED; urgency=medium
* New upstream release
- Refreshed the patches
diff --git a/debian/patches/01_fix_doc_gradle.diff
b/debian/patches/01_fix_doc_gradle.diff
index c4d27f1..a5149a3 100644
--- a/debian/patches/01_fix_doc_gradle.diff
+++ b/debian/patches/01_fix_doc_gradle.diff
@@ -28,7 +28,7 @@ Forwarded: not-needed
def javadocSpec = {
maxMemory = javaDoc_mx
project.configure(options) {
-@@ -125,73 +111,10 @@
+@@ -126,73 +112,10 @@
task docGDK {
// ext.extraDocGDKclasses = []
@@ -104,7 +104,7 @@ Forwarded: not-needed
if (JavaVersion.current().isJava7Compatible()) {
--- a/build.gradle
+++ b/build.gradle
-@@ -65,7 +65,6 @@
+@@ -67,7 +67,6 @@
apply from: 'gradle/filter.gradle'
apply from: 'gradle/indy.gradle'
apply from: 'gradle/publish.gradle'
@@ -112,7 +112,7 @@ Forwarded: not-needed
File javaHome = new File(System.getProperty('java.home'))
logger.lifecycle "Using Java from $javaHome (version
${System.getProperty('java.version')})"
-@@ -90,9 +89,6 @@
+@@ -92,9 +91,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 50b7e66..aeba0e4 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
-@@ -472,7 +472,6 @@
+@@ -466,7 +466,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 a334c2b..193bc65 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
-@@ -64,7 +64,6 @@
+@@ -66,7 +66,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 c179f4a..907fd39 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
-@@ -470,7 +470,6 @@
+@@ -464,7 +464,6 @@
apply from: 'gradle/upload.gradle'
apply from: 'gradle/idea.gradle'
apply from: 'gradle/eclipse.gradle'
diff --git a/debian/patches/09_ignore_buildscan.patch
b/debian/patches/09_ignore_buildscan.patch
index 6fa6986..88095f4 100644
--- a/debian/patches/09_ignore_buildscan.patch
+++ b/debian/patches/09_ignore_buildscan.patch
@@ -3,12 +3,12 @@ Author: Emmanuel Bourg <ebo...@apache.org>
Forwarded: not-needed
--- a/build.gradle
+++ b/build.gradle
-@@ -39,22 +39,6 @@
+@@ -39,24 +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'
+- classpath 'com.gradle:build-scan-plugin:1.8'
+- classpath 'me.champeau.gradle:buildscan-recipes-plugin:0.2.0'
- }
-}
-
@@ -20,6 +20,8 @@ Forwarded: not-needed
- licenseAgreementUrl = 'https://gradle.com/terms-of-service'
- licenseAgree = 'yes'
- publishAlways()
+- }
+- buildScanRecipes {
- 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'
diff --git a/debian/patches/transition_Gradle_3.1.patch
b/debian/patches/transition_Gradle_3.1.patch
index e6c870e..6cae3e0 100644
--- a/debian/patches/transition_Gradle_3.1.patch
+++ b/debian/patches/transition_Gradle_3.1.patch
@@ -4,7 +4,7 @@ Author: Kai-Chung Yan (殷啟聰)
Last-Update: 2016-11-01
--- a/gradle/docs.gradle
+++ b/gradle/docs.gradle
-@@ -39,10 +39,6 @@
+@@ -40,10 +40,6 @@
}
def groovydocSpec = {
@@ -15,7 +15,7 @@ Last-Update: 2016-11-01
use = true
if (project != rootProject) source = project.sourceSets.main.allSource
classpath = javadoc.classpath
-@@ -50,7 +46,11 @@
+@@ -51,7 +47,11 @@
ext.doctitle = doc.title
header = doc.title
footer = doc.footer
@@ -28,7 +28,7 @@ Last-Update: 2016-11-01
includePrivate = false
link 'http://docs.oracle.com/javaee/7/api/', 'javax.servlet.',
'javax.management.'
link 'http://docs.oracle.com/javase/8/docs/api/', 'java.',
'org.xml.', 'javax.', 'org.w3c.'
-@@ -58,7 +58,6 @@
+@@ -59,7 +59,6 @@
link 'http://junit.org/junit4/javadoc/latest/', 'org.junit.', 'junit.'
link 'http://www.antlr2.org/javadoc/', 'antlr.'
link
'http://commons.apache.org/proper/commons-cli/javadocs/api-release/',
'org.apache.commons.cli.'
--
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
