From c6905b1fb2e37ffcf6e8a2bc8b8357d5cf39024c Mon Sep 17 00:00:00 2001
From: Sheng Chen <sheche@microsoft.com>
Date: Wed, 8 Jun 2022 15:53:59 +0800
Subject: [PATCH] chore: Update to Java 17 in CI (#1434)

Signed-off-by: sheche <sheche@microsoft.com>
---
 .github/workflows/build.yml                          | 12 ++++++------
 .../launchers/JUnitLaunchConfigurationDelegate.java  |  4 +++-
 java-extension/pom.xml                               |  2 +-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2442f9fb..69f1c041 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -21,10 +21,10 @@ jobs:
         sudo /usr/bin/Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
         sleep 3
 
-    - name: Set up JDK 11
+    - name: Set up JDK 17
       uses: actions/setup-java@v1
       with:
-        java-version: '11'
+        java-version: '17'
 
     - name: Setup Node.js environment
       uses: actions/setup-node@v2
@@ -57,10 +57,10 @@ jobs:
     steps:
     - uses: actions/checkout@v2
 
-    - name: Set up JDK 11
+    - name: Set up JDK 17
       uses: actions/setup-java@v1
       with:
-        java-version: '11'
+        java-version: '17'
 
     - name: Setup Node.js environment
       uses: actions/setup-node@v2
@@ -93,10 +93,10 @@ jobs:
     steps:
     - uses: actions/checkout@v2
 
-    - name: Set up JDK 11
+    - name: Set up JDK 17
       uses: actions/setup-java@v1
       with:
-        java-version: '11'
+        java-version: '17'
 
     - name: Setup Node.js environment
       uses: actions/setup-node@v2
diff --git a/java-extension/com.microsoft.java.test.plugin/src/main/java/com/microsoft/java/test/plugin/launchers/JUnitLaunchConfigurationDelegate.java b/java-extension/com.microsoft.java.test.plugin/src/main/java/com/microsoft/java/test/plugin/launchers/JUnitLaunchConfigurationDelegate.java
index 3bbcfb4c..2d8e7d31 100644
--- a/java-extension/com.microsoft.java.test.plugin/src/main/java/com/microsoft/java/test/plugin/launchers/JUnitLaunchConfigurationDelegate.java
+++ b/java-extension/com.microsoft.java.test.plugin/src/main/java/com/microsoft/java/test/plugin/launchers/JUnitLaunchConfigurationDelegate.java
@@ -48,6 +48,7 @@
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
@@ -56,7 +57,8 @@ public class JUnitLaunchConfigurationDelegate extends org.eclipse.jdt.junit.laun
 
     private Argument args;
 
-    private static final Set<String> testNameArgs = Set.of("-test", "-classNames", "-packageNameFile", "-testNameFile");
+    private static final Set<String> testNameArgs = new HashSet<>(
+        Arrays.asList("-test", "-classNames", "-packageNameFile", "-testNameFile"));
 
     public JUnitLaunchConfigurationDelegate(Argument args) {
         super();
diff --git a/java-extension/pom.xml b/java-extension/pom.xml
index be2145a4..556c4b30 100644
--- a/java-extension/pom.xml
+++ b/java-extension/pom.xml
@@ -9,7 +9,7 @@
     <properties>
         <base.name>Test Runner for Java</base.name>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <tycho-version>1.7.0</tycho-version>
+        <tycho-version>2.7.2</tycho-version>
     </properties>
     <modules>
         <module>build-tools</module>