diff --git a/bundles/com.salesforce.bazel.scipls/build.properties b/bundles/com.salesforce.bazel.scipls/build.properties index 89e66008..fe7a9512 100644 --- a/bundles/com.salesforce.bazel.scipls/build.properties +++ b/bundles/com.salesforce.bazel.scipls/build.properties @@ -3,4 +3,8 @@ output.. = bin/ bin.includes = META-INF/,\ . additional.bundles = com.google.guava,\ - com.google.guava.failureaccess + com.google.guava.failureaccess,\ + wrapped.com.sourcegraph.semanticdb-java,\ + wrapped.com.sourcegraph.scip-java-proto,\ + wrapped.com.sourcegraph.scip-java_2.13,\ + wrapped.com.sourcegraph.scip-semanticdb diff --git a/bundles/com.salesforce.bazel.sdk/META-INF/MANIFEST.MF b/bundles/com.salesforce.bazel.sdk/META-INF/MANIFEST.MF index 366800e5..b885f71d 100644 --- a/bundles/com.salesforce.bazel.sdk/META-INF/MANIFEST.MF +++ b/bundles/com.salesforce.bazel.sdk/META-INF/MANIFEST.MF @@ -30,7 +30,8 @@ Export-Package: com.salesforce.bazel.sdk;uses:="org.osgi.framework,org.eclipse.c Import-Package: com.google.common.annotations;version="32.1.2", com.google.common.collect;version="32.1.2", com.google.protobuf;version="3.22.0", + org.eclipse.core.runtime;version="[3.7.0,4.0.0)", org.fusesource.jansi;version="2.4.0", + org.osgi.framework;version="[1.10.0,2.0.0)", org.slf4j;version="2.0.0" -Require-Bundle: com.salesforce.bazel.importedsource;bundle-version="2.0.0", - org.eclipse.core.runtime;bundle-version="3.27.0" +Require-Bundle: com.salesforce.bazel.importedsource;bundle-version="2.0.0" diff --git a/releng/target-platform/target-platform-dev.target b/releng/target-platform/target-platform-dev.target index ec1ab24c..a659c144 100644 --- a/releng/target-platform/target-platform-dev.target +++ b/releng/target-platform/target-platform-dev.target @@ -1,82 +1,83 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - + + + - - - + + + + - - + + - - - + + + - + - - + + - - + + - - - - + + + + - - + + - - + + @@ -89,17 +90,12 @@ - - - - - - - - - - - + + + + + + @@ -152,81 +148,108 @@ + + + + + + com.sourcegraph + scip-java_2.13 + 0.10.3 + jar + + + com.sourcegraph + scip-semanticdb + 0.10.3 + jar + + + com.sourcegraph + semanticdb-java + 0.10.3 + jar + + + com.sourcegraph + scip-java-proto + 0.10.3 + jar + + + - - - [Enter Feature Description here.] - - - [Enter Copyright Description here.] - - - [Enter License Description here.] - - - - - com.github.ben-manes.caffeine - caffeine - 3.1.8 - jar - - - com.google.protobuf - protobuf-java - 3.22.0 - jar - - - com.googlecode.json-simple - json-simple - 1.1.1 - jar - - - org.fusesource.jansi - jansi - 2.4.0 - jar - - - com.google.code.findbugs - jsr305 - 3.0.2 - jar - - - com.google.auto.value - auto-value - 1.10.1 - jar - - - com.google.auto.value - auto-value-annotations - 1.10.1 - jar - - - jakarta.servlet - jakarta.servlet-api - 5.0.0 - jar - - - org.apache.commons - commons-configuration2 - 2.9.0 - jar - - - org.apache.commons - commons-text - 1.11.0 - jar - - + + + + + com.github.ben-manes.caffeine + caffeine + 3.1.8 + jar + + + com.google.protobuf + protobuf-java + 3.25.5 + jar + + + com.google.protobuf + protobuf-java-util + 3.25.5 + jar + + + com.googlecode.json-simple + json-simple + 1.1.1 + jar + + + org.fusesource.jansi + jansi + 2.4.1 + jar + + + com.google.code.findbugs + jsr305 + 3.0.2 + jar + + + com.google.auto.value + auto-value + 1.11.0 + jar + + + com.google.auto.value + auto-value-annotations + 1.11.0 + jar + + + jakarta.servlet + jakarta.servlet-api + 5.0.0 + jar + + + org.apache.commons + commons-configuration2 + 2.11.0 + jar + + + org.apache.commons + commons-text + 1.12.0 + jar + + - + diff --git a/releng/target-platform/target-platform-dev.tpd b/releng/target-platform/target-platform-dev.tpd index 93193df2..31aab75d 100644 --- a/releng/target-platform/target-platform-dev.tpd +++ b/releng/target-platform/target-platform-dev.tpd @@ -1,6 +1,6 @@ target "bazel-eclipse-feature-target-platform-for-development" with source configurePhase requirements -environment JavaSE-17 +environment JavaSE-21 // import "build" target platform @@ -19,19 +19,16 @@ location "https://download.eclipse.org/egit/updates/" { org.eclipse.egit.gitflow.feature.feature.group lazy } -location "https://download.eclipse.org/releases/2023-12/" { +location "https://download.eclipse.org/releases/2024-09/" { // Docker Tools org.eclipse.linuxtools.docker.feature.feature.group lazy org.eclipse.linuxtools.docker.editor.ls.feature.feature.group lazy -} -location "https://download.eclipse.org/mylyn/docs/releases/3.0.48/" { - // Mylyn - org.eclipse.mylyn.wikitext_feature.feature.group lazy - org.eclipse.mylyn.wikitext.editors_feature.feature.group lazy - org.eclipse.mylyn.wikitext.sdk.feature.group lazy - org.eclipse.mylyn.wikitext.markdown lazy - org.eclipse.mylyn.wikitext.markdown.ui lazy + // Mylyn Wikitext + org.eclipse.mylyn.wikitext.feature.feature.group + org.eclipse.mylyn.wikitext.markdown + org.eclipse.mylyn.wikitext.markdown.ui + } location "https://raw.githubusercontent.com/iloveeclipse/plugins/latest/" { diff --git a/releng/target-platform/target-platform.target b/releng/target-platform/target-platform.target index 0a14b00c..1135511a 100644 --- a/releng/target-platform/target-platform.target +++ b/releng/target-platform/target-platform.target @@ -1,162 +1,190 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - + + + - - - + + + + - - + + - - - + + + - + - - + + - - - + + + - - + + - - - - + + + + - - + + - - + + + + + + + + + com.sourcegraph + scip-java_2.13 + 0.10.3 + jar + + + com.sourcegraph + scip-semanticdb + 0.10.3 + jar + + + com.sourcegraph + semanticdb-java + 0.10.3 + jar + + + com.sourcegraph + scip-java-proto + 0.10.3 + jar + + - - - [Enter Feature Description here.] - - - [Enter Copyright Description here.] - - - [Enter License Description here.] - - - - - com.github.ben-manes.caffeine - caffeine - 3.1.8 - jar - - - com.google.protobuf - protobuf-java - 3.22.0 - jar - - - com.googlecode.json-simple - json-simple - 1.1.1 - jar - - - org.fusesource.jansi - jansi - 2.4.0 - jar - - - com.google.code.findbugs - jsr305 - 3.0.2 - jar - - - com.google.auto.value - auto-value - 1.10.1 - jar - - - com.google.auto.value - auto-value-annotations - 1.10.1 - jar - - - jakarta.servlet - jakarta.servlet-api - 5.0.0 - jar - - - org.apache.commons - commons-configuration2 - 2.9.0 - jar - - - org.apache.commons - commons-text - 1.11.0 - jar - - + + + + + com.github.ben-manes.caffeine + caffeine + 3.1.8 + jar + + + com.google.protobuf + protobuf-java + 3.25.5 + jar + + + com.google.protobuf + protobuf-java-util + 3.25.5 + jar + + + com.googlecode.json-simple + json-simple + 1.1.1 + jar + + + org.fusesource.jansi + jansi + 2.4.1 + jar + + + com.google.code.findbugs + jsr305 + 3.0.2 + jar + + + com.google.auto.value + auto-value + 1.11.0 + jar + + + com.google.auto.value + auto-value-annotations + 1.11.0 + jar + + + jakarta.servlet + jakarta.servlet-api + 5.0.0 + jar + + + org.apache.commons + commons-configuration2 + 2.11.0 + jar + + + org.apache.commons + commons-text + 1.12.0 + jar + + diff --git a/releng/target-platform/target-platform.tpd b/releng/target-platform/target-platform.tpd index 682191e7..181880af 100644 --- a/releng/target-platform/target-platform.tpd +++ b/releng/target-platform/target-platform.tpd @@ -1,6 +1,6 @@ target "bazel-eclipse-feature-target-platform" with source configurePhase requirements environment JavaSE-17 -location "https://download.eclipse.org/eclipse/updates/4.30/" { +location "https://download.eclipse.org/eclipse/updates/4.33/" { org.eclipse.e4.rcp.feature.group org.eclipse.ecf.core.feature.feature.group org.eclipse.ecf.core.ssl.feature.feature.group @@ -37,7 +37,7 @@ location "https://download.eclipse.org/eclipse/updates/4.30/" { org.objectweb.asm.util } -location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12/" { +location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-09/" { slf4j.api ch.qos.logback.core ch.qos.logback.classic @@ -58,35 +58,35 @@ location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023 org.jdom2 } -location "https://download.eclipse.org/releases/2023-12/" { +location "https://download.eclipse.org/releases/2024-09/" { // TextMate org.eclipse.tm4e.feature.feature.group } -location "https://download.eclipse.org/jdtls/milestones/1.30.1/repository/" { +location "https://download.eclipse.org/jdtls/milestones/1.40.0/repository/" { org.eclipse.jdt.ls.core } // locations below taken from eclipse.jdt.ls project (to allow building the JDT LS in same workspace) -location "https://download.eclipse.org/releases/2023-12/" { +location "https://download.eclipse.org/releases/2024-09/" { org.eclipse.xtext.xbase.lib } -location "https://download.eclipse.org/lsp4j/updates/releases/0.21.1/" { +location "https://download.eclipse.org/lsp4j/updates/releases/0.23.1/" { org.eclipse.lsp4j.sdk.feature.group } -location "https://download.eclipse.org/technology/m2e/releases/2.5.0/" { +location "https://download.eclipse.org/technology/m2e/releases/2.6.2/" { org.eclipse.m2e.feature.feature.group org.eclipse.m2e.logback.feature.feature.group org.eclipse.m2e.sdk.feature.feature.group } -location "https://download.eclipse.org/wildwebdeveloper/releases/1.3.3/" { +location "https://download.eclipse.org/wildwebdeveloper/releases/1.3.7/" { org.eclipse.wildwebdeveloper.xml.feature.feature.group // required by M2E } -location "https://download.eclipse.org/buildship/updates/e423/releases/3.x/3.1.8.v20231117-1734/" { +location "https://download.eclipse.org/buildship/updates/e431/releases/3.x/3.1.10.v20240802-1211/" { org.eclipse.buildship.feature.group } @@ -104,7 +104,12 @@ maven MavenDependencies scope=compile dependencyDepth=infinite missingManifest=g dependency { groupId="com.google.protobuf" artifactId="protobuf-java" - version="3.22.0" + version="3.25.5" + } + dependency { + groupId="com.google.protobuf" + artifactId="protobuf-java-util" + version="3.25.5" } dependency { groupId="com.googlecode.json-simple" @@ -114,7 +119,7 @@ maven MavenDependencies scope=compile dependencyDepth=infinite missingManifest=g dependency { groupId="org.fusesource.jansi" artifactId="jansi" - version="2.4.0" + version="2.4.1" } dependency { groupId="com.google.code.findbugs" @@ -124,12 +129,12 @@ maven MavenDependencies scope=compile dependencyDepth=infinite missingManifest=g dependency { groupId="com.google.auto.value" artifactId="auto-value" - version="1.10.1" + version="1.11.0" } dependency { groupId="com.google.auto.value" artifactId="auto-value-annotations" - version="1.10.1" + version="1.11.0" } dependency { // Logback provides a Servlet Container service which is also loaded and that needs servlet (by default optional) groupId="jakarta.servlet" @@ -139,11 +144,39 @@ maven MavenDependencies scope=compile dependencyDepth=infinite missingManifest=g dependency { groupId="org.apache.commons" artifactId="commons-configuration2" - version="2.9.0" + version="2.11.0" } dependency { groupId="org.apache.commons" artifactId="commons-text" - version="1.11.0" + version="1.12.0" + } +} + +maven ScipMavenDependencies scope=compile dependencyDepth=none missingManifest=generate includeSources { + feature { + id="com.salesforce.bazel.scip.dependencies.feature" + name="Third-Party Dependencies used by the Bazel SCIP Feature" + version="2.0.0.qualifier" + } + dependency { + groupId="com.sourcegraph" + artifactId="scip-java_2.13" + version="0.10.3" + } + dependency { + groupId="com.sourcegraph" + artifactId="scip-semanticdb" + version="0.10.3" + } + dependency { + groupId="com.sourcegraph" + artifactId="semanticdb-java" + version="0.10.3" + } + dependency { + groupId="com.sourcegraph" + artifactId="scip-java-proto" + version="0.10.3" } }