[Git][java-team/groovy][master] 3 commits: Use salsa.debian.org Vcs-* URLs
Emmanuel Bourg
gitlab at salsa.debian.org
Thu May 17 09:10:58 BST 2018
Emmanuel Bourg pushed to branch master at Debian Java Maintainers / groovy
Commits:
b16fd06b by Emmanuel Bourg at 2018-05-17T09:34:03+02:00
Use salsa.debian.org Vcs-* URLs
- - - - -
681b5902 by Emmanuel Bourg at 2018-05-17T10:10:14+02:00
Fixed the build failure with Java 10 (Closes: #897612)
- - - - -
4ff64b98 by Emmanuel Bourg at 2018-05-17T10:10:27+02:00
Upload to unstable
- - - - -
4 changed files:
- debian/changelog
- debian/control
- + debian/patches/10_fix_javadoc_links.patch
- debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+groovy (2.4.15-2) unstable; urgency=medium
+
+ * Team upload.
+ * Fixed the build failure with Java 10 (Closes: #897612)
+ * Use salsa.debian.org Vcs-* URLs
+
+ -- Emmanuel Bourg <ebourg at apache.org> Thu, 17 May 2018 10:10:18 +0200
+
groovy (2.4.15-1) unstable; urgency=medium
* Team upload.
=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -10,6 +10,7 @@ Build-Depends:
bnd (>= 2.1.0),
debhelper (>= 11),
default-jdk-headless | default-jdk,
+ default-jdk-doc,
gradle-debian-helper,
ivy,
junit4,
@@ -29,8 +30,8 @@ Build-Depends:
testng,
unzip
Standards-Version: 4.1.4
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/groovy.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/groovy.git
+Vcs-Git: https://salsa.debian.org/java-team/groovy.git
+Vcs-Browser: https://salsa.debian.org/java-team/groovy
Homepage: http://www.groovy-lang.org
Package: groovy
=====================================
debian/patches/10_fix_javadoc_links.patch
=====================================
--- /dev/null
+++ b/debian/patches/10_fix_javadoc_links.patch
@@ -0,0 +1,30 @@
+Description: Use local javadoc links to avoid a build failure with Java 10
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/gradle/docs.gradle
++++ b/gradle/docs.gradle
+@@ -33,9 +33,7 @@
+ overview = rootProject.file('src/main/overviewj.html')
+ footer = doc.footer
+ source = rootProject.useIndy()?'1.7':'1.6'
+- links('http://docs.oracle.com/javase/8/docs/api/', 'http://docs.oracle.com/javaee/7/api/',
+- 'http://commons.apache.org/proper/commons-cli/javadocs/api-release/', 'http://junit.org/junit4/javadoc/latest/',
+- 'http://docs.oracle.com/javaee/6/api/', 'http://www.antlr2.org/javadoc/')
++ links('file:/usr/share/doc/default-jre/api/')
+ }
+ }
+
+@@ -53,12 +51,7 @@
+ 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.'
+- link 'http://docs.groovy-lang.org/docs/ant/api/', 'org.apache.ant.', 'org.apache.tools.ant.'
+- 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.'
++ link 'file:/usr/share/doc/default-jre/api/', 'java.', 'org.xml.', 'javax.', 'org.w3c.'
+ }
+
+ allprojects {
=====================================
debian/patches/series
=====================================
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@
transition_Gradle_3.1.patch
08_GROOVY-8163.patch
09_ignore_buildscan.patch
+10_fix_javadoc_links.patch
View it on GitLab: https://salsa.debian.org/java-team/groovy/compare/208ff66f1c69edd63d36ec8db51fef467a981ff0...4ff64b988bb32570c6247d21a06886fda562d8d3
---
View it on GitLab: https://salsa.debian.org/java-team/groovy/compare/208ff66f1c69edd63d36ec8db51fef467a981ff0...4ff64b988bb32570c6247d21a06886fda562d8d3
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20180517/053cf8a4/attachment.html>
More information about the pkg-java-commits
mailing list