Bug 574337 - Move bundles to Java 11 where needed Handle o.e.core.runtime and fix api_filters to no longer complain about chnages in reexported bundles. Change-Id: I9ec5338e065e87e5692fdf205fbf04f8cae40384 Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.runtime/+/182262 Tested-by: Platform Bot <platform-bot@eclipse.org> Reviewed-by: Alexander Kurtakov <akurtako@redhat.com>
diff --git a/bundles/org.eclipse.core.runtime/.classpath b/bundles/org.eclipse.core.runtime/.classpath index eca7bdb..e801ebf 100644 --- a/bundles/org.eclipse.core.runtime/.classpath +++ b/bundles/org.eclipse.core.runtime/.classpath
@@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/>
diff --git a/bundles/org.eclipse.core.runtime/.settings/.api_filters b/bundles/org.eclipse.core.runtime/.settings/.api_filters index bbc0a47..71d3a46 100644 --- a/bundles/org.eclipse.core.runtime/.settings/.api_filters +++ b/bundles/org.eclipse.core.runtime/.settings/.api_filters
@@ -1,50 +1,106 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <component id="org.eclipse.core.runtime" version="2"> - <resource path="META-INF/MANIFEST.MF"> - <filter comment="Bug 572013-Planned deletion-we-increase the minor version" id="932184123"> + <resource path="META-INF/MANIFEST.MF" type="org.eclipse.equinox.region.Region"> + <filter comment="No need for major bump for changes in reexported" id="305422471"> <message_arguments> - <message_argument value="3.22.0"/> - <message_argument value="3.20.100"/> - </message_arguments> - </filter> - </resource> - <resource path="META-INF/MANIFEST.MF" type="org.eclipse.core.runtime.ILibrary"> - <filter comment="Bug 572013-Planned deletion" id="305324134"> - <message_arguments> - <message_argument value="org.eclipse.core.runtime.ILibrary"/> + <message_argument value="org.eclipse.equinox.region.Region"/> <message_argument value="org.eclipse.core.runtime_3.22.0"/> </message_arguments> </filter> </resource> - <resource path="META-INF/MANIFEST.MF" type="org.eclipse.core.runtime.IPlatformRunnable"> - <filter comment="Bug 572013-Planned deletion" id="305324134"> + <resource path="META-INF/MANIFEST.MF" type="org.eclipse.equinox.region.RegionDigraph"> + <filter comment="No need for major bump for changes in reexported" id="305422471"> <message_arguments> - <message_argument value="org.eclipse.core.runtime.IPlatformRunnable"/> + <message_argument value="org.eclipse.equinox.region.RegionDigraph"/> <message_argument value="org.eclipse.core.runtime_3.22.0"/> </message_arguments> </filter> </resource> - <resource path="META-INF/MANIFEST.MF" type="org.eclipse.core.runtime.IPluginPrerequisite"> - <filter comment="Bug 572013-Planned deletion" id="305324134"> + <resource path="META-INF/MANIFEST.MF" type="org.eclipse.equinox.region.RegionDigraphPersistence"> + <filter comment="No need for major bump for changes in reexported" id="305422471"> <message_arguments> - <message_argument value="org.eclipse.core.runtime.IPluginPrerequisite"/> + <message_argument value="org.eclipse.equinox.region.RegionDigraphPersistence"/> <message_argument value="org.eclipse.core.runtime_3.22.0"/> </message_arguments> </filter> </resource> - <resource path="META-INF/MANIFEST.MF" type="org.eclipse.core.runtime.IPluginRegistry"> - <filter comment="Bug 572013-Planned deletion" id="305324134"> + <resource path="META-INF/MANIFEST.MF" type="org.eclipse.equinox.region.RegionDigraphVisitor"> + <filter comment="No need for major bump for changes in reexported" id="305422471"> <message_arguments> - <message_argument value="org.eclipse.core.runtime.IPluginRegistry"/> + <message_argument value="org.eclipse.equinox.region.RegionDigraphVisitor"/> <message_argument value="org.eclipse.core.runtime_3.22.0"/> </message_arguments> </filter> </resource> - <resource path="src/org/eclipse/core/runtime/Platform.java" type="org.eclipse.core.runtime.Platform"> - <filter comment="Planned deletion" id="338792546"> + <resource path="META-INF/MANIFEST.MF" type="org.eclipse.equinox.region.RegionFilter"> + <filter comment="No need for major bump for changes in reexported" id="305422471"> <message_arguments> - <message_argument value="org.eclipse.core.runtime.Platform"/> - <message_argument value="getPluginRegistry()"/> + <message_argument value="org.eclipse.equinox.region.RegionFilter"/> + <message_argument value="org.eclipse.core.runtime_3.22.0"/> + </message_arguments> + </filter> + </resource> + <resource path="META-INF/MANIFEST.MF" type="org.eclipse.equinox.region.RegionFilterBuilder"> + <filter comment="No need for major bump for changes in reexported" id="305422471"> + <message_arguments> + <message_argument value="org.eclipse.equinox.region.RegionFilterBuilder"/> + <message_argument value="org.eclipse.core.runtime_3.22.0"/> + </message_arguments> + </filter> + </resource> + <resource path="META-INF/MANIFEST.MF" type="org.eclipse.equinox.service.weaving.CacheEntry"> + <filter comment="No need for major bump for changes in reexported" id="305422471"> + <message_arguments> + <message_argument value="org.eclipse.equinox.service.weaving.CacheEntry"/> + <message_argument value="org.eclipse.core.runtime_3.22.0"/> + </message_arguments> + </filter> + </resource> + <resource path="META-INF/MANIFEST.MF" type="org.eclipse.equinox.service.weaving.ICachingService"> + <filter comment="No need for major bump for changes in reexported" id="305422471"> + <message_arguments> + <message_argument value="org.eclipse.equinox.service.weaving.ICachingService"/> + <message_argument value="org.eclipse.core.runtime_3.22.0"/> + </message_arguments> + </filter> + </resource> + <resource path="META-INF/MANIFEST.MF" type="org.eclipse.equinox.service.weaving.ICachingServiceFactory"> + <filter comment="No need for major bump for changes in reexported" id="305422471"> + <message_arguments> + <message_argument value="org.eclipse.equinox.service.weaving.ICachingServiceFactory"/> + <message_argument value="org.eclipse.core.runtime_3.22.0"/> + </message_arguments> + </filter> + </resource> + <resource path="META-INF/MANIFEST.MF" type="org.eclipse.equinox.service.weaving.ISupplementerRegistry"> + <filter comment="No need for major bump for changes in reexported" id="305422471"> + <message_arguments> + <message_argument value="org.eclipse.equinox.service.weaving.ISupplementerRegistry"/> + <message_argument value="org.eclipse.core.runtime_3.22.0"/> + </message_arguments> + </filter> + </resource> + <resource path="META-INF/MANIFEST.MF" type="org.eclipse.equinox.service.weaving.IWeavingService"> + <filter comment="No need for major bump for changes in reexported" id="305422471"> + <message_arguments> + <message_argument value="org.eclipse.equinox.service.weaving.IWeavingService"/> + <message_argument value="org.eclipse.core.runtime_3.22.0"/> + </message_arguments> + </filter> + </resource> + <resource path="META-INF/MANIFEST.MF" type="org.eclipse.equinox.service.weaving.IWeavingServiceFactory"> + <filter comment="No need for major bump for changes in reexported" id="305422471"> + <message_arguments> + <message_argument value="org.eclipse.equinox.service.weaving.IWeavingServiceFactory"/> + <message_argument value="org.eclipse.core.runtime_3.22.0"/> + </message_arguments> + </filter> + </resource> + <resource path="META-INF/MANIFEST.MF" type="org.eclipse.equinox.service.weaving.Supplementer"> + <filter comment="No need for major bump for changes in reexported" id="305422471"> + <message_arguments> + <message_argument value="org.eclipse.equinox.service.weaving.Supplementer"/> + <message_argument value="org.eclipse.core.runtime_3.22.0"/> </message_arguments> </filter> </resource>
diff --git a/bundles/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs index 68d5a2d..6f612b5 100644 --- a/bundles/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs
@@ -19,9 +19,9 @@ org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -38,6 +38,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled org.eclipse.jdt.core.compiler.problem.discouragedReference=error org.eclipse.jdt.core.compiler.problem.emptyStatement=warning +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore @@ -96,6 +97,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled @@ -132,10 +134,11 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 @@ -143,20 +146,23 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=16 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0 +org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 org.eclipse.jdt.core.formatter.alignment_for_module_statements=16 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 @@ -248,11 +254,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert @@ -283,6 +290,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert @@ -307,13 +316,17 @@ org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert +org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert @@ -361,6 +374,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert @@ -397,9 +412,12 @@ org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert @@ -435,10 +453,14 @@ org.eclipse.jdt.core.formatter.tabulation.size=4 org.eclipse.jdt.core.formatter.use_on_off_tags=false org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false +org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true +org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true +org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true +org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true org.eclipse.jdt.core.incompatibleJDKLevel=ignore org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/bundles/org.eclipse.core.runtime/META-INF/MANIFEST.MF b/bundles/org.eclipse.core.runtime/META-INF/MANIFEST.MF index ee77f45..885cb9e 100644 --- a/bundles/org.eclipse.core.runtime/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.core.runtime/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName -Bundle-Version: 3.22.0.qualifier +Bundle-Version: 3.23.0.qualifier Bundle-SymbolicName: org.eclipse.core.runtime; singleton:=true Bundle-Vendor: %providerName Bundle-Activator: org.eclipse.core.internal.runtime.PlatformActivator @@ -17,6 +17,6 @@ org.eclipse.core.contenttype;bundle-version="[3.7.0,4.0.0)";visibility:=reexport, org.eclipse.equinox.app;bundle-version="1.3.0";visibility:=reexport Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 DynamicImport-Package: org.eclipse.core.internal.runtime.auth Automatic-Module-Name: org.eclipse.core.runtime
diff --git a/bundles/org.eclipse.core.runtime/pom.xml b/bundles/org.eclipse.core.runtime/pom.xml index efd8f21..929847e 100644 --- a/bundles/org.eclipse.core.runtime/pom.xml +++ b/bundles/org.eclipse.core.runtime/pom.xml
@@ -19,6 +19,6 @@ </parent> <groupId>org.eclipse.core</groupId> <artifactId>org.eclipse.core.runtime</artifactId> - <version>3.22.0-SNAPSHOT</version> + <version>3.23.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>