Upgrade to Gradle 8.3 and support compiling Java 21 projects (attempt #2)

dev/.gradle-wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

dev/com.ibm.jbatch.container/build.gradle

@@ -0,0 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2023 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+test {
+   jvmArgs = ["--add-opens", "java.base/java.lang=ALL-UNNAMED"]
+}

dev/com.ibm.websphere.security/build.gradle

@@ -0,0 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2023 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+test {
+   jvmArgs = ["--add-opens", "java.base/java.lang=ALL-UNNAMED"]
+}

dev/com.ibm.ws.classloading_test/build.gradle

@@ -1,10 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2017 IBM Corporation and others.
+ * Copyright (c) 2017, 2023 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-2.0/
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
@@ -21,5 +21,6 @@ test {
         }
     }
 
-    jvmArgs '-Dservlet.jar.location=' + project(':com.ibm.websphere.javaee.servlet.3.1').configurations.archives.artifacts.files.asPath
-}
+    jvmArgs = ["--add-opens", "java.base/java.lang=ALL-UNNAMED",
+               "-Dservlet.jar.location=" + project(':com.ibm.websphere.javaee.servlet.3.1').configurations.archives.artifacts.files.asPath]
+}

dev/com.ibm.ws.config/build.gradle

@@ -0,0 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2023 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+test {
+   jvmArgs = ["--add-opens", "java.base/java.lang=ALL-UNNAMED"]
+}

dev/com.ibm.ws.crypto.certificateutil/build.gradle

@@ -0,0 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2023 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+test {
+   jvmArgs = ["--add-opens", "java.base/java.lang=ALL-UNNAMED"]
+}

dev/com.ibm.ws.ejbcontainer.core/build.gradle

@@ -0,0 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2023 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+test {
+   jvmArgs = ["--add-opens", "java.base/java.lang=ALL-UNNAMED"]
+}

dev/com.ibm.ws.ejbcontainer.security/build.gradle

@@ -0,0 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2023 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+test {
+   jvmArgs = ["--add-opens", "java.base/java.lang=ALL-UNNAMED"]
+}

dev/com.ibm.ws.install/build.gradle

@@ -45,4 +45,5 @@ jar.dependsOn(massiveCopyTask)
 
 test {
     dependsOn jar
+    jvmArgs = ["--add-opens", "java.base/java.lang=ALL-UNNAMED"]
 }

dev/com.ibm.ws.jbatch.jms/build.gradle

@@ -0,0 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2023 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+test {
+   jvmArgs = ["--add-opens", "java.base/java.lang=ALL-UNNAMED"]
+}

dev/com.ibm.ws.jmx.connector.server.rest/build.gradle

@@ -0,0 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2023 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+test {
+   jvmArgs = ["--add-opens", "java.base/java.lang=ALL-UNNAMED"]
+}

dev/com.ibm.ws.jndi.iiop/build.gradle

@@ -22,12 +22,15 @@ test {
     // subtests must only run as part of containing suites
     filter { excludeTestsMatching "com.ibm.ws.jndi.iiop.subtests.*" }
 
-    jvmArgs = ["--add-opens", "java.base/java.io=ALL-UNNAMED", "--add-opens", "java.rmi/java.rmi=ALL-UNNAMED"]
+    jvmArgs = ["--add-opens", "java.base/java.lang=ALL-UNNAMED",
+               "--add-opens", "java.base/java.io=ALL-UNNAMED",
+               "--add-opens", "java.base/java.util=ALL-UNNAMED",
+               "--add-opens", "java.rmi/java.rmi=ALL-UNNAMED"]
 
     // pre Java 9: use the endorsed standards mechanism to override ORB API
     if (JavaVersion.current() < JavaVersion.VERSION_1_9) {
         dependsOn stageEndorsed                                      // populate endorsed dir
         jvmArgs "-Djava.endorsed.dirs=$stageEndorsed.destinationDir" // endorse endorsed dir
         doLast { delete stageEndorsed.destinationDir }               // clean up endorsed dir
     }
-}
+}

dev/com.ibm.ws.jndi/build.gradle

@@ -0,0 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2023 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+test {
+   jvmArgs = ["--add-opens", "java.base/java.lang=ALL-UNNAMED"]
+}

dev/com.ibm.ws.kernel.boot_test/build.gradle

@@ -9,5 +9,6 @@
  *******************************************************************************/
 
 test {
-   jvmArgs = ["--add-opens", "java.base/java.io=ALL-UNNAMED"]
+   jvmArgs = ["--add-opens", "java.base/java.lang=ALL-UNNAMED",
+              "--add-opens", "java.base/java.io=ALL-UNNAMED"]
 }

dev/com.ibm.ws.kernel.service/build.gradle

@@ -14,6 +14,8 @@
 test {
     dependsOn ':cnf:copyMavenLibs'
     doFirst {
-        jvmArgs = ['-javaagent:' + cnf.file('mavenlibs/jmockit-1.25.jar'), '--add-opens', 'java.base/java.net=ALL-UNNAMED']
+        jvmArgs = ['-javaagent:' + cnf.file('mavenlibs/jmockit-1.25.jar'),
+        '--add-opens', 'java.base/java.lang=ALL-UNNAMED',
+        '--add-opens', 'java.base/java.net=ALL-UNNAMED']
     }
-}
+}

dev/com.ibm.ws.logging_test/build.gradle

@@ -0,0 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2023 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+test {
+   jvmArgs = ["--add-opens", "java.base/java.lang=ALL-UNNAMED"]
+}

dev/com.ibm.ws.product.utility/build.gradle

@@ -0,0 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2023 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+test {
+   jvmArgs = ["--add-opens", "java.base/java.lang=ALL-UNNAMED"]
+}

dev/com.ibm.ws.rest.handler/build.gradle

@@ -9,5 +9,6 @@
  *******************************************************************************/
 
 test {
-   jvmArgs = ["--add-opens", "java.base/java.io=ALL-UNNAMED"]
+   jvmArgs = ["--add-opens", "java.base/java.lang=ALL-UNNAMED",
+              "--add-opens", "java.base/java.io=ALL-UNNAMED"]
 }

dev/com.ibm.ws.runtime.update/build.gradle

@@ -0,0 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2023 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+test {
+   jvmArgs = ["--add-opens", "java.base/java.lang=ALL-UNNAMED"]
+}

dev/com.ibm.ws.security.auth.data/build.gradle

@@ -0,0 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2023 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+test {
+   jvmArgs = ["--add-opens", "java.base/java.lang=ALL-UNNAMED"]
+}

dev/com.ibm.ws.security.authentication.builtin/build.gradle

@@ -9,6 +9,7 @@
  *******************************************************************************/
 
 test {
-   jvmArgs = ["--add-opens", "java.base/javax.security.auth.login=ALL-UNNAMED", 
+   jvmArgs = ["--add-opens", "java.base/java.lang=ALL-UNNAMED",
+              "--add-opens", "java.base/javax.security.auth.login=ALL-UNNAMED", 
               "--add-opens", "java.base/java.security.cert=ALL-UNNAMED"]
 }

dev/com.ibm.ws.security.authentication.filter/build.gradle

@@ -0,0 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2023 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+test {
+   jvmArgs = ["--add-opens", "java.base/java.lang=ALL-UNNAMED"]
+}

dev/com.ibm.ws.security.authentication.tai/build.gradle

@@ -0,0 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2023 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+test {
+   jvmArgs = ["--add-opens", "java.base/java.lang=ALL-UNNAMED"]
+}

dev/com.ibm.ws.security.client/build.gradle

@@ -9,5 +9,6 @@
  *******************************************************************************/
 
 test {
-   jvmArgs = ["--add-opens", "java.base/javax.security.auth.login=ALL-UNNAMED"]
+   jvmArgs = ["--add-opens", "java.base/java.lang=ALL-UNNAMED",
+              "--add-opens", "java.base/javax.security.auth.login=ALL-UNNAMED"]
 }

dev/com.ibm.ws.security.common.jsonwebkey/build.gradle

@@ -0,0 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2023 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+test {
+   jvmArgs = ["--add-opens", "java.base/java.lang=ALL-UNNAMED"]
+}

dev/com.ibm.ws.security.common/build.gradle

@@ -0,0 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2023 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+test {
+   jvmArgs = ["--add-opens", "java.base/java.lang=ALL-UNNAMED"]
+}

dev/com.ibm.ws.security.fat.common.social/build.gradle

@@ -45,3 +45,7 @@ assemble {
   dependsOn \
     formlogin
 }
+
+test {
+   jvmArgs = ["--add-opens", "java.base/java.lang=ALL-UNNAMED"]
+}

dev/com.ibm.ws.security.fat.common/build.gradle

@@ -57,5 +57,6 @@ assemble {
 }
 
 test {
-   jvmArgs = ["--add-opens", "java.base/java.io=ALL-UNNAMED"]
-}
+   jvmArgs = ["--add-opens", "java.base/java.lang=ALL-UNNAMED",
+              "--add-opens", "java.base/java.io=ALL-UNNAMED"]
+}

dev/com.ibm.ws.security.jaas.common_test/build.gradle

@@ -9,5 +9,6 @@
  *******************************************************************************/
 
 test {
-   jvmArgs = ["--add-opens", "java.base/java.security.cert=ALL-UNNAMED"]
+   jvmArgs = ["--add-opens", "java.base/java.lang=ALL-UNNAMED",
+              "--add-opens", "java.base/java.security.cert=ALL-UNNAMED"]
 }