[Git][java-team/bnd][master] 5 commits: Fixed the build failure with Java 11 (Closes: #912231)

[Emmanuel Bourg]

Emmanuel Bourg pushed to branch master at Debian Java Maintainers / bnd


Commits:
50d45ef1 by Emmanuel Bourg at 2018-12-19T21:40:58Z
Fixed the build failure with Java 11 (Closes: #912231)

- - - - -
d74af2f9 by Emmanuel Bourg at 2018-12-19T21:42:10Z
Fixed the build failure caused by gradle-debian-helper 2.0.1

- - - - -
1a428bec by Emmanuel Bourg at 2018-12-19T21:42:31Z
Use salsa.debian.org Vcs-* URLs

- - - - -
3fe86f0c by Emmanuel Bourg at 2018-12-19T21:47:46Z
Ignore the dependency on xml-apis

- - - - -
5ea2d1b4 by Emmanuel Bourg at 2018-12-19T21:48:27Z
Upload to unstable

- - - - -


6 changed files:

- debian/changelog
- debian/control
- + debian/maven.ignoreRules
- + debian/patches/java11-compatibility.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+bnd (3.5.0-4) unstable; urgency=medium
+
+  * Fixed the build failure with Java 11 (Closes: #912231)
+  * Fixed the build failure caused by gradle-debian-helper 2.0.1
+  * Ignore the dependency on xml-apis
+  * Use salsa.debian.org Vcs-* URLs
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Wed, 19 Dec 2018 22:48:21 +0100
+
 bnd (3.5.0-3) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/control
=====================================
@@ -27,8 +27,8 @@ Build-Depends:
  libyaml-snake-java,
  maven-repo-helper
 Standards-Version: 4.2.1
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/bnd.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/bnd.git
+Vcs-Git: https://salsa.debian.org/java-team/bnd.git
+Vcs-Browser: https://salsa.debian.org/java-team/bnd
 Homepage: http://bnd.bndtools.org/
 
 Package: bnd


=====================================
debian/maven.ignoreRules
=====================================
@@ -0,0 +1,2 @@
+
+xml-apis xml-apis


=====================================
debian/patches/java11-compatibility.patch
=====================================
@@ -0,0 +1,21 @@
+Description: Fixes the compatibility with Java 11
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/biz.aQute.remote/src/aQute/remote/agent/RedirectOutput.java
++++ b/biz.aQute.remote/src/aQute/remote/agent/RedirectOutput.java
+@@ -32,13 +32,13 @@
+ 	}
+ 
+ 	public RedirectOutput(List<AgentServer> agents, PrintStream out, boolean err) {
+-		super(out == null ? out = nullOutputStream() : out);
++		super(out == null ? out = _nullOutputStream() : out);
+ 		this.agents = agents;
+ 		this.out = out;
+ 		this.err = err;
+ 	}
+ 
+-	private static PrintStream nullOutputStream() {
++	private static PrintStream _nullOutputStream() {
+ 		return new PrintStream(new NullOutputStream());
+ 	}
+ 


=====================================
debian/patches/series
=====================================
@@ -8,3 +8,4 @@ use-bootstrapped-gradle-plugin.patch
 reproducible-timestamps.patch
 reproducible-packages-list.patch
 build-scripts.patch
+java11-compatibility.patch


=====================================
debian/rules
=====================================
@@ -3,7 +3,7 @@
 include /usr/share/dpkg/pkg-info.mk
 PACKAGE              := bnd
 export JAVA_HOME = /usr/lib/jvm/default-java
-export HOME = debian
+export HOME = $(CURDIR)/debian
 
 %:
 	dh $@ --buildsystem=gradle --with maven-repo-helper



View it on GitLab: https://salsa.debian.org/java-team/bnd/compare/15fa62bf3da45d83d78735bb42329b518171f8bd...5ea2d1b4b6f7a96d7161d7e3c0264c1b8ae4ee7c

-- 
View it on GitLab: https://salsa.debian.org/java-team/bnd/compare/15fa62bf3da45d83d78735bb42329b518171f8bd...5ea2d1b4b6f7a96d7161d7e3c0264c1b8ae4ee7c
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/20181219/14422b8e/attachment.html>