This is an automated email from the ASF dual-hosted git repository.
andy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/jena.git
commit e26a2b3a8d02410d0e5a110b1bde7536799a3785
Author: Andy Seaborne <a...@apache.org>
AuthorDate: Thu May 2 11:30:51 2024 +0100
GH-2444: jena-fuseki-core to depend only the Jakarta servlet API
---
jena-fuseki2/jena-fuseki-core/pom.xml | 23 +++++++++--------------
jena-fuseki2/jena-fuseki-main/pom.xml | 15 +++++++++++++++
pom.xml | 10 ++++++++++
3 files changed, 34 insertions(+), 14 deletions(-)
diff --git a/jena-fuseki2/jena-fuseki-core/pom.xml
b/jena-fuseki2/jena-fuseki-core/pom.xml
index 1602959e8c..525a37424e 100644
--- a/jena-fuseki2/jena-fuseki-core/pom.xml
+++ b/jena-fuseki2/jena-fuseki-core/pom.xml
@@ -76,20 +76,15 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-fileupload2-jakarta-servlet6</artifactId>
</dependency>
-
- <dependency>
- <groupId>org.eclipse.jetty.ee10</groupId>
- <artifactId>jetty-ee10-servlet</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.eclipse.jetty.ee10</groupId>
- <artifactId>jetty-ee10-servlets</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-security</artifactId>
+
+ <!--
+ jena-fuseki-core is independent of Jetty.
+ This needs to be in-step with Jetty.
+ The version ismanaged in the top Jena POM.
+ -->
+ <dependency>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
</dependency>
<dependency>
diff --git a/jena-fuseki2/jena-fuseki-main/pom.xml
b/jena-fuseki2/jena-fuseki-main/pom.xml
index 05cb5b05f1..b1852cffea 100644
--- a/jena-fuseki2/jena-fuseki-main/pom.xml
+++ b/jena-fuseki2/jena-fuseki-main/pom.xml
@@ -62,6 +62,21 @@
<version>5.1.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty.ee10</groupId>
+ <artifactId>jetty-ee10-servlet</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.jetty.ee10</groupId>
+ <artifactId>jetty-ee10-servlets</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-security</artifactId>
+ </dependency>
+
<!-- For parsing Jetty configuration files -->
<dependency>
<groupId>org.eclipse.jetty</groupId>
diff --git a/pom.xml b/pom.xml
index 896d3e1c38..f96f85148c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,7 +65,10 @@
<ver.titanium-json-ld>1.4.0</ver.titanium-json-ld>
<ver.jakarta.json>2.0.1</ver.jakarta.json>
+ <!-- These two must be in-step -->
<ver.jetty>12.0.8</ver.jetty>
+ <ver.jakarta-servlet>6.0.0</ver.jakarta-servlet>
+
<ver.shiro>2.0.0</ver.shiro>
<ver.protobuf>4.26.1</ver.protobuf>
@@ -474,6 +477,13 @@
</dependency>
<!-- End JSON-LD 1.1 read support -->
+ <!-- Ensure the properties align the jakarta.servlet-api version to that
of Jetty. -->
+ <dependency>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>${ver.jakarta-servlet}</version>
+ </dependency>
+
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-bom</artifactId>
