Skip to content

Commit b661aed

Browse files
committed
Move bundles to Java 21 - take 2
They already transitively require it (due to eclipse-platform/eclipse.platform.swt#2824 ) so this change makes it to state it directly and silence the PDE warnings.
1 parent 0183152 commit b661aed

File tree

40 files changed

+87
-109
lines changed

40 files changed

+87
-109
lines changed

bundles/org.eclipse.e4.ui.dialogs/.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"/>

bundles/org.eclipse.e4.ui.dialogs/.settings/org.eclipse.jdt.core.prefs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
eclipse.preferences.version=1
22
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
3-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
4-
org.eclipse.jdt.core.compiler.compliance=17
3+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
4+
org.eclipse.jdt.core.compiler.compliance=21
55
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
66
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
77
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
88
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
99
org.eclipse.jdt.core.compiler.release=enabled
10-
org.eclipse.jdt.core.compiler.source=17
10+
org.eclipse.jdt.core.compiler.source=21
1111
org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
1212
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
1313
org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16

bundles/org.eclipse.e4.ui.dialogs/META-INF/MANIFEST.MF

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: %pluginName
44
Bundle-SymbolicName: org.eclipse.e4.ui.dialogs
5-
Bundle-Version: 1.6.200.qualifier
6-
Bundle-RequiredExecutionEnvironment: JavaSE-17
5+
Bundle-Version: 1.7.0.qualifier
6+
Bundle-RequiredExecutionEnvironment: JavaSE-21
77
Bundle-Vendor: %providerName
88
Bundle-Localization: plugin
99
Export-Package: org.eclipse.e4.ui.dialogs.filteredtree,
1010
org.eclipse.e4.ui.dialogs.textbundles;x-internal:=true,
1111
org.eclipse.e4.ui.internal.dialogs.about;x-internal:=true
12-
Require-Bundle: org.eclipse.jface;bundle-version="3.11.0",
12+
Require-Bundle: org.eclipse.jface;bundle-version="3.39.0",
1313
org.eclipse.core.runtime;bundle-version="3.29.0"
1414
Automatic-Module-Name: org.eclipse.e4.ui.dialogs
1515
Require-Capability: eclipse.swt;filter:="(image.format=svg)"

bundles/org.eclipse.jface/.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"/>

bundles/org.eclipse.jface/.settings/.api_filters

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

bundles/org.eclipse.jface/.settings/org.eclipse.jdt.core.prefs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
2828
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
2929
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
3030
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
31-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
31+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
3232
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
33-
org.eclipse.jdt.core.compiler.compliance=17
33+
org.eclipse.jdt.core.compiler.compliance=21
3434
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
3535
org.eclipse.jdt.core.compiler.debug.localVariable=generate
3636
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -147,7 +147,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
147147
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
148148
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
149149
org.eclipse.jdt.core.compiler.release=enabled
150-
org.eclipse.jdt.core.compiler.source=17
150+
org.eclipse.jdt.core.compiler.source=21
151151
org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
152152
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
153153
org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16

bundles/org.eclipse.jface/META-INF/MANIFEST.MF

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: %pluginName
44
Bundle-SymbolicName: org.eclipse.jface;singleton:=true
5-
Bundle-Version: 3.38.200.qualifier
5+
Bundle-Version: 3.39.0.qualifier
66
Bundle-Vendor: %providerName
77
Bundle-Localization: plugin
88
Export-Package: org.eclipse.jface,
@@ -38,7 +38,7 @@ Require-Bundle: org.eclipse.swt;bundle-version="[3.126.0,4.0.0)";visibility:=ree
3838
org.eclipse.core.commands;bundle-version="[3.4.0,4.0.0)";visibility:=reexport,
3939
org.eclipse.equinox.common;bundle-version="[3.18.0,4.0.0)",
4040
org.eclipse.equinox.bidi;bundle-version="[0.10.0,2.0.0)";resolution:=optional
41-
Bundle-RequiredExecutionEnvironment: JavaSE-17
41+
Bundle-RequiredExecutionEnvironment: JavaSE-21
4242
Import-Package: javax.xml.parsers,
4343
org.osgi.framework;version="[1.8.0,2.0.0)",
4444
org.w3c.dom,

bundles/org.eclipse.ltk.ui.refactoring/.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/org.eclipse.ltk.ui.refactoring/.settings/org.eclipse.jdt.core.prefs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
3030
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
3131
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
3232
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
33-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
33+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
3434
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
35-
org.eclipse.jdt.core.compiler.compliance=17
35+
org.eclipse.jdt.core.compiler.compliance=21
3636
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
3737
org.eclipse.jdt.core.compiler.debug.localVariable=generate
3838
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -149,7 +149,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
149149
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
150150
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
151151
org.eclipse.jdt.core.compiler.release=enabled
152-
org.eclipse.jdt.core.compiler.source=17
152+
org.eclipse.jdt.core.compiler.source=21
153153
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
154154
org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16
155155
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

bundles/org.eclipse.ltk.ui.refactoring/META-INF/MANIFEST.MF

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Automatic-Module-Name: org.eclipse.ltk.ui.refactoring
33
Bundle-ManifestVersion: 2
44
Bundle-Name: %pluginName
55
Bundle-SymbolicName: org.eclipse.ltk.ui.refactoring; singleton:=true
6-
Bundle-Version: 3.13.700.qualifier
6+
Bundle-Version: 3.14.0.qualifier
77
Bundle-Activator: org.eclipse.ltk.internal.ui.refactoring.RefactoringUIPlugin
88
Bundle-ActivationPolicy: lazy
99
Bundle-Vendor: %providerName
@@ -31,5 +31,5 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)",
3131
org.eclipse.compare;bundle-version="[3.5.0,4.0.0)",
3232
org.eclipse.team.core;bundle-version="[3.4.100,4.0.0)",
3333
org.eclipse.team.ui;bundle-version="[3.4.100,4.0.0)"
34-
Bundle-RequiredExecutionEnvironment: JavaSE-17
34+
Bundle-RequiredExecutionEnvironment: JavaSE-21
3535
Require-Capability: eclipse.swt;filter:="(image.format=svg)"

0 commit comments

Comments
 (0)