[Git][java-team/taglibs-standard][master] 6 commits: Fixed the build failure with OpenJDK 17 (Closes: #1011601)

[Emmanuel Bourg (@ebourg)]

Emmanuel Bourg pushed to branch master at Debian Java Maintainers / taglibs-standard


Commits:
4b11882b by Emmanuel Bourg at 2022-05-27T16:19:56+02:00
Fixed the build failure with OpenJDK 17 (Closes: #1011601)

- - - - -
f98c4599 by Emmanuel Bourg at 2022-05-27T16:20:24+02:00
Standards-Version updated to 4.6.1

- - - - -
fd9786af by Emmanuel Bourg at 2022-05-27T16:20:33+02:00
Switch to debhelper level 13

- - - - -
c918d19c by Emmanuel Bourg at 2022-05-27T16:20:39+02:00
Use salsa.debian.org Vcs-* URLs

- - - - -
23e78acb by Emmanuel Bourg at 2022-05-27T16:33:11+02:00
Depend on libservlet-api-java instead of libservlet3.1-java

- - - - -
0e96e7a5 by Emmanuel Bourg at 2022-05-27T16:33:22+02:00
Upload to unstable

- - - - -


6 changed files:

- debian/changelog
- − debian/compat
- debian/control
- debian/maven.properties
- debian/maven.rules
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+taglibs-standard (1.2.5-3) unstable; urgency=medium
+
+  * Fixed the build failure with OpenJDK 17 (Closes: #1011601)
+  * Depend on libservlet-api-java instead of libservlet3.1-java
+  * Standards-Version updated to 4.6.1
+  * Switch to debhelper level 13
+  * Use salsa.debian.org Vcs-* URLs
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Fri, 27 May 2022 16:33:18 +0200
+
 taglibs-standard (1.2.5-2) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-9


=====================================
debian/control
=====================================
@@ -4,17 +4,19 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Emmanuel Bourg <ebourg at apache.org>
 Build-Depends:
- debhelper (>= 9),
+ debhelper-compat (= 13),
  default-jdk,
  junit4,
  libeasymock-java,
+ libel-api-java,
+ libjsp-api-java,
  libmaven-bundle-plugin-java,
- libservlet3.1-java,
+ libservlet-api-java,
  libxalan2-java,
  maven-debian-helper (>= 2.0~)
-Standards-Version: 3.9.8
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/taglibs-standard.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/taglibs-standard.git
+Standards-Version: 4.6.1
+Vcs-Git: https://salsa.debian.org/java-team/taglibs-standard.git
+Vcs-Browser: https://salsa.debian.org/java-team/taglibs-standard
 Homepage: http://tomcat.apache.org/taglibs/standard/
 
 Package: libtaglibs-standard-spec-java


=====================================
debian/maven.properties
=====================================
@@ -8,3 +8,5 @@ maven.compiler.source=1.5
 maven.compiler.target=1.5
 
 project.build.sourceEncoding=UTF-8
+
+argLine=--add-opens java.base/java.lang=ALL-UNNAMED


=====================================
debian/maven.rules
=====================================
@@ -1,5 +1,5 @@
 
 junit junit jar s/4\..*/4.x/ * *
-javax.el s/el-api/javax.el-api/ * s/.*/3.0/ * *
-javax.servlet s/servlet-api/javax.servlet-api/ * s/.*/3.1/ * *
-javax.servlet.jsp s/jsp-api/javax.servlet.jsp-api/ * s/.*/2.3/ * *
+javax.el s/el-api/javax.el-api/ * s/.*/debian/ * *
+javax.servlet s/servlet-api/javax.servlet-api/ * s/.*/debian/ * *
+javax.servlet.jsp s/jsp-api/javax.servlet.jsp-api/ * s/.*/debian/ * *


=====================================
debian/rules
=====================================
@@ -1,10 +1,7 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@ --buildsystem=maven
+	dh $@
 
 override_dh_auto_build:
 	dh_auto_build -- install
-
-get-orig-source:
-	uscan --download-current-version --force-download --rename --repack --compression xz



View it on GitLab: https://salsa.debian.org/java-team/taglibs-standard/-/compare/a5586dbc043d0ed5a87e449202e41eba221ee101...0e96e7a58ee2dda0dc60935c59427c2e2d0a0925

-- 
View it on GitLab: https://salsa.debian.org/java-team/taglibs-standard/-/compare/a5586dbc043d0ed5a87e449202e41eba221ee101...0e96e7a58ee2dda0dc60935c59427c2e2d0a0925
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/20220527/134dc360/attachment.htm>