Skip to content

Commit 5f6cae6

Browse files
akurtakovakurtakov
committed
Move bundles to Java 21 - take 3
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 58a5d34 commit 5f6cae6

File tree

62 files changed

+176
-153
lines changed

Some content is hidden

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

62 files changed

+176
-153
lines changed

‎bundles/org.eclipse.jface.notifications/.classpath‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<classpath>
33
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
44
<classpathentry kind="src" path="src"/>
5-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
5+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
66
<attributes>
77
<attribute name="module" value="true"/>
88
</attributes>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul
77
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
88
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
99
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
10-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
10+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
1111
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
12-
org.eclipse.jdt.core.compiler.compliance=17
12+
org.eclipse.jdt.core.compiler.compliance=21
1313
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
1414
org.eclipse.jdt.core.compiler.debug.localVariable=generate
1515
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -101,7 +101,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
101101
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
102102
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
103103
org.eclipse.jdt.core.compiler.release=enabled
104-
org.eclipse.jdt.core.compiler.source=17
104+
org.eclipse.jdt.core.compiler.source=21
105105
org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
106106
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
107107
org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ Bundle-Name: %pluginName
44
Bundle-Vendor: %providerName
55
Bundle-Localization: plugin
66
Bundle-SymbolicName: org.eclipse.jface.notifications
7-
Bundle-Version: 0.7.500.qualifier
8-
Bundle-RequiredExecutionEnvironment: JavaSE-17
7+
Bundle-Version: 0.8.0.qualifier
8+
Bundle-RequiredExecutionEnvironment: JavaSE-21
99
Export-Package: org.eclipse.jface.notifications,
1010
org.eclipse.jface.notifications.internal;x-internal:=true
1111
Automatic-Module-Name: org.eclipse.jface.notifications
1212
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.29.0",
13-
org.eclipse.jface;bundle-version="3.20.0"
13+
org.eclipse.jface;bundle-version="3.39.0"
1414
Require-Capability: eclipse.swt;filter:="(image.format=svg)"

‎bundles/org.eclipse.jface.text/.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="src" path="projection"/>

‎bundles/org.eclipse.jface.text/.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_fields_grouping_blank_lines=2147483647
154154
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
155155
org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16

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

Lines changed: 4 additions & 4 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.text
5-
Bundle-Version: 3.29.100.qualifier
5+
Bundle-Version: 3.30.0.qualifier
66
Bundle-Vendor: %providerName
77
Bundle-Localization: plugin
88
Export-Package:
@@ -35,10 +35,10 @@ Export-Package:
3535
Require-Bundle:
3636
org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)",
3737
org.eclipse.text;bundle-version="[3.8.0,4.0.0)";visibility:=reexport,
38-
org.eclipse.swt;bundle-version="[3.126.0,4.0.0)",
39-
org.eclipse.jface;bundle-version="[3.19.0,4.0.0)"
38+
org.eclipse.swt;bundle-version="[3.133.0,4.0.0)",
39+
org.eclipse.jface;bundle-version="[3.39.0,4.0.0)"
4040
Import-Package: com.ibm.icu.text
41-
Bundle-RequiredExecutionEnvironment: JavaSE-17
41+
Bundle-RequiredExecutionEnvironment: JavaSE-21
4242
Automatic-Module-Name: org.eclipse.jface.text
4343
Bundle-Activator: org.eclipse.jface.text.Activator
4444
Bundle-ActivationPolicy: lazy

‎bundles/org.eclipse.ui.editors/.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.ui.editors/.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_arrows_in_switch_on_columns=false
154154
org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
155155
org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647

‎bundles/org.eclipse.ui.editors/META-INF/MANIFEST.MF‎

Lines changed: 4 additions & 4 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.ui.editors; singleton:=true
5-
Bundle-Version: 3.20.200.qualifier
5+
Bundle-Version: 3.21.0.qualifier
66
Bundle-Activator: org.eclipse.ui.internal.editors.text.EditorsPlugin
77
Bundle-ActivationPolicy: lazy
88
Bundle-Vendor: %providerName
@@ -20,16 +20,16 @@ Export-Package:
2020
Require-Bundle:
2121
org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)",
2222
org.eclipse.core.expressions;bundle-version="[3.9.0,4.0.0)",
23-
org.eclipse.swt;bundle-version="[3.128.0,4.0.0)",
23+
org.eclipse.swt;bundle-version="[3.133.0,4.0.0)",
2424
org.eclipse.ui.ide;bundle-version="[3.21.0,4.0.0)",
25-
org.eclipse.ui;bundle-version="[3.204.0,4.0.0)",
25+
org.eclipse.ui;bundle-version="[3.208.0,4.0.0)",
2626
org.eclipse.jface.text;bundle-version="[3.24.0,4.0.0)",
2727
org.eclipse.ui.workbench;bundle-version="[3.130.0,4.0.0)",
2828
org.eclipse.ui.workbench.texteditor;bundle-version="[3.19.0,4.0.0)",
2929
org.eclipse.core.filebuffers;bundle-version="[3.8.0,4.0.0)";visibility:=reexport,
3030
org.eclipse.core.resources;bundle-version="[3.19.0,4.0.0)",
3131
org.eclipse.core.filesystem;bundle-version="[1.10.0,2.0.0)",
3232
org.eclipse.jdt.annotation;bundle-version="2.3";resolution:=optional
33-
Bundle-RequiredExecutionEnvironment: JavaSE-17
33+
Bundle-RequiredExecutionEnvironment: JavaSE-21
3434
Automatic-Module-Name: org.eclipse.ui.editors
3535
Require-Capability: eclipse.swt;filter:="(image.format=svg)"

‎bundles/org.eclipse.ui.ide/.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="src" path="extensions"/>

0 commit comments

Comments
 (0)