Skip to content

Commit bbedc7c

Browse files
senivamsenivam
committedApr 5, 2024
ee10 versions update
Signed-off-by: Maxim Nesen <maxim.nesen@oracle.com>
1 parent d49a602 commit bbedc7c

File tree

9 files changed

+73
-9
lines changed

9 files changed

+73
-9
lines changed
 

‎connectors/jetty-http2-connector/pom.xml

+18
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,12 @@
4848
<dependency>
4949
<groupId>org.eclipse.jetty</groupId>
5050
<artifactId>jetty-util</artifactId>
51+
<exclusions>
52+
<exclusion>
53+
<groupId>org.slf4j</groupId>
54+
<artifactId>slf4j-api</artifactId>
55+
</exclusion>
56+
</exclusions>
5157
</dependency>
5258

5359
<dependency>
@@ -158,10 +164,22 @@
158164
<dependency>
159165
<groupId>org.eclipse.jetty.http2</groupId>
160166
<artifactId>jetty-http2-client</artifactId>
167+
<exclusions>
168+
<exclusion>
169+
<groupId>org.slf4j</groupId>
170+
<artifactId>slf4j-api</artifactId>
171+
</exclusion>
172+
</exclusions>
161173
</dependency>
162174
<dependency>
163175
<groupId>org.eclipse.jetty.http2</groupId>
164176
<artifactId>jetty-http2-client-transport</artifactId>
177+
<exclusions>
178+
<exclusion>
179+
<groupId>org.slf4j</groupId>
180+
<artifactId>slf4j-api</artifactId>
181+
</exclusion>
182+
</exclusions>
165183
</dependency>
166184
<dependency>
167185
<groupId>org.glassfish.jersey.containers</groupId>

‎connectors/jetty11-connector/pom.xml

+8-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<!--
33
4-
Copyright (c) 2023 Oracle and/or its affiliates. All rights reserved.
4+
Copyright (c) 2023, 2024 Oracle and/or its affiliates. All rights reserved.
55
66
This program and the accompanying materials are made available under the
77
terms of the Eclipse Public License v. 2.0, which is available at
@@ -151,6 +151,13 @@
151151
</instructions>
152152
</configuration>
153153
</plugin>
154+
<plugin>
155+
<groupId>org.apache.maven.plugins</groupId>
156+
<artifactId>maven-enforcer-plugin</artifactId>
157+
<configuration>
158+
<rulesToSkip>dependencyConvergence</rulesToSkip>
159+
</configuration>
160+
</plugin>
154161
</plugins>
155162
</build>
156163
</project>

‎containers/jetty11-http/pom.xml

+8-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright (c) 2013, 2023 Oracle and/or its affiliates. All rights reserved.
4+
Copyright (c) 2013, 2024 Oracle and/or its affiliates. All rights reserved.
55
66
This program and the accompanying materials are made available under the
77
terms of the Eclipse Public License v. 2.0, which is available at
@@ -114,6 +114,13 @@
114114
</instructions>
115115
</configuration>
116116
</plugin>
117+
<plugin>
118+
<groupId>org.apache.maven.plugins</groupId>
119+
<artifactId>maven-enforcer-plugin</artifactId>
120+
<configuration>
121+
<rulesToSkip>dependencyConvergence</rulesToSkip>
122+
</configuration>
123+
</plugin>
117124
</plugins>
118125

119126
<resources>

‎etc/jenkins/Jenkinsfile_ci_build

+1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ pipeline {
3434
steps {
3535
sh '''
3636
bash ${WORKSPACE}/etc/jenkins/jenkins_build.sh
37+
export EXCLUDE_ARGS=' -pl !:jersey-container-jetty11-http,!:jersey-jetty11-connector '
3738
bash ${WORKSPACE}/etc/scripts/validation/dependency-convergence.sh
3839
'''
3940
}

‎ext/bean-validation/pom.xml

+6
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,12 @@
138138
<dependency>
139139
<groupId>org.glassfish.expressly</groupId>
140140
<artifactId>expressly</artifactId>
141+
<exclusions>
142+
<exclusion>
143+
<groupId>jakarta.el</groupId>
144+
<artifactId>jakarta.el-api</artifactId>
145+
</exclusion>
146+
</exclusions>
141147
</dependency>
142148

143149
<dependency>

‎ext/cdi/jersey-weld2-se/pom.xml

+8
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,14 @@
6666
<groupId>jakarta.inject</groupId>
6767
<artifactId>jakarta.inject-api</artifactId>
6868
</exclusion>
69+
<exclusion>
70+
<groupId>jakarta.el</groupId>
71+
<artifactId>jakarta.el-api</artifactId>
72+
</exclusion>
73+
<exclusion>
74+
<groupId>jakarta.annotation</groupId>
75+
<artifactId>jakarta.annotation-api</artifactId>
76+
</exclusion>
6977
</exclusions>
7078
</dependency>
7179
</dependencies>

‎media/json-binding/pom.xml

+4
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,10 @@
9898
<groupId>org.glassfish</groupId>
9999
<artifactId>jakarta.json</artifactId>
100100
</exclusion>
101+
<exclusion>
102+
<groupId>org.eclipse.parsson</groupId>
103+
<artifactId>parsson</artifactId>
104+
</exclusion>
101105
</exclusions>
102106
</dependency>
103107

‎media/moxy/pom.xml

+13
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,11 @@
110110
<version>${asm.version}</version>
111111
</dependency>
112112

113+
<dependency>
114+
<groupId>jakarta.xml.bind</groupId>
115+
<artifactId>jakarta.xml.bind-api</artifactId>
116+
</dependency>
117+
113118
<dependency>
114119
<groupId>org.eclipse.persistence</groupId>
115120
<artifactId>org.eclipse.persistence.moxy</artifactId>
@@ -122,6 +127,14 @@
122127
<groupId>org.eclipse.angus</groupId>
123128
<artifactId>angus-activation</artifactId>
124129
</exclusion>
130+
<exclusion>
131+
<groupId>jakarta.xml.bind</groupId>
132+
<artifactId>jakarta.xml.bind-api</artifactId>
133+
</exclusion>
134+
<exclusion>
135+
<groupId>jakarta.activation</groupId>
136+
<artifactId>jakarta.activation-api</artifactId>
137+
</exclusion>
125138
</exclusions>
126139
</dependency>
127140

‎pom.xml

+7-7
Original file line numberDiff line numberDiff line change
@@ -2291,8 +2291,8 @@
22912291
<jstl.version>3.0.0</jstl.version>
22922292
<jta.api.version>2.0.1</jta.api.version>
22932293
<istack.commons.runtime.version>4.1.2</istack.commons.runtime.version>
2294-
<jakarta.activation-api.version>2.1.2</jakarta.activation-api.version>
2295-
<jakarta.activation.version>2.0.1</jakarta.activation.version>
2294+
<jakarta.activation-api.version>2.1.3</jakarta.activation-api.version>
2295+
<jakarta.activation.version>2.0.2</jakarta.activation.version>
22962296
<jakarta.el.version>5.0.1</jakarta.el.version>
22972297
<jakarta.el.impl.version>5.0.0</jakarta.el.impl.version>
22982298
<jakarta.annotation.osgi.version>jakarta.annotation.*;version="[2.0,3)"</jakarta.annotation.osgi.version>
@@ -2302,18 +2302,18 @@
23022302
<jakarta.jsonp.version>2.1.3</jakarta.jsonp.version>
23032303
<jakarta.persistence.version>3.1.0</jakarta.persistence.version>
23042304
<jakarta.validation.api.version>3.0.2</jakarta.validation.api.version>
2305-
<jakarta.jaxb.api.version>4.0.1</jakarta.jaxb.api.version>
2306-
<jaxb.ri.version>4.0.4</jaxb.ri.version>
2305+
<jakarta.jaxb.api.version>4.0.2</jakarta.jaxb.api.version>
2306+
<jaxb.ri.version>4.0.5</jaxb.ri.version>
23072307
<jaxrs.api.spec.version>3.1</jaxrs.api.spec.version>
23082308
<jaxrs.api.impl.version>3.1.0</jaxrs.api.impl.version>
23092309
<jetty.osgi.version>org.eclipse.jetty.*;version="[11,15)"</jetty.osgi.version>
23102310
<jetty.version>12.0.7</jetty.version>
23112311
<jetty9.version>9.4.54.v20240208</jetty9.version>
23122312
<jetty11.version>11.0.20</jetty11.version>
2313-
<jetty.plugin.version>12.0.5</jetty.plugin.version>
2314-
<jsonb.api.version>3.0.0</jsonb.api.version>
2313+
<jetty.plugin.version>12.0.8</jetty.plugin.version>
2314+
<jsonb.api.version>3.0.1</jsonb.api.version>
23152315
<jsonp.ri.version>1.1.5</jsonp.ri.version>
2316-
<jsonp.jaxrs.version>1.1.1</jsonp.jaxrs.version>
2316+
<jsonp.jaxrs.version>1.1.5</jsonp.jaxrs.version>
23172317
<moxy.version>4.0.2</moxy.version>
23182318
<yasson.version>3.0.3</yasson.version>
23192319
<!-- END of Jakartified -->

0 commit comments

Comments
 (0)