This is an automated email from the ASF dual-hosted git repository.
veithen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ws-axiom.git
The following commit(s) were added to refs/heads/master by this push:
new 85d33ccbe Manage the Jetty version in the root POM
85d33ccbe is described below
commit 85d33ccbe4d54cdd6db958cccf2f16a995cf0eaa
Author: Andreas Veithen-Knowles <[email protected]>
AuthorDate: Sat Sep 27 15:42:07 2025 +0000
Manage the Jetty version in the root POM
The build only uses a single Jetty version.
---
.github/dependabot.yml | 2 --
jakarta-bom/pom.xml | 11 -----------
pom.xml | 11 +++++++++++
3 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index a7035346c..86f1deeae 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -26,8 +26,6 @@ updates:
- dependency-name: "jakarta.xml.bind:jakarta.xml.bind-api"
- dependency-name: "org.glassfish.jaxb:jaxb-runtime"
- dependency-name: "com.sun.xml.bind:jaxb-osgi"
- - dependency-name: "org.eclipse.jetty:*"
- - dependency-name: "org.eclipse.jetty.ee10:*"
# There is a bug in Saxon 10 related to how xmlns="" declarations are
processed.
- dependency-name: "net.sf.saxon:Saxon-HE"
versions:
diff --git a/jakarta-bom/pom.xml b/jakarta-bom/pom.xml
index 010e173b9..4a18b597f 100644
--- a/jakarta-bom/pom.xml
+++ b/jakarta-bom/pom.xml
@@ -33,7 +33,6 @@
<properties>
<jaxbri.version>4.0.4</jaxbri.version>
- <jetty.version>12.0.9</jetty.version>
</properties>
<dependencyManagement>
@@ -68,16 +67,6 @@
<artifactId>jaxb-osgi</artifactId>
<version>${jaxbri.version}</version>
</dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-server</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty.ee10</groupId>
- <artifactId>jetty-ee10-webapp</artifactId>
- <version>${jetty.version}</version>
- </dependency>
</dependencies>
</dependencyManagement>
</project>
diff --git a/pom.xml b/pom.xml
index 9f18335c7..78323c504 100644
--- a/pom.xml
+++ b/pom.xml
@@ -286,6 +286,7 @@
<springws.version>4.1.1</springws.version>
<exam.version>4.14.0</exam.version>
<slf4j.version>1.7.36</slf4j.version>
+ <jetty.version>12.0.9</jetty.version>
<log4j.version>2.25.2</log4j.version>
<groovy.version>5.0.1</groovy.version>
<auto-service.version>1.1.1</auto-service.version>
@@ -519,6 +520,16 @@
<artifactId>asm-commons</artifactId>
<version>${asm.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty.ee10</groupId>
+ <artifactId>jetty-ee10-webapp</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
