Skip to content

Commit e06c763

Browse files
jonahgrahamjonahgraham
committed
Update BREE to Java21 for SWT
Includes: - bumping all minor versions - adding API filters for above because PDE is not considering BREE when reporting issues
1 parent 941ff78 commit e06c763

File tree

65 files changed

+160
-86
lines changed

Some content is hidden

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

65 files changed

+160
-86
lines changed

‎Jenkinsfile‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ def getNativeJdkUrl(String os, String arch) { // To update the used JDK version
4848
// Temporary workaround until there are official Temurin GA releases for Windows on ARM that can be consumed through JustJ
4949
dir("${WORKSPACE}/repackage-win32.aarch64-jdk") {
5050
sh """
51-
curl -L 'https://github.com/adoptium/temurin17-binaries/releases/download/jdk17u-2024-02-07-14-14-beta/OpenJDK17U-jdk_aarch64_windows_hotspot_2024-02-07-14-14.zip' > jdk.zip
52-
unzip -q jdk.zip jdk-17.0.11+1/include/** jdk-17.0.11+1/lib/**
53-
cd jdk-17.0.11+1
51+
curl -L 'https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.9%2B10/OpenJDK21U-jdk_aarch64_windows_hotspot_21.0.9_10.zip' > jdk.zip
52+
unzip -q jdk.zip jdk-21.0.9+10/include/** jdk-21.0.9+10/lib/**
53+
cd jdk-21.0.9+10
5454
tar -czf ../jdk.tar.gz include/ lib/
5555
"""
5656
}
@@ -59,15 +59,15 @@ def getNativeJdkUrl(String os, String arch) { // To update the used JDK version
5959
// Downloading jdk and renew it for riscv64 architecture on Linux
6060
dir("${WORKSPACE}/repackage-linux.riscv64-jdk") {
6161
sh """
62-
curl -L 'https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_riscv64_linux_hotspot_17.0.12_7.tar.gz' > jdk.tar.gz
63-
tar -xzf jdk.tar.gz jdk-17.0.12+7/include/ jdk-17.0.12+7/lib/
64-
cd jdk-17.0.12+7
62+
curl -L 'https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.9%2B10/OpenJDK21U-jdk_riscv64_linux_hotspot_21.0.9_10.tar.gz' > jdk.tar.gz
63+
tar -xzf jdk.tar.gz jdk-21.0.9+10/include/ jdk-21.0.9+10/lib/
64+
cd jdk-21.0.9+10
6565
tar -czf ../jdk.tar.gz include/ lib/
6666
"""
6767
}
6868
return "file://${WORKSPACE}/repackage-linux.riscv64-jdk/jdk.tar.gz"
6969
}
70-
return "https://download.eclipse.org/justj/jres/17/downloads/20230428_1804/org.eclipse.justj.openjdk.hotspot.jre.minimal.stripped-17.0.7-${os}-${arch}.tar.gz"
70+
return "https://download.eclipse.org/justj/jres/21/downloads/20251104_1502/org.eclipse.justj.openjdk.hotspot.jre.minimal.stripped-21.0.9-${os}-${arch}.tar.gz"
7171
}
7272

7373
def getLatestGitTag() {

‎binaries/.classpath_cocoa‎

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="src" path="Eclipse SWT/cocoa"/>
55
<classpathentry kind="src" path="Eclipse SWT/common"/>
66
<classpathentry kind="src" path="Eclipse SWT/emulated/bidi"/>

‎binaries/.classpath_gtk‎

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="src" path="Eclipse SWT/gtk"/>
55
<classpathentry kind="src" path="Eclipse SWT/cairo"/>
66
<classpathentry kind="src" path="Eclipse SWT/emulated/bidi"/>

‎binaries/.classpath_win32‎

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="src" path="Eclipse SWT/win32"/>
55
<classpathentry kind="src" path="Eclipse SWT/common"/>
66
<classpathentry kind="src" path="Eclipse SWT PI/common"/>

‎binaries/.settings/org.eclipse.jdt.core.prefs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
1111
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
1212
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
1313
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
14-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
14+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
1515
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
16-
org.eclipse.jdt.core.compiler.compliance=17
16+
org.eclipse.jdt.core.compiler.compliance=21
1717
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
1818
org.eclipse.jdt.core.compiler.debug.localVariable=generate
1919
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -129,4 +129,4 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
129129
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
130130
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
131131
org.eclipse.jdt.core.compiler.release=enabled
132-
org.eclipse.jdt.core.compiler.source=17
132+
org.eclipse.jdt.core.compiler.source=21

‎binaries/org.eclipse.swt.cocoa.macosx.aarch64/.settings/.api_filters‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,4 +196,12 @@
196196
</message_arguments>
197197
</filter>
198198
</resource>
199+
<resource path="META-INF/MANIFEST.MF">
200+
<filter comment="Version is bumped for Eclipse 4.39 because of new BREE requirement" id="926941240">
201+
<message_arguments>
202+
<message_argument value="3.133.0"/>
203+
<message_argument value="3.132.0"/>
204+
</message_arguments>
205+
</filter>
206+
</resource>
199207
</component>

‎binaries/org.eclipse.swt.cocoa.macosx.aarch64/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Fragment-Host: org.eclipse.swt;bundle-version="[3.128.0,4.0.0)"
33
Bundle-Name: %fragmentName
44
Bundle-Vendor: %providerName
55
Bundle-SymbolicName: org.eclipse.swt.cocoa.macosx.aarch64; singleton:=true
6-
Bundle-Version: 3.132.100.qualifier
6+
Bundle-Version: 3.133.0.qualifier
77
Bundle-ManifestVersion: 2
88
Bundle-Localization: fragment
99
Export-Package:

‎binaries/org.eclipse.swt.cocoa.macosx.x86_64/.settings/.api_filters‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,4 +196,12 @@
196196
</message_arguments>
197197
</filter>
198198
</resource>
199+
<resource path="META-INF/MANIFEST.MF">
200+
<filter comment="Version is bumped for Eclipse 4.39 because of new BREE requirement" id="926941240">
201+
<message_arguments>
202+
<message_argument value="3.133.0"/>
203+
<message_argument value="3.132.0"/>
204+
</message_arguments>
205+
</filter>
206+
</resource>
199207
</component>

‎binaries/org.eclipse.swt.cocoa.macosx.x86_64/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Fragment-Host: org.eclipse.swt;bundle-version="[3.128.0,4.0.0)"
33
Bundle-Name: %fragmentName
44
Bundle-Vendor: %providerName
55
Bundle-SymbolicName: org.eclipse.swt.cocoa.macosx.x86_64; singleton:=true
6-
Bundle-Version: 3.132.100.qualifier
6+
Bundle-Version: 3.133.0.qualifier
77
Bundle-ManifestVersion: 2
88
Bundle-Localization: fragment
99
Export-Package:

‎binaries/org.eclipse.swt.gtk.linux.aarch64/.settings/.api_filters‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,4 +204,12 @@
204204
</message_arguments>
205205
</filter>
206206
</resource>
207+
<resource path="META-INF/MANIFEST.MF">
208+
<filter comment="Version is bumped for Eclipse 4.39 because of new BREE requirement" id="926941240">
209+
<message_arguments>
210+
<message_argument value="3.133.0"/>
211+
<message_argument value="3.132.0"/>
212+
</message_arguments>
213+
</filter>
214+
</resource>
207215
</component>

0 commit comments

Comments
 (0)