Skip to content

Commit a2456f0

Browse files
tmortagnetmortagne
committed
XCOMMONS-2465: Upgrade to Jakarta XML Binding (JAX-B) 4.0.4
XCOMMONS-2854: Upgrade to Jakarta RESTful Web Services (JAX-RS) 4.0.0
1 parent 3842236 commit a2456f0

File tree

3 files changed

+65
-40
lines changed
  • pom.xml
  • xwiki-commons-core
    • xwiki-commons-extension/xwiki-commons-extension-repositories/xwiki-commons-extension-repository-xwiki
    • xwiki-commons-repository/xwiki-commons-repository-model

3 files changed

+65
-40
lines changed

‎pom.xml‎

Lines changed: 61 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,33 @@
6060
<!-- The highest Java version officially supported by this version of XWiki -->
6161
<xwiki.java.version.support>25</xwiki.java.version.support>
6262

63-
<!-- Javax/Jakarta modules -->
63+
<!-- Javax/Jakarta APIs -->
64+
<!-- Mail -->
6465
<jakarta.mail.version>1.6.8</jakarta.mail.version>
66+
<!-- Activation -->
6567
<jakarta.activation.version>1.2.2</jakarta.activation.version>
66-
<jakarta.transaction.version>2.0.1</jakarta.transaction.version>
68+
<!-- Transaction (JTA) -->
6769
<javax.transaction.version>1.3</javax.transaction.version>
70+
<jakarta.transaction.version>2.0.1</jakarta.transaction.version>
71+
<!-- JSON Processing (JSON-P) -->
6872
<jakarta.json.version>2.1.3</jakarta.json.version>
73+
<!-- XML Binding (JAX-B) -->
74+
<javax.xml.bind.version>2.3.1</javax.xml.bind.version>
75+
<jakarta.xml.bind.version>4.0.4</jakarta.xml.bind.version>
76+
<!-- RESTful Web Services (JAX-RS) -->
77+
<javax.ws.rs.version>2.1.1</javax.ws.rs.version>
78+
<jakarta.ws.rs.version>4.0.0</jakarta.ws.rs.version>
79+
<!-- Servlet -->
80+
<jakarta.servlet.version>5.0.0</jakarta.servlet.version>
81+
<javax.servlet.version>3.1.0</javax.servlet.version>
82+
<!-- Websoket -->
83+
<javax.websocket.version>1.1</javax.websocket.version>
84+
<jakarta.websocket.version>2.0.0</jakarta.websocket.version>
85+
86+
<!-- Jakarta JSON Processing (JSON-P) implementation -->
6987
<parsson.version>1.1.7</parsson.version>
88+
89+
<!-- Jakarta Expression Language (EL) implementation -->
7090
<expressly.version>5.0.0</expressly.version>
7191

7292
<!-- Jackson -->
@@ -158,8 +178,8 @@
158178
<xwiki.enforcer.enforce-plugins.skip>${xwiki.enforcer.skip}</xwiki.enforcer.enforce-plugins.skip>
159179
<xwiki.enforcer.enforce-jcl-log4j-isolation.skip>${xwiki.enforcer.skip}
160180
</xwiki.enforcer.enforce-jcl-log4j-isolation.skip>
161-
<xwiki.enforcer.enforce-glasshfish-jaxb.skip>${xwiki.enforcer.skip}</xwiki.enforcer.enforce-glasshfish-jaxb.skip>
162-
<xwiki.enforcer.enforce-jaxrs2.skip>${xwiki.enforcer.skip}</xwiki.enforcer.enforce-jaxrs2.skip>
181+
<xwiki.enforcer.enforce-jakarta.xml.bind.skip>${xwiki.enforcer.skip}</xwiki.enforcer.enforce-jakarta.xml.bind.skip>
182+
<xwiki.enforcer.enforce-javax.ws.rs.skip>${xwiki.enforcer.skip}</xwiki.enforcer.enforce-javax.ws.rs.skip>
163183
<xwiki.enforcer.enforce-open-json.skip>${xwiki.enforcer.skip}</xwiki.enforcer.enforce-open-json.skip>
164184
<xwiki.enforcer.enforce-glassfish-el.skip>${xwiki.enforcer.skip}</xwiki.enforcer.enforce-glassfish-el.skip>
165185
<xwiki.enforcer.enforce-commons-lang3.skip>${xwiki.enforcer.skip}</xwiki.enforcer.enforce-commons-lang3.skip>
@@ -278,14 +298,6 @@
278298
<npm.version>11.6.2</npm.version>
279299
<pnpm.version>10.20.0</pnpm.version>
280300

281-
<!-- Servlet specifications -->
282-
<javax.servlet.version>3.1.0</javax.servlet.version>
283-
<jakarta.servlet.version>5.0.0</jakarta.servlet.version>
284-
285-
<!-- WebSocket specifications -->
286-
<javax.websocket.version>1.1</javax.websocket.version>
287-
<jakarta.websocket.version>2.0.0</jakarta.websocket.version>
288-
289301
<webdrivermanager.version>6.3.3</webdrivermanager.version>
290302

291303
<!-- The recommended version of known extensions to use -->
@@ -652,17 +664,7 @@
652664
</exclusion>
653665
</exclusions>
654666
</dependency>
655-
<!-- JAXB -->
656-
<dependency>
657-
<groupId>jakarta.xml.bind</groupId>
658-
<artifactId>jakarta.xml.bind-api</artifactId>
659-
<version>2.3.3</version>
660-
</dependency>
661-
<dependency>
662-
<groupId>org.glassfish.jaxb</groupId>
663-
<artifactId>jaxb-runtime</artifactId>
664-
<version>2.3.9</version>
665-
</dependency>
667+
666668
<!-- ICU -->
667669
<dependency>
668670
<groupId>com.ibm.icu</groupId>
@@ -747,13 +749,6 @@
747749
<groupId>com.fasterxml.jackson.module</groupId>
748750
<artifactId>jackson-module-jaxb-annotations</artifactId>
749751
<version>${jackson.version}</version>
750-
<exclusions>
751-
<!-- We use jakarta.xml.bind:jakarta.xml.bind-api -->
752-
<exclusion>
753-
<groupId>javax.xml.bind</groupId>
754-
<artifactId>jaxb-api</artifactId>
755-
</exclusion>
756-
</exclusions>
757752
</dependency>
758753
<dependency>
759754
<groupId>com.fasterxml.jackson.module</groupId>
@@ -786,11 +781,42 @@
786781
<version>2.5</version>
787782
</dependency>
788783

784+
<!-- JAXB -->
785+
<!-- jakarta-->
786+
<dependency>
787+
<groupId>jakarta.xml.bind</groupId>
788+
<artifactId>jakarta.xml.bind-api</artifactId>
789+
<version>${jakarta.xml.bind.version}</version>
790+
</dependency>
791+
<dependency>
792+
<groupId>org.glassfish.jaxb</groupId>
793+
<artifactId>jaxb-runtime</artifactId>
794+
<version>4.0.6</version>
795+
</dependency>
796+
<!-- javax-->
797+
<dependency>
798+
<groupId>javax.xml.bind</groupId>
799+
<artifactId>jaxb-api</artifactId>
800+
<version>${javax.xml.bind.version}</version>
801+
</dependency>
802+
<dependency>
803+
<groupId>com.sun.xml.bind</groupId>
804+
<artifactId>jaxb-impl</artifactId>
805+
<version>2.3.9</version>
806+
</dependency>
807+
789808
<!-- JAX-RS -->
809+
<!-- jakarta-->
790810
<dependency>
791811
<groupId>jakarta.ws.rs</groupId>
792812
<artifactId>jakarta.ws.rs-api</artifactId>
793-
<version>2.1.6</version>
813+
<version>${jakarta.ws.rs.version}</version>
814+
</dependency>
815+
<!-- javax-->
816+
<dependency>
817+
<groupId>javax.ws.rs</groupId>
818+
<artifactId>javax.ws.rs-api</artifactId>
819+
<version>${javax.ws.rs.version}</version>
794820
</dependency>
795821

796822
<!-- JTA -->
@@ -1682,13 +1708,12 @@
16821708
<goal>enforce</goal>
16831709
</goals>
16841710
<configuration>
1685-
<skip>${xwiki.enforcer.enforce-jaxb.skip}</skip>
1711+
<skip>${xwiki.enforcer.enforce-jakarta.xml.bind.skip}</skip>
16861712
<rules>
16871713
<bannedDependencies>
16881714
<searchTransitive>true</searchTransitive>
1689-
<message>XWiki uses jakarta.xml.bind:jakarta.xml.bind-api instead</message>
1715+
<message>XWiki uses javax.xml.bind:jaxb-api instead</message>
16901716
<excludes>
1691-
<exclude>javax.xml.bind:jaxb-api</exclude>
16921717
<exclude>org.jboss.spec.javax.xml.bind:jboss-jaxb-api_2.3_spec</exclude>
16931718
</excludes>
16941719
</bannedDependencies>
@@ -1701,11 +1726,11 @@
17011726
<goal>enforce</goal>
17021727
</goals>
17031728
<configuration>
1704-
<skip>${xwiki.enforcer.enforce-jaxrs2.skip}</skip>
1729+
<skip>${xwiki.enforcer.enforce-javax.ws.rs.skip}</skip>
17051730
<rules>
17061731
<bannedDependencies>
17071732
<searchTransitive>true</searchTransitive>
1708-
<message>XWiki is using JAX-RS 2 (jakarta.ws.rs:jakarta.ws.rs-api) for now</message>
1733+
<message>XWiki uses javax.ws.rs:javax.ws.rs-api instead</message>
17091734
<excludes>
17101735
<exclude>javax.ws.rs:jsr311-api</exclude>
17111736
<exclude>org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.1_spec</exclude>

‎xwiki-commons-core/xwiki-commons-extension/xwiki-commons-extension-repositories/xwiki-commons-extension-repository-xwiki/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@
5252
<version>${project.version}</version>
5353
</dependency>
5454
<dependency>
55-
<groupId>jakarta.xml.bind</groupId>
56-
<artifactId>jakarta.xml.bind-api</artifactId>
55+
<groupId>javax.xml.bind</groupId>
56+
<artifactId>jaxb-api</artifactId>
5757
</dependency>
5858
<!-- Test dependencies -->
5959
<dependency>

‎xwiki-commons-core/xwiki-commons-repository/xwiki-commons-repository-model/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343
</properties>
4444
<dependencies>
4545
<dependency>
46-
<groupId>jakarta.xml.bind</groupId>
47-
<artifactId>jakarta.xml.bind-api</artifactId>
46+
<groupId>javax.xml.bind</groupId>
47+
<artifactId>jaxb-api</artifactId>
4848
</dependency>
4949
</dependencies>
5050
<build>

0 commit comments

Comments
 (0)