This is an automated email from the ASF dual-hosted git repository.
rcordier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit bf4f4266d257a7ffa5407633b661f3f5fb6d4c72
Author: TungTV <vtt...@linagora.com>
AuthorDate: Tue Feb 11 10:48:58 2025 +0700
JAMES-4104 [webadmin] Migrate from unmaintained SparkJava to active fork
com.sparkjava:spark-core => org.zoomba-lang:spark-core
https://github.com/nmondal/spark-11
---
pom.xml | 10 +++++-----
server/container/core/pom.xml | 10 +++++-----
server/container/filesystem-api/pom.xml | 2 +-
server/container/spring/pom.xml | 10 +++++-----
server/protocols/webadmin/webadmin-core/pom.xml | 8 ++++----
.../main/java/org/apache/james/webadmin/WebAdminServer.java | 4 ++--
.../src/main/java/org/apache/james/webadmin/mdc/MDCFilter.java | 2 +-
.../james/webadmin/routes/UserCreationRequestLogger.java | 2 +-
.../org/apache/james/webadmin/dropwizard/MetricsRoutes.java | 5 ++---
.../apache/james/webadmin/routes/MailRepositoriesRoutes.java | 3 +--
10 files changed, 27 insertions(+), 29 deletions(-)
diff --git a/pom.xml b/pom.xml
index ce69fdfa49..5c06383b9d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2318,11 +2318,6 @@
<artifactId>amqp-client</artifactId>
<version>5.21.0</version>
</dependency>
- <dependency>
- <groupId>com.sparkjava</groupId>
- <artifactId>spark-core</artifactId>
- <version>2.9.4</version>
- </dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-core</artifactId>
@@ -3037,6 +3032,11 @@
<artifactId>threeten-extra</artifactId>
<version>1.8.0</version>
</dependency>
+ <dependency>
+ <groupId>org.zoomba-lang</groupId>
+ <artifactId>spark-core</artifactId>
+ <version>3.0.1</version>
+ </dependency>
<dependency>
<groupId>pl.pragmatists</groupId>
<artifactId>JUnitParams</artifactId>
diff --git a/server/container/core/pom.xml b/server/container/core/pom.xml
index f49668b75b..3b4d12de4c 100644
--- a/server/container/core/pom.xml
+++ b/server/container/core/pom.xml
@@ -80,11 +80,6 @@
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
- <dependency>
- <groupId>com.sparkjava</groupId>
- <artifactId>spark-core</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
@@ -97,6 +92,11 @@
<groupId>org.eclipse.angus</groupId>
<artifactId>jakarta.mail</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.zoomba-lang</groupId>
+ <artifactId>spark-core</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>pl.pragmatists</groupId>
<artifactId>JUnitParams</artifactId>
diff --git a/server/container/filesystem-api/pom.xml
b/server/container/filesystem-api/pom.xml
index 45ddafe090..95f50daf02 100644
--- a/server/container/filesystem-api/pom.xml
+++ b/server/container/filesystem-api/pom.xml
@@ -39,7 +39,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.sparkjava</groupId>
+ <groupId>org.zoomba-lang</groupId>
<artifactId>spark-core</artifactId>
<scope>test</scope>
</dependency>
diff --git a/server/container/spring/pom.xml b/server/container/spring/pom.xml
index e7163884b9..aad19fad32 100644
--- a/server/container/spring/pom.xml
+++ b/server/container/spring/pom.xml
@@ -118,11 +118,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>com.sparkjava</groupId>
- <artifactId>spark-core</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
@@ -210,6 +205,11 @@
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.zoomba-lang</groupId>
+ <artifactId>spark-core</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>pl.pragmatists</groupId>
<artifactId>JUnitParams</artifactId>
diff --git a/server/protocols/webadmin/webadmin-core/pom.xml
b/server/protocols/webadmin/webadmin-core/pom.xml
index 752458970d..1d37c7790c 100644
--- a/server/protocols/webadmin/webadmin-core/pom.xml
+++ b/server/protocols/webadmin/webadmin-core/pom.xml
@@ -107,10 +107,6 @@
<artifactId>json-path</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>com.sparkjava</groupId>
- <artifactId>spark-core</artifactId>
- </dependency>
<dependency>
<groupId>io.rest-assured</groupId>
<artifactId>rest-assured</artifactId>
@@ -148,5 +144,9 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.zoomba-lang</groupId>
+ <artifactId>spark-core</artifactId>
+ </dependency>
</dependencies>
</project>
diff --git
a/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/WebAdminServer.java
b/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/WebAdminServer.java
index 2fd02a7126..51bea7b2f8 100644
---
a/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/WebAdminServer.java
+++
b/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/WebAdminServer.java
@@ -94,7 +94,7 @@ public class WebAdminServer implements Startable {
.collect(ImmutableList.toImmutableList());
}
- private static List<PublicRoutes> publicRoutes(List<Routes> routes) {
+ private static List<PublicRoutes> publicRoutes(List<Routes> routes) {
return routes.stream()
.filter(PublicRoutes.class::isInstance)
.map(PublicRoutes.class::cast)
@@ -178,7 +178,7 @@ public class WebAdminServer implements Startable {
service.notFound((req, res) -> ErrorResponder.builder()
.statusCode(NOT_FOUND_404)
.type(NOT_FOUND)
- .message("%s %s can not be found", req.requestMethod(),
req.pathInfo())
+ .message("%s %s can not be found", req.requestMethod(), req.uri())
.asString());
service.internalServerError((req, res) -> ErrorResponder.builder()
diff --git
a/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/mdc/MDCFilter.java
b/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/mdc/MDCFilter.java
index 48d7ea2014..6a05aeebda 100644
---
a/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/mdc/MDCFilter.java
+++
b/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/mdc/MDCFilter.java
@@ -39,7 +39,7 @@ public class MDCFilter implements Filter {
.addToContext(MDCBuilder.HOST, request.host())
.addToContext(VERB, request.requestMethod())
.addToContext(MDCBuilder.PROTOCOL, "webadmin")
- .addToContext(MDCBuilder.ACTION, request.pathInfo())
+ .addToContext(MDCBuilder.ACTION, request.uri())
.addToContext(MDCBuilder.USER,
request.attribute(AuthenticationFilter.LOGIN))
.build();
request.attribute(MDC_CLOSEABLE, mdcCloseable);
diff --git
a/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/UserCreationRequestLogger.java
b/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/UserCreationRequestLogger.java
index 8ae80fbe3c..1efa8c5e13 100644
---
a/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/UserCreationRequestLogger.java
+++
b/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/UserCreationRequestLogger.java
@@ -39,7 +39,7 @@ import spark.Request;
public class UserCreationRequestLogger implements RequestLogger {
@Override
public boolean applies(Request request) {
- return request.pathInfo().startsWith(UserRoutes.USERS)
+ return request.uri().startsWith(UserRoutes.USERS)
&& request.requestMethod().equals("PUT");
}
diff --git
a/server/protocols/webadmin/webadmin-dropwizard-metrics/src/main/java/org/apache/james/webadmin/dropwizard/MetricsRoutes.java
b/server/protocols/webadmin/webadmin-dropwizard-metrics/src/main/java/org/apache/james/webadmin/dropwizard/MetricsRoutes.java
index ccaa174285..a86c3e79d1 100644
---
a/server/protocols/webadmin/webadmin-dropwizard-metrics/src/main/java/org/apache/james/webadmin/dropwizard/MetricsRoutes.java
+++
b/server/protocols/webadmin/webadmin-dropwizard-metrics/src/main/java/org/apache/james/webadmin/dropwizard/MetricsRoutes.java
@@ -26,10 +26,9 @@ import java.util.Collections;
import java.util.Optional;
import java.util.Set;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import jakarta.inject.Inject;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.james.webadmin.PublicRoutes;
diff --git
a/server/protocols/webadmin/webadmin-mailrepository/src/main/java/org/apache/james/webadmin/routes/MailRepositoriesRoutes.java
b/server/protocols/webadmin/webadmin-mailrepository/src/main/java/org/apache/james/webadmin/routes/MailRepositoriesRoutes.java
index cc5a2ebce6..2777aea39c 100644
---
a/server/protocols/webadmin/webadmin-mailrepository/src/main/java/org/apache/james/webadmin/routes/MailRepositoriesRoutes.java
+++
b/server/protocols/webadmin/webadmin-mailrepository/src/main/java/org/apache/james/webadmin/routes/MailRepositoriesRoutes.java
@@ -29,11 +29,10 @@ import java.util.Set;
import java.util.function.Supplier;
import java.util.stream.Stream;
-import javax.servlet.http.HttpServletResponse;
-
import jakarta.inject.Inject;
import jakarta.mail.MessagingException;
import jakarta.mail.internet.MimeMessage;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.commons.io.output.CountingOutputStream;
import org.apache.james.core.MailAddress;
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscr...@james.apache.org
For additional commands, e-mail: notifications-h...@james.apache.org
