Skip to content

Commit ea7c8ec

Browse files
adangeladangel
committed
Merge pull request #181 from adangel:support-eclipse-2023-06
Support eclipse 2023-06 #181
2 parents d47660c + 0aca95a commit ea7c8ec

File tree

5 files changed

+28
-56
lines changed

5 files changed

+28
-56
lines changed

‎.github/workflows/build.yml‎

Lines changed: 6 additions & 6 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, 2023-03)
19+
name: verify (ubuntu-latest, 2023-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: 2023-03
32+
targetPlatform: 2023-06
3333
deploy: true
3434
pmdCiSecretPassphrase: ${{ secrets.PMD_CI_SECRET_PASSPHRASE }}
3535
githubToken: ${{ secrets.GITHUB_TOKEN }}
@@ -44,19 +44,19 @@ jobs:
4444
strategy:
4545
matrix:
4646
os: [ ubuntu-latest, windows-latest, macos-latest ]
47-
targetPlatform: [ 2023-03 ]
47+
targetPlatform: [ 2023-06 ]
4848
exclude:
4949
# exclude the fail-fast-build, which already ran
5050
- os: ubuntu-latest
51-
targetPlatform: 2023-03
51+
targetPlatform: 2023-06
5252
# run other target platforms only on linux
5353
include:
54+
- os: ubuntu-latest
55+
targetPlatform: 2023-03
5456
- os: ubuntu-latest
5557
targetPlatform: 2022-12
5658
- os: ubuntu-latest
5759
targetPlatform: 2022-09
58-
- os: ubuntu-latest
59-
targetPlatform: 2022-06
6060
fail-fast: true
6161

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

‎ReleaseNotes.md‎

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

1414
### New and noteworthy
1515

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

21+
* [#181](https://github.com/pmd/pmd-eclipse-plugin/pull/181): Support eclipse 2023-06
22+
1823
### API Changes
1924

2025
### External Contributions

‎pom.xml‎

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

1717
<properties>
18-
<target.platform>2023-03</target.platform>
18+
<target.platform>2023-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 -->
@@ -438,39 +438,6 @@
438438
</build>
439439

440440
<profiles>
441-
<profile>
442-
<!--
443-
This makes sure to ignore PMD processing errors: The two bundles org.eclipse.ui.ide-3.19.0.v20220511-1638.jar
444-
and org.eclipse.ui.workbench-3.125.100.v20220524-1304.jar are both containing classes in package
445-
"org.eclipse.ui". But those two jar-files are signed with different certificates, which leads to the following
446-
exception during PMD analysis: java.lang.SecurityException: class "org.eclipse.ui.IMarkerHelpRegistry"'s
447-
signer information does not match signer information of other classes in the same package.
448-
449-
org.eclipse.ui.ide-3.19.0.v20220511-1638.jar is signed with a certificate that expires on 2022-05-19.
450-
org.eclipse.ui.workbench-3.125.100.v20220524-1304.jar is signed with a certificate that expires on 2024-05-22.
451-
-->
452-
<id>2022-06</id>
453-
<activation>
454-
<property>
455-
<name>target.platform</name>
456-
<value>2022-06</value>
457-
</property>
458-
</activation>
459-
<build>
460-
<pluginManagement>
461-
<plugins>
462-
<plugin>
463-
<groupId>org.apache.maven.plugins</groupId>
464-
<artifactId>maven-pmd-plugin</artifactId>
465-
<configuration>
466-
<skipPmdError>true</skipPmdError>
467-
</configuration>
468-
</plugin>
469-
</plugins>
470-
</pluginManagement>
471-
</build>
472-
</profile>
473-
474441
<profile>
475442
<id>osx</id>
476443
<activation>

target-platforms/2022-06.target renamed to target-platforms/2023-06.target

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
22
<?pde?>
33
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
4-
<target name="2022-06 (4.24)" sequenceNumber="1683993282">
4+
<target name="2023-06 (4.28)" sequenceNumber="1691335648">
55
<locations>
66
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
7-
<unit id="org.eclipse.platform.feature.group" version="4.24.0.v20220607-0700"/>
8-
<unit id="org.eclipse.jdt.feature.group" version="3.18.1200.v20220607-0700"/>
9-
<unit id="org.eclipse.wst.xml_core.feature.feature.group" version="3.26.0.v202204042240"/>
10-
<unit id="org.eclipse.pde.feature.group" version="3.14.1200.v20220607-0700"/>
11-
<unit id="org.eclipse.swtbot.eclipse.feature.group" version="4.0.0.202206011610"/>
12-
<unit id="org.eclipse.swtbot.feature.group" version="4.0.0.202206011610"/>
13-
<unit id="org.eclipse.swtbot.ide.feature.group" version="4.0.0.202206011610"/>
14-
<unit id="org.eclipse.swtbot.generator.feature.feature.group" version="4.0.0.202206011610"/>
15-
<repository location="https://download.eclipse.org/releases/2022-06/"/>
7+
<unit id="org.eclipse.platform.feature.group" version="4.28.0.v20230605-0440"/>
8+
<unit id="org.eclipse.jdt.feature.group" version="3.19.100.v20230605-0440"/>
9+
<unit id="org.eclipse.wst.xml_core.feature.feature.group" version="3.30.0.v202305230750"/>
10+
<unit id="org.eclipse.pde.feature.group" version="3.15.0.v20230605-0440"/>
11+
<unit id="org.eclipse.swtbot.eclipse.feature.group" version="4.1.0.202306071420"/>
12+
<unit id="org.eclipse.swtbot.feature.group" version="4.1.0.202306071420"/>
13+
<unit id="org.eclipse.swtbot.ide.feature.group" version="4.1.0.202306071420"/>
14+
<unit id="org.eclipse.swtbot.generator.feature.feature.group" version="4.1.0.202306071420"/>
15+
<repository location="https://download.eclipse.org/releases/2023-06/"/>
1616
</location>
1717
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
1818
<unit id="org.apache.commons.io" version="2.8.0.v20210415-0900"/>
@@ -21,8 +21,8 @@
2121
<unit id="org.apache.commons.lang.source" version="2.6.0.v20220406-2305"/>
2222
<unit id="org.junit" version="4.13.2.v20211018-1956"/>
2323
<unit id="org.junit.source" version="4.13.2.v20211018-1956"/>
24-
<repository location="https://download.eclipse.org/tools/orbit/downloads/2022-06/"/>
24+
<repository location="https://download.eclipse.org/tools/orbit/downloads/2023-06/"/>
2525
</location>
2626
</locations>
27-
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
27+
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
2828
</target>

target-platforms/2022-06.tpd renamed to target-platforms/2023-06.tpd

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
target "2022-06 (4.24)"
2-
with source requirements environment JavaSE-11
3-
location "https://download.eclipse.org/releases/2022-06/" {
1+
target "2023-06 (4.28)"
2+
with source requirements environment JavaSE-17
3+
location "https://download.eclipse.org/releases/2023-06/" {
44
org.eclipse.platform.feature.group
55
org.eclipse.jdt.feature.group
66
org.eclipse.wst.xml_core.feature.feature.group
@@ -11,7 +11,7 @@ location "https://download.eclipse.org/releases/2022-06/" {
1111
org.eclipse.swtbot.generator.feature.feature.group
1212
}
1313

14-
location "https://download.eclipse.org/tools/orbit/downloads/2022-06/" {
14+
location "https://download.eclipse.org/tools/orbit/downloads/2023-06/" {
1515
org.apache.commons.io
1616
org.apache.commons.io.source
1717
org.apache.commons.lang

0 commit comments

Comments
 (0)