Upgrade dependencies, Upgrade to JDK17 (#2747)

* conversion to java17, dependency updates

Co-authored-by: Hendrik Duerkop <hendrik.duerkop@tchibo.de>

Author: hduerkop

build-logic/code-quality/build.gradle.kts

@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
 plugins {
     `kotlin-dsl`
 }
@@ -10,3 +12,9 @@ dependencies {
     implementation("org.sonarqube:org.sonarqube.gradle.plugin:2.8")
     implementation("com.github.autostyle:autostyle-plugin-gradle:3.1")
 }
+
+tasks.withType<KotlinCompile>().configureEach {
+    kotlinOptions {
+        jvmTarget = "11"
+    }
+}

build-logic/jvm/build.gradle.kts

@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
 plugins {
     `kotlin-dsl`
 }
@@ -10,5 +12,11 @@ dependencies {
     implementation(project(":basics"))
     implementation(project(":code-quality"))
     implementation("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:1.74")
-    implementation("org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.5.10")
+    implementation("org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.6.20")
+}
+
+tasks.withType<KotlinCompile>().configureEach {
+    kotlinOptions {
+        jvmTarget = "11"
+    }
 }

build-logic/jvm/src/main/kotlin/testng.kotlin-library.gradle.kts

@@ -6,7 +6,7 @@ plugins {
 }
 
 dependencies {
-    testImplementation(platform("org.jetbrains.kotlin:kotlin-bom:1.6.10"))
+    testImplementation(platform("org.jetbrains.kotlin:kotlin-bom:1.6.20"))
     testImplementation("org.jetbrains.kotlin:kotlin-stdlib")
 }
 

build-logic/publishing/build.gradle.kts

@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
 plugins {
     `kotlin-dsl`
 }
@@ -12,3 +14,9 @@ dependencies {
     implementation("com.github.johnrengelman.shadow:com.github.johnrengelman.shadow.gradle.plugin:7.0.0")
     implementation("org.jetbrains.kotlin:kotlin-gradle-plugin")
 }
+
+tasks.withType<KotlinCompile>().configureEach {
+    kotlinOptions {
+        jvmTarget = "11"
+    }
+}

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,4 @@
 distributionBase=GRADLE_USER_HOME
-distributionSha256Sum=b586e04868a22fd817c8971330fec37e298f3242eb85c374181b12d637f80302
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

testng-core/src/main/java/org/testng/reporters/jq/Main.java

@@ -20,7 +20,7 @@ public class Main implements IReporter {
   private static final String TESTNG_RESOURCE_PREFIX = "/org/testng/";
   private static final String[] RESOURCES =
       new String[] {
-        "jquery.min.js",
+        "jquery-3.6.0.min.js",
         "testng-reports.css",
         "testng-reports.js",
         "testng-reports1.css",
@@ -103,11 +103,7 @@ public void generateReport(
 
   private InputStream load(String fileName) {
     String path;
-    if (fileName.equals("jquery.min.js")) {
-      path = "/META-INF/resources/webjars/jquery/3.5.1/jquery.min.js";
-    } else {
-      path = Main.TESTNG_RESOURCE_PREFIX + fileName;
-    }
+    path = Main.TESTNG_RESOURCE_PREFIX + fileName;
     return getClass().getResourceAsStream(path);
   }
 }

testng-core/src/main/resources/org/testng/header

@@ -7,7 +7,7 @@
 
     <link type="text/css" href="testng-reports1.css" rel="stylesheet" id="ultra" />
     <link type="text/css" href="testng-reports.css" rel="stylesheet" id="retro" disabled="false"/>
-    <script type="text/javascript" src="jquery.min.js"></script>
+    <script type="text/javascript" src="jquery-3.6.0.min.js"></script>
     <script type="text/javascript" src="testng-reports.js"></script>
     <script type="text/javascript" src="https://www.google.com/jsapi"></script>
     <script type='text/javascript'>

testng-core/src/main/resources/org/testng/jquery-3.6.0.min.js

@@ -11,7 +11,6 @@
 import org.testng.ITestObjectFactory;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
-import org.testng.collections.Lists;
 import org.testng.collections.Maps;
 import org.testng.internal.annotations.DefaultAnnotationTransformer;
 import org.testng.internal.annotations.IAnnotationFinder;
@@ -66,8 +65,7 @@ private void runTest(ITestNGMethod testNGMethod, ParameterHolder.ParameterOrigin
     assertThat(params.parameterHolder).isNotNull();
     assertThat(params.parameterHolder.origin).isEqualByComparingTo(origin);
     Iterator<Object[]> iterators = params.parameterHolder.parameters;
-    assertThat(Lists.newArrayList(iterators))
-        .containsAll(Collections.singletonList(new Object[] {"bar"}));
+    assertThat(iterators).toIterable().containsAll(Collections.singletonList(new Object[] {"bar"}));
   }
 
   private ParameterHandler.ParameterBag invokeParameterCreation(ITestNGMethod method) {

testng-core/src/test/java/org/testng/internal/invokers/ParameterHandlerTest.java

@@ -4,32 +4,16 @@
 
 import java.io.File;
 import java.lang.reflect.Method;
-import java.security.Permission;
 import org.testng.IReporter;
 import org.testng.ITestNGListener;
 import org.testng.TestNG;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 import org.testng.reporters.EmailableReporter;
 import org.testng.reporters.EmailableReporter2;
 import test.SimpleBaseTest;
 
 public class EmailableReporterTest extends SimpleBaseTest {
-  private SecurityManager manager;
-
-  @BeforeClass(alwaysRun = true)
-  public void setup() {
-    manager = System.getSecurityManager();
-    System.setSecurityManager(new MySecurityManager(manager));
-  }
-
-  @AfterClass(alwaysRun = true)
-  public void cleanup() {
-    System.setSecurityManager(manager);
-  }
-
   @Test(dataProvider = "getReporterInstances", priority = 1)
   public void testReportsNameCustomizationViaRunMethodInvocationAndJVMArguments(
       IReporter reporter, String jvm) {
@@ -133,23 +117,4 @@ private void runTestViaRunMethod(IReporter reporter, String jvm) {
     File actual = new File(output.getAbsolutePath(), filename);
     assertThat(actual).exists();
   }
-
-  public static class MySecurityManager extends SecurityManager {
-
-    private SecurityManager baseSecurityManager;
-
-    MySecurityManager(SecurityManager baseSecurityManager) {
-      this.baseSecurityManager = baseSecurityManager;
-    }
-
-    @Override
-    public void checkPermission(Permission permission) {
-      if (permission.getName().startsWith("exitVM")) {
-        throw new SecurityException("System exit not allowed");
-      }
-      if (baseSecurityManager != null) {
-        baseSecurityManager.checkPermission(permission);
-      }
-    }
-  }
 }