From 5bfa401de6cca80c96223f0b70857af53e496224 Mon Sep 17 00:00:00 2001
From: Jorge Bescos Gascon <jorge.bescos.gascon@oracle.com>
Date: Wed, 10 Aug 2022 13:35:19 +0200
Subject: [PATCH 1/2] Support JDK19

Signed-off-by: Jorge Bescos Gascon <jorge.bescos.gascon@oracle.com>
---
 etc/jenkins/Jenkinsfile_ci_build                              | 4 ++--
 examples/groovy/pom.xml                                       | 2 +-
 .../config/SystemPropertiesConfigurationModelTest.java        | 2 ++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/etc/jenkins/Jenkinsfile_ci_build b/etc/jenkins/Jenkinsfile_ci_build
index 7c3f9ff093..a42997b475 100644
--- a/etc/jenkins/Jenkinsfile_ci_build
+++ b/etc/jenkins/Jenkinsfile_ci_build
@@ -32,12 +32,12 @@ pipeline {
                             '''
                     }
                 }
-                stage('JDK 16 ') {
+                stage('JDK 19 ') {
                     agent {
                         label 'centos-7'
                     }
                     tools {
-                        jdk 'openjdk-jdk16-latest'
+                        jdk 'openjdk-jdk19-latest'
                         maven 'apache-maven-latest'
                     }
                     steps {
diff --git a/examples/groovy/pom.xml b/examples/groovy/pom.xml
index 568f867b3e..e6b1ca883c 100644
--- a/examples/groovy/pom.xml
+++ b/examples/groovy/pom.xml
@@ -28,7 +28,7 @@
             <groupId>org.apache.groovy</groupId>
             <artifactId>groovy-all</artifactId>
             <type>pom</type>
-            <version>4.0.0-alpha-3</version>
+            <version>4.0.4</version>
         </dependency>
         <dependency>
             <groupId>org.glassfish.jersey.test-framework.providers</groupId>
diff --git a/tests/integration/property-check/src/test/java/org/glassfish/jersey/internal/config/SystemPropertiesConfigurationModelTest.java b/tests/integration/property-check/src/test/java/org/glassfish/jersey/internal/config/SystemPropertiesConfigurationModelTest.java
index f943686620..a503eb58ab 100644
--- a/tests/integration/property-check/src/test/java/org/glassfish/jersey/internal/config/SystemPropertiesConfigurationModelTest.java
+++ b/tests/integration/property-check/src/test/java/org/glassfish/jersey/internal/config/SystemPropertiesConfigurationModelTest.java
@@ -44,6 +44,7 @@
 import org.glassfish.jersey.server.oauth1.OAuth1ServerProperties;
 import org.glassfish.jersey.servlet.ServletProperties;
 import org.glassfish.jersey.test.TestProperties;
+import org.junit.Ignore;
 import org.junit.Test;
 
 public class SystemPropertiesConfigurationModelTest {
@@ -77,6 +78,7 @@ public void allPropertyClassLoaded() throws IOException {
     }
 
     @Test
+    @Ignore("System.setSecurityManager is deprecated in JDK 19 and there is no replacement")
     public void propertyLoadedWhenSecurityException() {
         final String TEST_STRING = "test";
         SecurityManager sm = System.getSecurityManager();

From 497df58b960d07e74299a8c9dfc22bdc8f5d385c Mon Sep 17 00:00:00 2001
From: Jorge Bescos Gascon <jorge.bescos.gascon@oracle.com>
Date: Wed, 10 Aug 2022 15:44:46 +0200
Subject: [PATCH 2/2] Comment reviews

Signed-off-by: Jorge Bescos Gascon <jorge.bescos.gascon@oracle.com>
---
 tests/integration/property-check/pom.xml      | 24 +++++++++++++++++++
 ...ystemPropertiesConfigurationModelTest.java |  2 --
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/tests/integration/property-check/pom.xml b/tests/integration/property-check/pom.xml
index abe4c82cc0..ec5920e491 100644
--- a/tests/integration/property-check/pom.xml
+++ b/tests/integration/property-check/pom.xml
@@ -109,4 +109,28 @@
             </plugin>
         </plugins>
     </build>
+    
+    <profiles>
+        <profile>
+            <id>jdk19+</id>
+            <activation>
+                <jdk>[19,)</jdk>
+            </activation>
+            <build>
+                <pluginManagement>
+                    <plugins>
+                        <plugin>
+                            <groupId>org.apache.maven.plugins</groupId>
+                            <artifactId>maven-surefire-plugin</artifactId>
+                            <configuration>
+                                <excludes>
+                                    <exclude>**/SystemPropertiesConfigurationModelTest.java</exclude>
+                                </excludes>
+                            </configuration>
+                        </plugin>
+                    </plugins>
+                </pluginManagement>
+            </build>
+        </profile>
+    </profiles>
 </project>
diff --git a/tests/integration/property-check/src/test/java/org/glassfish/jersey/internal/config/SystemPropertiesConfigurationModelTest.java b/tests/integration/property-check/src/test/java/org/glassfish/jersey/internal/config/SystemPropertiesConfigurationModelTest.java
index a503eb58ab..f943686620 100644
--- a/tests/integration/property-check/src/test/java/org/glassfish/jersey/internal/config/SystemPropertiesConfigurationModelTest.java
+++ b/tests/integration/property-check/src/test/java/org/glassfish/jersey/internal/config/SystemPropertiesConfigurationModelTest.java
@@ -44,7 +44,6 @@
 import org.glassfish.jersey.server.oauth1.OAuth1ServerProperties;
 import org.glassfish.jersey.servlet.ServletProperties;
 import org.glassfish.jersey.test.TestProperties;
-import org.junit.Ignore;
 import org.junit.Test;
 
 public class SystemPropertiesConfigurationModelTest {
@@ -78,7 +77,6 @@ public void allPropertyClassLoaded() throws IOException {
     }
 
     @Test
-    @Ignore("System.setSecurityManager is deprecated in JDK 19 and there is no replacement")
     public void propertyLoadedWhenSecurityException() {
         final String TEST_STRING = "test";
         SecurityManager sm = System.getSecurityManager();