From d9974314e99afc8df2d07140440d7be125dc7ba3 Mon Sep 17 00:00:00 2001
From: Shi Chen <chenshi@microsoft.com>
Date: Fri, 17 Jun 2022 11:06:18 +0800
Subject: [PATCH] chore: Support JDK 17 (#102)

---
 README.md                                           |  4 ++++
 com.microsoft.java.lsif.core/META-INF/MANIFEST.MF   |  2 +-
 .../languageServer.product                          |  7 +++++--
 .../com.microsoft.java.lsif.tp.target               | 13 ++++++++-----
 pom.xml                                             |  4 ++--
 5 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index d73dcad..60c2753 100644
--- a/README.md
+++ b/README.md
@@ -7,6 +7,10 @@ The purpose of the Language Server Index Format (LSIF) is to define a standard f
 
 A first draft specification can be found [here](https://github.com/Microsoft/language-server-protocol/blob/main/indexFormat/specification.md).
 
+## Requirement
+
+JDK 17 is required to build or run this tool.
+
 ## Quickstart
 
 - Go to the build path:
diff --git a/com.microsoft.java.lsif.core/META-INF/MANIFEST.MF b/com.microsoft.java.lsif.core/META-INF/MANIFEST.MF
index 5e40db2..8c14260 100644
--- a/com.microsoft.java.lsif.core/META-INF/MANIFEST.MF
+++ b/com.microsoft.java.lsif.core/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: com.microsoft.java.lsif.core;singleton:=true
 Bundle-Version: 0.5.2
 Bundle-Activator: com.microsoft.java.lsif.core.internal.LanguageServerIndexerPlugin
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-Localization: plugin
 Import-Package: org.osgi.framework;version="1.3.0"
 Bundle-ActivationPolicy: lazy
diff --git a/com.microsoft.java.lsif.product/languageServer.product b/com.microsoft.java.lsif.product/languageServer.product
index 1efc1c9..67f571e 100644
--- a/com.microsoft.java.lsif.product/languageServer.product
+++ b/com.microsoft.java.lsif.product/languageServer.product
@@ -22,6 +22,7 @@
 
 
    <plugins>
+      <plugin id="org.apache.commons.codec"/>
       <plugin id="org.apache.felix.scr"/>
       <plugin id="com.microsoft.java.lsif.core"/>
       <plugin id="org.eclipse.ant.core"/>
@@ -33,7 +34,7 @@
       <plugin id="org.eclipse.core.filesystem"/>
       <plugin id="org.eclipse.core.jobs"/>
       <plugin id="org.eclipse.core.net"/>
-      <plugin id="org.eclipse.core.net.linux.x86_64" fragment="true"/>
+      <plugin id="org.eclipse.core.net.linux" fragment="true"/>
       <plugin id="org.eclipse.core.net.win32.x86_64" fragment="true"/>
       <plugin id="org.eclipse.core.resources"/>
       <plugin id="org.eclipse.core.runtime"/>
@@ -44,14 +45,16 @@
       <plugin id="org.eclipse.equinox.preferences"/>
       <plugin id="org.eclipse.equinox.registry"/>
       <plugin id="org.eclipse.equinox.security"/>
-      <plugin id="org.eclipse.equinox.security.linux.x86_64" fragment="true"/>
+      <plugin id="org.eclipse.equinox.security.linux" fragment="true"/>
       <plugin id="org.eclipse.equinox.security.macosx" fragment="true"/>
       <plugin id="org.eclipse.equinox.security.win32.x86_64" fragment="true"/>
+      <plugin id="org.eclipse.jdt.apt.pluggable.core"/>
       <plugin id="org.eclipse.jdt.compiler.apt" fragment="true"/>
       <plugin id="org.eclipse.jdt.compiler.tool" fragment="true"/>
       <plugin id="org.eclipse.jdt.core"/>
       <plugin id="org.eclipse.jdt.launching"/>
       <plugin id="org.eclipse.jdt.launching.macosx"/>
+      <plugin id="org.eclipse.m2e.apt.core"/>
       <plugin id="org.eclipse.m2e.core"/>
       <plugin id="org.eclipse.m2e.jdt"/>
       <plugin id="org.eclipse.m2e.lifecyclemapping.defaults"/>
diff --git a/com.microsoft.java.lsif.target/com.microsoft.java.lsif.tp.target b/com.microsoft.java.lsif.target/com.microsoft.java.lsif.tp.target
index 676e85f..48a9b65 100644
--- a/com.microsoft.java.lsif.target/com.microsoft.java.lsif.tp.target
+++ b/com.microsoft.java.lsif.target/com.microsoft.java.lsif.tp.target
@@ -13,12 +13,12 @@
         </location>
         <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
             <unit id="org.eclipse.buildship.feature.group" version="0.0.0"/>
-            <repository location="https://download.eclipse.org/buildship/updates/e416/snapshots/3.x/3.1.6.v20211108-1823-s/"/>
+            <repository location="https://download.eclipse.org/buildship/updates/e423/releases/3.x/3.1.6.v20220511-1359/"/>
         </location>
         <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
             <unit id="org.eclipse.m2e.feature.feature.group" version="0.0.0"/>
             <unit id="org.eclipse.m2e.logback.feature.feature.group" version="0.0.0"/>
-            <repository location="https://download.eclipse.org/technology/m2e/releases/1.18.2/"/>
+            <repository location="https://download.eclipse.org/technology/m2e/snapshots/latest/"/>
         </location>
         <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
             <unit id="org.eclipse.equinox.core.feature.feature.group" version="0.0.0"/>
@@ -28,9 +28,12 @@
             <unit id="org.eclipse.equinox.sdk.feature.group" version="0.0.0"/>
             <unit id="org.eclipse.jdt.source.feature.group" version="0.0.0"/>
             <unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
+            <repository location="https://download.eclipse.org/eclipse/updates/4.25-I-builds/I20220614-1800/"/>
+        </location>
+        <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
             <unit id="org.eclipse.xtend.sdk.feature.group" version="0.0.0"/>
             <unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
-            <repository location="https://download.eclipse.org/releases/2021-12/202112081000/"/>
+            <repository location="https://download.eclipse.org/releases/2021-09/202109151000/"/>
         </location>
         <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
            <repository location="https://download.eclipse.org/lsp4j/updates/releases/0.11.0/"/>
@@ -38,8 +41,8 @@
         </location>
         <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
             <unit id="org.eclipse.jdt.ls.core" version="0.0.0"/>
-            <repository location="https://download.eclipse.org/jdtls/snapshots/repository/1.11.0.202204271528/"/>
+            <repository location="https://download.eclipse.org/jdtls/snapshots/repository/1.13.0.202206090136/"/>
         </location>
     </locations>
-    <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+    <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
 </target>
diff --git a/pom.xml b/pom.xml
index fc318a9..b70580a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
 	<properties>
 		<base.name>Java Language Server Indexer</base.name>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<tycho-version>2.0.0</tycho-version>
+		<tycho-version>2.7.2</tycho-version>
 		<tycho-extras-version>${tycho-version}</tycho-extras-version>
 		<tycho.scmUrl>scm:git:https://github.com/eclipse/eclipse.jdt.ls.git</tycho.scmUrl>
 		<sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
@@ -245,7 +245,7 @@
 					<plugin>
 						<groupId>org.jacoco</groupId>
 						<artifactId>jacoco-maven-plugin</artifactId>
-						<version>0.8.2</version>
+						<version>0.8.7</version>
 						<executions>
 							<execution>
 								<goals>