WIP WIP

terrestris · Dec 18, 2023 · 2465e7d · 2465e7d
1 parent b05c599
commit 2465e7d
Show file tree

Hide file tree

Showing 30 changed files with 87 additions and 85 deletions.
diff --git a/SPRING6_MIGRATION.md b/SPRING6_MIGRATION.md
@@ -0,0 +1 @@
+When trying to update to spring 6, use OpenJDK 17 and this command to build: `mvn clean install -DskipTests -Dmaven.javadoc.skip=true -DskipCodeQualityChecks` (be sure that maven uses your java 17)
diff --git a/src/pom.xml b/src/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>de.terrestris</groupId>
     <artifactId>shogun-core</artifactId>
-    <version>5.3.13-SNAPSHOT</version>
+    <version>6.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>SHOGun-Core</name>
     <description>SHOGun-Core is the core framework used in SHOGun</description>
@@ -121,10 +121,10 @@
 
         <webapp-archetype-resource-pom>shogun-core-webapp-archetype/src/main/resources/archetype-resources/pom.xml</webapp-archetype-resource-pom>
 
-        <tomcat.version>9.0.30</tomcat.version>
+        <tomcat.version>10.1.17</tomcat.version>
 
         <!-- Core -->
-        <spring.version>5.3.26</spring.version>
+        <spring.version>6.0.15</spring.version>
         <spring-security.version>5.5.7</spring-security.version>
         <spring-ldap.version>2.3.2.RELEASE</spring-ldap.version>
         <log4j.version>2.17.0</log4j.version>
@@ -145,7 +145,8 @@
         <hamcrest.version>1.3</hamcrest.version>
         <mockito.version>2.28.2</mockito.version>
         <jsonpath.version>1.2.0</jsonpath.version>
-        <greenmail.version>1.5.11</greenmail.version>
+        <greenmail.version>2.0.1</greenmail.version>
+        <angus-mail.version>2.0.2</angus-mail.version>
 
         <!-- Code Coverage -->
         <coveralls-maven-plugin.version>4.3.0</coveralls-maven-plugin.version>
@@ -167,10 +168,10 @@
         <jadira-usertype-jodatime.version>7.0.0.CR1</jadira-usertype-jodatime.version>
 
         <!-- Maven Plugins -->
-        <maven-javadoc-plugin.version>3.3.1</maven-javadoc-plugin.version>
+        <maven-javadoc-plugin.version>3.6.3</maven-javadoc-plugin.version>
         <maven-deploy-plugin.version>3.0.0-M1</maven-deploy-plugin.version>
         <maven-gpg-plugin.version>3.0.1</maven-gpg-plugin.version>
-        <maven-release-plugin.version>3.0.0-M4</maven-release-plugin.version>
+        <maven-release-plugin.version>3.0.1</maven-release-plugin.version>
         <maven-replacer-plugin.version>1.5.3</maven-replacer-plugin.version>
         <maven-scm-plugin.version>1.12.0</maven-scm-plugin.version>
         <spotbugs-maven-plugin.version>4.4.1</spotbugs-maven-plugin.version>
@@ -185,13 +186,14 @@
         <structured-content-tools.version>1.3.11</structured-content-tools.version>
 
         <!-- Java Mail API -->
-        <javax-mail-api.version>1.6.2</javax-mail-api.version>
+        <jakarta-mail.version>2.0.1</jakarta-mail.version>
+        <jakarta-mail-api.version>2.1.2</jakarta-mail-api.version>
 
         <!-- Java Transaction API -->
         <jta.version>1.1</jta.version>
 
         <!-- Java Servlet API -->
-        <javax-servlet-api.version>4.0.1</javax-servlet-api.version>
+        <jakarta-servlet-api.version>6.0.0</jakarta-servlet-api.version>
 
         <!-- Apache HTTP Client -->
         <apache-httpclient.version>4.5.11</apache-httpclient.version>
@@ -216,7 +218,8 @@
         <jackson-datatype-jts.version>0.12-2.5-1</jackson-datatype-jts.version>
 
         <jaxb-javax.version>2.3.1</jaxb-javax.version>
-        <jaxb-sun.version>2.3.0.1</jaxb-sun.version>
+        <jaxb-core-sun.version>2.3.0.1</jaxb-core-sun.version>
+        <jaxb-impl-sun.version>2.3.9</jaxb-impl-sun.version>
         <clean-plugin.version>3.1.0</clean-plugin.version>
         <compiler-plugin.version>3.8.1</compiler-plugin.version>
         <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
@@ -1024,22 +1027,22 @@
             </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>
 
             <!-- Mail -->
             <dependency>
-                <groupId>javax.mail</groupId>
-                <artifactId>javax.mail-api</artifactId>
-                <version>${javax-mail-api.version}</version>
+                <groupId>jakarta.mail</groupId>
+                <artifactId>jakarta.mail-api</artifactId>
+                <version>${jakarta-mail-api.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>com.sun.mail</groupId>
-                <artifactId>javax.mail</artifactId>
-                <version>${javax-mail-api.version}</version>
+                <artifactId>jakarta.mail</artifactId>
+                <version>${jakarta-mail.version}</version>
             </dependency>
 
             <dependency>
@@ -1048,6 +1051,13 @@
                 <version>${greenmail.version}</version>
             </dependency>
 
+            <!-- https://mvnrepository.com/artifact/org.eclipse.angus/angus-mail -->
+            <dependency>
+                <groupId>org.eclipse.angus</groupId>
+                <artifactId>angus-mail</artifactId>
+                <version>${angus-mail.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>javax.xml.parsers</groupId>
                 <artifactId>jaxp-api</artifactId>
@@ -1099,12 +1109,12 @@
             <dependency>
                 <groupId>com.sun.xml.bind</groupId>
                 <artifactId>jaxb-core</artifactId>
-                <version>${jaxb-sun.version}</version>
+                <version>${jaxb-core-sun.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.sun.xml.bind</groupId>
                 <artifactId>jaxb-impl</artifactId>
-                <version>${jaxb-sun.version}</version>
+                <version>${jaxb-impl-sun.version}</version>
             </dependency>
 
             <dependency>

diff --git a/src/shogun-core-main/pom.xml b/src/shogun-core-main/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>de.terrestris</groupId>
         <artifactId>shogun-core</artifactId>
-        <version>5.3.13-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>shogun-core-main</artifactId>
@@ -16,12 +16,14 @@
 
     <dependencies>
 
-        <!-- https://mvnrepository.com/artifact/javax/javaee-api -->
+        <!-- https://mvnrepository.com/artifact/jakarta.platform/jakarta.jakartaee-api -->
         <dependency>
-            <groupId>javax</groupId>
-            <artifactId>javaee-api</artifactId>
-            <version>8.0</version>
+            <groupId>jakarta.platform</groupId>
+            <artifactId>jakarta.jakartaee-api</artifactId>
+            <version>10.0.0</version>
+            <scope>provided</scope>
         </dependency>
+
         <dependency>
             <groupId>javax.transaction</groupId>
             <artifactId>javax.transaction-api</artifactId>
@@ -232,19 +234,20 @@
         </dependency>
 
         <!-- Mailing -->
-        <dependency>
-            <groupId>javax.mail</groupId>
-            <artifactId>javax.mail-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.sun.mail</groupId>
-            <artifactId>javax.mail</artifactId>
+            <artifactId>jakarta.mail</artifactId>
         </dependency>
         <dependency>
             <groupId>com.icegreen</groupId>
             <artifactId>greenmail</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.eclipse.angus</groupId>
+            <artifactId>angus-mail</artifactId>
+        </dependency>
+
         <!-- Apache HTTP -->
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
@@ -267,8 +270,8 @@
             <artifactId>jta</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
         </dependency>
 
         <!-- Tomcat -->

diff --git a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/rest/AbstractRestController.java b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/rest/AbstractRestController.java
@@ -16,7 +16,7 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.Reader;

diff --git a/...core-main/src/main/java/de/terrestris/shoguncore/service/GeoServerInterceptorService.java b/...core-main/src/main/java/de/terrestris/shoguncore/service/GeoServerInterceptorService.java
@@ -27,7 +27,7 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import javax.transaction.Transactional;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;

diff --git a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/service/HttpProxyService.java b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/service/HttpProxyService.java
@@ -13,8 +13,8 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URI;

diff --git a/...n-core-main/src/main/java/de/terrestris/shoguncore/service/PasswordResetTokenService.java b/...n-core-main/src/main/java/de/terrestris/shoguncore/service/PasswordResetTokenService.java
@@ -16,7 +16,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.web.util.UriUtils;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.io.UnsupportedEncodingException;
 import java.lang.reflect.InvocationTargetException;
 import java.net.URI;

diff --git a/...un-core-main/src/main/java/de/terrestris/shoguncore/service/RegistrationTokenService.java b/...un-core-main/src/main/java/de/terrestris/shoguncore/service/RegistrationTokenService.java
@@ -15,7 +15,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.web.util.UriUtils;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.io.UnsupportedEncodingException;
 import java.lang.reflect.InvocationTargetException;
 import java.net.URI;

diff --git a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/service/UserService.java b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/service/UserService.java
@@ -16,7 +16,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.util.Set;
 
 /**

diff --git a/...e-main/src/main/java/de/terrestris/shoguncore/util/application/ShogunCoreContextUtil.java b/...e-main/src/main/java/de/terrestris/shoguncore/util/application/ShogunCoreContextUtil.java
@@ -2,7 +2,7 @@
 
 import org.apache.http.client.utils.URIBuilder;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.net.URI;
 import java.net.URISyntaxException;
 

diff --git a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/util/http/HttpUtil.java b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/util/http/HttpUtil.java
@@ -34,9 +34,9 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Component;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.Part;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.Part;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;

diff --git a/...ain/src/main/java/de/terrestris/shoguncore/util/interceptor/CachedServletInputStream.java b/...ain/src/main/java/de/terrestris/shoguncore/util/interceptor/CachedServletInputStream.java
@@ -1,7 +1,7 @@
 package de.terrestris.shoguncore.util.interceptor;
 
-import javax.servlet.ReadListener;
-import javax.servlet.ServletInputStream;
+import jakarta.servlet.ReadListener;
+import jakarta.servlet.ServletInputStream;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;

diff --git a/...n/src/main/java/de/terrestris/shoguncore/util/interceptor/GeoserverAuthHeaderRequest.java b/...n/src/main/java/de/terrestris/shoguncore/util/interceptor/GeoserverAuthHeaderRequest.java
@@ -2,7 +2,7 @@
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.util.*;
 
 /**

diff --git a/...in/src/main/java/de/terrestris/shoguncore/util/interceptor/MutableHttpServletRequest.java b/...in/src/main/java/de/terrestris/shoguncore/util/interceptor/MutableHttpServletRequest.java
@@ -10,9 +10,8 @@
 import org.w3c.dom.NodeList;
 import org.w3c.dom.Element;
 
-import javax.servlet.ServletInputStream;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequestWrapper;
 import java.io.*;
 import java.net.URI;
 import java.util.Arrays;
@@ -309,17 +308,6 @@ public String getHeader(String name) {
         return ((HttpServletRequest) getRequest()).getHeader(name);
     }
 
-    /**
-     *
-     */
-    @Override
-    public ServletInputStream getInputStream() throws IOException {
-        if (cachedInputStream == null) {
-            cacheInputStream();
-        }
-        return new CachedServletInputStream(cachedInputStream);
-    }
-
     /**
      * Set the cachedInputStream as a copy of UTF-8 encoded {@link ByteArrayInputStream}
      *

diff --git a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/util/interceptor/OgcXmlUtil.java b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/util/interceptor/OgcXmlUtil.java
@@ -10,8 +10,8 @@
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 
-import javax.servlet.ServletInputStream;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.http.HttpServletRequest;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;

diff --git a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/util/mail/MailPublisher.java b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/util/mail/MailPublisher.java
@@ -10,8 +10,8 @@
 import org.springframework.mail.javamail.MimeMessageHelper;
 import org.springframework.stereotype.Component;
 
-import javax.mail.MessagingException;
-import javax.mail.internet.MimeMessage;
+import jakarta.mail.MessagingException;
+import jakarta.mail.internet.MimeMessage;
 import java.io.File;
 
 import static org.apache.logging.log4j.LogManager.getLogger;

diff --git a/...-core-main/src/main/java/de/terrestris/shoguncore/web/GeoServerInterceptorController.java b/...-core-main/src/main/java/de/terrestris/shoguncore/web/GeoServerInterceptorController.java
@@ -17,7 +17,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URISyntaxException;

diff --git a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/web/HttpProxyController.java b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/web/HttpProxyController.java
@@ -9,7 +9,7 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.util.Map;
 
 /**

diff --git a/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/web/UserController.java b/src/shogun-core-main/src/main/java/de/terrestris/shoguncore/web/UserController.java
@@ -15,7 +15,7 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.util.Map;
 
 /**

diff --git a/...shogun-core-main/src/test/java/de/terrestris/shoguncore/service/HttpProxyServiceTest.java b/...shogun-core-main/src/test/java/de/terrestris/shoguncore/service/HttpProxyServiceTest.java
@@ -20,8 +20,8 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;

diff --git a/src/shogun-core-main/src/test/java/de/terrestris/shoguncore/service/UserServiceTest.java b/src/shogun-core-main/src/test/java/de/terrestris/shoguncore/service/UserServiceTest.java
@@ -13,7 +13,7 @@
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import org.hibernate.HibernateException;