Upgrade from javax to jakarta namespace, including upgrades to Spring…

… Boot 3 and Spring 6 - Currently missing modules: CDI (some more research/help needed to fix tests), Shiro (still no jakarta version available) and Cassandra (outdated)
MediaMarco · Jan 11, 2023 · 8cb5719 · 8cb5719
1 parent 846c623
commit 8cb5719
Show file tree

Hide file tree

Showing 108 changed files with 673 additions and 600 deletions.
diff --git a/amazon-s3/src/test/resources/logback-test.xml b/amazon-s3/src/test/resources/logback-test.xml
@@ -2,7 +2,7 @@
 
 <configuration>
     <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-        <withJansi>true</withJansi>
+        <withJansi>false</withJansi>
 
         <encoder>
             <pattern>%highlight(%.-1level) %date{HH:mm:ss.SSS} [%30.30logger] %msg%n</pattern>

diff --git a/appengine/pom.xml b/appengine/pom.xml
@@ -35,12 +35,11 @@
       <version>${appengine.target.version}</version>
     </dependency>
 
-    <dependency>
-      <groupId>javax.inject</groupId>
-      <artifactId>javax.inject</artifactId>
-      <version>1</version>
-      <scope>provided</scope>
-    </dependency>
+      <dependency>
+          <groupId>jakarta.enterprise</groupId>
+          <artifactId>jakarta.enterprise.cdi-api</artifactId>
+          <version>4.0.1</version>
+      </dependency>
 
     <!-- Appengine testing -->
     <dependency>

diff --git a/appengine/src/test/resources/logback-test.xml b/appengine/src/test/resources/logback-test.xml
@@ -2,7 +2,7 @@
 
 <configuration>
     <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-        <withJansi>true</withJansi>
+        <withJansi>false</withJansi>
 
         <encoder>
             <pattern>%highlight(%.-1level) %date{HH:mm:ss.SSS} [%30.30logger] %msg%n</pattern>

diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml
@@ -53,7 +53,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jmh.version>1.35</jmh.version>
-        <javac.target>1.8</javac.target>
+        <javac.target>17</javac.target>
         <uberjar.name>togglz-benchmarks-uberjar</uberjar.name>
     </properties>
 

diff --git a/cassandra/pom.xml b/cassandra/pom.xml
@@ -85,7 +85,7 @@
         <dependency>
             <groupId>org.cassandraunit</groupId>
             <artifactId>cassandra-unit</artifactId>
-            <version>2.0.2.0</version>
+            <version>4.3.1.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/cassandra/src/test/resources/logback-test.xml b/cassandra/src/test/resources/logback-test.xml
@@ -2,7 +2,7 @@
 
 <configuration>
     <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-        <withJansi>true</withJansi>
+        <withJansi>false</withJansi>
 
         <encoder>
             <pattern>%highlight(%.-1level) %date{HH:mm:ss.SSS} [%30.30logger] %msg%n</pattern>

diff --git a/cdi/pom.xml b/cdi/pom.xml
@@ -20,17 +20,22 @@
     </dependency>
 
     <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
       <scope>provided</scope>
     </dependency>
 
-    <dependency>
-      <groupId>javax.enterprise</groupId>
-      <artifactId>cdi-api</artifactId>
-      <version>2.0.SP1</version>
-      <scope>provided</scope>
-    </dependency>
+      <dependency>
+          <groupId>jakarta.annotation</groupId>
+          <artifactId>jakarta.annotation-api</artifactId>
+          <version>2.1.1</version>
+      </dependency>
+
+      <dependency>
+          <groupId>jakarta.enterprise</groupId>
+          <artifactId>jakarta.enterprise.cdi-api</artifactId>
+          <version>3.0.1</version>
+      </dependency>
 
     <dependency>
       <groupId>org.junit.vintage</groupId>

diff --git a/cdi/src/main/java/org/togglz/cdi/spi/CDIBeanFinder.java b/cdi/src/main/java/org/togglz/cdi/spi/CDIBeanFinder.java
@@ -7,11 +7,11 @@
 
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
 
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
 import org.togglz.core.spi.BeanFinder;
 
 public class CDIBeanFinder implements BeanFinder {
@@ -21,6 +21,7 @@ public class CDIBeanFinder implements BeanFinder {
     public final static String BEAN_MANAGER_JNDI_TOMCAT = "java:comp/env/BeanManager";
 
     public final static String SERVLET_CONTEXT_ATTR_WELD_1_1 = "org.jboss.weld.environment.servlet.javax.enterprise.inject.spi.BeanManager";
+    public final static String SERVLET_CONTEXT_ATTR_WELD_5_1 = "org.jboss.weld.environment.servlet.jakarta.enterprise.inject.spi.BeanManager";
 
     @Override
     @SuppressWarnings("unchecked")
@@ -67,6 +68,21 @@ private BeanManager getBeanManager(ServletContext servletContext) {
             beanManager = (BeanManager) servletContext.getAttribute(SERVLET_CONTEXT_ATTR_WELD_1_1);
         }
 
+        // try Weld 5.1.x servlet context attribute
+        if (beanManager == null && servletContext != null) {
+            beanManager = (BeanManager) servletContext.getAttribute(SERVLET_CONTEXT_ATTR_WELD_5_1);
+        }
+
+        // try jakarta servlet context attribute
+        if (beanManager == null && servletContext != null) {
+            beanManager = (BeanManager) servletContext.getAttribute("jakarta.enterprise.inject.spi.BeanManager");
+        }
+
+        // try jakarta servlet context attribute
+        if (beanManager == null && servletContext != null) {
+            beanManager = (BeanManager) servletContext.getAttribute("org.jboss.weld.manager.BeanManagerImpl");
+        }
+
         // try standard JNDI name
         if (beanManager == null) {
             beanManager = getBeanManagerFromJNDI(BEAN_MANAGER_JNDI);

diff --git a/cdi/src/main/resources/META-INF/beans.xml b/cdi/src/main/resources/META-INF/beans.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
 <beans xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://jboss.org/schema/cdi/beans_1_0.xsd">
-
-</beans>
+</beans>
diff --git a/cdi/src/test/java/org/togglz/cdi/container/ManagedFeatureManagerProvider.java b/cdi/src/test/java/org/togglz/cdi/container/ManagedFeatureManagerProvider.java
@@ -1,7 +1,7 @@
 package org.togglz.cdi.container;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
 import org.togglz.cdi.Features;
 import org.togglz.core.manager.FeatureManager;
 import org.togglz.core.manager.FeatureManagerBuilder;

diff --git a/cdi/src/test/java/org/togglz/cdi/test/CDIFeatureConfiguration.java b/cdi/src/test/java/org/togglz/cdi/test/CDIFeatureConfiguration.java
@@ -1,6 +1,6 @@
 package org.togglz.cdi.test;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 import org.togglz.cdi.Features;
 import org.togglz.core.Feature;
 import org.togglz.core.manager.TogglzConfig;

diff --git a/cdi/src/test/resources/logback-test.xml b/cdi/src/test/resources/logback-test.xml
@@ -2,7 +2,7 @@
 
 <configuration>
     <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-        <withJansi>true</withJansi>
+        <withJansi>false</withJansi>
 
         <encoder>
             <pattern>%highlight(%.-1level) %date{HH:mm:ss.SSS} [%30.30logger] %msg%n</pattern>

diff --git a/cloud-datastore/pom.xml b/cloud-datastore/pom.xml
@@ -36,6 +36,12 @@
             <artifactId>togglz-core</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
+            <version>2.0.1</version>
+        </dependency>
+
         <dependency>
             <groupId>com.google.cloud</groupId>
             <artifactId>google-cloud-datastore</artifactId>
@@ -48,13 +54,6 @@
             </exclusions>
         </dependency>
 
-        <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
-            <version>1</version>
-            <scope>provided</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>

diff --git a/.../java/org/togglz/googleclouddatastore/repository/GoogleCloudDatastoreStateRepository.java b/.../java/org/togglz/googleclouddatastore/repository/GoogleCloudDatastoreStateRepository.java
@@ -5,7 +5,7 @@
 import com.google.cloud.datastore.Key;
 import com.google.cloud.datastore.KeyFactory;
 import com.google.cloud.datastore.Value;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import org.togglz.core.Feature;
 import org.togglz.core.repository.FeatureState;
 import org.togglz.core.repository.StateRepository;

diff --git a/cloud-datastore/src/test/resources/logback-test.xml b/cloud-datastore/src/test/resources/logback-test.xml
@@ -2,7 +2,7 @@
 
 <configuration>
     <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-        <withJansi>true</withJansi>
+        <withJansi>false</withJansi>
 
         <encoder>
             <pattern>%highlight(%.-1level) %date{HH:mm:ss.SSS} [%30.30logger] %msg%n</pattern>

diff --git a/cloud-storage/src/test/resources/logback-test.xml b/cloud-storage/src/test/resources/logback-test.xml
@@ -2,7 +2,7 @@
 
 <configuration>
     <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-        <withJansi>true</withJansi>
+        <withJansi>false</withJansi>
 
         <encoder>
             <pattern>%highlight(%.-1level) %date{HH:mm:ss.SSS} [%30.30logger] %msg%n</pattern>

diff --git a/console/pom.xml b/console/pom.xml
@@ -66,8 +66,8 @@
     </dependency>
 
     <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
       <scope>provided</scope>
     </dependency>
 

diff --git a/console/src/main/java/org/togglz/console/RequestEvent.java b/console/src/main/java/org/togglz/console/RequestEvent.java
@@ -1,8 +1,8 @@
 package org.togglz.console;
 
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.togglz.core.manager.FeatureManager;
 

diff --git a/console/src/main/java/org/togglz/console/RequestHandlerBase.java b/console/src/main/java/org/togglz/console/RequestHandlerBase.java
@@ -3,8 +3,8 @@
 import com.floreysoft.jmte.Engine;
 import org.togglz.core.Togglz;
 
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;

diff --git a/console/src/main/java/org/togglz/console/TogglzConsoleServlet.java b/console/src/main/java/org/togglz/console/TogglzConsoleServlet.java
@@ -4,11 +4,11 @@
 import org.togglz.core.manager.LazyResolvingFeatureManager;
 import org.togglz.core.user.FeatureUser;
 
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;

diff --git a/console/src/main/java/org/togglz/console/handlers/ResourceHandler.java b/console/src/main/java/org/togglz/console/handlers/ResourceHandler.java
@@ -5,7 +5,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.togglz.console.RequestEvent;
 import org.togglz.console.RequestHandlerBase;

diff --git a/console/src/main/java/org/togglz/console/handlers/edit/EditPageHandler.java b/console/src/main/java/org/togglz/console/handlers/edit/EditPageHandler.java
@@ -6,9 +6,9 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.togglz.console.RequestEvent;
 import org.togglz.console.RequestHandlerBase;

diff --git a/console/src/main/java/org/togglz/console/handlers/index/IndexPageHandler.java b/console/src/main/java/org/togglz/console/handlers/index/IndexPageHandler.java
@@ -6,7 +6,7 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.http.Cookie;
+import jakarta.servlet.http.Cookie;
 
 import org.togglz.console.RequestEvent;
 import org.togglz.console.RequestHandlerBase;

diff --git a/console/src/main/java/org/togglz/console/model/FeatureModel.java b/console/src/main/java/org/togglz/console/model/FeatureModel.java
@@ -9,7 +9,7 @@
 import java.util.Map.Entry;
 import java.util.Set;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.togglz.core.Feature;
 import org.togglz.core.activation.Parameter;

diff --git a/console/src/main/java/org/togglz/console/model/ParameterModel.java b/console/src/main/java/org/togglz/console/model/ParameterModel.java
@@ -1,6 +1,6 @@
 package org.togglz.console.model;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.togglz.core.activation.Parameter;
 import org.togglz.core.repository.FeatureState;

diff --git a/console/src/main/java/org/togglz/console/security/TogglzCSRFTokenProvider.java b/console/src/main/java/org/togglz/console/security/TogglzCSRFTokenProvider.java
@@ -2,7 +2,7 @@
 
 import java.util.UUID;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.togglz.servlet.spi.CSRFToken;
 import org.togglz.servlet.spi.CSRFTokenProvider;
@@ -22,4 +22,4 @@ public CSRFToken getToken(HttpServletRequest request) {
 		}
 		return token;
 	}
-}
+}
diff --git a/console/src/main/java/org/togglz/console/security/TogglzCSRFTokenValidator.java b/console/src/main/java/org/togglz/console/security/TogglzCSRFTokenValidator.java
@@ -1,6 +1,6 @@
 package org.togglz.console.security;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.togglz.servlet.spi.CSRFToken;
 import org.togglz.servlet.spi.CSRFTokenValidator;

diff --git a/console/src/main/resources/META-INF/web-fragment.xml b/console/src/main/resources/META-INF/web-fragment.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-fragment version="3.0" xmlns="http://java.sun.com/xml/ns/javaee"
+<web-fragment version="6.0" xmlns="https://jakarta.ee/xml/ns/jakartaee/"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-fragment_3_0.xsd">
+  xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee/ https://jakarta.ee/xml/ns/jakartaee/web-fragment_6_0.xsd">
 
   <name>togglz_console</name>
 

diff --git a/console/src/test/resources/logback-test.xml b/console/src/test/resources/logback-test.xml
@@ -2,7 +2,7 @@
 
 <configuration>
     <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-        <withJansi>true</withJansi>
+        <withJansi>false</withJansi>
 
         <encoder>
             <pattern>%highlight(%.-1level) %date{HH:mm:ss.SSS} [%30.30logger] %msg%n</pattern>

diff --git a/core/src/main/java/org/togglz/core/jndi/FeatureManagerObjectFactory.java b/core/src/main/java/org/togglz/core/jndi/FeatureManagerObjectFactory.java
@@ -17,15 +17,15 @@
  * <p>
  * Implementation of {@link ObjectFactory} that creates a {@link FeatureManager}.
  * </p>
- * 
+ *
  * <p>
  * The method {@link #getConfiguration(Object)} is used to obtain the {@link TogglzConfig} instance to use for building the
  * manager. The default implementation assumes that the supplied object is a {@link Reference} with an {@link RefAddr} element
  * with the name <code>togglzConfig</code>. This behavior can be changed by overwriting this method.
  * </p>
- * 
+ *
  * @author Christian Kaltepoth
- * 
+ *
  * @see "http://tomcat.apache.org/tomcat-7.0-doc/jndi-resources-howto.html#Adding_Custom_Resource_Factories"
  */
 public class FeatureManagerObjectFactory implements ObjectFactory {
@@ -41,7 +41,7 @@ public Object getObjectInstance(Object obj, Name name, Context nameCtx, Hashtabl
 
     /**
      * This class looks up the {@link TogglzConfig} to use when building the {@link FeatureManager}.
-     * 
+     *
      * @param obj The {@link Object} obtained from {@link #getObjectInstance(Object, Name, Context, Hashtable)}.
      */
     protected TogglzConfig getConfiguration(Object obj) {