Skip to content

Commit db4295a

Browse files
committed
Move bundles to Java 21 - take 4
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 19ffef3 commit db4295a

File tree

93 files changed

+217
-217
lines changed

Some content is hidden

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

93 files changed

+217
-217
lines changed

bundles/org.eclipse.e4.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="output" path="bin"/>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul
1414
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
1515
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
1616
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
17-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
17+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
1818
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
19-
org.eclipse.jdt.core.compiler.compliance=17
19+
org.eclipse.jdt.core.compiler.compliance=21
2020
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
2121
org.eclipse.jdt.core.compiler.debug.localVariable=generate
2222
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -122,7 +122,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
122122
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
123123
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
124124
org.eclipse.jdt.core.compiler.release=enabled
125-
org.eclipse.jdt.core.compiler.source=17
125+
org.eclipse.jdt.core.compiler.source=21
126126
org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
127127
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
128128
org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
22
Automatic-Module-Name: org.eclipse.e4.ui.ide
33
Bundle-ManifestVersion: 2
44
Bundle-SymbolicName: org.eclipse.e4.ui.ide
5-
Bundle-Version: 3.17.300.qualifier
5+
Bundle-Version: 3.18.0.qualifier
66
Bundle-Name: %Bundle-Name
77
Bundle-Vendor: %Bundle-Vendor
8-
Bundle-RequiredExecutionEnvironment: JavaSE-17
8+
Bundle-RequiredExecutionEnvironment: JavaSE-21
99
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)",
1010
org.eclipse.core.resources;bundle-version="[3.7.0,4.0.0)";resolution:=optional,
11-
org.eclipse.swt;bundle-version="[3.107.0,4.0.0)"
11+
org.eclipse.swt;bundle-version="[3.133.0,4.0.0)"
1212
Export-Package: org.eclipse.e4.ui.internal.workspace.markers;x-friends:="org.eclipse.ui.ide"

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
1010
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
1111
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
1212
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
13-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
13+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
1414
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
15-
org.eclipse.jdt.core.compiler.compliance=17
15+
org.eclipse.jdt.core.compiler.compliance=21
1616
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
1717
org.eclipse.jdt.core.compiler.debug.localVariable=generate
1818
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -112,7 +112,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
112112
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
113113
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
114114
org.eclipse.jdt.core.compiler.release=enabled
115-
org.eclipse.jdt.core.compiler.source=17
115+
org.eclipse.jdt.core.compiler.source=21
116116
org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
117117
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
118118
org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-SymbolicName: org.eclipse.e4.ui.progress;singleton:=true
4-
Bundle-Version: 0.4.900.qualifier
4+
Bundle-Version: 0.5.0.qualifier
55
Bundle-Name: %pluginName
66
Bundle-Vendor: %providerName
77
Bundle-Localization: plugin
88
Require-Bundle: org.eclipse.e4.core.di;bundle-version="1.3.0",
99
org.eclipse.e4.ui.di;bundle-version="1.0.0",
10-
org.eclipse.jface;bundle-version="3.10.0",
10+
org.eclipse.jface;bundle-version="3.39.0",
1111
org.eclipse.e4.ui.workbench,
1212
org.eclipse.e4.core.commands,
1313
org.eclipse.e4.core.services,
@@ -18,7 +18,7 @@ Require-Bundle: org.eclipse.e4.core.di;bundle-version="1.3.0",
1818
org.eclipse.e4.ui.services
1919
Import-Package: jakarta.annotation;version="[2.1.0,3.0.0)",
2020
jakarta.inject;version="[2.0.0,3.0.0)"
21-
Bundle-RequiredExecutionEnvironment: JavaSE-17
21+
Bundle-RequiredExecutionEnvironment: JavaSE-21
2222
Bundle-ActivationPolicy: lazy
2323
Export-Package: org.eclipse.e4.ui.progress
2424
Service-Component: OSGI-INF/org.eclipse.e4.ui.progress.internal.ProgressServiceCreationFunction.xml

bundles/org.eclipse.e4.ui.widgets/.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.widgets/.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.e4.ui.widgets/META-INF/MANIFEST.MF

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ Bundle-Name: %pluginName
44
Bundle-Vendor: %providerName
55
Bundle-Localization: plugin
66
Bundle-SymbolicName: org.eclipse.e4.ui.widgets
7-
Bundle-Version: 1.4.300.qualifier
8-
Bundle-RequiredExecutionEnvironment: JavaSE-17
7+
Bundle-Version: 1.5.0.qualifier
8+
Bundle-RequiredExecutionEnvironment: JavaSE-21
99
Export-Package: org.eclipse.e4.ui.widgets;x-friends:="org.eclipse.e4.ui.workbench.swt,org.eclipse.e4.ui.workbench.addons.swt"
10-
Require-Bundle: org.eclipse.swt;bundle-version="[3.6.0,4.0.0)"
10+
Require-Bundle: org.eclipse.swt;bundle-version="[3.133.0,4.0.0)"
1111
Automatic-Module-Name: org.eclipse.e4.ui.widgets

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

0 commit comments

Comments
 (0)