Skip to content

Commit 3031506

Browse files
jansupolsenivam
jansupol
authored and
senivam
committed
Updated dependency versions
Signed-off-by: jansupol <[email protected]>
1 parent 3e3e8b1 commit 3031506

File tree

8 files changed

+38
-26
lines changed

8 files changed

+38
-26
lines changed

‎containers/glassfish/jersey-gf-ejb/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,12 +112,12 @@
112112
<extensions>true</extensions>
113113
<configuration>
114114
<instructions>
115-
<!-- Explicitly set versions for packages from GlassFish to allow future uptake of GlassFish 5.x-->
115+
<!-- Explicitly set versions for packages from GlassFish to allow future uptake of GlassFish 7.x-->
116116
<Import-Package>
117-
com.sun.*;version="[4.0,7)",
117+
com.sun.*;version="[6.0,8)",
118118
${jakarta.annotation.osgi.version},
119-
org.glassfish.ejb.*;version="[4.0,7)",
120-
org.glassfish.internal.*;version="[4.0,7)",
119+
org.glassfish.ejb.*;version="[6.0,8)",
120+
org.glassfish.internal.*;version="[6.0,8)",
121121
${hk2.osgi.version},
122122
*
123123
</Import-Package>

‎containers/grizzly2-servlet/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
<configuration>
7272
<instructions>
7373
<Import-Package>
74-
jakarta.servlet.*;version="[5.0,6.0)",
74+
jakarta.servlet.*;version="[5.0,7.0)",
7575
*
7676
</Import-Package>
7777
</instructions>

‎containers/jersey-servlet-core/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
<!-- Note: When you're changing these properties change them also in bundles/jax-rs-ri/bundle/pom.xml. -->
7272
<Import-Package>
7373
jakarta.persistence.*;resolution:=optional,
74-
jakarta.servlet.*;version="[5.0,6.0)",
74+
jakarta.servlet.*;version="[5.0,7.0)",
7575
${jakarta.annotation.osgi.version},
7676
*
7777
</Import-Package>

‎containers/jersey-servlet/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
<instructions>
7575
<!-- Note: When you're changing these properties change them also in bundles/jax-rs-ri/bundle/pom.xml. -->
7676
<Import-Package>
77-
jakarta.servlet.*;version="[5.0,6.0)",
77+
jakarta.servlet.*;version="[5.0,7.0)",
7878
${jakarta.annotation.osgi.version},
7979
*
8080
</Import-Package>

‎containers/jetty-servlet/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
<configuration>
7575
<instructions>
7676
<Import-Package>
77-
jakarta.servlet.*;version="[5.0,6.0)",
77+
jakarta.servlet.*;version="[5.0,7.0)",
7878
*
7979
</Import-Package>
8080
</instructions>

‎examples/osgi-http-service/bundle/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
<configuration>
7373
<instructions>
7474
<Export-Package>org.glassfish.jersey.examples.osgihttpservice</Export-Package>
75-
<Import-Package>jakarta.servlet.*;version="[5.0,6.0)",*</Import-Package>
75+
<Import-Package>jakarta.servlet.*;version="[5.0,7.0)",*</Import-Package>
7676
<Bundle-Activator>org.glassfish.jersey.examples.osgihttpservice.Activator</Bundle-Activator>
7777
<Implementation-Title>jersey-osgi-http-service-bundle</Implementation-Title>
7878
<Implementation-Version>${project.version}</Implementation-Version>

‎pom.xml‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1813,7 +1813,7 @@
18131813
<dependency>
18141814
<groupId>jakarta.json</groupId>
18151815
<artifactId>jakarta.json-api</artifactId>
1816-
<version>${jsonp.ri.version}</version>
1816+
<version>${jakarta.jsonp.version}</version>
18171817
</dependency>
18181818
<dependency>
18191819
<groupId>org.glassfish</groupId>
@@ -2109,12 +2109,12 @@
21092109
<slf4j.version>1.7.21</slf4j.version>
21102110
<spring4.version>4.3.20.RELEASE</spring4.version>
21112111
<spring5.version>5.1.5.RELEASE</spring5.version>
2112-
<surefire.version>3.0.0-M3</surefire.version>
2112+
<surefire.version>3.0.0-M5</surefire.version>
21132113

21142114
<!-- Jakartified, eligible for CQ -->
21152115
<weld.version>4.0.2.Final</weld.version>
21162116
<weld3.version>3.1.7.SP1</weld3.version>
2117-
<validation.impl.version>7.0.0.Final</validation.impl.version>
2117+
<validation.impl.version>7.0.1.Final</validation.impl.version>
21182118
<!-- END of Jakartified, eligible for CQ -->
21192119
<xerces.version>2.11.0</xerces.version>
21202120

@@ -2126,35 +2126,36 @@
21262126
<!-- Jakartified -->
21272127
<cdi.api.version>3.0.0</cdi.api.version>
21282128
<ejb.version>4.0.0</ejb.version>
2129-
<grizzly2.version>3.0.0</grizzly2.version>
2130-
<hk2.version>3.0.1</hk2.version>
2129+
<grizzly2.version>3.0.1</grizzly2.version>
2130+
<hk2.version>3.0.2</hk2.version>
21312131
<jsp.version>3.0.0</jsp.version>
21322132
<jstl.version>2.0.0</jstl.version>
21332133
<jta.api.version>2.0.0</jta.api.version>
21342134
<servlet5.version>5.0.0</servlet5.version>
21352135
<istack.commons.runtime.version>4.0.0</istack.commons.runtime.version>
2136-
<jakarta.activation-api.version>2.0.0</jakarta.activation-api.version>
2136+
<jakarta.activation-api.version>2.0.1</jakarta.activation-api.version>
21372137
<jakarta.activation.version>2.0.1</jakarta.activation.version>
21382138
<jakarta.el.version>4.0.0</jakarta.el.version>
2139-
<jakarta.el.impl.version>4.0.0</jakarta.el.impl.version>
2139+
<jakarta.el.impl.version>4.0.2</jakarta.el.impl.version>
21402140
<jakarta.annotation.osgi.version>jakarta.annotation.*;version="[2.0,3)"</jakarta.annotation.osgi.version>
21412141
<jakarta.annotation.version>2.0.0</jakarta.annotation.version>
2142-
<jakarta.inject.version>2.0.0</jakarta.inject.version>
2142+
<jakarta.inject.version>2.0.1</jakarta.inject.version>
21432143
<jakarta.interceptor.version>2.0.0</jakarta.interceptor.version>
2144+
<jakarta.jsonp.version>2.0.1</jakarta.jsonp.version>
21442145
<jakarta.persistence.version>3.0.0</jakarta.persistence.version>
2145-
<jakarta.validation.api.version>3.0.0</jakarta.validation.api.version>
2146+
<jakarta.validation.api.version>3.0.1</jakarta.validation.api.version>
21462147
<jakarta.jaxb.api.version>3.0.1</jakarta.jaxb.api.version>
21472148
<jaxb.ri.version>3.0.2</jaxb.ri.version>
2148-
<jaxrs.api.spec.version>3.0</jaxrs.api.spec.version>
2149+
<jaxrs.api.spec.version>3.1</jaxrs.api.spec.version>
21492150
<jaxrs.api.impl.version>3.1.0</jaxrs.api.impl.version>
2150-
<jetty.version>11.0.0</jetty.version>
2151-
<jetty.plugin.version>11.0.0</jetty.plugin.version>
2151+
<jetty.version>11.0.7</jetty.version>
2152+
<jetty.plugin.version>11.0.7</jetty.plugin.version>
21522153
<jetty.servlet.api.25.version>6.1.14</jetty.servlet.api.25.version>
21532154
<jsonb.api.version>2.0.0</jsonb.api.version>
2154-
<jsonp.ri.version>2.0.0</jsonp.ri.version>
2155-
<jsonp.jaxrs.version>2.0.0</jsonp.jaxrs.version>
2156-
<moxy.version>3.0.0</moxy.version>
2157-
<yasson.version>2.0.1</yasson.version>
2155+
<jsonp.ri.version>2.0.1</jsonp.ri.version>
2156+
<jsonp.jaxrs.version>2.0.1</jsonp.jaxrs.version>
2157+
<moxy.version>3.0.2</moxy.version>
2158+
<yasson.version>2.0.3</yasson.version>
21582159
<!-- END of Jakartified -->
21592160

21602161
<javax.annotation.version>1.3.2</javax.annotation.version> <!--Deprecated, used only for @generated annotation in perf tests -->

‎tests/e2e/src/test/java/org/glassfish/jersey/tests/e2e/container/LeadingSlashesTest.java‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2015, 2021 Oracle and/or its affiliates. All rights reserved.
33
*
44
* This program and the accompanying materials are made available under the
55
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -31,6 +31,7 @@
3131
import org.glassfish.jersey.server.ResourceConfig;
3232
import org.glassfish.jersey.server.ServerProperties;
3333

34+
import org.glassfish.jersey.test.jetty.JettyTestContainerFactory;
3435
import org.junit.Test;
3536
import static org.junit.Assert.assertNotEquals;
3637

@@ -118,12 +119,19 @@ public void testSlashesWithBeginningEmpty() {
118119

119120
@Test
120121
public void testSlashesWithBeginningEmptyPathParam() {
122+
if (JettyTestContainerFactory.class.isInstance(factory)) {
123+
return; // since Jetty 11.0.5
124+
}
121125
Response result = call("///test");
122126
assertEquals("-", result.readEntity(String.class));
123127
}
124128

125129
@Test
126130
public void testSlashesWithBeginningEmptyPathParamWithQueryParams() {
131+
if (JettyTestContainerFactory.class.isInstance(factory)) {
132+
return; // since Jetty 11.0.5
133+
}
134+
127135
URI hostPort = UriBuilder.fromUri("http://localhost/").port(getPort()).build();
128136
WebTarget target = client().target(hostPort).path("///testParams")
129137
.queryParam("bar", "Container")
@@ -135,6 +143,9 @@ public void testSlashesWithBeginningEmptyPathParamWithQueryParams() {
135143

136144
@Test
137145
public void testEncodedQueryParams() {
146+
if (JettyTestContainerFactory.class.isInstance(factory)) {
147+
return; // Jetty 11.0.5
148+
}
138149
URI hostPort = UriBuilder.fromUri("http://localhost/").port(getPort()).build();
139150
WebTarget target = client().target(hostPort).path("///encoded")
140151
.queryParam("query", "%dummy23+a");

0 commit comments

Comments
 (0)