Merge branch 'master' of https://github.com/microsoft/lsif-java into …

…cs/perf
microsoft · Jul 11, 2019 · 90f0906 · 90f0906
2 parents 688e846 + aa9d666
commit 90f0906
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/com.microsoft.java.lsif.core/META-INF/MANIFEST.MF b/com.microsoft.java.lsif.core/META-INF/MANIFEST.MF
@@ -27,7 +27,8 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.12.0",
  org.eclipse.lsp4j,
  org.eclipse.lsp4j.jsonrpc,
  org.eclipse.jdt.ls.core;bundle-version="0.32.0",
- org.apache.commons.io;bundle-version="2.2.0"
+ org.apache.commons.io;bundle-version="2.2.0",
+ org.apache.commons.codec;bundle-version="1.10.0"
 Export-Package: com.microsoft.java.lsif.core.internal
 Bundle-ClassPath: lib/rxjava-2.2.8.jar,
  lib/reactive-streams-1.0.0.jar,

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
@@ -14,12 +14,12 @@
             <repository location="http://download.eclipse.org/tools/orbit/R-builds/R20170516192513/repository"/>
         </location>
         <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-            <unit id="org.eclipse.buildship.feature.group" version="3.0.0.v20181205-1821"/>
+            <unit id="org.eclipse.buildship.feature.group" version="3.1.0.v20190501-0830"/>
             <repository location="http://download.eclipse.org/buildship/updates/e410/releases/3.x/"/>
         </location>
         <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-            <unit id="org.eclipse.m2e.feature.feature.group" version="1.10.0.20181127-2120"/>
-            <repository location="http://download.eclipse.org/technology/m2e/releases/1.10/1.10.0.20181127-2120/"/>
+            <unit id="org.eclipse.m2e.feature.feature.group" version="0.0.0"/>
+	    <repository location="https://download.eclipse.org/technology/m2e/milestones/1.12/"/>
         </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"/>
@@ -29,24 +29,24 @@
             <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="http://download.eclipse.org/releases/2018-12/"/>
-        </location>
-        <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-            <unit id="org.eclipse.lsp4j.sdk.feature.group" version="0.6.0.v20181130-0905"/>
-            <repository location="http://download.eclipse.org/lsp4j/updates/releases/"/>
+            <repository location="https://download.eclipse.org/eclipse/updates/4.13-I-builds"/>
         </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="http://download.eclipse.org/releases/2018-12/"/>
+            <repository location="http://download.eclipse.org/releases/2019-06/"/>
+        </location>
+        <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+           <unit id="org.eclipse.lsp4j.sdk.feature.group" version="0.7.2.v20190528-0935"/>
+           <repository location="http://download.eclipse.org/lsp4j/updates/releases/0.7.2"/>
         </location>
         <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
             <unit id="org.jboss.tools.maven.apt.core" version="0.0.0"/>
             <repository location="http://download.jboss.org/jbosstools/updates/m2e-extensions/m2e-apt/1.5.2-2018-12-24_15-46-05-H18/"/>
         </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="http://download.eclipse.org/jdtls/snapshots/repository/0.35.0.201903142358/"/>
+            <repository location="http://download.eclipse.org/jdtls/snapshots/repository/0.41.0.201907021619/"/>
         </location>
     </locations>
     <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>

diff --git 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>1.3.0</tycho-version>
+		<tycho-version>1.4.0</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>