[Git][java-team/jnlp-servlet][master] 5 commits: Add Pack200-removal.patch and stop relying on the Pack200 compression scheme

[Markus Koschany (@apo)]

Markus Koschany pushed to branch master at Debian Java Maintainers / jnlp-servlet


Commits:
97f06125 by Markus Koschany at 2023-03-02T19:56:12+01:00
Add Pack200-removal.patch and stop relying on the Pack200 compression scheme

which has been removed in OpenJDK 14.

Closes: #1026571

- - - - -
9a6f4b78 by Markus Koschany at 2023-03-02T19:56:35+01:00
Update changelog

- - - - -
6553849c by Markus Koschany at 2023-03-02T19:58:18+01:00
Use canonical VCS URI.

- - - - -
d7b01c99 by Markus Koschany at 2023-03-02T19:59:25+01:00
Depend on libservlet-api-java instead of obsolete package libservlet3.1-java.

- - - - -
d4d40d26 by Markus Koschany at 2023-03-02T20:00:58+01:00
Fix path to servlet-api.jar.

- - - - -


5 changed files:

- debian/changelog
- debian/control
- + debian/patches/Pack200-removal.patch
- debian/patches/build.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,14 @@
+jnlp-servlet (20120126-5) unstable; urgency=medium
+
+  * Team upload.
+  * Add Pack200-removal.patch and stop relying on the Pack200 compression
+    scheme which has been removed in OpenJDK 14. (Closes: #1026571)
+  * Use canonical VCS URI.
+  * Depend on libservlet-api-java instead of obsolete package
+    libservlet3.1-java.
+
+ -- Markus Koschany <apo at debian.org>  Thu, 02 Mar 2023 19:56:15 +0100
+
 jnlp-servlet (20120126-4) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/control
=====================================
@@ -10,10 +10,10 @@ Build-Depends:
  maven-repo-helper
 Build-Depends-Indep:
  default-jdk,
- libservlet3.1-java
+ libservlet-api-java
 Standards-Version: 4.1.1
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/jnlp-servlet.git
-Vcs-Browser: https://anonscm.debian.org/git/pkg-java/jnlp-servlet.git
+Vcs-Git: https://salsa.debian.org/java-team/jnlp-servlet.git
+Vcs-Browser: https://salsa.debian.org/java-team/jnlp-servlet
 Homepage: https://github.com/psndcsrv/jnlp-servlet
 
 Package: libjnlp-servlet-java


=====================================
debian/patches/Pack200-removal.patch
=====================================
@@ -0,0 +1,43 @@
+From: Markus Koschany <apo at debian.org>
+Date: Thu, 2 Mar 2023 19:52:25 +0100
+Subject: Pack200 removal
+
+---
+ src/classes/jnlp/sample/servlet/JnlpResource.java | 10 ----------
+ 1 file changed, 10 deletions(-)
+
+diff --git a/src/classes/jnlp/sample/servlet/JnlpResource.java b/src/classes/jnlp/sample/servlet/JnlpResource.java
+index 42b7c18..8f69b86 100644
+--- a/src/classes/jnlp/sample/servlet/JnlpResource.java
++++ b/src/classes/jnlp/sample/servlet/JnlpResource.java
+@@ -44,8 +44,6 @@ import java.net.URLConnection;
+ import java.util.Date;
+ import java.util.Map;
+ import java.util.jar.JarFile;
+-import java.util.jar.Pack200;
+-import java.util.jar.Pack200.Packer;
+ import java.util.logging.Level;
+ import java.util.logging.Logger;
+ import java.util.zip.GZIPOutputStream;
+@@ -90,13 +88,6 @@ public class JnlpResource {
+ 		}
+ 	}
+ 	
+-	private static Packer packer;
+-	
+-	static {
+-		packer = Pack200.newPacker();
+-		Map<String, String> p = packer.properties();
+-	}
+-
+ 	/* Pattern matching arguments */
+ 	private String _name;	  // Name of resource with path (this is the same as path for non-version based)
+ 	private String _versionId;    // Version-id for resource, or null if none
+@@ -244,7 +235,6 @@ public class JnlpResource {
+ 		try {
+ 			JarFile jar = new JarFile(path);
+ 			GZIPOutputStream gzos = new GZIPOutputStream(new FileOutputStream(path + ".pack.gz"));
+-			packer.pack(jar, gzos);
+ 			jar.close();
+ 			gzos.close();
+ 		} catch (IOException ioe) {


=====================================
debian/patches/build.patch
=====================================
@@ -15,7 +15,7 @@ index 1138a4d..2c99898 100644
  FILE_SEPARATOR = :
  # environment variable CLASS_PATH should contain path to javaws.jar and servlet.jar
 -CLASS_PATH = $(JAVA_HOME)/lib/javaws.jar$(FILE_SEPARATOR)deplib/servlet-api.jar
-+CLASS_PATH = $(JAVA_HOME)/lib/javaws.jar$(FILE_SEPARATOR)/usr/share/java/servlet-api-3.1.jar
++CLASS_PATH = $(JAVA_HOME)/lib/javaws.jar$(FILE_SEPARATOR)/usr/share/java/servlet-api.jar
 +TMPDIR = .
  # environment variable TMPDIR should point to tmp directory 
  # environment variable SDK_HOME should point to SDK directory


=====================================
debian/patches/series
=====================================
@@ -1,2 +1,3 @@
 build.patch
 java9.patch
+Pack200-removal.patch



View it on GitLab: https://salsa.debian.org/java-team/jnlp-servlet/-/compare/6aaf70f5ca93465b7bd0f4746f94932dbf0f2d41...d4d40d263207d4101f76ba14d97d77afd9a919a8

-- 
View it on GitLab: https://salsa.debian.org/java-team/jnlp-servlet/-/compare/6aaf70f5ca93465b7bd0f4746f94932dbf0f2d41...d4d40d263207d4101f76ba14d97d77afd9a919a8
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/20230302/6a949781/attachment.htm>