This is an automated email from the ASF dual-hosted git repository. btellier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 57fddebdd599d3b9cb3eba353f26675503374d4b Author: Benoit TELLIER <btell...@linagora.com> AuthorDate: Fri Jan 26 16:54:28 2024 +0100 Revert "[UPDATE] Update spark version: Jetty update" This reverts commit 69e45e4ddf164cff38764bcc4860b47b1274abb1. --- pom.xml | 10 +++++----- server/container/core/pom.xml | 2 +- server/container/filesystem-api/pom.xml | 2 +- server/container/spring/pom.xml | 2 +- server/protocols/webadmin/webadmin-core/pom.xml | 8 ++++---- .../org/apache/james/webadmin/dropwizard/MetricsRoutes.java | 4 ++-- .../apache/james/webadmin/routes/MailRepositoriesRoutes.java | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pom.xml b/pom.xml index 037ef9b666..8f67121499 100644 --- a/pom.xml +++ b/pom.xml @@ -2210,11 +2210,6 @@ <artifactId>guice-assistedinject</artifactId> <version>${guice.version}</version> </dependency> - <dependency> - <groupId>com.intellisrc</groupId> - <artifactId>spark-core</artifactId> - <version>2.9.4-unofficial-5</version> - </dependency> <dependency> <groupId>com.jayway.jsonpath</groupId> <artifactId>json-path</artifactId> @@ -2235,6 +2230,11 @@ <artifactId>amqp-client</artifactId> <version>5.20.0</version> </dependency> + <dependency> + <groupId>com.sparkjava</groupId> + <artifactId>spark-core</artifactId> + <version>2.9.4</version> + </dependency> <dependency> <groupId>com.sun.activation</groupId> <artifactId>javax.activation</artifactId> diff --git a/server/container/core/pom.xml b/server/container/core/pom.xml index 09dda08f72..6e176893a5 100644 --- a/server/container/core/pom.xml +++ b/server/container/core/pom.xml @@ -86,7 +86,7 @@ <artifactId>guava</artifactId> </dependency> <dependency> - <groupId>com.intellisrc</groupId> + <groupId>com.sparkjava</groupId> <artifactId>spark-core</artifactId> <scope>test</scope> </dependency> diff --git a/server/container/filesystem-api/pom.xml b/server/container/filesystem-api/pom.xml index e712879845..45ddafe090 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.intellisrc</groupId> + <groupId>com.sparkjava</groupId> <artifactId>spark-core</artifactId> <scope>test</scope> </dependency> diff --git a/server/container/spring/pom.xml b/server/container/spring/pom.xml index 97c25bce52..38ea065542 100644 --- a/server/container/spring/pom.xml +++ b/server/container/spring/pom.xml @@ -119,7 +119,7 @@ </exclusions> </dependency> <dependency> - <groupId>com.intellisrc</groupId> + <groupId>com.sparkjava</groupId> <artifactId>spark-core</artifactId> <scope>test</scope> </dependency> diff --git a/server/protocols/webadmin/webadmin-core/pom.xml b/server/protocols/webadmin/webadmin-core/pom.xml index d9b48a1fc2..37172efd14 100644 --- a/server/protocols/webadmin/webadmin-core/pom.xml +++ b/server/protocols/webadmin/webadmin-core/pom.xml @@ -102,15 +102,15 @@ <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> - <dependency> - <groupId>com.intellisrc</groupId> - <artifactId>spark-core</artifactId> - </dependency> <dependency> <groupId>com.jayway.jsonpath</groupId> <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> 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 c2d25a8f8c..0e78accb7f 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 @@ -27,6 +27,8 @@ import java.util.Optional; import java.util.Set; import javax.inject.Inject; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.apache.james.webadmin.PublicRoutes; @@ -37,8 +39,6 @@ import com.google.common.collect.ImmutableSet; import io.prometheus.client.SampleNameFilter; import io.prometheus.client.dropwizard.DropwizardExports; import io.prometheus.client.exporter.common.TextFormat; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; import spark.Request; import spark.Response; import spark.Service; 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 7a6ad3f83e..407408aaf8 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,6 +29,7 @@ import java.util.function.Supplier; import javax.inject.Inject; import javax.mail.MessagingException; import javax.mail.internet.MimeMessage; +import javax.servlet.http.HttpServletResponse; import org.apache.commons.io.output.CountingOutputStream; import org.apache.james.mailrepository.api.MailKey; @@ -64,7 +65,6 @@ import com.google.common.base.Splitter; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; -import jakarta.servlet.http.HttpServletResponse; import spark.HaltException; import spark.Request; import spark.Service; --------------------------------------------------------------------- To unsubscribe, e-mail: notifications-unsubscr...@james.apache.org For additional commands, e-mail: notifications-h...@james.apache.org