From 9f639898907b3c1e057e0c9e65851ab812af5ecf Mon Sep 17 00:00:00 2001 From: Gunnar Wagenknecht Date: Thu, 6 Mar 2025 09:58:20 +0100 Subject: [PATCH 1/5] Update target platforms to Eclipse 2024-12 release --- .../target-platform-dev.target | 115 +++++++++--------- .../target-platform/target-platform-dev.tpd | 6 +- releng/target-platform/target-platform.target | 99 ++++++++------- releng/target-platform/target-platform.tpd | 18 +-- 4 files changed, 119 insertions(+), 119 deletions(-) diff --git a/releng/target-platform/target-platform-dev.target b/releng/target-platform/target-platform-dev.target index a659c144..6442f71b 100644 --- a/releng/target-platform/target-platform-dev.target +++ b/releng/target-platform/target-platform-dev.target @@ -1,84 +1,87 @@ - + - + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - + + - - + - + - + - - + + - + - - + + - - + + - - - - + + + + - - + + + + + + @@ -90,12 +93,12 @@ - - - - - - + + + + + + @@ -144,10 +147,6 @@ - - - - @@ -230,6 +229,12 @@ 1.11.0 jar + + com.google.truth + truth + 1.4.4 + jar + jakarta.servlet jakarta.servlet-api diff --git a/releng/target-platform/target-platform-dev.tpd b/releng/target-platform/target-platform-dev.tpd index 31aab75d..454ecf00 100644 --- a/releng/target-platform/target-platform-dev.tpd +++ b/releng/target-platform/target-platform-dev.tpd @@ -19,7 +19,7 @@ location "https://download.eclipse.org/egit/updates/" { org.eclipse.egit.gitflow.feature.feature.group lazy } -location "https://download.eclipse.org/releases/2024-09/" { +location "https://download.eclipse.org/releases/2024-12/" { // Docker Tools org.eclipse.linuxtools.docker.feature.feature.group lazy org.eclipse.linuxtools.docker.editor.ls.feature.feature.group lazy @@ -78,7 +78,3 @@ location "https://eclipseguru.github.io/p4eclipse/" { com.perforce.team.search.feature.feature.group lazy } -// cream theme -location "https://fappel.github.io/xiliary/" { - com.codeaffine.eclipse.ui.swt.theme.feature.feature.group lazy -} diff --git a/releng/target-platform/target-platform.target b/releng/target-platform/target-platform.target index 228251bf..d00b1076 100644 --- a/releng/target-platform/target-platform.target +++ b/releng/target-platform/target-platform.target @@ -1,92 +1,91 @@ - + - + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - + + - - + - + - + - - + + - + - - + + - - - + + + - - + + - - - - + + + + - - + + - - + + diff --git a/releng/target-platform/target-platform.tpd b/releng/target-platform/target-platform.tpd index b5a9ed73..be69f189 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-21 -location "https://download.eclipse.org/eclipse/updates/4.33/" { +location "https://download.eclipse.org/eclipse/updates/4.34/" { 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.33/" { org.objectweb.asm.util } -location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-09/" { +location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-12/" { slf4j.api ch.qos.logback.core ch.qos.logback.classic @@ -58,31 +58,31 @@ location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024 org.jdom2 } -location "https://download.eclipse.org/releases/2024-09/" { +location "https://download.eclipse.org/releases/2024-12/" { // TextMate org.eclipse.tm4e.feature.feature.group } -location "https://download.eclipse.org/jdtls/milestones/1.40.0/repository/" { +location "https://download.eclipse.org/jdtls/milestones/1.45.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/2024-09/" { +location "https://download.eclipse.org/releases/2024-12/" { org.eclipse.xtext.xbase.lib } -location "https://download.eclipse.org/lsp4j/updates/releases/0.23.1/" { +location "https://download.eclipse.org/lsp4j/updates/releases/0.24.0/" { org.eclipse.lsp4j.sdk.feature.group } -location "https://download.eclipse.org/technology/m2e/releases/2.6.2/" { +location "https://download.eclipse.org/technology/m2e/releases/2.8.0/" { 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.7/" { +location "https://download.eclipse.org/wildwebdeveloper/releases/1.3.10/" { org.eclipse.wildwebdeveloper.xml.feature.feature.group // required by M2E } @@ -90,7 +90,7 @@ location "https://download.eclipse.org/buildship/updates/e431/releases/3.x/3.1.1 org.eclipse.buildship.feature.group } -location "https://download.eclipse.org/justj/jres/21/updates/release/21.0.5/" { +location "https://download.eclipse.org/justj/jres/21/updates/release/21.0.6/" { org.eclipse.justj.openjdk.hotspot.jre.minimal.stripped } From 922101cbbd3ae978ea37d264d3c85a5c7a0015f9 Mon Sep 17 00:00:00 2001 From: Gunnar Wagenknecht Date: Thu, 6 Mar 2025 10:03:19 +0100 Subject: [PATCH 2/5] Update Tycho & Maven --- .mvn/maven.config | 2 +- .mvn/wrapper/maven-wrapper.properties | 4 ++-- CONTRIBUTING.md | 23 ++++++++++++++++++++--- releng/mavenparent/pom.xml | 2 +- 4 files changed, 24 insertions(+), 7 deletions(-) diff --git a/.mvn/maven.config b/.mvn/maven.config index ead1a623..e4e74bf1 100644 --- a/.mvn/maven.config +++ b/.mvn/maven.config @@ -1,2 +1,2 @@ --Dtycho.version=4.0.9 +-Dtycho.version=4.0.12 -Dtycho.p2.transport.min-cache-minutes=129600 \ No newline at end of file diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index ae6dda5a..4f080e68 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -15,5 +15,5 @@ # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip -wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7c2f3cf1..2a19512b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -19,7 +19,7 @@ Recommended resources You need: - latest version of [Eclipse IDE for Eclipse Committers](https://www.eclipse.org/downloads/packages/) -- JDK 17 +- JDK 21 - Bazelisk available as `bazel` binary in `PATH` environment ### Additional Plug-Ins from the Eclipse Marketplace: @@ -41,7 +41,7 @@ As a result, modifications in the core plug-in may need adaption in BEF as well **After cloning the repository, follow these steps:** - Launch the Eclipse IDE for Committers with a **new workspace** -- Ensure JDK 17 is configured (*Preferences > Java > Installed JREs*) +- Ensure JDK 21 is configured (*Preferences > Java > Installed JREs*) - Click *File > Import > General > Existing Projects into Workspace* - Select the `bazel-eclipse` folder as the root directory - Select **Search for nested projects** (critical step) @@ -67,7 +67,7 @@ Once done everything should build. This will download the IntelliJ Aspects and puts them into a ZIP file for use. We don't distribute them in our source control. Note, the shell script requires a working Git and Bazel binary in the `PATH`. -On MacOS, GNU Tar (`gtar`) is needed as well. +On MacOS, GNU Tar (`gtar`) is needed as well (`brew install gnu-tar`). ## Debugging @@ -95,3 +95,20 @@ We use [GitHub Actions](https://github.com/salesforce/bazel-eclipse/actions) for This is explained in more detail in the [build guide](docs/dev/thebuild.md). +### Command Line Build + +To build on the command line quickly, run the following commands: + +1. Import IJ Aspects + +``` +pushd ./bundles/com.salesforce.bazel.sdk/aspects/import +./import-and-build.sh +popd +``` + +2. Run Maven build + +``` +./mvnw clean verify +``` diff --git a/releng/mavenparent/pom.xml b/releng/mavenparent/pom.xml index 73a701b2..0dd2ed9c 100644 --- a/releng/mavenparent/pom.xml +++ b/releng/mavenparent/pom.xml @@ -31,7 +31,7 @@ -Dorg.eclipse.swtbot.search.timeout=30000 -Dorg.eclipse.swtbot.screenshots.dir=target/screenshots - 4.0.9 + 4.0.12 UTF-8 From 8356055780afd999622a866ab96be3a0dd802b9d Mon Sep 17 00:00:00 2001 From: Gunnar Wagenknecht Date: Thu, 6 Mar 2025 10:05:25 +0100 Subject: [PATCH 3/5] Remove dead bundle --- .../com.salesforce.bazel.importedsource.tests/build.properties | 3 +-- tests/com.salesforce.bazel.sdk.tests/build.properties | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/tests/com.salesforce.bazel.importedsource.tests/build.properties b/tests/com.salesforce.bazel.importedsource.tests/build.properties index bce0c43d..7467e043 100644 --- a/tests/com.salesforce.bazel.importedsource.tests/build.properties +++ b/tests/com.salesforce.bazel.importedsource.tests/build.properties @@ -2,8 +2,7 @@ source.. = src/ output.. = bin/ bin.includes = META-INF/,\ . -additional.bundles = org.hamcrest.core,\ - org.mockito.mockito-core,\ +additional.bundles = org.mockito.mockito-core,\ junit-jupiter-api,\ org.hamcrest,\ net.bytebuddy.byte-buddy,\ diff --git a/tests/com.salesforce.bazel.sdk.tests/build.properties b/tests/com.salesforce.bazel.sdk.tests/build.properties index 948df807..70d7b8f6 100644 --- a/tests/com.salesforce.bazel.sdk.tests/build.properties +++ b/tests/com.salesforce.bazel.sdk.tests/build.properties @@ -2,8 +2,7 @@ source.. = src/ output.. = bin/ bin.includes = META-INF/,\ . -additional.bundles = org.hamcrest.core,\ - org.mockito.mockito-core,\ +additional.bundles = org.mockito.mockito-core,\ junit-jupiter-api,\ org.hamcrest,\ net.bytebuddy.byte-buddy From ece8a969383efe3350f3d5f7e9a5b3942f9c2a53 Mon Sep 17 00:00:00 2001 From: Gunnar Wagenknecht Date: Thu, 6 Mar 2025 10:08:40 +0100 Subject: [PATCH 4/5] Fix version --- bundles/com.salesforce.bazel.importedsource/.factorypath | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundles/com.salesforce.bazel.importedsource/.factorypath b/bundles/com.salesforce.bazel.importedsource/.factorypath index c9646254..40d0358b 100644 --- a/bundles/com.salesforce.bazel.importedsource/.factorypath +++ b/bundles/com.salesforce.bazel.importedsource/.factorypath @@ -1,3 +1,3 @@ - + From ae7dc5171e46aac7299f45b7d72da4477c3f0543 Mon Sep 17 00:00:00 2001 From: Gunnar Wagenknecht Date: Thu, 6 Mar 2025 10:21:44 +0100 Subject: [PATCH 5/5] Update all to 21 --- bundles/com.salesforce.bazel.eclipse.core/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- .../com.salesforce.bazel.eclipse.core/META-INF/MANIFEST.MF | 2 +- bundles/com.salesforce.bazel.eclipse.jdtls/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- .../com.salesforce.bazel.eclipse.jdtls/META-INF/MANIFEST.MF | 2 +- bundles/com.salesforce.bazel.eclipse.ui/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- .../com.salesforce.bazel.eclipse.ui/META-INF/MANIFEST.MF | 2 +- bundles/com.salesforce.bazel.logback/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- bundles/com.salesforce.bazel.logback/META-INF/MANIFEST.MF | 2 +- bundles/com.salesforce.bazel.sdk/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- bundles/com.salesforce.bazel.sdk/META-INF/MANIFEST.MF | 2 +- bundles/testdata/.classpath | 2 +- bundles/testdata/.settings/org.eclipse.jdt.core.prefs | 6 +++--- bundles/testdata/META-INF/MANIFEST.MF | 2 +- tests/com.salesforce.bazel.eclipse.core.tests/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- .../META-INF/MANIFEST.MF | 2 +- tests/com.salesforce.bazel.eclipse.jdtls.tests/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- .../META-INF/MANIFEST.MF | 2 +- tests/com.salesforce.bazel.eclipse.ui.tests/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- .../META-INF/MANIFEST.MF | 2 +- tests/com.salesforce.bazel.sdk.tests/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- tests/com.salesforce.bazel.sdk.tests/META-INF/MANIFEST.MF | 2 +- 30 files changed, 50 insertions(+), 50 deletions(-) diff --git a/bundles/com.salesforce.bazel.eclipse.core/.classpath b/bundles/com.salesforce.bazel.eclipse.core/.classpath index d4dbdb13..c5714f71 100644 --- a/bundles/com.salesforce.bazel.eclipse.core/.classpath +++ b/bundles/com.salesforce.bazel.eclipse.core/.classpath @@ -1,6 +1,6 @@ - + diff --git a/bundles/com.salesforce.bazel.eclipse.core/.settings/org.eclipse.jdt.core.prefs b/bundles/com.salesforce.bazel.eclipse.core/.settings/org.eclipse.jdt.core.prefs index fe700e3b..f486898e 100644 --- a/bundles/com.salesforce.bazel.eclipse.core/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/com.salesforce.bazel.eclipse.core/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 org.eclipse.jdt.core.formatter.align_selector_in_method_invocation_on_expression_first_line=true diff --git a/bundles/com.salesforce.bazel.eclipse.core/META-INF/MANIFEST.MF b/bundles/com.salesforce.bazel.eclipse.core/META-INF/MANIFEST.MF index fdb0341c..71f87ca9 100644 --- a/bundles/com.salesforce.bazel.eclipse.core/META-INF/MANIFEST.MF +++ b/bundles/com.salesforce.bazel.eclipse.core/META-INF/MANIFEST.MF @@ -54,5 +54,5 @@ Require-Bundle: org.eclipse.core.jobs;bundle-version="3.12.0", org.eclipse.jdt.junit.core;bundle-version="3.11.0", org.eclipse.core.filesystem;bundle-version="1.9.500", org.eclipse.core.variables;bundle-version="3.6.0" -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy diff --git a/bundles/com.salesforce.bazel.eclipse.jdtls/.classpath b/bundles/com.salesforce.bazel.eclipse.jdtls/.classpath index e0d74f0c..fb8267a0 100644 --- a/bundles/com.salesforce.bazel.eclipse.jdtls/.classpath +++ b/bundles/com.salesforce.bazel.eclipse.jdtls/.classpath @@ -1,6 +1,6 @@ - + diff --git a/bundles/com.salesforce.bazel.eclipse.jdtls/.settings/org.eclipse.jdt.core.prefs b/bundles/com.salesforce.bazel.eclipse.jdtls/.settings/org.eclipse.jdt.core.prefs index fe700e3b..f486898e 100644 --- a/bundles/com.salesforce.bazel.eclipse.jdtls/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/com.salesforce.bazel.eclipse.jdtls/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 org.eclipse.jdt.core.formatter.align_selector_in_method_invocation_on_expression_first_line=true diff --git a/bundles/com.salesforce.bazel.eclipse.jdtls/META-INF/MANIFEST.MF b/bundles/com.salesforce.bazel.eclipse.jdtls/META-INF/MANIFEST.MF index f3cff083..4b9f9a52 100644 --- a/bundles/com.salesforce.bazel.eclipse.jdtls/META-INF/MANIFEST.MF +++ b/bundles/com.salesforce.bazel.eclipse.jdtls/META-INF/MANIFEST.MF @@ -29,6 +29,6 @@ Export-Package: com.salesforce.bazel.eclipse.jdtls, Import-Package: org.fusesource.jansi;version="2.4.0", org.osgi.service.event;version="1.4.1", org.slf4j;version="2.0.0" -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Service-Component: OSGI-INF/com.salesforce.bazel.eclipse.jdtls.execution.BazelJdtLsSyncStatsOutputComponent.xml diff --git a/bundles/com.salesforce.bazel.eclipse.ui/.classpath b/bundles/com.salesforce.bazel.eclipse.ui/.classpath index 81fe078c..375961e4 100644 --- a/bundles/com.salesforce.bazel.eclipse.ui/.classpath +++ b/bundles/com.salesforce.bazel.eclipse.ui/.classpath @@ -1,6 +1,6 @@ - + diff --git a/bundles/com.salesforce.bazel.eclipse.ui/.settings/org.eclipse.jdt.core.prefs b/bundles/com.salesforce.bazel.eclipse.ui/.settings/org.eclipse.jdt.core.prefs index 1f3e19a9..3ee841fb 100644 --- a/bundles/com.salesforce.bazel.eclipse.ui/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/com.salesforce.bazel.eclipse.ui/.settings/org.eclipse.jdt.core.prefs @@ -1,13 +1,13 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 org.eclipse.jdt.core.formatter.align_selector_in_method_invocation_on_expression_first_line=true diff --git a/bundles/com.salesforce.bazel.eclipse.ui/META-INF/MANIFEST.MF b/bundles/com.salesforce.bazel.eclipse.ui/META-INF/MANIFEST.MF index f690d802..453761f3 100644 --- a/bundles/com.salesforce.bazel.eclipse.ui/META-INF/MANIFEST.MF +++ b/bundles/com.salesforce.bazel.eclipse.ui/META-INF/MANIFEST.MF @@ -33,7 +33,7 @@ Require-Bundle: org.eclipse.ui, org.eclipse.ltk.core.refactoring, org.eclipse.tm4e.ui Service-Component: OSGI-INF/com.salesforce.bazel.eclipse.ui.execution.BazelUiSyncStatsOutputComponent.xml -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Automatic-Module-Name: com.salesforce.bazel.eclipse.ui Bundle-ActivationPolicy: lazy Export-Package: com.salesforce.bazel.eclipse.ui, diff --git a/bundles/com.salesforce.bazel.logback/.classpath b/bundles/com.salesforce.bazel.logback/.classpath index 81fe078c..375961e4 100644 --- a/bundles/com.salesforce.bazel.logback/.classpath +++ b/bundles/com.salesforce.bazel.logback/.classpath @@ -1,6 +1,6 @@ - + diff --git a/bundles/com.salesforce.bazel.logback/.settings/org.eclipse.jdt.core.prefs b/bundles/com.salesforce.bazel.logback/.settings/org.eclipse.jdt.core.prefs index 1f3e19a9..3ee841fb 100644 --- a/bundles/com.salesforce.bazel.logback/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/com.salesforce.bazel.logback/.settings/org.eclipse.jdt.core.prefs @@ -1,13 +1,13 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 org.eclipse.jdt.core.formatter.align_selector_in_method_invocation_on_expression_first_line=true diff --git a/bundles/com.salesforce.bazel.logback/META-INF/MANIFEST.MF b/bundles/com.salesforce.bazel.logback/META-INF/MANIFEST.MF index 7bb79f01..184e9d52 100644 --- a/bundles/com.salesforce.bazel.logback/META-INF/MANIFEST.MF +++ b/bundles/com.salesforce.bazel.logback/META-INF/MANIFEST.MF @@ -6,5 +6,5 @@ Bundle-Version: 1.0.0.qualifier Bundle-Vendor: Bazel Eclipse Feature Fragment-Host: ch.qos.logback.classic;bundle-version="1.4.11" Automatic-Module-Name: com.salesforce.bazel.logback -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.core.runtime diff --git a/bundles/com.salesforce.bazel.sdk/.classpath b/bundles/com.salesforce.bazel.sdk/.classpath index 3628e336..35386b94 100644 --- a/bundles/com.salesforce.bazel.sdk/.classpath +++ b/bundles/com.salesforce.bazel.sdk/.classpath @@ -1,6 +1,6 @@ - + diff --git a/bundles/com.salesforce.bazel.sdk/.settings/org.eclipse.jdt.core.prefs b/bundles/com.salesforce.bazel.sdk/.settings/org.eclipse.jdt.core.prefs index 1f3e19a9..3ee841fb 100644 --- a/bundles/com.salesforce.bazel.sdk/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/com.salesforce.bazel.sdk/.settings/org.eclipse.jdt.core.prefs @@ -1,13 +1,13 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 org.eclipse.jdt.core.formatter.align_selector_in_method_invocation_on_expression_first_line=true diff --git a/bundles/com.salesforce.bazel.sdk/META-INF/MANIFEST.MF b/bundles/com.salesforce.bazel.sdk/META-INF/MANIFEST.MF index b885f71d..c8afe28d 100644 --- a/bundles/com.salesforce.bazel.sdk/META-INF/MANIFEST.MF +++ b/bundles/com.salesforce.bazel.sdk/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: Bazel Java SDK and IntelliJ Helpers Bundle-SymbolicName: com.salesforce.bazel.sdk;singleton:=true Bundle-Version: 2.0.0.qualifier Bundle-Vendor: Bazel Eclipse Feature -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Automatic-Module-Name: com.salesforce.bazel.eclipse.model Bundle-ActivationPolicy: lazy Bundle-Activator: com.salesforce.bazel.sdk.BazelJavaSdkPlugin diff --git a/bundles/testdata/.classpath b/bundles/testdata/.classpath index 81fe078c..375961e4 100644 --- a/bundles/testdata/.classpath +++ b/bundles/testdata/.classpath @@ -1,6 +1,6 @@ - + diff --git a/bundles/testdata/.settings/org.eclipse.jdt.core.prefs b/bundles/testdata/.settings/org.eclipse.jdt.core.prefs index 06092b7a..da6c09be 100644 --- a/bundles/testdata/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/testdata/.settings/org.eclipse.jdt.core.prefs @@ -1,13 +1,13 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 org.eclipse.jdt.core.formatter.align_selector_in_method_invocation_on_expression_first_line=true diff --git a/bundles/testdata/META-INF/MANIFEST.MF b/bundles/testdata/META-INF/MANIFEST.MF index 1611c5db..a4c9d7ee 100644 --- a/bundles/testdata/META-INF/MANIFEST.MF +++ b/bundles/testdata/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: testdata Bundle-Version: 1.0.0.qualifier Bundle-Vendor: Bazel Eclipse Feature Automatic-Module-Name: testdata -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Eclipse-BundleShape: dir Export-Package: testdata;x-friends:="com.salesforce.bazel.eclipse.core.tests,com.salesforce.bazel.eclipse.jdtls.tests,com.salesforce.bazel.eclipse.ui.tests", testdata.utils diff --git a/tests/com.salesforce.bazel.eclipse.core.tests/.classpath b/tests/com.salesforce.bazel.eclipse.core.tests/.classpath index 675a5e29..1aa9eca9 100644 --- a/tests/com.salesforce.bazel.eclipse.core.tests/.classpath +++ b/tests/com.salesforce.bazel.eclipse.core.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/tests/com.salesforce.bazel.eclipse.core.tests/.settings/org.eclipse.jdt.core.prefs b/tests/com.salesforce.bazel.eclipse.core.tests/.settings/org.eclipse.jdt.core.prefs index 1f3e19a9..3ee841fb 100644 --- a/tests/com.salesforce.bazel.eclipse.core.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/com.salesforce.bazel.eclipse.core.tests/.settings/org.eclipse.jdt.core.prefs @@ -1,13 +1,13 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 org.eclipse.jdt.core.formatter.align_selector_in_method_invocation_on_expression_first_line=true diff --git a/tests/com.salesforce.bazel.eclipse.core.tests/META-INF/MANIFEST.MF b/tests/com.salesforce.bazel.eclipse.core.tests/META-INF/MANIFEST.MF index 1ebe18c6..2cc1e1b9 100644 --- a/tests/com.salesforce.bazel.eclipse.core.tests/META-INF/MANIFEST.MF +++ b/tests/com.salesforce.bazel.eclipse.core.tests/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 2.0.0.qualifier Bundle-Vendor: Bazel Eclipse Feature Fragment-Host: com.salesforce.bazel.eclipse.core;bundle-version="2.0.0" Automatic-Module-Name: com.salesforce.bazel.eclipse.core.tests -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Import-Package: org.hamcrest;version="2.2.0", org.hamcrest.collection;version="2.2.0", org.junit.jupiter.api;version="5.9.2", diff --git a/tests/com.salesforce.bazel.eclipse.jdtls.tests/.classpath b/tests/com.salesforce.bazel.eclipse.jdtls.tests/.classpath index 0ab3788d..0bc9534e 100644 --- a/tests/com.salesforce.bazel.eclipse.jdtls.tests/.classpath +++ b/tests/com.salesforce.bazel.eclipse.jdtls.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/tests/com.salesforce.bazel.eclipse.jdtls.tests/.settings/org.eclipse.jdt.core.prefs b/tests/com.salesforce.bazel.eclipse.jdtls.tests/.settings/org.eclipse.jdt.core.prefs index fe700e3b..f486898e 100644 --- a/tests/com.salesforce.bazel.eclipse.jdtls.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/com.salesforce.bazel.eclipse.jdtls.tests/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 org.eclipse.jdt.core.formatter.align_selector_in_method_invocation_on_expression_first_line=true diff --git a/tests/com.salesforce.bazel.eclipse.jdtls.tests/META-INF/MANIFEST.MF b/tests/com.salesforce.bazel.eclipse.jdtls.tests/META-INF/MANIFEST.MF index d6ac6edb..2c567c6c 100644 --- a/tests/com.salesforce.bazel.eclipse.jdtls.tests/META-INF/MANIFEST.MF +++ b/tests/com.salesforce.bazel.eclipse.jdtls.tests/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-SymbolicName: com.salesforce.bazel.eclipse.jdtls.tests;singleton:=true Bundle-Version: 2.0.0.qualifier Fragment-Host: com.salesforce.bazel.eclipse.jdtls;bundle-version="2.0.0" Bundle-Vendor: Bazel Eclipse Feature -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Import-Package: org.hamcrest;version="2.2.0", org.hamcrest.collection;version="2.2.0", org.junit.jupiter.api;version="5.9.2", diff --git a/tests/com.salesforce.bazel.eclipse.ui.tests/.classpath b/tests/com.salesforce.bazel.eclipse.ui.tests/.classpath index 675a5e29..1aa9eca9 100644 --- a/tests/com.salesforce.bazel.eclipse.ui.tests/.classpath +++ b/tests/com.salesforce.bazel.eclipse.ui.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/tests/com.salesforce.bazel.eclipse.ui.tests/.settings/org.eclipse.jdt.core.prefs b/tests/com.salesforce.bazel.eclipse.ui.tests/.settings/org.eclipse.jdt.core.prefs index 1f3e19a9..3ee841fb 100644 --- a/tests/com.salesforce.bazel.eclipse.ui.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/com.salesforce.bazel.eclipse.ui.tests/.settings/org.eclipse.jdt.core.prefs @@ -1,13 +1,13 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 org.eclipse.jdt.core.formatter.align_selector_in_method_invocation_on_expression_first_line=true diff --git a/tests/com.salesforce.bazel.eclipse.ui.tests/META-INF/MANIFEST.MF b/tests/com.salesforce.bazel.eclipse.ui.tests/META-INF/MANIFEST.MF index 4286e16a..108b1bd0 100644 --- a/tests/com.salesforce.bazel.eclipse.ui.tests/META-INF/MANIFEST.MF +++ b/tests/com.salesforce.bazel.eclipse.ui.tests/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 2.0.0.qualifier Bundle-Vendor: Bazel Eclipse Feature Automatic-Module-Name: com.salesforce.bazel.eclipse.ui.tests Fragment-Host: com.salesforce.bazel.eclipse.ui;bundle-version="2.0.0.qualifier" -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Import-Package: net.bytebuddy.agent;version="1.14.0", org.hamcrest;version="2.2.0", org.hamcrest.collection;version="2.2.0", diff --git a/tests/com.salesforce.bazel.sdk.tests/.classpath b/tests/com.salesforce.bazel.sdk.tests/.classpath index 675a5e29..1aa9eca9 100644 --- a/tests/com.salesforce.bazel.sdk.tests/.classpath +++ b/tests/com.salesforce.bazel.sdk.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/tests/com.salesforce.bazel.sdk.tests/.settings/org.eclipse.jdt.core.prefs b/tests/com.salesforce.bazel.sdk.tests/.settings/org.eclipse.jdt.core.prefs index 1f3e19a9..3ee841fb 100644 --- a/tests/com.salesforce.bazel.sdk.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/com.salesforce.bazel.sdk.tests/.settings/org.eclipse.jdt.core.prefs @@ -1,13 +1,13 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 org.eclipse.jdt.core.formatter.align_selector_in_method_invocation_on_expression_first_line=true diff --git a/tests/com.salesforce.bazel.sdk.tests/META-INF/MANIFEST.MF b/tests/com.salesforce.bazel.sdk.tests/META-INF/MANIFEST.MF index fa1f2f2a..3f1fb1a1 100644 --- a/tests/com.salesforce.bazel.sdk.tests/META-INF/MANIFEST.MF +++ b/tests/com.salesforce.bazel.sdk.tests/META-INF/MANIFEST.MF @@ -10,5 +10,5 @@ Import-Package: org.junit.jupiter.api;version="[5.11.0,6.0.0)", org.junit.jupiter.api.function;version="[5.11.0,6.0.0)", org.junit.jupiter.api.io;version="[5.11.0,6.0.0)" Automatic-Module-Name: com.salesforce.bazel.java.sdk.tests -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ClassPath: .