eclipse-ee4j · Feb 16, 2023 · Feb 23, 2023 · Mar 6, 2023 · Mar 22, 2023 · Mar 22, 2023
Showing 431 changed files with 786 additions and 531 deletions.
diff --git a/archetypes/jersey-example-java8-webapp/pom.xml b/archetypes/jersey-example-java8-webapp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.jersey.archetypes</groupId>
         <artifactId>project</artifactId>
-        <version>2.39</version>
+        <version>2.39.1</version>
     </parent>
 
     <artifactId>jersey-example-java8-webapp</artifactId>

diff --git a/archetypes/jersey-heroku-webapp/pom.xml b/archetypes/jersey-heroku-webapp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.jersey.archetypes</groupId>
         <artifactId>project</artifactId>
-        <version>2.39</version>
+        <version>2.39.1</version>
     </parent>
     <packaging>maven-archetype</packaging>
 

diff --git a/archetypes/jersey-heroku-webapp/src/main/resources/archetype-resources/pom.xml b/archetypes/jersey-heroku-webapp/src/main/resources/archetype-resources/pom.xml
@@ -100,12 +100,19 @@
                     <war>\${project.build.directory}/\${project.build.finalName}.war</war>
                 </configuration>
             </plugin>
+            <plugin>
+                <!-- Surefire support for JUnit-5 -->
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${surefire.mvn.plugin.version}</version>
+            </plugin>
         </plugins>
     </build>
 
     <properties>
         <jersey.version>${project.version}</jersey.version>
+        <jetty.version>9.4.49.v20220914</jetty.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <jetty.version>9.4.28.v20200408</jetty.version>
+        <surefire.mvn.plugin.version>3.0.0-M7</surefire.mvn.plugin.version>
     </properties>
 </project>
diff --git a/archetypes/jersey-quickstart-grizzly2/pom.xml b/archetypes/jersey-quickstart-grizzly2/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.glassfish.jersey.archetypes</groupId>
         <artifactId>project</artifactId>
-        <version>2.39</version>
+        <version>2.39.1</version>
     </parent>
     <artifactId>jersey-quickstart-grizzly2</artifactId>
     <packaging>maven-archetype</packaging>

diff --git a/archetypes/jersey-quickstart-grizzly2/src/main/resources/archetype-resources/pom.xml b/archetypes/jersey-quickstart-grizzly2/src/main/resources/archetype-resources/pom.xml
@@ -72,12 +72,19 @@
                     <mainClass>\${package}.Main</mainClass>
                 </configuration>
             </plugin>
+            <plugin>
+                <!-- Surefire support for JUnit-5 -->
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${surefire.mvn.plugin.version}</version>
+            </plugin>
         </plugins>
     </build>
 
     <properties>
         <jersey.version>${project.version}</jersey.version>
         <junit-jupiter.version>5.9.1</junit-jupiter.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <surefire.mvn.plugin.version>3.0.0-M7</surefire.mvn.plugin.version>
     </properties>
 </project>
diff --git a/archetypes/jersey-quickstart-webapp/pom.xml b/archetypes/jersey-quickstart-webapp/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.glassfish.jersey.archetypes</groupId>
         <artifactId>project</artifactId>
-        <version>2.39</version>
+        <version>2.39.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>maven-archetype</packaging>

diff --git a/archetypes/pom.xml b/archetypes/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.jersey</groupId>
         <artifactId>project</artifactId>
-        <version>2.39</version>
+        <version>2.39.1</version>
     </parent>
 
     <groupId>org.glassfish.jersey.archetypes</groupId>

diff --git a/bom/pom.xml b/bom/pom.xml
@@ -30,7 +30,7 @@
 
     <groupId>org.glassfish.jersey</groupId>
     <artifactId>jersey-bom</artifactId>
-    <version>2.39</version>
+    <version>2.39.1</version>
     <packaging>pom</packaging>
     <name>jersey-bom</name>
 

diff --git a/bundles/apidocs/pom.xml b/bundles/apidocs/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.jersey.bundles</groupId>
         <artifactId>project</artifactId>
-        <version>2.39</version>
+        <version>2.39.1</version>
     </parent>
 
     <artifactId>apidocs</artifactId>

diff --git a/bundles/examples/pom.xml b/bundles/examples/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.glassfish.jersey.bundles</groupId>
         <artifactId>project</artifactId>
-        <version>2.39</version>
+        <version>2.39.1</version>
     </parent>
 
     <artifactId>jersey-examples</artifactId>

diff --git a/bundles/jaxrs-ri/pom.xml b/bundles/jaxrs-ri/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.glassfish.jersey.bundles</groupId>
         <artifactId>project</artifactId>
-        <version>2.39</version>
+        <version>2.39.1</version>
     </parent>
 
     <artifactId>jaxrs-ri</artifactId>

diff --git a/bundles/pom.xml b/bundles/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.glassfish.jersey</groupId>
         <artifactId>project</artifactId>
-        <version>2.39</version>
+        <version>2.39.1</version>
     </parent>
 
     <groupId>org.glassfish.jersey.bundles</groupId>

diff --git a/connectors/apache-connector/pom.xml b/connectors/apache-connector/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.jersey.connectors</groupId>
         <artifactId>project</artifactId>
-        <version>2.39</version>
+        <version>2.39.1</version>
     </parent>
 
     <artifactId>jersey-apache-connector</artifactId>

diff --git a/connectors/apache5-connector/pom.xml b/connectors/apache5-connector/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.jersey.connectors</groupId>
         <artifactId>project</artifactId>
-        <version>2.39</version>
+        <version>2.39.1</version>
     </parent>
 
     <artifactId>jersey-apache5-connector</artifactId>

diff --git a/connectors/grizzly-connector/pom.xml b/connectors/grizzly-connector/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.jersey.connectors</groupId>
         <artifactId>project</artifactId>
-        <version>2.39</version>
+        <version>2.39.1</version>
     </parent>
 
     <artifactId>jersey-grizzly-connector</artifactId>

diff --git a/connectors/helidon-connector/pom.xml b/connectors/helidon-connector/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>project</artifactId>
         <groupId>org.glassfish.jersey.connectors</groupId>
-        <version>2.39</version>
+        <version>2.39.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/connectors/jdk-connector/pom.xml b/connectors/jdk-connector/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.jersey.connectors</groupId>
         <artifactId>project</artifactId>
-        <version>2.39</version>
+        <version>2.39.1</version>
     </parent>
 
     <artifactId>jersey-jdk-connector</artifactId>

diff --git a/connectors/jetty-connector/pom.xml b/connectors/jetty-connector/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.jersey.connectors</groupId>
         <artifactId>project</artifactId>
-        <version>2.39</version>
+        <version>2.39.1</version>
     </parent>
 
     <artifactId>jersey-jetty-connector</artifactId>

diff --git a/...rs/jetty-connector/src/main/java/org/glassfish/jersey/jetty/connector/JettyConnector.java b/...rs/jetty-connector/src/main/java/org/glassfish/jersey/jetty/connector/JettyConnector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2022 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -154,16 +154,20 @@ class JettyConnector implements Connector {
         }
         if (httpClient == null) {
             final SSLContext sslContext = jaxrsClient.getSslContext();
-            final SslContextFactory sslContextFactory = new SslContextFactory();
+            final SslContextFactory.Client sslContextFactory = new SslContextFactory.Client(false);
             sslContextFactory.setSslContext(sslContext);
             httpClient = new HttpClient(sslContextFactory);
         }
         this.client = httpClient;
 
         Boolean enableHostnameVerification = (Boolean) config.getProperties()
                 .get(JettyClientProperties.ENABLE_SSL_HOSTNAME_VERIFICATION);
-        if (enableHostnameVerification != null && enableHostnameVerification) {
-            client.getSslContextFactory().setEndpointIdentificationAlgorithm("https");
+        if (enableHostnameVerification != null) {
+            final String verificationAlgorithm = enableHostnameVerification ? "HTTPS" : null;
+            client.getSslContextFactory().setEndpointIdentificationAlgorithm(verificationAlgorithm);
+        }
+        if (jaxrsClient.getHostnameVerifier() != null) {
+            client.getSslContextFactory().setHostnameVerifier(jaxrsClient.getHostnameVerifier());
         }
 
         final Object connectTimeout = config.getProperties().get(ClientProperties.CONNECT_TIMEOUT);

diff --git a/connectors/netty-connector/pom.xml b/connectors/netty-connector/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.jersey.connectors</groupId>
         <artifactId>project</artifactId>
-        <version>2.39</version>
+        <version>2.39.1</version>
     </parent>
 
     <artifactId>jersey-netty-connector</artifactId>

diff --git a/connectors/pom.xml b/connectors/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.jersey</groupId>
         <artifactId>project</artifactId>
-        <version>2.39</version>
+        <version>2.39.1</version>
     </parent>
 
     <groupId>org.glassfish.jersey.connectors</groupId>

diff --git a/containers/glassfish/jersey-gf-ejb/pom.xml b/containers/glassfish/jersey-gf-ejb/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.jersey.containers.glassfish</groupId>
         <artifactId>project</artifactId>
-        <version>2.39</version>
+        <version>2.39.1</version>
     </parent>
 
     <artifactId>jersey-gf-ejb</artifactId>

diff --git a/containers/glassfish/pom.xml b/containers/glassfish/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.jersey.containers</groupId>
         <artifactId>project</artifactId>
-        <version>2.39</version>
+        <version>2.39.1</version>
     </parent>
 
     <groupId>org.glassfish.jersey.containers.glassfish</groupId>

diff --git a/containers/grizzly2-http/pom.xml b/containers/grizzly2-http/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.jersey.containers</groupId>
         <artifactId>project</artifactId>
-        <version>2.39</version>
+        <version>2.39.1</version>
     </parent>
 
     <artifactId>jersey-container-grizzly2-http</artifactId>

diff --git a/containers/grizzly2-servlet/pom.xml b/containers/grizzly2-servlet/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.jersey.containers</groupId>
         <artifactId>project</artifactId>
-        <version>2.39</version>
+        <version>2.39.1</version>
     </parent>
 
     <artifactId>jersey-container-grizzly2-servlet</artifactId>

diff --git a/containers/jdk-http/pom.xml b/containers/jdk-http/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.jersey.containers</groupId>
         <artifactId>project</artifactId>
-        <version>2.39</version>
+        <version>2.39.1</version>
     </parent>
 
     <artifactId>jersey-container-jdk-http</artifactId>

diff --git a/containers/jersey-servlet-core/pom.xml b/containers/jersey-servlet-core/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.jersey.containers</groupId>
         <artifactId>project</artifactId>
-        <version>2.39</version>
+        <version>2.39.1</version>
     </parent>
 
     <artifactId>jersey-container-servlet-core</artifactId>

diff --git a/containers/jersey-servlet/pom.xml b/containers/jersey-servlet/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.jersey.containers</groupId>
         <artifactId>project</artifactId>
-        <version>2.39</version>
+        <version>2.39.1</version>
     </parent>
 
     <artifactId>jersey-container-servlet</artifactId>

diff --git a/containers/jetty-http/pom.xml b/containers/jetty-http/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>project</artifactId>
         <groupId>org.glassfish.jersey.containers</groupId>
-        <version>2.39</version>
+        <version>2.39.1</version>
     </parent>
 
     <artifactId>jersey-container-jetty-http</artifactId>

diff --git a/containers/jetty-servlet/pom.xml b/containers/jetty-servlet/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.jersey.containers</groupId>
         <artifactId>project</artifactId>
-        <version>2.39</version>
+        <version>2.39.1</version>
     </parent>
 
     <artifactId>jersey-container-jetty-servlet</artifactId>

diff --git a/containers/netty-http/pom.xml b/containers/netty-http/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.jersey.containers</groupId>
         <artifactId>project</artifactId>
-        <version>2.39</version>
+        <version>2.39.1</version>
     </parent>
 
     <artifactId>jersey-container-netty-http</artifactId>

diff --git a/...s/netty-http/src/main/java/org/glassfish/jersey/netty/httpserver/NettyResponseWriter.java b/...s/netty-http/src/main/java/org/glassfish/jersey/netty/httpserver/NettyResponseWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -105,7 +105,7 @@ public synchronized OutputStream writeResponseStatusAndHeaders(long contentLengt
 
         if (contentLength == -1) {
             HttpUtil.setTransferEncodingChunked(response, true);
-        } else {
+        } else if (req.method() != HttpMethod.HEAD || !response.headers().contains(HttpHeaderNames.CONTENT_LENGTH)) {
             response.headers().set(HttpHeaderNames.CONTENT_LENGTH, contentLength);
         }
 

diff --git a/containers/pom.xml b/containers/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.jersey</groupId>
         <artifactId>project</artifactId>
-        <version>2.39</version>
+        <version>2.39.1</version>
     </parent>
 
     <groupId>org.glassfish.jersey.containers</groupId>

diff --git a/containers/simple-http/pom.xml b/containers/simple-http/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.jersey.containers</groupId>
         <artifactId>project</artifactId>
-        <version>2.39</version>
+        <version>2.39.1</version>
     </parent>
 
     <artifactId>jersey-container-simple-http</artifactId>

diff --git a/core-client/pom.xml b/core-client/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.jersey</groupId>
         <artifactId>project</artifactId>
-        <version>2.39</version>
+        <version>2.39.1</version>
     </parent>
 
     <groupId>org.glassfish.jersey.core</groupId>

diff --git a/core-client/src/main/java/org/glassfish/jersey/client/ChunkedInputReader.java b/core-client/src/main/java/org/glassfish/jersey/client/ChunkedInputReader.java
@@ -24,6 +24,7 @@
 import javax.ws.rs.ConstrainedTo;
 import javax.ws.rs.RuntimeType;
 import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.MultivaluedMap;
 import javax.ws.rs.ext.MessageBodyReader;
@@ -47,8 +48,8 @@ class ChunkedInputReader implements MessageBodyReader<ChunkedInput> {
     private final Provider<PropertiesDelegate> propertiesDelegateProvider;
 
     @Inject
-    public ChunkedInputReader(Provider<MessageBodyWorkers> messageBodyWorkers,
-                              Provider<PropertiesDelegate> propertiesDelegateProvider) {
+    public ChunkedInputReader(@Context Provider<MessageBodyWorkers> messageBodyWorkers,
+                              @Context Provider<PropertiesDelegate> propertiesDelegateProvider) {
         this.messageBodyWorkers = messageBodyWorkers;
         this.propertiesDelegateProvider = propertiesDelegateProvider;
     }