Updated Spring 5.x to 6.x and jetty 9.x to 11.x (#645)
Change-Id: Id8dbb2465128d4572dfc2d3fd0e49462589f5e17
diff --git a/full/Changes b/full/Changes
index 90c30ed..ab8435c 100644
--- a/full/Changes
+++ b/full/Changes
@@ -2,6 +2,7 @@
- Replaced javax.ws to jakarta.ws namespace (#648)
- Upgrading Jersey 2.40 to 3.x (#646)
+- Updated Spring 5.x to 6.x and jetty 9.x to 11.x (#645)
# version 0.71
diff --git a/full/pom.xml b/full/pom.xml
index 4660834..15fb79e 100644
--- a/full/pom.xml
+++ b/full/pom.xml
@@ -9,8 +9,8 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jersey.version>3.0.11</jersey.version>
<hibernate.version>5.6.15.Final</hibernate.version>
- <spring.version>5.3.29</spring.version>
- <jetty.version>9.4.51.v20230217</jetty.version>
+ <spring.version>6.0.11</spring.version>
+ <jetty.version>11.0.15</jetty.version>
<flyway.version>9.21.1</flyway.version>
<log4j.version>2.20.0</log4j.version>
<krill.version>[0.61.4,)</krill.version>
@@ -259,7 +259,7 @@
<dependency>
<groupId>org.glassfish.jersey.ext</groupId>
- <artifactId>jersey-spring5</artifactId>
+ <artifactId>jersey-spring6</artifactId>
<version>${jersey.version}</version>
<exclusions>
<exclusion>
@@ -638,6 +638,12 @@
<version>0.1.0</version>
</dependency>
+ <dependency>
+ <groupId>jakarta.persistence</groupId>
+ <artifactId>jakarta.persistence-api</artifactId>
+ <version>3.1.0</version>
+ </dependency>
+
<!-- servlet -->
<dependency>
<groupId>jakarta.servlet</groupId>
@@ -646,6 +652,7 @@
<scope>provided</scope>
</dependency>
+ <!-- needed by apache Oltu -->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
@@ -728,12 +735,14 @@
<artifactId>velocity-tools-generic</artifactId>
<version>3.1</version>
</dependency>
- <!-- mail -->
+
+ <!-- Mail -->
<dependency>
- <groupId>com.sun.mail</groupId>
- <artifactId>javax.mail</artifactId>
- <version>1.6.2</version>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>jakarta.mail</artifactId>
+ <version>2.0.1</version>
</dependency>
+
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
diff --git a/full/src/main/java/de/ids_mannheim/korap/server/KustvaktBaseServer.java b/full/src/main/java/de/ids_mannheim/korap/server/KustvaktBaseServer.java
index e7fa88e..ecd1ac9 100644
--- a/full/src/main/java/de/ids_mannheim/korap/server/KustvaktBaseServer.java
+++ b/full/src/main/java/de/ids_mannheim/korap/server/KustvaktBaseServer.java
@@ -8,8 +8,6 @@
import java.security.NoSuchAlgorithmException;
import java.util.Scanner;
-import javax.servlet.ServletContextListener;
-
import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.HttpConnectionFactory;
import org.eclipse.jetty.server.Server;
@@ -25,6 +23,7 @@
import de.ids_mannheim.korap.config.KustvaktConfiguration;
import de.ids_mannheim.korap.encryption.RandomCodeGenerator;
import de.ids_mannheim.korap.exceptions.KustvaktException;
+import jakarta.servlet.ServletContextListener;
import lombok.Getter;
import lombok.Setter;
diff --git a/full/src/main/java/de/ids_mannheim/korap/service/MailAuthenticator.java b/full/src/main/java/de/ids_mannheim/korap/service/MailAuthenticator.java
index a15d890..84397d5 100644
--- a/full/src/main/java/de/ids_mannheim/korap/service/MailAuthenticator.java
+++ b/full/src/main/java/de/ids_mannheim/korap/service/MailAuthenticator.java
@@ -1,7 +1,7 @@
package de.ids_mannheim.korap.service;
-import javax.mail.Authenticator;
-import javax.mail.PasswordAuthentication;
+import jakarta.mail.Authenticator;
+import jakarta.mail.PasswordAuthentication;
/** Defines Authenticator for creating javax.mail.Session.
*
diff --git a/full/src/main/java/de/ids_mannheim/korap/service/MailService.java b/full/src/main/java/de/ids_mannheim/korap/service/MailService.java
index 1aaebc5..0a6b2d4 100644
--- a/full/src/main/java/de/ids_mannheim/korap/service/MailService.java
+++ b/full/src/main/java/de/ids_mannheim/korap/service/MailService.java
@@ -3,9 +3,6 @@
import java.io.StringWriter;
import java.nio.charset.StandardCharsets;
-import javax.mail.internet.InternetAddress;
-import javax.mail.internet.MimeMessage;
-
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.velocity.VelocityContext;
@@ -22,6 +19,8 @@
import de.ids_mannheim.korap.exceptions.KustvaktException;
import de.ids_mannheim.korap.user.User;
import de.ids_mannheim.korap.utils.ParameterChecker;
+import jakarta.mail.internet.InternetAddress;
+import jakarta.mail.internet.MimeMessage;
/**
* Manages mail related services, such as sending group member