Skip to content

Commit a3742d5

Browse files
committed
Updated dependecies
Signed-off-by: jansupol <jan.supol@oracle.com>
1 parent f11c363 commit a3742d5

File tree

3 files changed

+23
-61
lines changed

3 files changed

+23
-61
lines changed

ext/cdi/jersey-cdi1x-servlet/pom.xml

-6
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,6 @@
3333
<description>Jersey CDI 1.x Servlet Support</description>
3434

3535
<dependencies>
36-
<dependency>
37-
<groupId>jakarta.servlet</groupId>
38-
<artifactId>jakarta.servlet-api</artifactId>
39-
<version>${servlet4.version}</version>
40-
<scope>provided</scope>
41-
</dependency>
4236
<dependency>
4337
<groupId>jakarta.enterprise</groupId>
4438
<artifactId>jakarta.enterprise.cdi-api</artifactId>

pom.xml

+10-43
Original file line numberDiff line numberDiff line change
@@ -698,11 +698,6 @@
698698
<version>1.1</version>
699699
</plugin>
700700
<!-- TODO: remove the old jetty plugin dependencies -->
701-
<plugin>
702-
<groupId>org.mortbay.jetty</groupId>
703-
<artifactId>maven-jetty-plugin</artifactId>
704-
<version>${mortbay.jetty.plugin.version}</version>
705-
</plugin>
706701
<plugin>
707702
<groupId>org.mortbay.jetty</groupId>
708703
<artifactId>jetty-maven-plugin</artifactId>
@@ -1912,28 +1907,6 @@
19121907
<version>${pax.exam.version}</version>
19131908
<scope>test</scope>
19141909
</dependency>
1915-
1916-
<dependency>
1917-
<groupId>org.mortbay.jetty</groupId>
1918-
<artifactId>jetty</artifactId>
1919-
<version>${mortbay.jetty.plugin.version}</version>
1920-
<scope>test</scope>
1921-
</dependency>
1922-
1923-
<dependency>
1924-
<groupId>org.mortbay.jetty</groupId>
1925-
<artifactId>jetty-util</artifactId>
1926-
<version>${mortbay.jetty.plugin.version}</version>
1927-
<scope>test</scope>
1928-
</dependency>
1929-
1930-
<dependency>
1931-
<groupId>org.mortbay.jetty</groupId>
1932-
<artifactId>servlet-api-2.5</artifactId>
1933-
<version>${jetty.servlet.api.25.version}</version>
1934-
<scope>test</scope>
1935-
</dependency>
1936-
19371910
<dependency>
19381911
<groupId>junit</groupId>
19391912
<artifactId>junit</artifactId>
@@ -2079,7 +2052,7 @@
20792052
<xmlunit.version>1.6</xmlunit.version>
20802053
<hk2.osgi.version>org.glassfish.hk2.*;version="[2.5,4)"</hk2.osgi.version>
20812054
<hk2.jvnet.osgi.version>org.jvnet.hk2.*;version="[2.5,4)"</hk2.jvnet.osgi.version>
2082-
<hk2.config.version>6.0.0-RC1</hk2.config.version>
2055+
<hk2.config.version>6.0.0</hk2.config.version>
20832056
<httpclient.version>4.5.9</httpclient.version>
20842057
<jackson.version>2.11.3</jackson.version>
20852058
<javassist.version>3.25.0-GA</javassist.version>
@@ -2103,7 +2076,6 @@
21032076
<paxexam.mvn.plugin.version>1.2.4</paxexam.mvn.plugin.version>
21042077
<rxjava.version>1.2.5</rxjava.version>
21052078
<rxjava2.version>2.0.4</rxjava2.version>
2106-
<servlet2.version>2.4</servlet2.version>
21072079
<servlet3.version>3.0.1</servlet3.version>
21082080
<servlet4.version>4.0.3</servlet4.version>
21092081
<simple.version>6.0.1</simple.version>
@@ -2114,18 +2086,18 @@
21142086
<surefire.version>3.0.0-M3</surefire.version>
21152087

21162088
<!-- Jakartified, eligible for CQ -->
2117-
<weld.version>4.0.0.Beta5</weld.version> <!-- 2.4.1 doesn't work - bv tests -->
2118-
<validation.impl.version>7.0.0.Alpha6</validation.impl.version>
2089+
<weld.version>4.0.0.Final</weld.version> <!-- 2.4.1 doesn't work - bv tests -->
2090+
<validation.impl.version>7.0.0.Final</validation.impl.version>
21192091
<!-- END of Jakartified, eligible for CQ -->
21202092
<xerces.version>2.11.0</xerces.version>
21212093

21222094
<!-- do not need CQs (below this line till the end of version properties)-->
2123-
<gf.impl.version>6.0.0-RC1</gf.impl.version>
2095+
<gf.impl.version>6.0.0</gf.impl.version>
21242096
<!-- Jakartified -->
21252097
<cdi.api.version>3.0.0</cdi.api.version>
21262098
<ejb.version>4.0.0</ejb.version>
2127-
<grizzly2.version>3.0.0-M1</grizzly2.version>
2128-
<hk2.version>3.0.0-RC1</hk2.version>
2099+
<grizzly2.version>3.0.0</grizzly2.version>
2100+
<hk2.version>3.0.1</hk2.version>
21292101
<jsp.version>3.0.0</jsp.version>
21302102
<jstl.version>2.0.0</jstl.version>
21312103
<jta.api.version>2.0.0</jta.api.version>
@@ -2142,24 +2114,19 @@
21422114
<jakarta.persistence.version>3.0.0</jakarta.persistence.version>
21432115
<jakarta.validation.api.version>3.0.0</jakarta.validation.api.version>
21442116
<jakarta.jaxb.api.version>3.0.0</jakarta.jaxb.api.version>
2145-
<jaxb.ri.version>3.0.0-M5</jaxb.ri.version>
2117+
<jaxb.ri.version>3.0.0</jaxb.ri.version>
21462118
<jaxrs.api.spec.version>3.0</jaxrs.api.spec.version>
21472119
<jaxrs.api.impl.version>3.0.0</jaxrs.api.impl.version>
2148-
<jetty.version>11.0.0.beta3</jetty.version>
2149-
<jetty.plugin.version>11.0.0.beta3</jetty.plugin.version>
2120+
<jetty.version>11.0.0</jetty.version>
2121+
<jetty.plugin.version>11.0.0</jetty.plugin.version>
21502122
<jsonb.api.version>2.0.0</jsonb.api.version>
21512123
<jsonp.ri.version>2.0.0</jsonp.ri.version>
21522124
<jsonp.jaxrs.version>2.0.0</jsonp.jaxrs.version>
2153-
<moxy.version>3.0.0-M2</moxy.version>
2125+
<moxy.version>3.0.0</moxy.version>
21542126
<yasson.version>2.0.1</yasson.version>
21552127
<!-- END of Jakartified -->
21562128

21572129
<javax.annotation.version>1.3.2</javax.annotation.version> <!--Deprecated, used only for @generated annotation in perf tests -->
2158-
2159-
<mortbay.jetty.plugin.version>6.1.26</mortbay.jetty.plugin.version>
2160-
<jetty.servlet.api.25.version>6.1.14</jetty.servlet.api.25.version>
2161-
21622130
<mimepull.version>1.9.13</mimepull.version>
2163-
21642131
</properties>
21652132
</project>

tests/osgi/functional/pom.xml

+13-12
Original file line numberDiff line numberDiff line change
@@ -253,19 +253,20 @@
253253
<artifactId>jaxrs-ri</artifactId>
254254
<scope>test</scope>
255255
</dependency>
256+
<!-- <dependency>-->
257+
<!-- <groupId>org.mortbay.jetty</groupId>-->
258+
<!-- <artifactId>jetty</artifactId>-->
259+
<!-- <scope>test</scope>-->
260+
<!-- </dependency>-->
261+
<!-- <dependency>-->
262+
<!-- <groupId>org.mortbay.jetty</groupId>-->
263+
<!-- <artifactId>jetty-util</artifactId>-->
264+
<!-- <scope>test</scope>-->
265+
<!-- </dependency>-->
256266
<dependency>
257-
<groupId>org.mortbay.jetty</groupId>
258-
<artifactId>jetty</artifactId>
259-
<scope>test</scope>
260-
</dependency>
261-
<dependency>
262-
<groupId>org.mortbay.jetty</groupId>
263-
<artifactId>jetty-util</artifactId>
264-
<scope>test</scope>
265-
</dependency>
266-
<dependency>
267-
<groupId>org.mortbay.jetty</groupId>
268-
<artifactId>servlet-api-2.5</artifactId>
267+
<groupId>jakarta.servlet</groupId>
268+
<artifactId>jakarta.servlet-api</artifactId>
269+
<version>${servlet5.version}</version>
269270
<scope>test</scope>
270271
</dependency>
271272
<dependency>

0 commit comments

Comments
 (0)