This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/main by this push:
new d7e6477f31 [KARAF-7544] Use properties to centralize jetty version and
servlet api maven coordinates
new c8cfb5236b This closes #1809
d7e6477f31 is described below
commit d7e6477f316ed5f89ec17f32462f475b99906559
Author: Robert Varga <robert.va...@pantheon.tech>
AuthorDate: Sat Dec 16 10:07:03 2023 +0100
[KARAF-7544] Use properties to centralize jetty version and servlet api
maven coordinates
Signed-off-by: Robert Varga <robert.va...@pantheon.tech>
---
assemblies/features/standard/src/main/feature/feature.xml | 2 +-
examples/karaf-docker-example/karaf-docker-example-app/pom.xml | 8 ++++----
.../karaf-graphql-example-features/src/main/feature/feature.xml | 2 +-
.../karaf-graphql-example/karaf-graphql-example-websocket/pom.xml | 2 +-
examples/karaf-jaas-example/karaf-jaas-example-wab/pom.xml | 8 ++++----
.../karaf-servlet-example-annotation/pom.xml | 8 ++++----
.../karaf-servlet-example/karaf-servlet-example-blueprint/pom.xml | 8 ++++----
.../karaf-servlet-example-registration/pom.xml | 8 ++++----
examples/karaf-servlet-example/karaf-servlet-example-scr/pom.xml | 8 ++++----
.../karaf-servlet-example/karaf-servlet-example-upload/pom.xml | 8 ++++----
examples/karaf-websocket-example/pom.xml | 2 +-
itests/test/pom.xml | 4 ++--
pom.xml | 1 +
13 files changed, 35 insertions(+), 34 deletions(-)
diff --git a/assemblies/features/standard/src/main/feature/feature.xml
b/assemblies/features/standard/src/main/feature/feature.xml
index 896cdf5c97..2bbb0c56a1 100644
--- a/assemblies/features/standard/src/main/feature/feature.xml
+++ b/assemblies/features/standard/src/main/feature/feature.xml
@@ -910,7 +910,7 @@ org.osgi.service.http.port=8181
<feature>pax-web-http-war</feature>
</feature>
- <feature name="jetty" description="Transition feature for backward
compatibility" version="9.4.52.v20230823">
+ <feature name="jetty" description="Transition feature for backward
compatibility" version="${jetty.version}">
<feature>pax-web-jetty</feature>
</feature>
diff --git a/examples/karaf-docker-example/karaf-docker-example-app/pom.xml
b/examples/karaf-docker-example/karaf-docker-example-app/pom.xml
index 60b8f61bbc..15ab5d6f5c 100644
--- a/examples/karaf-docker-example/karaf-docker-example-app/pom.xml
+++ b/examples/karaf-docker-example/karaf-docker-example-app/pom.xml
@@ -56,9 +56,9 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>3.1.0</version>
+ <groupId>${servlet.spec.groupId}</groupId>
+ <artifactId>${servlet.spec.artifactId}</artifactId>
+ <version>${servlet.spec.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
@@ -86,4 +86,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git
a/examples/karaf-graphql-example/karaf-graphql-example-features/src/main/feature/feature.xml
b/examples/karaf-graphql-example/karaf-graphql-example-features/src/main/feature/feature.xml
index 7849f18f88..8e3ba27d96 100644
---
a/examples/karaf-graphql-example/karaf-graphql-example-features/src/main/feature/feature.xml
+++
b/examples/karaf-graphql-example/karaf-graphql-example-features/src/main/feature/feature.xml
@@ -41,7 +41,7 @@
<bundle
dependency="true">mvn:com.graphql-java-kickstart/graphql-java-servlet/14.0.0</bundle>
<bundle
dependency="true">mvn:io.reactivex.rxjava3/rxjava/3.1.5</bundle>
- <bundle
dependency="true">mvn:org.eclipse.jetty.websocket/websocket-server/9.4.52.v20230823</bundle>
+ <bundle
dependency="true">mvn:org.eclipse.jetty.websocket/websocket-server/${jetty.version}</bundle>
<bundle>mvn:org.apache.karaf.examples/karaf-graphql-example-api/${project.version}</bundle>
<bundle>mvn:org.apache.karaf.examples/karaf-graphql-example-core/${project.version}</bundle>
diff --git
a/examples/karaf-graphql-example/karaf-graphql-example-websocket/pom.xml
b/examples/karaf-graphql-example/karaf-graphql-example-websocket/pom.xml
index 286df65c4f..ba4467f269 100644
--- a/examples/karaf-graphql-example/karaf-graphql-example-websocket/pom.xml
+++ b/examples/karaf-graphql-example/karaf-graphql-example-websocket/pom.xml
@@ -36,7 +36,7 @@
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-servlet</artifactId>
- <version>9.4.52.v20230823</version>
+ <version>${jetty.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/examples/karaf-jaas-example/karaf-jaas-example-wab/pom.xml
b/examples/karaf-jaas-example/karaf-jaas-example-wab/pom.xml
index 643040e2be..e4cf775976 100644
--- a/examples/karaf-jaas-example/karaf-jaas-example-wab/pom.xml
+++ b/examples/karaf-jaas-example/karaf-jaas-example-wab/pom.xml
@@ -34,9 +34,9 @@
<dependencies>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>3.1.0</version>
+ <groupId>${servlet.spec.groupId}</groupId>
+ <artifactId>${servlet.spec.artifactId}</artifactId>
+ <version>${servlet.spec.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
@@ -60,4 +60,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git
a/examples/karaf-servlet-example/karaf-servlet-example-annotation/pom.xml
b/examples/karaf-servlet-example/karaf-servlet-example-annotation/pom.xml
index 61eaa73199..4652cf7f47 100644
--- a/examples/karaf-servlet-example/karaf-servlet-example-annotation/pom.xml
+++ b/examples/karaf-servlet-example/karaf-servlet-example-annotation/pom.xml
@@ -34,9 +34,9 @@
<dependencies>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>3.1.0</version>
+ <groupId>${servlet.spec.groupId}</groupId>
+ <artifactId>${servlet.spec.artifactId}</artifactId>
+ <version>${servlet.spec.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
@@ -60,4 +60,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git
a/examples/karaf-servlet-example/karaf-servlet-example-blueprint/pom.xml
b/examples/karaf-servlet-example/karaf-servlet-example-blueprint/pom.xml
index 5c2855b5d4..81fc266cb5 100644
--- a/examples/karaf-servlet-example/karaf-servlet-example-blueprint/pom.xml
+++ b/examples/karaf-servlet-example/karaf-servlet-example-blueprint/pom.xml
@@ -34,9 +34,9 @@
<dependencies>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>3.0.1</version>
+ <groupId>${servlet.spec.groupId}</groupId>
+ <artifactId>${servlet.spec.artifactId}</artifactId>
+ <version>${servlet.spec.version}</version>
</dependency>
</dependencies>
@@ -49,4 +49,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git
a/examples/karaf-servlet-example/karaf-servlet-example-registration/pom.xml
b/examples/karaf-servlet-example/karaf-servlet-example-registration/pom.xml
index ada540a00c..085f1b775a 100644
--- a/examples/karaf-servlet-example/karaf-servlet-example-registration/pom.xml
+++ b/examples/karaf-servlet-example/karaf-servlet-example-registration/pom.xml
@@ -34,9 +34,9 @@
<dependencies>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>3.0.1</version>
+ <groupId>${servlet.spec.groupId}</groupId>
+ <artifactId>${servlet.spec.artifactId}</artifactId>
+ <version>${servlet.spec.version}</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
@@ -67,4 +67,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/examples/karaf-servlet-example/karaf-servlet-example-scr/pom.xml
b/examples/karaf-servlet-example/karaf-servlet-example-scr/pom.xml
index de576bc1aa..7922be1f64 100644
--- a/examples/karaf-servlet-example/karaf-servlet-example-scr/pom.xml
+++ b/examples/karaf-servlet-example/karaf-servlet-example-scr/pom.xml
@@ -40,9 +40,9 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>3.0.1</version>
+ <groupId>${servlet.spec.groupId}</groupId>
+ <artifactId>${servlet.spec.artifactId}</artifactId>
+ <version>${servlet.spec.version}</version>
</dependency>
</dependencies>
@@ -55,4 +55,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git
a/examples/karaf-servlet-example/karaf-servlet-example-upload/pom.xml
b/examples/karaf-servlet-example/karaf-servlet-example-upload/pom.xml
index 0495e4e1dd..3e39ff859b 100644
--- a/examples/karaf-servlet-example/karaf-servlet-example-upload/pom.xml
+++ b/examples/karaf-servlet-example/karaf-servlet-example-upload/pom.xml
@@ -46,9 +46,9 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>3.0.1</version>
+ <groupId>${servlet.spec.groupId}</groupId>
+ <artifactId>${servlet.spec.artifactId}</artifactId>
+ <version>${servlet.spec.version}</version>
</dependency>
</dependencies>
@@ -61,4 +61,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/examples/karaf-websocket-example/pom.xml
b/examples/karaf-websocket-example/pom.xml
index 8a4c6720c3..545ea062d4 100644
--- a/examples/karaf-websocket-example/pom.xml
+++ b/examples/karaf-websocket-example/pom.xml
@@ -36,7 +36,7 @@
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-servlet</artifactId>
- <version>9.4.52.v20230823</version>
+ <version>${jetty.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/itests/test/pom.xml b/itests/test/pom.xml
index 36f8695375..c2bd2cfd34 100644
--- a/itests/test/pom.xml
+++ b/itests/test/pom.xml
@@ -206,13 +206,13 @@
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-client</artifactId>
- <version>9.4.52.v20230823</version>
+ <version>${jetty.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
- <version>9.4.52.v20230823</version>
+ <version>${jetty.version}</version>
<scope>test</scope>
</dependency>
diff --git a/pom.xml b/pom.xml
index 7972897369..ba8ea46929 100644
--- a/pom.xml
+++ b/pom.xml
@@ -313,6 +313,7 @@
<pax.swissbox.version>1.8.5</pax.swissbox.version>
<pax.url.version>2.6.14</pax.url.version>
<pax.web.version>8.0.22</pax.web.version>
+ <jetty.version>9.4.52.v20230823</jetty.version>
<pax.tinybundle.version>3.0.0</pax.tinybundle.version>
<pax.jdbc.version>1.5.6</pax.jdbc.version>
<pax.jms.version>1.1.3</pax.jms.version>
