You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by bt...@apache.org on 2022/08/18 10:28:47 UTC
[james-project] branch master updated: [UPGRADE] Spark 2.9.3 -> 2.9.4 (#1129)
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
The following commit(s) were added to refs/heads/master by this push:
new e1bbf8e356 [UPGRADE] Spark 2.9.3 -> 2.9.4 (#1129)
e1bbf8e356 is described below
commit e1bbf8e3564bdc7b37141bdac26e27a80dd07862
Author: Benoit TELLIER <bt...@linagora.com>
AuthorDate: Thu Aug 18 17:28:42 2022 +0700
[UPGRADE] Spark 2.9.3 -> 2.9.4 (#1129)
Fixes Jetty dependency management mess
---
pom.xml | 42 +------------------------
server/container/core/pom.xml | 5 ---
server/container/spring/pom.xml | 5 ---
server/protocols/webadmin/webadmin-core/pom.xml | 16 ----------
4 files changed, 1 insertion(+), 67 deletions(-)
diff --git a/pom.xml b/pom.xml
index d434538d75..f51bb532e4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -652,7 +652,6 @@
<scala.version>${scala.base}.8</scala.version>
<scalatestplus-play.version>5.0.0</scalatestplus-play.version>
<doclint>none</doclint>
- <jetty.version>9.4.46.v20220331</jetty.version>
</properties>
<dependencyManagement>
@@ -2212,25 +2211,7 @@
<dependency>
<groupId>com.sparkjava</groupId>
<artifactId>spark-core</artifactId>
- <version>2.9.3</version>
- <exclusions>
- <exclusion>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-server</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-webapp</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.jetty.websocket</groupId>
- <artifactId>websocket-server</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.jetty.websocket</groupId>
- <artifactId>websocket-servlet</artifactId>
- </exclusion>
- </exclusions>
+ <version>2.9.4</version>
</dependency>
<dependency>
<groupId>com.sun.activation</groupId>
@@ -2690,27 +2671,6 @@
<artifactId>bcprov-jdk15on</artifactId>
<version>${bouncycastle.version}</version>
</dependency>
- <!-- JETTY DEPENDENCIES -->
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-server</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-webapp</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty.websocket</groupId>
- <artifactId>websocket-server</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty.websocket</groupId>
- <artifactId>websocket-servlet</artifactId>
- <version>${jetty.version}</version>
- </dependency>
<dependency>
<groupId>org.hamcrest</groupId>
diff --git a/server/container/core/pom.xml b/server/container/core/pom.xml
index 4f32ba5fea..5905272bf0 100644
--- a/server/container/core/pom.xml
+++ b/server/container/core/pom.xml
@@ -102,11 +102,6 @@
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-server</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>pl.pragmatists</groupId>
<artifactId>JUnitParams</artifactId>
diff --git a/server/container/spring/pom.xml b/server/container/spring/pom.xml
index a35b62df92..f5abc4e4a1 100644
--- a/server/container/spring/pom.xml
+++ b/server/container/spring/pom.xml
@@ -164,11 +164,6 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
</dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-server</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
diff --git a/server/protocols/webadmin/webadmin-core/pom.xml b/server/protocols/webadmin/webadmin-core/pom.xml
index e621482612..c38df8c883 100644
--- a/server/protocols/webadmin/webadmin-core/pom.xml
+++ b/server/protocols/webadmin/webadmin-core/pom.xml
@@ -134,22 +134,6 @@
<artifactId>json-unit-assertj</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-server</artifactId>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-webapp</artifactId>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty.websocket</groupId>
- <artifactId>websocket-server</artifactId>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty.websocket</groupId>
- <artifactId>websocket-servlet</artifactId>
- </dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org