Skip to content

Commit d7e6477

Browse files
rovargajbonofre
rovarga
authored and
jbonofre
committedDec 19, 2023
[KARAF-7544] Use properties to centralize jetty version and servlet api maven coordinates
Signed-off-by: Robert Varga <[email protected]>
1 parent 849dc1b commit d7e6477

File tree

13 files changed

+35
-34
lines changed
  • assemblies/features/standard/src/main/feature
  • examples
    • karaf-docker-example/karaf-docker-example-app
    • karaf-graphql-example
      • karaf-graphql-example-features/src/main/feature
      • karaf-graphql-example-websocket
    • karaf-jaas-example/karaf-jaas-example-wab
    • karaf-servlet-example
      • karaf-servlet-example-annotation
      • karaf-servlet-example-blueprint
      • karaf-servlet-example-registration
      • karaf-servlet-example-scr
      • karaf-servlet-example-upload
    • karaf-websocket-example
  • itests/test
  • pom.xml

13 files changed

+35
-34
lines changed
 

‎assemblies/features/standard/src/main/feature/feature.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -910,7 +910,7 @@ org.osgi.service.http.port=8181
910910
<feature>pax-web-http-war</feature>
911911
</feature>
912912

913-
<feature name="jetty" description="Transition feature for backward compatibility" version="9.4.52.v20230823">
913+
<feature name="jetty" description="Transition feature for backward compatibility" version="${jetty.version}">
914914
<feature>pax-web-jetty</feature>
915915
</feature>
916916

‎examples/karaf-docker-example/karaf-docker-example-app/pom.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@
5656
<scope>provided</scope>
5757
</dependency>
5858
<dependency>
59-
<groupId>javax.servlet</groupId>
60-
<artifactId>javax.servlet-api</artifactId>
61-
<version>3.1.0</version>
59+
<groupId>${servlet.spec.groupId}</groupId>
60+
<artifactId>${servlet.spec.artifactId}</artifactId>
61+
<version>${servlet.spec.version}</version>
6262
<scope>provided</scope>
6363
</dependency>
6464
</dependencies>
@@ -86,4 +86,4 @@
8686
</plugins>
8787
</build>
8888

89-
</project>
89+
</project>

‎examples/karaf-graphql-example/karaf-graphql-example-features/src/main/feature/feature.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<bundle dependency="true">mvn:com.graphql-java-kickstart/graphql-java-servlet/14.0.0</bundle>
4242

4343
<bundle dependency="true">mvn:io.reactivex.rxjava3/rxjava/3.1.5</bundle>
44-
<bundle dependency="true">mvn:org.eclipse.jetty.websocket/websocket-server/9.4.52.v20230823</bundle>
44+
<bundle dependency="true">mvn:org.eclipse.jetty.websocket/websocket-server/${jetty.version}</bundle>
4545

4646
<bundle>mvn:org.apache.karaf.examples/karaf-graphql-example-api/${project.version}</bundle>
4747
<bundle>mvn:org.apache.karaf.examples/karaf-graphql-example-core/${project.version}</bundle>

‎examples/karaf-graphql-example/karaf-graphql-example-websocket/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<dependency>
3737
<groupId>org.eclipse.jetty.websocket</groupId>
3838
<artifactId>websocket-servlet</artifactId>
39-
<version>9.4.52.v20230823</version>
39+
<version>${jetty.version}</version>
4040
<scope>provided</scope>
4141
</dependency>
4242
<dependency>

‎examples/karaf-jaas-example/karaf-jaas-example-wab/pom.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434

3535
<dependencies>
3636
<dependency>
37-
<groupId>javax.servlet</groupId>
38-
<artifactId>javax.servlet-api</artifactId>
39-
<version>3.1.0</version>
37+
<groupId>${servlet.spec.groupId}</groupId>
38+
<artifactId>${servlet.spec.artifactId}</artifactId>
39+
<version>${servlet.spec.version}</version>
4040
<scope>provided</scope>
4141
</dependency>
4242
</dependencies>
@@ -60,4 +60,4 @@
6060
</plugins>
6161
</build>
6262

63-
</project>
63+
</project>

‎examples/karaf-servlet-example/karaf-servlet-example-annotation/pom.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434

3535
<dependencies>
3636
<dependency>
37-
<groupId>javax.servlet</groupId>
38-
<artifactId>javax.servlet-api</artifactId>
39-
<version>3.1.0</version>
37+
<groupId>${servlet.spec.groupId}</groupId>
38+
<artifactId>${servlet.spec.artifactId}</artifactId>
39+
<version>${servlet.spec.version}</version>
4040
<scope>provided</scope>
4141
</dependency>
4242
</dependencies>
@@ -60,4 +60,4 @@
6060
</plugins>
6161
</build>
6262

63-
</project>
63+
</project>

‎examples/karaf-servlet-example/karaf-servlet-example-blueprint/pom.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434

3535
<dependencies>
3636
<dependency>
37-
<groupId>javax.servlet</groupId>
38-
<artifactId>javax.servlet-api</artifactId>
39-
<version>3.0.1</version>
37+
<groupId>${servlet.spec.groupId}</groupId>
38+
<artifactId>${servlet.spec.artifactId}</artifactId>
39+
<version>${servlet.spec.version}</version>
4040
</dependency>
4141
</dependencies>
4242

@@ -49,4 +49,4 @@
4949
</plugins>
5050
</build>
5151

52-
</project>
52+
</project>

‎examples/karaf-servlet-example/karaf-servlet-example-registration/pom.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434

3535
<dependencies>
3636
<dependency>
37-
<groupId>javax.servlet</groupId>
38-
<artifactId>javax.servlet-api</artifactId>
39-
<version>3.0.1</version>
37+
<groupId>${servlet.spec.groupId}</groupId>
38+
<artifactId>${servlet.spec.artifactId}</artifactId>
39+
<version>${servlet.spec.version}</version>
4040
</dependency>
4141
<dependency>
4242
<groupId>org.osgi</groupId>
@@ -67,4 +67,4 @@
6767
</plugins>
6868
</build>
6969

70-
</project>
70+
</project>

‎examples/karaf-servlet-example/karaf-servlet-example-scr/pom.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@
4040
<scope>provided</scope>
4141
</dependency>
4242
<dependency>
43-
<groupId>javax.servlet</groupId>
44-
<artifactId>javax.servlet-api</artifactId>
45-
<version>3.0.1</version>
43+
<groupId>${servlet.spec.groupId}</groupId>
44+
<artifactId>${servlet.spec.artifactId}</artifactId>
45+
<version>${servlet.spec.version}</version>
4646
</dependency>
4747
</dependencies>
4848

@@ -55,4 +55,4 @@
5555
</plugins>
5656
</build>
5757

58-
</project>
58+
</project>

‎examples/karaf-servlet-example/karaf-servlet-example-upload/pom.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@
4646
<scope>provided</scope>
4747
</dependency>
4848
<dependency>
49-
<groupId>javax.servlet</groupId>
50-
<artifactId>javax.servlet-api</artifactId>
51-
<version>3.0.1</version>
49+
<groupId>${servlet.spec.groupId}</groupId>
50+
<artifactId>${servlet.spec.artifactId}</artifactId>
51+
<version>${servlet.spec.version}</version>
5252
</dependency>
5353
</dependencies>
5454

@@ -61,4 +61,4 @@
6161
</plugins>
6262
</build>
6363

64-
</project>
64+
</project>

‎examples/karaf-websocket-example/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<dependency>
3737
<groupId>org.eclipse.jetty.websocket</groupId>
3838
<artifactId>websocket-servlet</artifactId>
39-
<version>9.4.52.v20230823</version>
39+
<version>${jetty.version}</version>
4040
<scope>provided</scope>
4141
</dependency>
4242
<dependency>

‎itests/test/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -206,13 +206,13 @@
206206
<dependency>
207207
<groupId>org.eclipse.jetty.websocket</groupId>
208208
<artifactId>websocket-client</artifactId>
209-
<version>9.4.52.v20230823</version>
209+
<version>${jetty.version}</version>
210210
<scope>test</scope>
211211
</dependency>
212212
<dependency>
213213
<groupId>org.eclipse.jetty</groupId>
214214
<artifactId>jetty-server</artifactId>
215-
<version>9.4.52.v20230823</version>
215+
<version>${jetty.version}</version>
216216
<scope>test</scope>
217217
</dependency>
218218

‎pom.xml

+1
Original file line numberDiff line numberDiff line change
@@ -313,6 +313,7 @@
313313
<pax.swissbox.version>1.8.5</pax.swissbox.version>
314314
<pax.url.version>2.6.14</pax.url.version>
315315
<pax.web.version>8.0.22</pax.web.version>
316+
<jetty.version>9.4.52.v20230823</jetty.version>
316317
<pax.tinybundle.version>3.0.0</pax.tinybundle.version>
317318
<pax.jdbc.version>1.5.6</pax.jdbc.version>
318319
<pax.jms.version>1.1.3</pax.jms.version>

0 commit comments

Comments
 (0)
Please sign in to comment.