Merge branch 'feature/upgrade-dotnet4.8' of https://github.com/RWS/dx…

…a-modules into feature/upgrade-dotnet4.8

.github/workflows/dotnet.yml

@@ -14,7 +14,7 @@ jobs:
 
     steps:
     - name: Checkout...
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
     - name: Adding msbuild to PATH...
       uses: microsoft/setup-msbuild@v1.0.2
     - name: Restoring NuGet Packages...

.github/workflows/gui.yml

@@ -13,7 +13,7 @@ jobs:
 
     steps:
     - name: Checkout...
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
     - name: Installing GULP
       run:
         sudo npm install gulp -g;

.github/workflows/java.yml

@@ -13,7 +13,12 @@ jobs:
 
     steps:
     - name: Checkout...
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
+    - name: Set up JDK 17
+      uses: actions/setup-java@v3
+      with:
+        java-version: '17'
+        distribution: 'temurin'
     - name: Building Web application...
       working-directory: webapp-java
       run:

README.md

@@ -5,6 +5,10 @@ Build status
 ### Java
 - Develop: ![Build Status](https://github.com/rws/dxa-modules/workflows/build_java/badge.svg?branch=develop)
 - 1.8: ![Build Status](https://github.com/rws/dxa-modules/workflows/build_java/badge.svg?branch=release/1.8)
+=======
+- Develop: ![Build Status](https://github.com/sdl/dxa-modules/workflows/build_java/badge.svg?branch=develop)
+- 2.2: ![Build Status](https://github.com/sdl/dxa-modules/workflows/build_java/badge.svg?branch=release/2.2)
+- 1.8: ![Build Status](https://github.com/sdl/dxa-modules/workflows/build_java/badge.svg?branch=release/1.8)
 
 ### NET
 - Develop: ![Build Status](https://github.com/rws/dxa-modules/workflows/build_dotnet/badge.svg?branch=develop)
@@ -29,19 +33,78 @@ For building .NET modules: see readme in webapp-net
 
 For building Java modules: `cd webapp-java; mvn install`
 
+Compatibility Matrices for Java DXA
+-----------------------------------
+<table>
+    <tr>
+        <th nowrap="nowrap">Java DXA Version</th>
+        <th nowrap="nowrap">Tridion Sites 10</th>
+        <th nowrap="nowrap">Tridion Sites 9.6</th>
+        <th nowrap="nowrap">Tridion Sites 9.5</th>
+        <th nowrap="nowrap">Tridion Sites 9.1</th>
+    </tr>
+    <tr>
+        <td nowrap="nowrap">2.2.x</td>
+        <td nowrap="nowrap" align="center">✔️</td>
+        <td nowrap="nowrap" align="center">✔️</td>
+        <td nowrap="nowrap" align="center">✔️</td>
+        <td nowrap="nowrap" align="center">✔️</td>
+    </tr>
+    <tr text-align="center">
+        <td nowrap="nowrap">2.3.x</td>
+        <td nowrap="nowrap" align="center">✔️</td>
+        <td nowrap="nowrap" align="center">✔️</td>
+        <td nowrap="nowrap" align="center">✔️</td>
+        <td nowrap="nowrap" align="center">✔️</td>
+    </tr>
+</table>
+
+<table>
+    <tr>
+        <th nowrap="nowrap">Java DXA Version</th>
+        <th nowrap="nowrap">JDK 1.8</th>
+        <th nowrap="nowrap">JDK 11</th>
+        <th nowrap="nowrap">JDK 17</th>
+        <th nowrap="nowrap">Tomcat 9</th>
+        <th nowrap="nowrap">Tomcat 10</th>
+    </tr>
+    <tr>
+        <td nowrap="nowrap">2.2.x</td>
+        <td nowrap="nowrap" align="center">✔️</td>
+        <td nowrap="nowrap" align="center">✔️</td>
+        <td nowrap="nowrap" align="center">❌</td>
+        <td nowrap="nowrap" align="center">✔️</td>
+        <td nowrap="nowrap" align="center">❌</td>
+    </tr>
+    <tr text-align="center">
+        <td nowrap="nowrap">2.3.x</td>
+        <td nowrap="nowrap" align="center">❌</td>
+        <td nowrap="nowrap" align="center">❌</td>
+        <td nowrap="nowrap" align="center">✔️</td>
+        <td nowrap="nowrap" align="center">❌</td>
+        <td nowrap="nowrap" align="center">✔️</td>
+    </tr>
+</table>
+
+The latest `Java DXA 2.3` version includes the `Spring Framework version 6` and `Jakarta Servlet API` as dependencies.
+
 About
 -----
 The RWS Digital Experience Accelerator (DXA) is a reference implementation of RWS Tridion Sites 9 and SDL Web 8 intended to help you create, design and publish an SDL Tridion/Web-based website quickly.
+=======
+The RWS Digital Experience Accelerator (DXA) is a reference implementation of RWS Tridion Sites 10, 9.x and RWS Web 8 intended to help you create, design and publish an RWS Tridion/Web-based website quickly.
 
 DXA is available for both .NET and Java web applications. Its modular architecture consists of a framework and example web application, which includes all core SDL Tridion/Web functionality as well as separate Modules for additional, optional functionality.
 
-This repository contains the source code of all the DXA Modules maintained by SDL. 
+This repository contains the source code of all the DXA Modules maintained by SDL.
 
 The Module distributions (including Content Manager-side items and installation support) are downloadable from the [SDL AppStore](https://appstore.sdl.com/list/?search=dxa) or the [Releases in GitHub](https://github.com/rws/dxa-modules/releases).
+=======
+The Module distributions (including Content Manager-side items and installation support) are downloadable from the [Releases in GitHub](https://github.com/sdl/dxa-modules/releases).
 
 
 Support
----------------
+-------
 At RWS we take your investment in Digital Experience very seriously, if you encounter any issues with the Digital Experience Accelerator, please use one of the following channels:
 
 - Report issues directly in [this repository](https://github.com/sdl/dxa-modules/issues)
@@ -51,7 +114,7 @@ At RWS we take your investment in Digital Experience very seriously, if you enco
 
 Documentation
 -------------
-Documentation for most of the SDL DXA Modules can be found online in the SDL documentation portal: https://docs.sdl.com/sdldxa
+Documentation for most of the SDL DXA Modules can be found online in the SDL documentation portal: https://docs.rws.com/publications/DXA
 
 
 Repositories
@@ -66,7 +129,7 @@ We are using the following branching strategy:
  - `develop` - Represents the latest development version.
  - `release/x.y` - Represents the x.y Release. If hotfixes are applicable, they will be applied to the appropriate release branch so that the branch actually represents the initial release plus hotfixes.
 
-All releases (including pre-releases and hotfix releases) are tagged. 
+All releases (including pre-releases and hotfix releases) are tagged.
 
 If you wish to submit a Pull Request, it should normally be submitted on the `develop` branch so that it can be incorporated in the upcoming release.
 
@@ -81,9 +144,9 @@ DXA Builder
 -----------
 The current DXA Builder is available in Maven Central, and the latest DXA Builder is also available as a public snapshot.
 
-If you have not configured a snapshot repository and don't want to, you may need to install the DXA Builder locally in order to run the SNAPSHOT. 
+If you have not configured a snapshot repository and don't want to, you may need to install the DXA Builder locally in order to run the SNAPSHOT.
 
-To install it, run the wrapper script of the `dxa-builder` project: `gradlew(.bat) publishLocal` 
+To install it, run the wrapper script of the `dxa-builder` project: `gradlew(.bat) publishLocal`
 On Windows, you can also just run `get-started.cmd` script at first run.
 
 Snapshots
@@ -92,7 +155,7 @@ DXA publishes SNAPSHOT versions to Sonatype. To use them, configure `https://oss
 
 License
 -------
-Copyright (c) 2014-2021 SDL Group.
+Copyright (c) 2014-2024 RWS Group.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

webapp-java/dxa-module-51degrees/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.sdl.dxa.modules</groupId>
         <artifactId>dxa-modules</artifactId>
-        <version>2.2.30-SNAPSHOT</version>
+        <version>2.3.0-RC2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -84,13 +84,14 @@
         </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>junit</groupId>
-            <artifactId>junit</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
@@ -99,7 +100,7 @@
 
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
+            <artifactId>mockito-core</artifactId>
         </dependency>
 
         <dependency>

webapp-java/dxa-module-51degrees/src/main/java/com/sdl/dxa/modules/degrees51/api/Degrees51DataProvider.java

@@ -18,7 +18,7 @@
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import java.io.File;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;

webapp-java/dxa-module-51degrees/src/main/java/com/sdl/dxa/modules/degrees51/api/mapping/Extractors.java

@@ -5,8 +5,8 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Objects;

webapp-java/dxa-module-51degrees/src/main/java/com/sdl/dxa/modules/degrees51/contextengine/Degrees51ClaimsProvider.java

@@ -11,7 +11,7 @@
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Component;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;

webapp-java/dxa-module-51degrees/src/test/java/com/sdl/dxa/modules/degrees51/api/mapping/ExtractorsTest.java

@@ -2,8 +2,8 @@
 
 import com.sdl.webapp.common.util.ApplicationContextHolder;
 import fiftyone.mobile.detection.Match;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
@@ -12,15 +12,15 @@
 import org.springframework.context.annotation.Profile;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.context.support.AnnotationConfigContextLoader;
 
 import java.io.IOException;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.mock;
 
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration(loader = AnnotationConfigContextLoader.class)
 @ActiveProfiles("test")
 public class ExtractorsTest {