Skip to content

Commit 358ad8d

Browse files
holgerfriedrichholgerfriedrich
committed
Migrate to Jakarta EE 10: Jetty 12, Jersey 3.x, Karaf 4.5
Servlet / HTTP: - Migrate all servlet imports to jakarta.servlet.* - Upgrade Jetty 9.4.x → 12.0.23 (ee10 modules) - Upgrade Pax Web 8.0.x → 11.0.1 - Replace org.apache.felix.http.servlet-api with jakarta.servlet-api 6.1.0 JAX-RS: - Replace Apache Aries JAX-RS Whiteboard + CXF with Eclipse OSGi Tech REST backed by Jersey 3.1.3 - Switch osgi.service.jaxrs to osgi.service.jakartars (OSGi R8) - Update all itest bndrun -runbundles accordingly JAXB: - Migrate maven-jaxb2-plugin → org.jvnet.jaxb:jaxb-maven-plugin 3.0.2 - Upgrade jakarta.xml.bind-api 2.3.3 → 3.0.0 (jakarta namespace) - Replace org.glassfish.jaxb:jaxb-osgi with com.sun.xml.bind:jaxb-osgi 3.0.2 - Update .xjb binding files and XSD to JAXB 3 namespace - Add openhab.tp-jaxb as dependency to openhab-core-base feature Karaf: - Upgrade karaf.compile.version and karaf.tooling.version to 4.5.0 Dependencies: - Pin org.glassfish.hk2:osgi-resource-locator to 1.0.3 in bom/runtime to match feature.xml; Jersey 3.x requires this version range - jupnp upgrade to jakarta, not yet available Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
1 parent b18e2db commit 358ad8d

163 files changed

Lines changed: 2019 additions & 2174 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎bom/compile/pom.xml‎

Lines changed: 25 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818

1919
<properties>
2020
<californium.version>4.0.0-M2</californium.version>
21-
<jetty.version>9.4.58.v20250814</jetty.version>
22-
<pax.web.version>8.0.34</pax.web.version>
23-
<swagger.version>2.2.43</swagger.version>
21+
<jetty.version>12.0.23</jetty.version>
22+
<pax.web.version>11.0.1</pax.web.version>
23+
<swagger.version>2.2.31</swagger.version>
2424
</properties>
2525

2626
<dependencies>
@@ -71,8 +71,8 @@
7171
</dependency>
7272
<dependency>
7373
<groupId>org.osgi</groupId>
74-
<artifactId>org.osgi.service.jaxrs</artifactId>
75-
<version>1.0.1</version>
74+
<artifactId>org.osgi.service.jakartars</artifactId>
75+
<version>2.0.0</version>
7676
</dependency>
7777
<dependency>
7878
<groupId>org.osgi</groupId>
@@ -165,40 +165,40 @@
165165
<scope>compile</scope>
166166
</dependency>
167167
<dependency>
168-
<groupId>org.eclipse.jetty</groupId>
169-
<artifactId>jetty-servlet</artifactId>
168+
<groupId>org.eclipse.jetty.ee10</groupId>
169+
<artifactId>jetty-ee10-servlet</artifactId>
170170
<version>${jetty.version}</version>
171171
<scope>compile</scope>
172172
</dependency>
173173
<dependency>
174174
<groupId>org.eclipse.jetty.websocket</groupId>
175-
<artifactId>websocket-client</artifactId>
175+
<artifactId>jetty-websocket-jetty-api</artifactId>
176176
<version>${jetty.version}</version>
177177
<scope>compile</scope>
178178
</dependency>
179179
<dependency>
180180
<groupId>org.eclipse.jetty.websocket</groupId>
181-
<artifactId>websocket-servlet</artifactId>
181+
<artifactId>jetty-websocket-jetty-client</artifactId>
182182
<version>${jetty.version}</version>
183183
<scope>compile</scope>
184184
</dependency>
185185
<dependency>
186-
<groupId>org.eclipse.jetty.websocket</groupId>
187-
<artifactId>websocket-server</artifactId>
186+
<groupId>org.eclipse.jetty.ee10.websocket</groupId>
187+
<artifactId>jetty-ee10-websocket-jetty-server</artifactId>
188188
<version>${jetty.version}</version>
189189
<scope>compile</scope>
190190
</dependency>
191191

192192
<!-- Jetty HTTP2 -->
193193
<dependency>
194194
<groupId>org.eclipse.jetty.http2</groupId>
195-
<artifactId>http2-client</artifactId>
195+
<artifactId>jetty-http2-client</artifactId>
196196
<version>${jetty.version}</version>
197197
<scope>compile</scope>
198198
</dependency>
199199
<dependency>
200200
<groupId>org.eclipse.jetty.http2</groupId>
201-
<artifactId>http2-server</artifactId>
201+
<artifactId>jetty-http2-server</artifactId>
202202
<version>${jetty.version}</version>
203203
<scope>compile</scope>
204204
</dependency>
@@ -215,7 +215,7 @@
215215
<dependency>
216216
<groupId>org.jupnp</groupId>
217217
<artifactId>org.jupnp</artifactId>
218-
<version>3.0.4</version>
218+
<version>4.0.0-SNAPSHOT</version>
219219
<scope>compile</scope>
220220
</dependency>
221221

@@ -330,54 +330,36 @@
330330

331331
<!-- Servlet and JAX-RS API -->
332332
<dependency>
333-
<groupId>org.apache.felix</groupId>
334-
<artifactId>org.apache.felix.http.servlet-api</artifactId>
335-
<version>1.2.0</version>
333+
<groupId>jakarta.servlet</groupId>
334+
<artifactId>jakarta.servlet-api</artifactId>
335+
<version>6.1.0</version>
336336
<scope>compile</scope>
337-
<exclusions>
338-
<exclusion>
339-
<groupId>org.apache.tomcat</groupId>
340-
<artifactId>tomcat-servlet-api</artifactId>
341-
</exclusion>
342-
</exclusions>
343337
</dependency>
344338
<dependency>
345-
<groupId>org.apache.aries.spec</groupId>
346-
<artifactId>org.apache.aries.javax.jax.rs-api</artifactId>
347-
<version>1.0.4</version>
339+
<groupId>jakarta.ws.rs</groupId>
340+
<artifactId>jakarta.ws.rs-api</artifactId>
341+
<version>3.1.0</version>
348342
<scope>compile</scope>
349343
</dependency>
350344

351-
<!-- Swagger -->
345+
<!-- Swagger (Jakarta EE variants) -->
352346
<dependency>
353347
<groupId>io.swagger.core.v3</groupId>
354-
<artifactId>swagger-annotations</artifactId>
348+
<artifactId>swagger-annotations-jakarta</artifactId>
355349
<version>${swagger.version}</version>
356350
<scope>compile</scope>
357351
</dependency>
358352
<dependency>
359353
<groupId>io.swagger.core.v3</groupId>
360-
<artifactId>swagger-core</artifactId>
354+
<artifactId>swagger-core-jakarta</artifactId>
361355
<version>${swagger.version}</version>
362356
<scope>compile</scope>
363-
<exclusions>
364-
<exclusion>
365-
<groupId>javax.xml.bind</groupId>
366-
<artifactId>jaxb-api</artifactId>
367-
</exclusion>
368-
</exclusions>
369357
</dependency>
370358
<dependency>
371359
<groupId>io.swagger.core.v3</groupId>
372-
<artifactId>swagger-jaxrs2</artifactId>
360+
<artifactId>swagger-jaxrs2-jakarta</artifactId>
373361
<version>${swagger.version}</version>
374362
<scope>compile</scope>
375-
<exclusions>
376-
<exclusion>
377-
<groupId>jakarta.activation</groupId>
378-
<artifactId>jakarta.activation-api</artifactId>
379-
</exclusion>
380-
</exclusions>
381363
</dependency>
382364

383365
<!-- XStream -->
@@ -400,7 +382,7 @@
400382
<dependency>
401383
<groupId>jakarta.xml.bind</groupId>
402384
<artifactId>jakarta.xml.bind-api</artifactId>
403-
<version>2.3.3</version>
385+
<version>3.0.0</version>
404386
<scope>compile</scope>
405387
<exclusions>
406388
<exclusion>

‎bom/runtime-index/pom.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,13 @@
2323
<scope>compile</scope>
2424
<optional>true</optional>
2525
</dependency>
26+
<dependency>
27+
<groupId>jakarta.xml.bind</groupId>
28+
<artifactId>jakarta.xml.bind-api</artifactId>
29+
<version>3.0.0</version>
30+
<scope>compile</scope>
31+
<optional>true</optional>
32+
</dependency>
2633
</dependencies>
2734

2835
<build>

0 commit comments

Comments
 (0)