[Git][java-team/commons-httpclient][master] 2 commits: Fixed the build failure with OpenJDK 17 (Closes #982053)

[Emmanuel Bourg]

Emmanuel Bourg pushed to branch master at Debian Java Maintainers / commons-httpclient


Commits:
567d790f by Emmanuel Bourg at 2021-02-08T00:49:35+01:00
Fixed the build failure with OpenJDK 17 (Closes #982053)

- - - - -
8d0f3c31 by Emmanuel Bourg at 2021-02-08T00:49:41+01:00
Upload to unstable

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/07_java17-compatibility.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,9 +1,10 @@
-commons-httpclient (3.1-16) UNRELEASED; urgency=medium
+commons-httpclient (3.1-16) unstable; urgency=medium
 
+  * Fixed the build failure with OpenJDK 17 (Closes #982053)
   * Standards-Version updated to 4.5.1
   * Switch to debhelper level 13
 
- -- Emmanuel Bourg <ebourg at apache.org>  Sun, 07 Feb 2021 23:58:53 +0100
+ -- Emmanuel Bourg <ebourg at apache.org>  Mon, 08 Feb 2021 00:10:24 +0100
 
 commons-httpclient (3.1-15) unstable; urgency=medium
 


=====================================
debian/patches/07_java17-compatibility.patch
=====================================
@@ -0,0 +1,33 @@
+Description: Fixes the compatibility with Java 17
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/src/test/org/apache/commons/httpclient/ssl/SimpleSSLSocketFactory.java
++++ b/src/test/org/apache/commons/httpclient/ssl/SimpleSSLSocketFactory.java
+@@ -42,9 +42,9 @@
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+ 
+-import com.sun.net.ssl.KeyManager;
+-import com.sun.net.ssl.KeyManagerFactory;
+-import com.sun.net.ssl.SSLContext;
++import javax.net.ssl.KeyManager;
++import javax.net.ssl.KeyManagerFactory;
++import javax.net.ssl.SSLContext;
+ 
+ /**
+  * Defines a SSL socket factory
+--- a/src/test/org/apache/commons/httpclient/ssl/SimpleSSLTestProtocolSocketFactory.java
++++ b/src/test/org/apache/commons/httpclient/ssl/SimpleSSLTestProtocolSocketFactory.java
+@@ -46,9 +46,9 @@
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+ 
+-import com.sun.net.ssl.SSLContext;
+-import com.sun.net.ssl.TrustManager;
+-import com.sun.net.ssl.TrustManagerFactory;
++import javax.net.ssl.SSLContext;
++import javax.net.ssl.TrustManager;
++import javax.net.ssl.TrustManagerFactory;
+ 
+ public class SimpleSSLTestProtocolSocketFactory implements SecureProtocolSocketFactory {
+ 


=====================================
debian/patches/series
=====================================
@@ -6,3 +6,4 @@
 06_fix_CVE-2012-5783.patch
 CVE-2014-3577.patch
 CVE-2015-5262.patch
+07_java17-compatibility.patch



View it on GitLab: https://salsa.debian.org/java-team/commons-httpclient/-/compare/bddc56e65f327105747954e9da2fe88bba2307e2...8d0f3c3187f6bc86df2606d79162191cfe27b1c3

-- 
View it on GitLab: https://salsa.debian.org/java-team/commons-httpclient/-/compare/bddc56e65f327105747954e9da2fe88bba2307e2...8d0f3c3187f6bc86df2606d79162191cfe27b1c3
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/20210207/9bfe7cf7/attachment.html>