[Git][java-team/antlr4][master] 3 commits: Fix dependency to new libjsonp-java

[Jochen Sprickerhof]

Jochen Sprickerhof pushed to branch master at Debian Java Maintainers / antlr4


Commits:
549c4b26 by Jochen Sprickerhof at 2021-01-22T11:21:59+01:00
Fix dependency to new libjsonp-java

Closes: #980371

- - - - -
955ea633 by Jochen Sprickerhof at 2021-01-22T11:30:07+01:00
Add MA hint

- - - - -
a9205c16 by Jochen Sprickerhof at 2021-01-22T11:31:31+01:00
Update changelog for 4.7.2-4 release

- - - - -


4 changed files:

- debian/changelog
- debian/control
- + debian/patches/0004-Switch-to-javax.json-api.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+antlr4 (4.7.2-4) unstable; urgency=medium
+
+  * Team upload.
+  * Fix dependency to new libjsonp-java (Closes: #980371)
+  * Add MA hint
+
+ -- Jochen Sprickerhof <jspricke at debian.org>  Fri, 22 Jan 2021 11:31:28 +0100
+
 antlr4 (4.7.2-3) unstable; urgency=medium
 
   * Fixed the build failure with icu4j >= 64.1


=====================================
debian/control
=====================================
@@ -76,6 +76,7 @@ Description: Maven plugin for ANTLR 4
 
 Package: libantlr4-runtime-java
 Architecture: all
+Multi-Arch: foreign
 Depends: ${misc:Depends}
 Description: Runtime library for ANTLR 4
  ANTLR (ANother Tool for Language Recognition) is a powerful parser generator


=====================================
debian/patches/0004-Switch-to-javax.json-api.patch
=====================================
@@ -0,0 +1,25 @@
+From: Jochen Sprickerhof <jspricke at debian.org>
+Date: Fri, 22 Jan 2021 11:03:47 +0100
+Subject: Switch to javax.json-api
+
+---
+ tool/pom.xml | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/tool/pom.xml b/tool/pom.xml
+index 82c7fb8..9af87e0 100644
+--- a/tool/pom.xml
++++ b/tool/pom.xml
+@@ -37,9 +37,9 @@
+ 			<version>1.0.3</version>
+ 		</dependency>
+ 		<dependency>
+-			<groupId>org.glassfish</groupId>
+-			<artifactId>javax.json</artifactId>
+-			<version>1.0.4</version>
++			<groupId>javax.json</groupId>
++			<artifactId>javax.json-api</artifactId>
++			<version>1.1.2</version>
+ 		</dependency>
+ 		<dependency>
+ 			<groupId>com.ibm.icu</groupId>


=====================================
debian/patches/series
=====================================
@@ -1,3 +1,4 @@
 02-ignore-modules.patch
 fix-unicodedata.st.patch
 icu4j-compatibility.patch
+0004-Switch-to-javax.json-api.patch



View it on GitLab: https://salsa.debian.org/java-team/antlr4/-/compare/1edd409cc83f86a04ae475783d57d302e0dd87fb...a9205c1626d80a54da315c1dcf3fb1056a456913

-- 
View it on GitLab: https://salsa.debian.org/java-team/antlr4/-/compare/1edd409cc83f86a04ae475783d57d302e0dd87fb...a9205c1626d80a54da315c1dcf3fb1056a456913
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/20210122/43850022/attachment.html>