fix: bundle org.slf4j.api renamed to slf4j.api (#935)

microsoft · Jan 18, 2023 · 0841d26 · 0841d26
1 parent dfb71fc
commit 0841d26
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/jdtls.ext/com.microsoft.java.maven.plugin/META-INF/MANIFEST.MF b/jdtls.ext/com.microsoft.java.maven.plugin/META-INF/MANIFEST.MF
@@ -21,6 +21,7 @@ Require-Bundle: com.google.guava,
  org.eclipse.text,
  org.eclipse.ltk.core.refactoring,
  com.google.gson,
+ slf4j.api,
  org.eclipse.m2e.maven.runtime
 Bundle-ClassPath: .,
  lib/indexer-core-6.0.0.jar,
@@ -33,6 +34,5 @@ Bundle-ClassPath: .,
  lib/plexus-utils-3.2.1.jar,
  lib/maven-resolver-api-1.1.0.jar,
  lib/maven-resolver-util-1.1.0.jar,
- lib/aopalliance-1.0.jar,
- lib/slf4j-api-1.7.10.jar
+ lib/aopalliance-1.0.jar
 Automatic-Module-Name: com.microsoft.java.maven
diff --git a/jdtls.ext/com.microsoft.java.maven.plugin/build.properties b/jdtls.ext/com.microsoft.java.maven.plugin/build.properties
@@ -14,5 +14,4 @@ bin.includes = META-INF/,\
                lib/plexus-utils-3.2.1.jar,\
                lib/maven-resolver-api-1.1.0.jar,\
                lib/maven-resolver-util-1.1.0.jar,\
-               lib/aopalliance-1.0.jar,\
-               lib/slf4j-api-1.7.10.jar
+               lib/aopalliance-1.0.jar
diff --git a/jdtls.ext/com.microsoft.java.maven.plugin/pom.xml b/jdtls.ext/com.microsoft.java.maven.plugin/pom.xml
@@ -103,11 +103,6 @@
 							<artifactId>aopalliance</artifactId>
 							<version>1.0</version>
 						</artifactItem>
-						<artifactItem>
-							<groupId>org.slf4j</groupId>
-							<artifactId>slf4j-api</artifactId>
-							<version>1.7.10</version>
-						</artifactItem>
 					</artifactItems>
 				</configuration>
 			</plugin>

diff --git a/jdtls.ext/pom.xml b/jdtls.ext/pom.xml
@@ -93,5 +93,10 @@
             <layout>p2</layout>
             <url>https://download.eclipse.org/jdtls/snapshots/repository/latest/</url>
         </repository>
+        <repository>
+            <id>M2E</id>
+            <layout>p2</layout>
+            <url>https://download.eclipse.org/technology/m2e/snapshots/latest/</url>
+        </repository>
     </repositories>
 </project>
diff --git a/jdtls.ext/target.target b/jdtls.ext/target.target
@@ -17,6 +17,7 @@
             <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
             <unit id="org.apache.commons.lang3" version="3.1.0.v201403281430"/>
             <unit id="com.google.gson" version="2.7.0.v20170129-0911"/>
+            <unit id="org.slf4j.api" version="1.7.30.v20200204-2150"/>
             <repository location="https://download.eclipse.org/tools/orbit/R-builds/R20200529191137/repository"/>
         </location>
     </locations>