Skip to content

Commit ab88f29

Browse files
authored
Update versions to Eclipse 4.34 / 2024-12 Update (#513)
* Update target platforms to Eclipse 2024-12 release * Update Tycho & Maven * Remove dead bundle * Fix version * Update all to 21
1 parent 24a954c commit ab88f29

File tree

41 files changed

+196
-181
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+196
-181
lines changed

.mvn/maven.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
-Dtycho.version=4.0.9
1+
-Dtycho.version=4.0.12
22
-Dtycho.p2.transport.min-cache-minutes=129600

.mvn/wrapper/maven-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@
1515
# specific language governing permissions and limitations
1616
# under the License.
1717

18-
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip
19-
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
18+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip
19+
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar

CONTRIBUTING.md

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Recommended resources
1919

2020
You need:
2121
- latest version of [Eclipse IDE for Eclipse Committers](https://www.eclipse.org/downloads/packages/)
22-
- JDK 17
22+
- JDK 21
2323
- Bazelisk available as `bazel` binary in `PATH` environment
2424

2525
### 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
4141
**After cloning the repository, follow these steps:**
4242

4343
- Launch the Eclipse IDE for Committers with a **new workspace**
44-
- Ensure JDK 17 is configured (*Preferences > Java > Installed JREs*)
44+
- Ensure JDK 21 is configured (*Preferences > Java > Installed JREs*)
4545
- Click *File > Import > General > Existing Projects into Workspace*
4646
- Select the `bazel-eclipse` folder as the root directory
4747
- Select **Search for nested projects** (critical step)
@@ -67,7 +67,7 @@ Once done everything should build.
6767
This will download the IntelliJ Aspects and puts them into a ZIP file for use.
6868
We don't distribute them in our source control.
6969
Note, the shell script requires a working Git and Bazel binary in the `PATH`.
70-
On MacOS, GNU Tar (`gtar`) is needed as well.
70+
On MacOS, GNU Tar (`gtar`) is needed as well (`brew install gnu-tar`).
7171

7272

7373
## Debugging
@@ -95,3 +95,20 @@ We use [GitHub Actions](https://github.com/salesforce/bazel-eclipse/actions) for
9595

9696
This is explained in more detail in the [build guide](docs/dev/thebuild.md).
9797

98+
### Command Line Build
99+
100+
To build on the command line quickly, run the following commands:
101+
102+
1. Import IJ Aspects
103+
104+
```
105+
pushd ./bundles/com.salesforce.bazel.sdk/aspects/import
106+
./import-and-build.sh
107+
popd
108+
```
109+
110+
2. Run Maven build
111+
112+
```
113+
./mvnw clean verify
114+
```

bundles/com.salesforce.bazel.eclipse.core/.classpath

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
44
<attributes>
55
<attribute name="module" value="true"/>
66
</attributes>

bundles/com.salesforce.bazel.eclipse.core/.settings/org.eclipse.jdt.core.prefs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
eclipse.preferences.version=1
22
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
33
org.eclipse.jdt.core.compiler.codegen.methodParameters=generate
4-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
4+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
55
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
6-
org.eclipse.jdt.core.compiler.compliance=17
6+
org.eclipse.jdt.core.compiler.compliance=21
77
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
88
org.eclipse.jdt.core.compiler.debug.localVariable=generate
99
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
1212
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
1313
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
1414
org.eclipse.jdt.core.compiler.release=enabled
15-
org.eclipse.jdt.core.compiler.source=17
15+
org.eclipse.jdt.core.compiler.source=21
1616
org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
1717
org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
1818
org.eclipse.jdt.core.formatter.align_selector_in_method_invocation_on_expression_first_line=true

bundles/com.salesforce.bazel.eclipse.core/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,5 +54,5 @@ Require-Bundle: org.eclipse.core.jobs;bundle-version="3.12.0",
5454
org.eclipse.jdt.junit.core;bundle-version="3.11.0",
5555
org.eclipse.core.filesystem;bundle-version="1.9.500",
5656
org.eclipse.core.variables;bundle-version="3.6.0"
57-
Bundle-RequiredExecutionEnvironment: JavaSE-17
57+
Bundle-RequiredExecutionEnvironment: JavaSE-21
5858
Bundle-ActivationPolicy: lazy

bundles/com.salesforce.bazel.eclipse.jdtls/.classpath

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
44
<attributes>
55
<attribute name="module" value="true"/>
66
</attributes>

bundles/com.salesforce.bazel.eclipse.jdtls/.settings/org.eclipse.jdt.core.prefs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
eclipse.preferences.version=1
22
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
33
org.eclipse.jdt.core.compiler.codegen.methodParameters=generate
4-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
4+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
55
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
6-
org.eclipse.jdt.core.compiler.compliance=17
6+
org.eclipse.jdt.core.compiler.compliance=21
77
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
88
org.eclipse.jdt.core.compiler.debug.localVariable=generate
99
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
1212
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
1313
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
1414
org.eclipse.jdt.core.compiler.release=enabled
15-
org.eclipse.jdt.core.compiler.source=17
15+
org.eclipse.jdt.core.compiler.source=21
1616
org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
1717
org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
1818
org.eclipse.jdt.core.formatter.align_selector_in_method_invocation_on_expression_first_line=true

bundles/com.salesforce.bazel.eclipse.jdtls/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@ Export-Package: com.salesforce.bazel.eclipse.jdtls,
2929
Import-Package: org.fusesource.jansi;version="2.4.0",
3030
org.osgi.service.event;version="1.4.1",
3131
org.slf4j;version="2.0.0"
32-
Bundle-RequiredExecutionEnvironment: JavaSE-17
32+
Bundle-RequiredExecutionEnvironment: JavaSE-21
3333
Bundle-ActivationPolicy: lazy
3434
Service-Component: OSGI-INF/com.salesforce.bazel.eclipse.jdtls.execution.BazelJdtLsSyncStatsOutputComponent.xml

bundles/com.salesforce.bazel.eclipse.ui/.classpath

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
44
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
55
<classpathentry kind="src" path="src"/>
66
<classpathentry kind="output" path="bin"/>

0 commit comments

Comments
 (0)