Skip to content

Commit 8db202c

Browse files
committed
Support Eclipse 2024-06
1 parent 76f07ca commit 8db202c

File tree

7 files changed

+37
-48
lines changed

7 files changed

+37
-48
lines changed

.github/actions/setup/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ description: 'Setup java and ruby, check environment'
44
runs:
55
using: 'composite'
66
steps:
7-
- name: Set up JDK 17
7+
- name: Set up JDK 21
88
id: java17
99
uses: actions/setup-java@v4
1010
with:
1111
distribution: temurin
12-
java-version: '17'
12+
java-version: '21'
1313
- name: Cache local Maven repository
1414
uses: actions/cache@v4
1515
with:

.github/workflows/build.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ on:
1616
jobs:
1717
# verify build on one node before multiple builds on different os are started
1818
fail-fast-build:
19-
name: verify (ubuntu-latest, 2024-03)
19+
name: verify (ubuntu-latest, 2024-06)
2020
timeout-minutes: 60
2121
runs-on: ubuntu-latest
2222
steps:
@@ -29,7 +29,7 @@ jobs:
2929
- name: Build
3030
uses: ./.github/actions/build
3131
with:
32-
targetPlatform: 2024-03
32+
targetPlatform: 2024-06
3333
deploy: true
3434
pmdCiSecretPassphrase: ${{ secrets.PMD_CI_SECRET_PASSPHRASE }}
3535
githubToken: ${{ secrets.GITHUB_TOKEN }}
@@ -38,7 +38,7 @@ jobs:
3838
uses: actions/upload-artifact@v4
3939
if: ${{ failure() }}
4040
with:
41-
name: screenshots-ubuntu-latest-2024-03
41+
name: screenshots-ubuntu-latest-2024-06
4242
path: net.sourceforge.pmd.eclipse.plugin.test/screenshots
4343
if-no-files-found: ignore
4444

@@ -52,19 +52,19 @@ jobs:
5252
strategy:
5353
matrix:
5454
os: [ ubuntu-latest, windows-latest, macos-latest ]
55-
targetPlatform: [ 2024-03 ]
55+
targetPlatform: [ 2024-06 ]
5656
exclude:
5757
# exclude the fail-fast-build, which already ran
5858
- os: ubuntu-latest
59-
targetPlatform: 2024-03
59+
targetPlatform: 2024-06
6060
# run other target platforms only on linux
6161
include:
62+
- os: ubuntu-latest
63+
targetPlatform: 2024-03
6264
- os: ubuntu-latest
6365
targetPlatform: 2023-12
6466
- os: ubuntu-latest
6567
targetPlatform: 2023-09
66-
- os: ubuntu-latest
67-
targetPlatform: 2023-06
6868
fail-fast: true
6969

7070
runs-on: ${{ matrix.os }}

ReleaseNotes.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ This is a minor release.
1313

1414
### New and noteworthy
1515

16+
* Support for Eclipse 2024-06 added
17+
* Support for Eclipse 2023-06 removed
18+
1619
### Fixed Issues
1720

1821
### API Changes

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
</modules>
1616

1717
<properties>
18-
<target.platform>2024-03</target.platform>
18+
<target.platform>2024-06</target.platform>
1919

2020
<java.version>1.8</java.version>
2121
<!-- https://github.com/eclipse/tycho/blob/master/RELEASE_NOTES.md and https://github.com/eclipse-tycho/tycho/releases -->

target-platforms/2023-06.target

Lines changed: 0 additions & 28 deletions
This file was deleted.

target-platforms/2024-06.target

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2+
<?pde?>
3+
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
4+
<target name="2024-06 (4.32)" sequenceNumber="1718389263">
5+
<locations>
6+
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
7+
<unit id="org.eclipse.platform.feature.group" version="4.32.0.v20240601-0610"/>
8+
<unit id="org.eclipse.jdt.feature.group" version="3.19.500.v20240601-0610"/>
9+
<unit id="org.eclipse.wst.xml_core.feature.feature.group" version="3.34.0.v202405130132"/>
10+
<unit id="org.eclipse.pde.feature.group" version="3.15.400.v20240601-0610"/>
11+
<unit id="org.eclipse.swtbot.eclipse.feature.group" version="4.2.0.202405291350"/>
12+
<unit id="org.eclipse.swtbot.feature.group" version="4.2.0.202405291350"/>
13+
<unit id="org.eclipse.swtbot.ide.feature.group" version="4.2.0.202405291350"/>
14+
<unit id="org.eclipse.swtbot.generator.feature.feature.group" version="4.2.0.202405291350"/>
15+
<unit id="org.junit" version="4.13.2.v20230809-1000"/>
16+
<unit id="org.junit.source" version="4.13.2.v20230809-1000"/>
17+
<repository location="https://download.eclipse.org/releases/2024-06/"/>
18+
</location>
19+
</locations>
20+
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
21+
</target>
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
target "2023-06 (4.28)"
2-
with source requirements environment JavaSE-17
3-
location "https://download.eclipse.org/releases/2023-06/" {
1+
target "2024-06 (4.32)"
2+
with source requirements environment JavaSE-21
3+
location "https://download.eclipse.org/releases/2024-06/" {
44
org.eclipse.platform.feature.group
55
org.eclipse.jdt.feature.group
66
org.eclipse.wst.xml_core.feature.feature.group
@@ -9,13 +9,6 @@ location "https://download.eclipse.org/releases/2023-06/" {
99
org.eclipse.swtbot.feature.group
1010
org.eclipse.swtbot.ide.feature.group
1111
org.eclipse.swtbot.generator.feature.feature.group
12-
}
13-
14-
location "https://download.eclipse.org/tools/orbit/downloads/2023-06/" {
15-
org.apache.commons.io
16-
org.apache.commons.io.source
17-
org.apache.commons.lang
18-
org.apache.commons.lang.source
1912
org.junit
2013
org.junit.source
2114
}

0 commit comments

Comments
 (0)