Merge pull request #2 from RWS/subtask/UDP-11072

UDP-11072: lib updates and moving to jakarta namespace
dd4t · Jul 24, 2024 · c640a2f · c640a2f
2 parents e47a255 + 25fa559
commit c640a2f
Show file tree

Hide file tree

Showing 85 changed files with 273 additions and 239 deletions.
diff --git a/dd4t-api/pom.xml b/dd4t-api/pom.xml
@@ -129,8 +129,8 @@
             <artifactId>joda-time</artifactId>
         </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>

diff --git a/dd4t-api/src/main/java/org/dd4t/core/request/RequestContext.java b/dd4t-api/src/main/java/org/dd4t/core/request/RequestContext.java
@@ -16,7 +16,7 @@
 
 package org.dd4t.core.request;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 /**
  * Bean Interface describes the request which is given to CWA for retrieval. It will at the

diff --git a/dd4t-bom-2013SP1/pom.xml b/dd4t-bom-2013SP1/pom.xml
@@ -39,7 +39,8 @@
     </scm>
 
     <properties>
-        <tridion.build.version>7.1.0</tridion.build.version>
+        <tridion.build.version>8.5.0-SNAPSHOT</tridion.build.version>
+        <tridion.cd_ambient.version>7.1.1-228</tridion.cd_ambient.version>
         <java-version>1.7</java-version>
 
         <guava.version>17.0</guava.version>
@@ -71,7 +72,7 @@
             <dependency>
                 <groupId>com.tridion</groupId>
                 <artifactId>cd_ambient</artifactId>
-                <version>${tridion.build.version}</version>
+                <version>${tridion.cd_ambient.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.tridion</groupId>

diff --git a/dd4t-bom-tridion-9/pom.xml b/dd4t-bom-tridion-9/pom.xml
@@ -77,7 +77,7 @@
         <scala-parser-combinators_2.12.version>1.1.1</scala-parser-combinators_2.12.version>
         <slf4j.version>1.7.30</slf4j.version>
         <snakeyaml.version>1.28</snakeyaml.version>
-        <spring.version>5.3.18</spring.version>
+        <spring.version>6.1.10</spring.version>
         <stax-ex.version>1.8.1</stax-ex.version>
         <txw2.version>2.3.2</txw2.version>
         <uap-java.version>1.5.2</uap-java.version>
@@ -260,7 +260,6 @@
             </dependency>
 
 
-
             <!-- Third party dependencies -->
 
             <dependency>

diff --git a/dd4t-bom/pom.xml b/dd4t-bom/pom.xml
@@ -33,12 +33,13 @@
         <jackson.version>2.10.5</jackson.version>
         <jackson.databind.version>2.10.5.1</jackson.databind.version>
         <javax.cache-api.version>1.1.1</javax.cache-api.version>
-        <javax.jms.version>1.1-rev-1</javax.jms.version>
-        <javax.servlet-api.version>4.0.1</javax.servlet-api.version>
+        <jakarta.jms-api.version>3.1.0</jakarta.jms-api.version>
+        <jakarta.servlet-api.version>6.1.0</jakarta.servlet-api.version>
         <joda-time.version>2.10.3</joda-time.version>
         <jsoup.version>1.14.3</jsoup.version>
-        <jsp-api.version>2.2</jsp-api.version>
-        <jstl.version>1.2</jstl.version>
+        <jakarta.jsp-api.version>4.0.0</jakarta.jsp-api.version>
+        <jakarta-annotation-api.version>3.0.0</jakarta-annotation-api.version>
+        <jakarta.jstl.version>3.0.0</jakarta.jstl.version>
         <slf4j.version>1.7.30</slf4j.version>
         <thymeleaf.version>3.0.2.RELEASE</thymeleaf.version>
 
@@ -70,19 +71,24 @@
                 <version>${httpcomponents.version}</version>
             </dependency>
             <dependency>
-                <groupId>javax.servlet</groupId>
-                <artifactId>javax.servlet-api</artifactId>
-                <version>${javax.servlet-api.version}</version>
+                <groupId>jakarta.servlet</groupId>
+                <artifactId>jakarta.servlet-api</artifactId>
+                <version>${jakarta.servlet-api.version}</version>
             </dependency>
             <dependency>
-                <groupId>javax.servlet</groupId>
-                <artifactId>jstl</artifactId>
-                <version>${jstl.version}</version>
+                <groupId>jakarta.servlet.jsp.jstl</groupId>
+                <artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
+                <version>${jakarta.jstl.version}</version>
             </dependency>
             <dependency>
-                <groupId>javax.servlet.jsp</groupId>
-                <artifactId>jsp-api</artifactId>
-                <version>${jsp-api.version}</version>
+                <groupId>jakarta.servlet.jsp</groupId>
+                <artifactId>jakarta.servlet.jsp-api</artifactId>
+                <version>${jakarta.jsp-api.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>jakarta.annotation</groupId>
+                <artifactId>jakarta.annotation-api</artifactId>
+                <version>${jakarta-annotation-api.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
@@ -135,11 +141,10 @@
                 <artifactId>joda-time</artifactId>
                 <version>${joda-time.version}</version>
             </dependency>
-
             <dependency>
-                <groupId>javax.jms</groupId>
-                <artifactId>jms-api</artifactId>
-                <version>${javax.jms.version}</version>
+                <groupId>jakarta.jms</groupId>
+                <artifactId>jakarta.jms-api</artifactId>
+                <version>${jakarta.jms-api.version}</version>
             </dependency>
 
             <!-- Only used for JMS cache invalidation -->

diff --git a/dd4t-caching/pom.xml b/dd4t-caching/pom.xml
@@ -162,8 +162,8 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>javax.jms</groupId>
-            <artifactId>jms-api</artifactId>
+            <groupId>jakarta.jms</groupId>
+            <artifactId>jakarta.jms-api</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -230,4 +230,21 @@
             <scope>provided</scope>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration combine.children="append">
+                    <argLine>
+                        --add-opens java.base/java.lang=ALL-UNNAMED
+                        --add-opens java.base/java.util=ALL-UNNAMED
+                        --add-opens java.base/java.util.concurrent=ALL-UNNAMED
+                        --add-opens java.base/java.util.concurrent.atomic=ALL-UNNAMED
+                    </argLine>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/dd4t-caching/src/main/java/org/dd4t/caching/jms/impl/JMSCacheMessageListener.java b/dd4t-caching/src/main/java/org/dd4t/caching/jms/impl/JMSCacheMessageListener.java
@@ -17,15 +17,15 @@
 package org.dd4t.caching.jms.impl;
 
 import com.tridion.cache.CacheEvent;
+import jakarta.annotation.Resource;
 import org.dd4t.caching.CacheInvalidator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.annotation.Resource;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageListener;
-import javax.jms.ObjectMessage;
+import jakarta.jms.JMSException;
+import jakarta.jms.Message;
+import jakarta.jms.MessageListener;
+import jakarta.jms.ObjectMessage;
 import java.io.Serializable;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;

diff --git a/dd4t-caching/src/main/java/org/dd4t/caching/jms/impl/JMSCacheMonitor.java b/dd4t-caching/src/main/java/org/dd4t/caching/jms/impl/JMSCacheMonitor.java
@@ -20,7 +20,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 /**
  * @author Mihai Cadariu

diff --git a/dd4t-caching/src/main/java/org/dd4t/caching/jms/impl/JMSErrorHandler.java b/dd4t-caching/src/main/java/org/dd4t/caching/jms/impl/JMSErrorHandler.java
@@ -20,7 +20,7 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.util.ErrorHandler;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 /**
  * Spring JMS error handler, alternative to the JMSExceptionListener which isn't always easy to hook up.

diff --git a/dd4t-caching/src/main/java/org/dd4t/caching/jms/impl/JMSExceptionListener.java b/dd4t-caching/src/main/java/org/dd4t/caching/jms/impl/JMSExceptionListener.java
@@ -16,12 +16,12 @@
 
 package org.dd4t.caching.jms.impl;
 
+import jakarta.annotation.Resource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.annotation.Resource;
-import javax.jms.ExceptionListener;
-import javax.jms.JMSException;
+import jakarta.jms.ExceptionListener;
+import jakarta.jms.JMSException;
 
 /**
  * @author Mihai Cadariu

diff --git a/dd4t-caching/src/main/java/org/dd4t/caching/jms/impl/JMSTransportListener.java b/dd4t-caching/src/main/java/org/dd4t/caching/jms/impl/JMSTransportListener.java
@@ -2,7 +2,7 @@
 
 import org.apache.activemq.transport.TransportListener;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.io.IOException;
 
 /**

diff --git a/dd4t-caching/src/test/java/org/dd4t/caching/jms/impl/JMSCacheMessageListenerTest.java b/dd4t-caching/src/test/java/org/dd4t/caching/jms/impl/JMSCacheMessageListenerTest.java
@@ -33,7 +33,7 @@ public void stripNamespaceIfRequired() {
         JMSCacheMessageListener messageListener = (JMSCacheMessageListener) applicationContext.getBean
                 ("cacheMessageListener");
         assertNotNull(messageListener);
-        assertEquals("1:233:2222:64", messageListener.stripNamespaceIfRequired(key));
+        assertEquals("233:2222:64", messageListener.stripNamespaceIfRequired(key));
 
     }
 }
diff --git a/dd4t-compatibility/pom.xml b/dd4t-compatibility/pom.xml
@@ -132,8 +132,8 @@
             <version>${project.version}</version>
         </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>

diff --git a/dd4t-compatibility/src/main/java/org/dd4t/caching/impl/WrappingCacheProvider.java b/dd4t-compatibility/src/main/java/org/dd4t/caching/impl/WrappingCacheProvider.java
@@ -15,6 +15,7 @@
  */
 package org.dd4t.caching.impl;
 
+import jakarta.annotation.Resource;
 import org.dd4t.caching.Cachable;
 import org.dd4t.caching.CacheDependency;
 import org.dd4t.caching.CacheElement;
@@ -23,7 +24,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.annotation.Resource;
 import java.util.Collection;
 import java.util.List;
 

diff --git a/dd4t-compatibility/src/main/java/org/dd4t/core/factories/impl/GenericComponentFactory.java b/dd4t-compatibility/src/main/java/org/dd4t/core/factories/impl/GenericComponentFactory.java
@@ -28,7 +28,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 /**
  * Backwards compatibility class

diff --git a/dd4t-compatibility/src/main/java/org/dd4t/core/request/impl/BasicRequestContext.java b/dd4t-compatibility/src/main/java/org/dd4t/core/request/impl/BasicRequestContext.java
@@ -18,7 +18,7 @@
 import org.dd4t.core.request.RequestContext;
 import org.dd4t.core.util.HttpUtils;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 
 /**

diff --git a/dd4t-core/pom.xml b/dd4t-core/pom.xml
@@ -208,11 +208,10 @@
             <artifactId>jsoup</artifactId>
         </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>org.apache.httpcomponents</groupId>
             <artifactId>httpcore</artifactId>

diff --git a/dd4t-core/src/main/java/org/dd4t/core/factories/impl/BaseFactory.java b/dd4t-core/src/main/java/org/dd4t/core/factories/impl/BaseFactory.java
@@ -16,6 +16,7 @@
 
 package org.dd4t.core.factories.impl;
 
+import jakarta.annotation.Resource;
 import org.dd4t.contentmodel.Item;
 import org.dd4t.core.databind.DataBinder;
 import org.dd4t.core.exceptions.FactoryException;
@@ -25,7 +26,6 @@
 import org.dd4t.core.request.RequestContext;
 import org.dd4t.providers.PayloadCacheProvider;
 
-import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 

diff --git a/dd4t-core/src/main/java/org/dd4t/core/factories/impl/ComponentPresentationFactoryImpl.java b/dd4t-core/src/main/java/org/dd4t/core/factories/impl/ComponentPresentationFactoryImpl.java
@@ -16,6 +16,7 @@
 
 package org.dd4t.core.factories.impl;
 
+import jakarta.annotation.Resource;
 import org.apache.commons.lang3.StringUtils;
 import org.dd4t.caching.CacheElement;
 import org.dd4t.contentmodel.ComponentPresentation;
@@ -31,7 +32,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.annotation.Resource;
 import java.text.ParseException;
 
 public class ComponentPresentationFactoryImpl extends BaseFactory implements ComponentPresentationFactory {

diff --git a/dd4t-core/src/main/java/org/dd4t/core/factories/impl/PageFactoryImpl.java b/dd4t-core/src/main/java/org/dd4t/core/factories/impl/PageFactoryImpl.java
@@ -34,7 +34,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.io.IOException;
 import java.text.ParseException;
 

diff --git a/dd4t-core/src/main/java/org/dd4t/core/factories/impl/TaxonomyFactoryImpl.java b/dd4t-core/src/main/java/org/dd4t/core/factories/impl/TaxonomyFactoryImpl.java
@@ -29,7 +29,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.io.IOException;
 import java.text.ParseException;
 

diff --git a/dd4t-core/src/main/java/org/dd4t/core/processors/impl/DcpResolver.java b/dd4t-core/src/main/java/org/dd4t/core/processors/impl/DcpResolver.java
@@ -16,6 +16,7 @@
 
 package org.dd4t.core.processors.impl;
 
+import jakarta.annotation.Resource;
 import org.dd4t.contentmodel.ComponentPresentation;
 import org.dd4t.contentmodel.Item;
 import org.dd4t.contentmodel.Page;
@@ -26,8 +27,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.annotation.Resource;
-
 /**
  * Pagefactory processor intended to resolve DCP's on pages at the factory level. It checks the page
  * being produced, finds the dynamic components (if any), and resolves these components through

diff --git a/dd4t-core/src/main/java/org/dd4t/core/processors/impl/LinkingProcessor.java b/dd4t-core/src/main/java/org/dd4t/core/processors/impl/LinkingProcessor.java
@@ -16,6 +16,7 @@
 
 package org.dd4t.core.processors.impl;
 
+import jakarta.annotation.Resource;
 import org.dd4t.contentmodel.Component;
 import org.dd4t.contentmodel.ComponentPresentation;
 import org.dd4t.contentmodel.Field;
@@ -35,7 +36,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.annotation.Resource;
 import javax.xml.transform.TransformerException;
 import java.util.Collection;
 import java.util.HashMap;

diff --git a/dd4t-core/src/main/java/org/dd4t/core/processors/impl/RichTextWithLinksResolver.java b/dd4t-core/src/main/java/org/dd4t/core/processors/impl/RichTextWithLinksResolver.java
@@ -23,7 +23,7 @@
 import org.dd4t.core.resolvers.LinkResolver;
 import org.dd4t.core.util.RichTextUtils;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import javax.xml.transform.TransformerException;
 
 /**

diff --git a/dd4t-core/src/main/java/org/dd4t/core/request/impl/BasicRequestContext.java b/dd4t-core/src/main/java/org/dd4t/core/request/impl/BasicRequestContext.java
@@ -18,7 +18,7 @@
 import org.dd4t.core.request.RequestContext;
 import org.dd4t.core.util.HttpUtils;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 
 /**

diff --git a/dd4t-core/src/main/java/org/dd4t/core/resolvers/impl/DefaultLinkResolver.java b/dd4t-core/src/main/java/org/dd4t/core/resolvers/impl/DefaultLinkResolver.java
@@ -34,7 +34,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.text.ParseException;