Skip to content
GitLab
Explore
Sign in
Register
Commits on Source (3)
Use salsa.debian.org Vcs-* URLs
· b16fd06b
Emmanuel Bourg
authored
May 17, 2018
b16fd06b
Fixed the build failure with Java 10 (Closes: #897612)
· 681b5902
Emmanuel Bourg
authored
May 17, 2018
681b5902
Upload to unstable
· 4ff64b98
Emmanuel Bourg
authored
May 17, 2018
4ff64b98
Show whitespace changes
Inline
Side-by-side
debian/changelog
View file @
4ff64b98
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@apache.org> Thu, 17 May 2018 10:10:18 +0200
groovy (2.4.15-1) unstable; urgency=medium
* Team upload.
...
...
debian/control
View file @
4ff64b98
...
...
@@ -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
0 → 100644
View file @
4ff64b98
Description: Use local javadoc links to avoid a build failure with Java 10
Author: Emmanuel Bourg <ebourg@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
View file @
4ff64b98
...
...
@@ -8,3 +8,4 @@
transition_Gradle_3.1.patch
08_GROOVY-8163.patch
09_ignore_buildscan.patch
10_fix_javadoc_links.patch