JDK16 Support (#4785)

* JDK16 Support Signed-off-by: jansupol <[email protected]>
eclipse-ee4j · May 10, 2021 · e129ced · e129ced
1 parent 74e2279
commit e129ced
Show file tree

Hide file tree

Showing 50 changed files with 286 additions and 122 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,7 +10,7 @@ services:
 jdk:
   - oraclejdk8
   - openjdk11
-  - openjdk15
+  - openjdk16
 
 cache:
   directories:

diff --git a/connectors/jdk-connector/pom.xml b/connectors/jdk-connector/pom.xml
@@ -104,6 +104,28 @@
                 </plugins>
             </build>
         </profile>
+        <profile>
+            <id>disable_tls1and11</id>
+            <!-- TLS 1 and TLS 1.1 are disabled for JDK 16 -->
+            <activation>
+                <jdk>[16,)</jdk>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <reuseForks>false</reuseForks>
+                            <excludes>
+                                <exclude>**/SslFilterTLS1Test.java</exclude>
+                                <exclude>**/SslFilterTLS11Test.java</exclude>
+                            </excludes>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
     </profiles>
 
 </project>
diff --git a/core-client/pom.xml b/core-client/pom.xml
@@ -118,6 +118,14 @@
             <artifactId>jakarta.inject</artifactId>
         </dependency>
 
+        <dependency>
+            <!-- not to warn about missing activation -->
+            <groupId>com.sun.activation</groupId>
+            <artifactId>jakarta.activation</artifactId>
+            <version>${jakarta.activation.version}</version>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -132,7 +140,7 @@
 
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
+            <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
 

diff --git a/core-client/src/test/java/org/glassfish/jersey/client/ClientRequestTest.java b/core-client/src/test/java/org/glassfish/jersey/client/ClientRequestTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2021 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
@@ -32,14 +32,14 @@
 import org.glassfish.jersey.message.MessageBodyWorkers;
 
 import org.hamcrest.core.Is;
+import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
-import org.mockito.runners.MockitoJUnitRunner;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
@@ -53,17 +53,24 @@
  *
  * @author Marek Potociar
  */
-@RunWith(MockitoJUnitRunner.class)
+//@RunWith(MockitoJUnitRunner.class)
 public class ClientRequestTest {
 
     @Mock
     private MessageBodyWorkers workers;
     @Mock
     private GenericType<?> entityType;
 
+    private AutoCloseable mockito;
+
     @Before
     public void initMocks() {
-        MockitoAnnotations.initMocks(this);
+        mockito = MockitoAnnotations.openMocks(this);
+    }
+
+    @After
+    public void closeMocks() throws Exception {
+        mockito.close();
     }
 
     /**

diff --git a/core-common/pom.xml b/core-common/pom.xml
@@ -212,7 +212,7 @@
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
+            <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/core-common/src/test/java/org/glassfish/jersey/logging/LoggingInterceptorTest.java b/core-common/src/test/java/org/glassfish/jersey/logging/LoggingInterceptorTest.java
@@ -150,8 +150,8 @@ public void testLogInboundEntityMockedStream() throws Exception {
 
     private Answer<?> chunk(int size, char filler) {
         return invocation -> {
-            byte[] buf = invocation.getArgumentAt(0, byte[].class);
-            int offset = invocation.getArgumentAt(1, Integer.class);
+            byte[] buf = invocation.getArgument(0, byte[].class);
+            int offset = invocation.getArgument(1, Integer.class);
             Arrays.fill(buf, offset, offset + size, (byte) filler);
             return size;
         };

diff --git a/core-common/src/test/resources/surefire.policy b/core-common/src/test/resources/surefire.policy
@@ -38,6 +38,7 @@ grant codebase "file:${project.build.directory}/test-classes/-" {
   permission java.lang.RuntimePermission "accessDeclaredMembers";
   permission java.lang.RuntimePermission "accessClassInPackage.sun.reflect";
   permission java.lang.RuntimePermission "reflectionFactoryAccess";
+  permission java.lang.RuntimePermission "getProtectionDomain"; // mockito for JDK<16
 };
 
 grant codebase "file:${project.build.directory}/classes/-" {

diff --git a/examples/cdi-webapp/pom.xml b/examples/cdi-webapp/pom.xml
@@ -45,8 +45,8 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>javax.enterprise</groupId>
-            <artifactId>cdi-api</artifactId>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-api</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency> <!-- this is to avoid Jersey jars to be bundled with the WAR -->

diff --git a/examples/helloworld-cdi2-se/pom.xml b/examples/helloworld-cdi2-se/pom.xml
@@ -26,11 +26,6 @@
 
     <description>Jersey "Hello world" example with CDI 2 SE.</description>
 
-    <properties>
-        <cdi.api.version>2.0</cdi.api.version>
-        <weld.version>${weld3.version}</weld.version>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.glassfish.jersey.inject</groupId>
@@ -91,7 +86,6 @@
                 <dependency>
                     <groupId>org.jboss.weld.se</groupId>
                     <artifactId>weld-se-core</artifactId>
-                    <version>3.1.1.Final</version>
                 </dependency>
             </dependencies>
         </profile>

diff --git a/examples/helloworld-spring-annotations/pom.xml b/examples/helloworld-spring-annotations/pom.xml
@@ -32,13 +32,13 @@
         </dependency>
         <dependency>
             <groupId>org.glassfish.jersey.ext</groupId>
-            <artifactId>jersey-spring4</artifactId>
+            <artifactId>jersey-spring5</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
-            <version>${spring4.version}</version>
+            <version>${spring5.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

diff --git a/...-test/src/test/java/org/glassfish/jersey/examples/helloworld/test/AbstractWebAppTest.java b/...-test/src/test/java/org/glassfish/jersey/examples/helloworld/test/AbstractWebAppTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -135,7 +135,7 @@ public List<Option> genericOsgiOptions() {
                 // javax.annotation must go first!
                 mavenBundle().groupId("jakarta.annotation").artifactId("jakarta.annotation-api").versionAsInProject(),
                 // pax exam dependencies
-                mavenBundle("org.ops4j.pax.url", "pax-url-mvn"),
+                // mavenBundle("org.ops4j.pax.url", "pax-url-mvn"),
                 junitBundles(), // adds junit classes to the OSGi context
 
                 // HK2

diff --git a/examples/osgi-http-service/functional-test/pom.xml b/examples/osgi-http-service/functional-test/pom.xml
@@ -99,6 +99,12 @@
             <artifactId>pax-web-extender-war</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.url</groupId>
+            <artifactId>pax-url-mvn</artifactId>
+            <version>1.3.7</version>
+            <scope>test</scope>
+        </dependency>
 
         <dependency>
             <groupId>junit</groupId>

diff --git a/...test/java/org/glassfish/jersey/examples/osgihttpservice/test/AbstractHttpServiceTest.java b/...test/java/org/glassfish/jersey/examples/osgihttpservice/test/AbstractHttpServiceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -96,7 +96,7 @@ public List<Option> genericOsgiOptions() {
                 // javax.annotation has to go first!
                 mavenBundle().groupId("jakarta.annotation").artifactId("jakarta.annotation-api").versionAsInProject(),
 
-                mavenBundle("org.ops4j.pax.url", "pax-url-mvn"),
+                mavenBundle("org.ops4j.pax.url", "pax-url-mvn").versionAsInProject(),
                 junitBundles(),
 
                 // HK2

diff --git a/examples/reload/src/main/java/org/glassfish/jersey/examples/reload/App.java b/examples/reload/src/main/java/org/glassfish/jersey/examples/reload/App.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -15,6 +15,7 @@
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.lang.reflect.Field;
 import java.net.URI;
 import java.nio.file.FileSystems;
 import java.nio.file.Path;
@@ -40,8 +41,6 @@
 
 import org.glassfish.grizzly.http.server.HttpServer;
 
-import com.sun.nio.file.SensitivityWatchEventModifier;
-
 /**
  * Reload example application.
  * <p/>
@@ -116,7 +115,7 @@ private void registerWatcher(WatchService watcher, Path directory) throws IOExce
                     new WatchEvent.Kind[]{
                             StandardWatchEventKinds.ENTRY_MODIFY
                     },
-                    SensitivityWatchEventModifier.HIGH);
+                    /* SensitivityWatchEventModifier.HIGH */ getWatchEventModifiers());
         }
 
         private void reloadApp(final File configFile) {
@@ -125,6 +124,21 @@ private void reloadApp(final File configFile) {
             App.container.reload(rc);
         }
 
+        /**
+         * @return sensitivity watch event modifier
+         */
+        private static WatchEvent.Modifier[] getWatchEventModifiers() {
+            String className = "com.sun.nio.file.SensitivityWatchEventModifier";
+            try {
+                Class<?> c = Class.forName(className);
+                Field f = c.getField("HIGH");
+                WatchEvent.Modifier modifier = WatchEvent.Modifier.class.cast(f.get(c));
+                return new WatchEvent.Modifier[] {modifier};
+            } catch (Exception e) {
+                return new WatchEvent.Modifier[] {};
+            }
+        }
+
     }
 
     private static ResourceConfig createResourceConfig(File configFile) {

diff --git a/...n/java/org/glassfish/jersey/server/validation/internal/ValidationInterceptorExecutor.java b/...n/java/org/glassfish/jersey/server/validation/internal/ValidationInterceptorExecutor.java
@@ -81,7 +81,12 @@ public Object[] getArgs() {
 
     @Override
     public void setArgs(final Object[] args) {
-        this.args = args;
+        if (args.length == this.args.length) {
+            // Replace the original arguments with the new ones
+            System.arraycopy(args, 0, this.args, 0, args.length);
+        } else {
+            this.args = args;
+        }
     }
 
     @Override

diff --git a/ext/cdi/jersey-cdi1x-validation/pom.xml b/ext/cdi/jersey-cdi1x-validation/pom.xml
@@ -47,16 +47,18 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.enterprise</groupId>
-            <artifactId>cdi-api</artifactId>
+            <groupId>org.glassfish.jersey.ext.cdi</groupId>
+            <artifactId>jersey-cdi1x</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-api</artifactId>
             <scope>provided</scope>
-            <version>1.2</version>
             <exclusions>
                 <!-- Remove ancient javax.el that causes problems with Hibernate -->
-                <exclusion>
-                    <groupId>javax.el</groupId>
-                    <artifactId>el-api</artifactId>
-                </exclusion>
                 <exclusion>
                     <groupId>jakarta.el</groupId>
                     <artifactId>jakarta.el-api</artifactId>

diff --git a/...c/main/java/org/glassfish/jersey/ext/cdi1x/validation/internal/CdiInterceptorWrapper.java b/...c/main/java/org/glassfish/jersey/ext/cdi1x/validation/internal/CdiInterceptorWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2021 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
@@ -60,13 +60,13 @@ public CdiInterceptorWrapper(BeanManager beanManager) {
 
     @AroundInvoke
     public Object validateMethodInvocation(InvocationContext ctx) throws Exception {
-        final boolean isJaxRsMethod = extension.jaxRsResourceCache.apply(ctx.getMethod().getDeclaringClass());
+        final boolean isJaxRsMethod = extension.getJaxRsResourceCache().apply(ctx.getMethod().getDeclaringClass());
         return isJaxRsMethod ? ctx.proceed() : interceptor.validateMethodInvocation(ctx);
     }
 
     @AroundConstruct
     public void validateConstructorInvocation(InvocationContext ctx) throws Exception {
-        final boolean isJaxRsConstructor = extension.jaxRsResourceCache.apply(ctx.getConstructor().getDeclaringClass());
+        final boolean isJaxRsConstructor = extension.getJaxRsResourceCache().apply(ctx.getConstructor().getDeclaringClass());
         if (!isJaxRsConstructor) {
             interceptor.validateConstructorInvocation(ctx);
         }