Skip to content

Commit d303dac

Browse files
retareta
authored
CXF-8828: Support Jakarta EE 11 (#2473)
* CXF-8828: Support Jakarta EE 11 Signed-off-by: Andriy Redko <[email protected]> * Fix some formatting * Fix JAXRSClientServerBookTest tests * Fix JAXRSClientServerWebSocketSpringWebAppTest test cases * Fix JAXRSRequestDispatcherTest test cases * Fix OpenApi and SwaggerUi test cases * Fix cxf-systests-jaxrs test cases * Update to Spring Boot 4.0.0-M3 * Update Hibernate to 7.1.2.Final * Fix samples issues * Update Microprofile OpenApi to 4.1.1 * Update Spring Boot to 4.0.0-RC1 Signed-off-by: Andriy Redko <[email protected]> * Add temporary workaround for failing cxf-systests-rs-security test cases * Update Undertow to 2.4.0.Alpha1 * Fix org.eclipse.microprofile.rest.client.tck.ClientBuilderHeaderTes and org.eclipse.microprofile.rest.client.tck.cditests.ClientClosedTest test cases * Update to Spring Boot 4.0.0-RC2 * Update Hibernate Validator to 9.1.0.Final * Replace Micrometer's OnlyOnceLoggingDenyMeterFilter with MaximumAllowableTagsMeterFilter * Dependency updates, test fixes * Fix versions post merge with main * Update Spring LDAP to 4.0.0 * Dependency updates --------- Signed-off-by: Andriy Redko <[email protected]>
1 parent 6c49fbf commit d303dac

File tree

393 files changed

+1644
-1170
lines changed

Some content is hidden

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

393 files changed

+1644
-1170
lines changed

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ jobs:
3030
- name: Checkout repository
3131
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
3232

33-
- name: Setup JDK 17
33+
- name: Setup JDK 21
3434
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
3535
with:
3636
distribution: 'temurin'
37-
java-version: '17'
37+
java-version: '21'
3838
- name: Cache local Maven repository
3939
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
4040
with:

‎.github/workflows/pull-request-build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ jobs:
1919
timeout-minutes: 130
2020
steps:
2121
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v3.6.0
22-
- name: Set up JDK 17
22+
- name: Set up JDK 21
2323
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
2424
with:
25-
java-version: '17'
25+
java-version: '21'
2626
distribution: 'temurin'
2727
cache: maven
2828
- name: Build with Apache Maven (Windows)

‎bom/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<groupId>org.apache.cxf</groupId>
2222
<artifactId>cxf</artifactId>
23-
<version>4.1.5-SNAPSHOT</version>
23+
<version>4.2.0-SNAPSHOT</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626
<artifactId>cxf-bom</artifactId>

‎core/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<parent>
2828
<groupId>org.apache.cxf</groupId>
2929
<artifactId>cxf-parent</artifactId>
30-
<version>4.1.5-SNAPSHOT</version>
30+
<version>4.2.0-SNAPSHOT</version>
3131
<relativePath>../parent/pom.xml</relativePath>
3232
</parent>
3333
<properties>

‎coverage/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<groupId>org.apache.cxf</groupId>
2222
<artifactId>cxf</artifactId>
23-
<version>4.1.5-SNAPSHOT</version>
23+
<version>4.2.0-SNAPSHOT</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626
<artifactId>cxf-coverage-report</artifactId>

‎distribution/javadoc/pom.xml‎

Lines changed: 34 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<parent>
2828
<groupId>org.apache.cxf</groupId>
2929
<artifactId>cxf-parent</artifactId>
30-
<version>4.1.5-SNAPSHOT</version>
30+
<version>4.2.0-SNAPSHOT</version>
3131
<relativePath>../../parent</relativePath>
3232
</parent>
3333
<properties>
@@ -38,7 +38,7 @@
3838
<dependency>
3939
<groupId>org.apache.cxf</groupId>
4040
<artifactId>cxf-bom</artifactId>
41-
<version>4.1.5-SNAPSHOT</version>
41+
<version>4.2.0-SNAPSHOT</version>
4242
<type>pom</type>
4343
<scope>import</scope>
4444
</dependency>
@@ -48,107 +48,107 @@
4848
<dependency>
4949
<groupId>org.apache.cxf</groupId>
5050
<artifactId>cxf-core</artifactId>
51-
<version>4.1.5-SNAPSHOT</version>
51+
<version>4.2.0-SNAPSHOT</version>
5252
</dependency>
5353
<dependency>
5454
<groupId>org.apache.cxf</groupId>
5555
<artifactId>cxf-rt-rs-client</artifactId>
56-
<version>4.1.5-SNAPSHOT</version>
56+
<version>4.2.0-SNAPSHOT</version>
5757
</dependency>
5858
<dependency>
5959
<groupId>org.apache.cxf</groupId>
6060
<artifactId>cxf-rt-security</artifactId>
61-
<version>4.1.5-SNAPSHOT</version>
61+
<version>4.2.0-SNAPSHOT</version>
6262
</dependency>
6363
<dependency>
6464
<groupId>org.apache.cxf</groupId>
6565
<artifactId>cxf-rt-rs-security-http-signature</artifactId>
66-
<version>4.1.5-SNAPSHOT</version>
66+
<version>4.2.0-SNAPSHOT</version>
6767
</dependency>
6868
<dependency>
6969
<groupId>org.apache.cxf</groupId>
7070
<artifactId>cxf-rt-rs-security-jose</artifactId>
71-
<version>4.1.5-SNAPSHOT</version>
71+
<version>4.2.0-SNAPSHOT</version>
7272
</dependency>
7373
<dependency>
7474
<groupId>org.apache.cxf</groupId>
7575
<artifactId>cxf-rt-rs-security-jose-jaxrs</artifactId>
76-
<version>4.1.5-SNAPSHOT</version>
76+
<version>4.2.0-SNAPSHOT</version>
7777
</dependency>
7878
<dependency>
7979
<groupId>org.apache.cxf</groupId>
8080
<artifactId>cxf-rt-rs-security-oauth2</artifactId>
81-
<version>4.1.5-SNAPSHOT</version>
81+
<version>4.2.0-SNAPSHOT</version>
8282
</dependency>
8383
<dependency>
8484
<groupId>org.apache.cxf</groupId>
8585
<artifactId>cxf-rt-rs-security-oauth2-saml</artifactId>
86-
<version>4.1.5-SNAPSHOT</version>
86+
<version>4.2.0-SNAPSHOT</version>
8787
</dependency>
8888
<dependency>
8989
<groupId>org.apache.cxf</groupId>
9090
<artifactId>cxf-rt-security-saml</artifactId>
91-
<version>4.1.5-SNAPSHOT</version>
91+
<version>4.2.0-SNAPSHOT</version>
9292
</dependency>
9393
<dependency>
9494
<groupId>org.apache.cxf</groupId>
9595
<artifactId>cxf-rt-rs-service-description</artifactId>
96-
<version>4.1.5-SNAPSHOT</version>
96+
<version>4.2.0-SNAPSHOT</version>
9797
</dependency>
9898
<dependency>
9999
<groupId>org.apache.cxf</groupId>
100100
<artifactId>cxf-rt-rs-service-description-openapi-v3</artifactId>
101-
<version>4.1.5-SNAPSHOT</version>
101+
<version>4.2.0-SNAPSHOT</version>
102102
</dependency>
103103
<dependency>
104104
<groupId>org.apache.cxf</groupId>
105105
<artifactId>cxf-rt-rs-service-description-microprofile-openapi</artifactId>
106-
<version>4.1.5-SNAPSHOT</version>
106+
<version>4.2.0-SNAPSHOT</version>
107107
</dependency>
108108
<dependency>
109109
<groupId>org.apache.cxf</groupId>
110110
<artifactId>cxf-rt-rs-mp-client</artifactId>
111-
<version>4.1.5-SNAPSHOT</version>
111+
<version>4.2.0-SNAPSHOT</version>
112112
</dependency>
113113
<dependency>
114114
<groupId>org.apache.cxf</groupId>
115115
<artifactId>cxf-rt-databinding-aegis</artifactId>
116-
<version>4.1.5-SNAPSHOT</version>
116+
<version>4.2.0-SNAPSHOT</version>
117117
</dependency>
118118
<dependency>
119119
<groupId>org.apache.cxf</groupId>
120120
<artifactId>cxf-rt-databinding-jaxb</artifactId>
121-
<version>4.1.5-SNAPSHOT</version>
121+
<version>4.2.0-SNAPSHOT</version>
122122
</dependency>
123123
<dependency>
124124
<groupId>org.apache.cxf</groupId>
125125
<artifactId>cxf-rt-rs-extension-providers</artifactId>
126-
<version>4.1.5-SNAPSHOT</version>
126+
<version>4.2.0-SNAPSHOT</version>
127127
</dependency>
128128
<dependency>
129129
<groupId>org.apache.cxf</groupId>
130130
<artifactId>cxf-rt-rs-extension-reactor</artifactId>
131-
<version>4.1.5-SNAPSHOT</version>
131+
<version>4.2.0-SNAPSHOT</version>
132132
</dependency>
133133
<dependency>
134134
<groupId>org.apache.cxf</groupId>
135135
<artifactId>cxf-rt-rs-extension-search</artifactId>
136-
<version>4.1.5-SNAPSHOT</version>
136+
<version>4.2.0-SNAPSHOT</version>
137137
</dependency>
138138
<dependency>
139139
<groupId>org.apache.cxf</groupId>
140140
<artifactId>cxf-rt-features-clustering</artifactId>
141-
<version>4.1.5-SNAPSHOT</version>
141+
<version>4.2.0-SNAPSHOT</version>
142142
</dependency>
143143
<dependency>
144144
<groupId>org.apache.cxf</groupId>
145145
<artifactId>cxf-rt-ws-transfer</artifactId>
146-
<version>4.1.5-SNAPSHOT</version>
146+
<version>4.2.0-SNAPSHOT</version>
147147
</dependency>
148148
<dependency>
149149
<groupId>org.apache.cxf</groupId>
150150
<artifactId>cxf-rt-transports-websocket</artifactId>
151-
<version>4.1.5-SNAPSHOT</version>
151+
<version>4.2.0-SNAPSHOT</version>
152152
</dependency>
153153
<dependency>
154154
<groupId>org.apache.commons</groupId>
@@ -391,11 +391,6 @@
391391
<artifactId>opentelemetry-semconv</artifactId>
392392
<version>${cxf.opentelemetry.semconv.version}</version>
393393
</dependency>
394-
<dependency>
395-
<groupId>io.opentelemetry.semconv</groupId>
396-
<artifactId>opentelemetry-semconv-incubating</artifactId>
397-
<version>${cxf.opentelemetry.semconv.version}</version>
398-
</dependency>
399394
<dependency>
400395
<groupId>io.opentracing</groupId>
401396
<artifactId>opentracing-util</artifactId>
@@ -417,24 +412,24 @@
417412
<artifactId>undertow-core</artifactId>
418413
</dependency>
419414
<dependency>
420-
<groupId>io.undertow</groupId>
415+
<groupId>io.undertow.ee</groupId>
421416
<artifactId>undertow-servlet</artifactId>
422417
</dependency>
423418
<dependency>
424419
<groupId>org.eclipse.jetty</groupId>
425420
<artifactId>jetty-server</artifactId>
426421
</dependency>
427422
<dependency>
428-
<groupId>org.eclipse.jetty.ee10</groupId>
429-
<artifactId>jetty-ee10-webapp</artifactId>
423+
<groupId>org.eclipse.jetty.ee11</groupId>
424+
<artifactId>jetty-ee11-webapp</artifactId>
430425
</dependency>
431426
<dependency>
432-
<groupId>org.eclipse.jetty.ee10</groupId>
433-
<artifactId>jetty-ee10-servlet</artifactId>
427+
<groupId>org.eclipse.jetty.ee11</groupId>
428+
<artifactId>jetty-ee11-servlet</artifactId>
434429
</dependency>
435430
<dependency>
436-
<groupId>org.eclipse.jetty.ee10.websocket</groupId>
437-
<artifactId>jetty-ee10-websocket-jetty-server</artifactId>
431+
<groupId>org.eclipse.jetty.ee11.websocket</groupId>
432+
<artifactId>jetty-ee11-websocket-jetty-server</artifactId>
438433
</dependency>
439434
<dependency>
440435
<groupId>org.eclipse.jetty</groupId>
@@ -542,6 +537,10 @@
542537
<groupId>org.springframework.boot</groupId>
543538
<artifactId>spring-boot-starter-validation</artifactId>
544539
</dependency>
540+
<dependency>
541+
<groupId>org.springframework.boot</groupId>
542+
<artifactId>spring-boot-micrometer-metrics</artifactId>
543+
</dependency>
545544
<dependency>
546545
<groupId>org.springframework.security</groupId>
547546
<artifactId>spring-security-web</artifactId>

0 commit comments

Comments
 (0)