[groovy] 03/05: Refreshed the patches
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Mon Jan 16 00:24:17 UTC 2017
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository groovy.
commit ffeefd3b32173249815a81c8a2ae1050849bf7dc
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Mon Jan 16 00:30:46 2017 +0100
Refreshed the patches
---
debian/changelog | 1 +
debian/patches/01_fix_doc_gradle.diff | 8 ++--
debian/patches/03_ignore_reporting_tools.diff | 4 +-
debian/patches/04_ignore_bintray.diff | 2 +-
.../06_ignore_documentation_publication.diff | 4 +-
debian/patches/transition_Gradle_3.1.patch | 45 +++++++++++++++-------
6 files changed, 42 insertions(+), 22 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 23a416f..66e6729 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ groovy (2.4.8-1) UNRELEASED; urgency=medium
* Team upload.
* New upstream release
+ - Refreshed the patches
- Updated the poms
-- Emmanuel Bourg <ebourg at apache.org> Sun, 15 Jan 2017 10:13:30 +0100
diff --git a/debian/patches/01_fix_doc_gradle.diff b/debian/patches/01_fix_doc_gradle.diff
index 9b3c427..93100f3 100644
--- a/debian/patches/01_fix_doc_gradle.diff
+++ b/debian/patches/01_fix_doc_gradle.diff
@@ -10,7 +10,7 @@ Forwarded: not-needed
- if (JavaVersion.current().java7Compatible) {
- dependsOn 'asciidocAll', 'assembleAsciidoc'
- }
- ext.footer = 'Copyright © 2003-2016 The Apache Software Foundation. All rights reserved.'
+ ext.footer = 'Copyright © 2003-2017 The Apache Software Foundation. All rights reserved.'
ext.title = "Groovy ${groovyVersion}"
}
@@ -28,7 +28,7 @@ Forwarded: not-needed
def javadocSpec = {
maxMemory = javaDoc_mx
project.configure(options) {
-@@ -120,71 +106,10 @@
+@@ -125,71 +111,10 @@
task docGDK {
// ext.extraDocGDKclasses = []
@@ -100,7 +100,7 @@ Forwarded: not-needed
}
if (JavaVersion.current().isJava7Compatible()) {
-@@ -198,4 +123,4 @@
+@@ -203,4 +128,4 @@
options.addStringOption('Xdoclint:none', '-quiet')
}
}
@@ -112,7 +112,7 @@ Forwarded: not-needed
@@ -45,7 +45,6 @@
apply from: 'gradle/filter.gradle'
apply from: 'gradle/indy.gradle'
- apply from: 'gradle/bintray.gradle'
+ apply from: 'gradle/publish.gradle'
-apply plugin: 'javadocHotfix'
File javaHome = new File(System.getProperty('java.home'))
diff --git a/debian/patches/03_ignore_reporting_tools.diff b/debian/patches/03_ignore_reporting_tools.diff
index 9b561a7..96442a7 100644
--- a/debian/patches/03_ignore_reporting_tools.diff
+++ b/debian/patches/03_ignore_reporting_tools.diff
@@ -3,11 +3,11 @@ Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: not-needed
--- a/build.gradle
+++ b/build.gradle
-@@ -439,7 +439,6 @@
+@@ -456,7 +456,6 @@
apply from: 'gradle/idea.gradle'
apply from: 'gradle/eclipse.gradle'
apply from: 'gradle/codehaus.gradle'
-apply from: 'gradle/quality.gradle'
+
// If a local configuration file for tweaking the build is present, apply it
if (file('user.gradle').exists()) {
- apply from: 'user.gradle'
diff --git a/debian/patches/04_ignore_bintray.diff b/debian/patches/04_ignore_bintray.diff
index 4afd802..17f7e61 100644
--- a/debian/patches/04_ignore_bintray.diff
+++ b/debian/patches/04_ignore_bintray.diff
@@ -7,7 +7,7 @@ Forwarded: not-needed
apply from: 'gradle/filter.gradle'
apply from: 'gradle/indy.gradle'
--apply from: 'gradle/bintray.gradle'
+-apply from: 'gradle/publish.gradle'
File javaHome = new File(System.getProperty('java.home'))
logger.lifecycle "Using Java from $javaHome (version ${System.getProperty('java.version')})"
diff --git a/debian/patches/06_ignore_documentation_publication.diff b/debian/patches/06_ignore_documentation_publication.diff
index a0c8c31..ccb9c02 100644
--- a/debian/patches/06_ignore_documentation_publication.diff
+++ b/debian/patches/06_ignore_documentation_publication.diff
@@ -3,11 +3,11 @@ Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: not-needed
--- a/build.gradle
+++ b/build.gradle
-@@ -437,7 +437,6 @@
+@@ -454,7 +454,6 @@
apply from: 'gradle/upload.gradle'
apply from: 'gradle/idea.gradle'
apply from: 'gradle/eclipse.gradle'
-apply from: 'gradle/codehaus.gradle'
+
// If a local configuration file for tweaking the build is present, apply it
if (file('user.gradle').exists()) {
- apply from: 'user.gradle'
diff --git a/debian/patches/transition_Gradle_3.1.patch b/debian/patches/transition_Gradle_3.1.patch
index cf3e9a0..e6c870e 100644
--- a/debian/patches/transition_Gradle_3.1.patch
+++ b/debian/patches/transition_Gradle_3.1.patch
@@ -4,16 +4,35 @@ Author: Kai-Chung Yan (殷啟聰)
Last-Update: 2016-11-01
--- a/gradle/docs.gradle
+++ b/gradle/docs.gradle
-@@ -46,7 +46,11 @@
- ext.doctitle = doc.title
- header = doc.title
- footer = doc.footer
-- overview = rootProject.file('src/main/overview.html')
-+ if (gradle.gradleVersion.startsWith('2.')) {
-+ overview = rootProject.file('src/main/overview.html')
-+ } else {
-+ overviewText = resources.text.fromFile(rootProject.file('src/main/overview.html'))
-+ }
- 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.'
+@@ -39,10 +39,6 @@
+ }
+
+ def groovydocSpec = {
+- // hack to avoid errors when using gradle 3 to get the wrapper
+- // we won't ever build 2.4.x using a 3+ version - at least not
+- // without further changes
+- if (gradle.gradleVersion.startsWith('2.')) {
+ use = true
+ if (project != rootProject) source = project.sourceSets.main.allSource
+ classpath = javadoc.classpath
+@@ -50,7 +46,11 @@
+ ext.doctitle = doc.title
+ header = doc.title
+ footer = doc.footer
+- overview = rootProject.file('src/main/overview.html')
++ if (gradle.gradleVersion.startsWith('2.')) {
++ overview = rootProject.file('src/main/overview.html')
++ } else {
++ overviewText = resources.text.fromFile(rootProject.file('src/main/overview.html'))
++ }
+ 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 @@
+ 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.'
+- }
+ }
+
+ allprojects {
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/groovy.git
More information about the pkg-java-commits
mailing list