Update to Java EE 10 for zxing.org (#1621)

* Update to Java EE 10 for zxing.org * Just remove reactor convergence
zxing · Apr 27, 2023 · a24f930 · a24f930
1 parent 1d2379d
commit a24f930
Show file tree

Hide file tree

Showing 18 changed files with 83 additions and 81 deletions.
diff --git a/pom.xml b/pom.xml
@@ -57,7 +57,7 @@
     <module>core</module>
     <module>javase</module>
     <!-- android modules are activated by a profile below -->
-    <module>zxingorg</module>
+    <!-- zxingorg activated by a profile below -->
     <!-- appspot app activated by a profile below -->
   </modules>
 
@@ -119,7 +119,6 @@
               <id>enforce</id>
               <configuration>
                 <rules>
-                  <reactorModuleConvergence />
                   <requireUpperBoundDeps />
                   <dependencyConvergence />
                   <requireMavenVersion>
@@ -757,6 +756,15 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>zxingorg</id>
+      <activation>
+        <jdk>[17,)</jdk> <!-- Requires Java 17+ for Java EE 10+ -->
+      </activation>
+      <modules>
+        <module>zxingorg</module>
+      </modules>
+    </profile>
     <profile>
       <id>appspot</id>
       <activation>

diff --git a/zxingorg/pom.xml b/zxingorg/pom.xml
@@ -31,9 +31,9 @@
       <artifactId>javase</artifactId>
     </dependency>
     <dependency>
-      <groupId>javax</groupId>
-      <artifactId>javaee-web-api</artifactId>
-      <version>8.0.1</version>
+      <groupId>jakarta.platform</groupId>
+      <artifactId>jakarta.jakartaee-web-api</artifactId>
+      <version>10.0.0</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -58,12 +58,6 @@
       <version>${spring.version}</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
-      <version>4.0.1</version>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <parent>
@@ -73,7 +67,7 @@
   </parent>
 
   <properties>
-    <spring.version>5.3.24</spring.version>
+    <spring.version>6.0.8</spring.version>
   </properties>
 
   <build>

diff --git a/zxingorg/src/main/java/com/google/zxing/web/AbstractFilter.java b/zxingorg/src/main/java/com/google/zxing/web/AbstractFilter.java
@@ -18,10 +18,10 @@
 
 import com.google.common.net.HttpHeaders;
 
-import javax.servlet.Filter;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 /**
  * Provides no-op default implementations for convenience of subclasses.
@@ -37,7 +37,7 @@ public final void init(FilterConfig filterConfig) {
   public final void destroy() {
     // do nothing
   }
-  
+
   static void redirect(ServletResponse servletResponse, String location) {
     HttpServletResponse response = (HttpServletResponse) servletResponse;
     response.setStatus(HttpServletResponse.SC_MOVED_PERMANENTLY);

diff --git a/zxingorg/src/main/java/com/google/zxing/web/ChartDoSFilter.java b/zxingorg/src/main/java/com/google/zxing/web/ChartDoSFilter.java
@@ -16,8 +16,8 @@
 
 package com.google.zxing.web;
 
-import javax.servlet.annotation.WebFilter;
-import javax.servlet.annotation.WebInitParam;
+import jakarta.servlet.annotation.WebFilter;
+import jakarta.servlet.annotation.WebInitParam;
 
 /**
  * Protect the /chart endpoint from too many requests.

diff --git a/zxingorg/src/main/java/com/google/zxing/web/ChartServlet.java b/zxingorg/src/main/java/com/google/zxing/web/ChartServlet.java
@@ -27,11 +27,11 @@
 import com.google.zxing.qrcode.QRCodeWriter;
 import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
 
-import javax.servlet.ServletRequest;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.nio.charset.Charset;

diff --git a/zxingorg/src/main/java/com/google/zxing/web/DecodeDoSFilter.java b/zxingorg/src/main/java/com/google/zxing/web/DecodeDoSFilter.java
@@ -16,8 +16,8 @@
 
 package com.google.zxing.web;
 
-import javax.servlet.annotation.WebFilter;
-import javax.servlet.annotation.WebInitParam;
+import jakarta.servlet.annotation.WebFilter;
+import jakarta.servlet.annotation.WebInitParam;
 
 /**
  * Protect the /decode endpoint from too many requests.

diff --git a/zxingorg/src/main/java/com/google/zxing/web/DecodeServlet.java b/zxingorg/src/main/java/com/google/zxing/web/DecodeServlet.java
@@ -65,17 +65,17 @@
 import java.util.regex.Pattern;
 
 import javax.imageio.ImageIO;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.annotation.MultipartConfig;
-import javax.servlet.annotation.WebInitParam;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.Part;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.MultipartConfig;
+import jakarta.servlet.annotation.WebInitParam;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.Part;
 
 /**
  * {@link HttpServlet} which decodes images containing barcodes. Given a URL, it will

diff --git a/zxingorg/src/main/java/com/google/zxing/web/DoSFilter.java b/zxingorg/src/main/java/com/google/zxing/web/DoSFilter.java
@@ -18,14 +18,14 @@
 
 import com.google.common.base.Preconditions;
 
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.Timer;
 import java.util.concurrent.TimeUnit;

diff --git a/zxingorg/src/main/java/com/google/zxing/web/HTTPSFilter.java b/zxingorg/src/main/java/com/google/zxing/web/HTTPSFilter.java
@@ -16,12 +16,12 @@
 
 package com.google.zxing.web;
 
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.annotation.WebFilter;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.annotation.WebFilter;
+import jakarta.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.util.regex.Pattern;
 

diff --git a/zxingorg/src/main/java/com/google/zxing/web/ServletContextLogHandler.java b/zxingorg/src/main/java/com/google/zxing/web/ServletContextLogHandler.java
@@ -16,14 +16,14 @@
 
 package com.google.zxing.web;
 
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
 import java.util.logging.Formatter;
 import java.util.logging.Handler;
 import java.util.logging.LogRecord;
 
 /**
  * A {@link Handler} that redirects log messages to the servlet container log.
- * 
+ *
  * @author Sean Owen
  */
 final class ServletContextLogHandler extends Handler {
@@ -61,4 +61,4 @@ public void close() {
     // do nothing
   }
 
-}
+}
diff --git a/zxingorg/src/main/java/com/google/zxing/web/TimeoutFilter.java b/zxingorg/src/main/java/com/google/zxing/web/TimeoutFilter.java
@@ -19,15 +19,15 @@
 import com.google.common.util.concurrent.SimpleTimeLimiter;
 import com.google.common.util.concurrent.TimeLimiter;
 
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.annotation.WebFilter;
-import javax.servlet.annotation.WebInitParam;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.annotation.WebFilter;
+import jakarta.servlet.annotation.WebInitParam;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;

diff --git a/zxingorg/src/main/java/com/google/zxing/web/WelcomeFilter.java b/zxingorg/src/main/java/com/google/zxing/web/WelcomeFilter.java
@@ -16,10 +16,10 @@
 
 package com.google.zxing.web;
 
-import javax.servlet.FilterChain;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.annotation.WebFilter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.annotation.WebFilter;
 
 /**
  * Handles redirects to the app landing page.

diff --git a/zxingorg/src/test/java/com/google/zxing/web/ChartServletTestCase.java b/zxingorg/src/test/java/com/google/zxing/web/ChartServletTestCase.java
@@ -23,7 +23,7 @@
 
 import java.util.HashMap;
 import java.util.Map;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 /**
  * Tests {@link ChartServlet}.

diff --git a/zxingorg/src/test/java/com/google/zxing/web/DecodeServletTestCase.java b/zxingorg/src/test/java/com/google/zxing/web/DecodeServletTestCase.java
@@ -25,7 +25,7 @@
 
 import java.util.HashMap;
 import java.util.Map;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 /**
  * Tests {@link DecodeServlet}.

diff --git a/zxingorg/src/test/java/com/google/zxing/web/DoSFilterTestCase.java b/zxingorg/src/test/java/com/google/zxing/web/DoSFilterTestCase.java
@@ -23,9 +23,9 @@
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 
-import javax.servlet.Filter;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.Filter;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.Arrays;
 

diff --git a/zxingorg/src/test/java/com/google/zxing/web/HTTPSFilterTestCase.java b/zxingorg/src/test/java/com/google/zxing/web/HTTPSFilterTestCase.java
@@ -24,7 +24,7 @@
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 /**
  * Tests {@link HTTPSFilter}.

diff --git a/zxingorg/src/test/java/com/google/zxing/web/TimeoutFilterTestCase.java b/zxingorg/src/test/java/com/google/zxing/web/TimeoutFilterTestCase.java
@@ -23,12 +23,12 @@
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.GenericServlet;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.GenericServlet;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 /**
  * Tests {@link TimeoutFilter}.

diff --git a/zxingorg/src/test/java/com/google/zxing/web/WelcomeFilterTestCase.java b/zxingorg/src/test/java/com/google/zxing/web/WelcomeFilterTestCase.java
@@ -23,8 +23,8 @@
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 
-import javax.servlet.FilterChain;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.http.HttpServletResponse;
 
 /**
  * Tests {@link WelcomeFilter}.