Use upstream Apache commons instead of Orbit ones

mickaelistria · Aug 29, 2023 · bb31aed · bb31aed
1 parent 792c343
commit bb31aed
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -13,7 +13,7 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ "master" ]
+    branches: [ '**' ]
   pull_request:
     # The branches below must be a subset of the branches above
     branches: [ "master" ]

diff --git a/org.eclipse.jdt.ls.target/org.eclipse.jdt.ls.tp.target b/org.eclipse.jdt.ls.target/org.eclipse.jdt.ls.tp.target
@@ -2,11 +2,6 @@
 <?pde version="3.8"?>
 <target includeMode="feature" name="Java Language Server Target Definition" sequenceNumber="113">
     <locations>
-        <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-            <unit id="org.apache.commons.io" version="2.2.0.v201405211200"/>
-            <unit id="org.apache.commons.lang3" version="3.1.0.v201403281430"/>
-            <repository location="https://download.eclipse.org/tools/orbit/R-builds/R20200529191137/repository"/>
-        </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/e423/snapshots/3.x/3.1.7.v20221108-1729-s/"/>
@@ -29,6 +24,7 @@
             <unit id="org.eclipse.jdt.source.feature.group" version="0.0.0"/>
             <unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
             <unit id="org.mockito.mockito-core" version="0.0.0"/>
+            <unit id="org.apache.commons.commons-io" version="0.0.0"/>
             <repository location="https://download.eclipse.org/eclipse/updates/4.29-I-builds/I20230806-1800/"/>
         </location>
         <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
@@ -39,6 +35,16 @@
            <repository location="https://download.eclipse.org/lsp4j/updates/releases/0.21.0/"/>
            <unit id="org.eclipse.lsp4j" version="0.0.0"/>
         </location>
+		<location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="generate" type="Maven">
+			<dependencies>
+				<dependency>
+					<groupId>org.apache.commons</groupId>
+					<artifactId>commons-lang3</artifactId>
+					<version>3.8.1</version>
+					<type>jar</type>
+				</dependency>
+			</dependencies>
+		</location>
     </locations>
     <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
 </target>
diff --git a/org.eclipse.jdt.ls.tests.syntaxserver/META-INF/MANIFEST.MF b/org.eclipse.jdt.ls.tests.syntaxserver/META-INF/MANIFEST.MF
@@ -15,7 +15,7 @@ Require-Bundle: org.eclipse.jdt.ls.core,
  org.eclipse.text;bundle-version="3.6.0",
  org.eclipse.core.filebuffers;bundle-version="3.6.0",
  org.junit;bundle-version="4.12.0",
- org.apache.commons.io;bundle-version="2.2.0",
+ org.apache.commons.commons-io;bundle-version="2.2.0",
  org.apache.commons.lang3;bundle-version="3.1.0",
  com.google.gson;bundle-version="2.7.0",
  org.eclipse.lsp4j;bundle-version="[0.21.0,0.22.0)",

diff --git a/org.eclipse.jdt.ls.tests/META-INF/MANIFEST.MF b/org.eclipse.jdt.ls.tests/META-INF/MANIFEST.MF
@@ -21,7 +21,7 @@ Require-Bundle: org.eclipse.jdt.ls.core,
  org.eclipse.m2e.maven.runtime,
  org.eclipse.m2e.jdt,
  org.junit;bundle-version="4.12.0",
- org.apache.commons.io;bundle-version="2.2.0",
+ org.apache.commons.commons-io;bundle-version="2.2.0",
  org.eclipse.buildship.core;bundle-version="1.0.18",
  org.apache.commons.lang3;bundle-version="3.1.0",
  com.google.gson;bundle-version="2.7.0",