[Git][java-team/libsweble-common-java][master] 6 commits: java17

[Markus Koschany (@apo)]

Markus Koschany pushed to branch master at Debian Java Maintainers / libsweble-common-java


Commits:
cfdf6da6 by Markus Koschany at 2022-08-27T22:10:49+02:00
java17

- - - - -
b43ea815 by Markus Koschany at 2022-08-27T22:25:15+02:00
Fix FTBFS with Java 17.

Closes: #1012064

- - - - -
513d62c1 by Markus Koschany at 2022-08-27T22:25:35+02:00
Declare compliance with Debian Policy 4.6.1.

- - - - -
3a4d3bb6 by Markus Koschany at 2022-08-27T22:25:51+02:00
Update copyright year

- - - - -
247c8061 by Markus Koschany at 2022-08-27T22:26:22+02:00
Update changelog

- - - - -
43a8c443 by Markus Koschany at 2022-08-27T22:26:33+02:00
Revert "java17"

This reverts commit cfdf6da6153c326815d7a7789386ebf121c65dc2.

- - - - -


5 changed files:

- debian/changelog
- debian/control
- debian/copyright
- + debian/patches/java17.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+libsweble-common-java (3.0.8-3) unstable; urgency=medium
+
+  * Fix FTBFS with Java 17. (Closes: #1012064)
+  * Declare compliance with Debian Policy 4.6.1.
+
+ -- Markus Koschany <apo at debian.org>  Sat, 27 Aug 2022 22:25:59 +0200
+
 libsweble-common-java (3.0.8-2) unstable; urgency=medium
 
   * Source-only rebuild.


=====================================
debian/control
=====================================
@@ -11,7 +11,7 @@ Build-Depends:
  libcommons-lang3-java,
  libxtc-rats-java,
  maven-debian-helper
-Standards-Version: 4.6.0
+Standards-Version: 4.6.1
 Vcs-Git: https://salsa.debian.org/java-team/libsweble-common-java.git
 Vcs-Browser: https://salsa.debian.org/java-team/libsweble-common-java
 Homepage: https://github.com/sweble/osr-common


=====================================
debian/copyright
=====================================
@@ -8,7 +8,7 @@ Copyright: 2011, The Open Source Research Group,
 License: Apache-2.0
 
 Files: debian/*
-Copyright: 2021, Markus Koschany <apo at debian.org>
+Copyright: 2021-2022, Markus Koschany <apo at debian.org>
 License: Apache-2.0
 
 License: Apache-2.0


=====================================
debian/patches/java17.patch
=====================================
@@ -0,0 +1,25 @@
+From: Markus Koschany <apo at debian.org>
+Date: Sat, 27 Aug 2022 22:19:06 +0200
+Subject: java17
+
+Fix FTBFS with Java 17.
+
+Bug-Debian: https://bugs.debian.org/1012064
+Forwarded: https://github.com/sweble/osr-common/issues/10
+---
+ utils-parent/utils/src/main/java/de/fau/cs/osr/utils/XmlGrammar.java | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/utils-parent/utils/src/main/java/de/fau/cs/osr/utils/XmlGrammar.java b/utils-parent/utils/src/main/java/de/fau/cs/osr/utils/XmlGrammar.java
+index 1277c6b..96680e3 100644
+--- a/utils-parent/utils/src/main/java/de/fau/cs/osr/utils/XmlGrammar.java
++++ b/utils-parent/utils/src/main/java/de/fau/cs/osr/utils/XmlGrammar.java
+@@ -38,7 +38,7 @@ public class XmlGrammar
+ 					"|[\\u3001-\\uD7FF]" +
+ 					"|[\\uF900-\\uFDCF]" +
+ 					"|[\\uFDF0-\\uFFFD]" +
+-					"|[\uD800\\uDC00-\uDB7F\uDFFF]" + // #x10000-#xEFFFF
++					"|[\\uD800\\uDC00-\\uDB7F\\uDFFF]" + // #x10000-#xEFFFF
+ 					")";
+ 
+ 	public final static String RE_XML_NAME_CHAR =


=====================================
debian/patches/series
=====================================
@@ -1 +1,2 @@
 build.patch
+java17.patch



View it on GitLab: https://salsa.debian.org/java-team/libsweble-common-java/-/compare/5dd94a5145b44a49f9c4c12d213a92213bab397b...43a8c44302df596ec4353da7dd07f23e55e232c4

-- 
View it on GitLab: https://salsa.debian.org/java-team/libsweble-common-java/-/compare/5dd94a5145b44a49f9c4c12d213a92213bab397b...43a8c44302df596ec4353da7dd07f23e55e232c4
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/20220827/0e49ea8a/attachment.htm>