Skip to content

Commit ee5feb6

Browse files
ShahzaibIbrahimShahzaibIbrahim
authored
Merge branch 'eclipse-platform:master' into master
2 parents a18d507 + ec85999 commit ee5feb6

File tree

516 files changed

+22753
-11446
lines changed

Some content is hidden

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

516 files changed

+22753
-11446
lines changed

‎.mvn/maven.config‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,2 @@
11
-Pbuild-individual-bundles
2-
--threads
3-
1C
4-
--builder
5-
smart
2+
-Dtycho.target.eager=true

‎Jenkinsfile‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ pipeline {
1919
mvn clean verify --batch-mode --fail-at-end -Dmaven.repo.local=$WORKSPACE/.m2/repository \
2020
-Pbree-libs -Papi-check -Pjavadoc \
2121
-Dcompare-version-with-baselines.skip=false \
22-
-Dmaven.compiler.failOnWarning=true \
22+
-Dmaven.compiler.failOnWarning=false \
2323
-Dorg.slf4j.simpleLogger.showDateTime=true -Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss.SSS \
2424
-DtrimStackTrace=false
2525
"""
@@ -30,7 +30,8 @@ pipeline {
3030
archiveArtifacts artifacts: '.*log,*/target/work/data/.metadata/.*log,*/tests/target/work/data/.metadata/.*log,apiAnalyzer-workspace/.metadata/.*log', allowEmptyArchive: true
3131
junit '**/target/surefire-reports/TEST-*.xml'
3232
discoverGitReferenceBuild referenceJob: 'eclipse.platform/master'
33-
recordIssues publishAllIssues: true, tools: [java(), mavenConsole(), javaDoc()]
33+
recordIssues tools: [eclipse(), javaDoc()], qualityGates: [[threshold: 1, type: 'DELTA', unstable: true]]
34+
recordIssues tool: mavenConsole(), qualityGates: [[threshold: 1, type: 'DELTA_ERROR', unstable: true]]
3435
}
3536
}
3637
}

‎ant/org.eclipse.ant.core/.settings/org.eclipse.jdt.ui.prefs‎

Lines changed: 85 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
5656
formatter_settings_version=12
5757
org.eclipse.jdt.ui.ondemandthreshold=99
5858
org.eclipse.jdt.ui.staticondemandthreshold=99
59+
sp_cleanup.add_all=false
5960
sp_cleanup.add_default_serial_version_id=true
6061
sp_cleanup.add_generated_serial_version_id=false
6162
sp_cleanup.add_missing_annotations=true
@@ -65,39 +66,83 @@ sp_cleanup.add_missing_nls_tags=false
6566
sp_cleanup.add_missing_override_annotations=true
6667
sp_cleanup.add_missing_override_annotations_interface_methods=true
6768
sp_cleanup.add_serial_version_id=false
69+
sp_cleanup.also_simplify_lambda=true
6870
sp_cleanup.always_use_blocks=true
6971
sp_cleanup.always_use_parentheses_in_expressions=false
7072
sp_cleanup.always_use_this_for_non_static_field_access=false
7173
sp_cleanup.always_use_this_for_non_static_method_access=false
72-
sp_cleanup.convert_functional_interfaces=false
73-
sp_cleanup.convert_to_enhanced_for_loop=false
74-
sp_cleanup.convert_to_enhanced_for_loop_if_loop_var_used=false
75-
sp_cleanup.correct_indentation=true
74+
sp_cleanup.array_with_curly=false
75+
sp_cleanup.arrays_fill=false
76+
sp_cleanup.bitwise_conditional_expression=false
77+
sp_cleanup.boolean_literal=false
78+
sp_cleanup.boolean_value_rather_than_comparison=true
79+
sp_cleanup.break_loop=false
80+
sp_cleanup.collection_cloning=false
81+
sp_cleanup.comparing_on_criteria=false
82+
sp_cleanup.comparison_statement=false
83+
sp_cleanup.controlflow_merge=false
84+
sp_cleanup.convert_functional_interfaces=true
85+
sp_cleanup.convert_to_enhanced_for_loop=true
86+
sp_cleanup.convert_to_enhanced_for_loop_if_loop_var_used=true
87+
sp_cleanup.convert_to_switch_expressions=false
88+
sp_cleanup.correct_indentation=false
89+
sp_cleanup.do_while_rather_than_while=false
90+
sp_cleanup.double_negation=false
91+
sp_cleanup.else_if=false
92+
sp_cleanup.embedded_if=false
93+
sp_cleanup.evaluate_nullable=false
94+
sp_cleanup.extract_increment=false
7695
sp_cleanup.format_source_code=true
77-
sp_cleanup.format_source_code_changes_only=false
96+
sp_cleanup.format_source_code_changes_only=true
97+
sp_cleanup.hash=false
98+
sp_cleanup.if_condition=false
7899
sp_cleanup.insert_inferred_type_arguments=false
100+
sp_cleanup.instanceof=false
101+
sp_cleanup.instanceof_keyword=false
102+
sp_cleanup.invert_equals=false
103+
sp_cleanup.join=false
79104
sp_cleanup.lazy_logical_operator=false
80-
sp_cleanup.make_local_variable_final=false
105+
sp_cleanup.make_local_variable_final=true
81106
sp_cleanup.make_parameters_final=false
82107
sp_cleanup.make_private_fields_final=true
83108
sp_cleanup.make_type_abstract_if_missing_method=false
84109
sp_cleanup.make_variable_declarations_final=false
110+
sp_cleanup.map_cloning=false
85111
sp_cleanup.merge_conditional_blocks=false
112+
sp_cleanup.multi_catch=false
86113
sp_cleanup.never_use_blocks=false
87114
sp_cleanup.never_use_parentheses_in_expressions=true
115+
sp_cleanup.no_string_creation=false
116+
sp_cleanup.no_super=false
88117
sp_cleanup.number_suffix=false
118+
sp_cleanup.objects_equals=false
89119
sp_cleanup.on_save_use_additional_actions=true
120+
sp_cleanup.one_if_rather_than_duplicate_blocks_that_fall_through=true
121+
sp_cleanup.operand_factorization=false
90122
sp_cleanup.organize_imports=true
123+
sp_cleanup.overridden_assignment=false
124+
sp_cleanup.overridden_assignment_move_decl=true
125+
sp_cleanup.plain_replacement=false
126+
sp_cleanup.precompile_regex=false
127+
sp_cleanup.primitive_comparison=false
128+
sp_cleanup.primitive_parsing=false
129+
sp_cleanup.primitive_rather_than_wrapper=true
130+
sp_cleanup.primitive_serialization=false
131+
sp_cleanup.pull_out_if_from_if_else=false
132+
sp_cleanup.pull_up_assignment=false
91133
sp_cleanup.push_down_negation=false
92134
sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
93135
sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
94136
sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
95-
sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
137+
sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
96138
sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
139+
sp_cleanup.reduce_indentation=false
140+
sp_cleanup.redundant_comparator=false
141+
sp_cleanup.redundant_falling_through_block_end=false
97142
sp_cleanup.remove_private_constructors=true
98143
sp_cleanup.remove_redundant_modifiers=false
99-
sp_cleanup.remove_redundant_semicolons=false
100-
sp_cleanup.remove_redundant_type_arguments=false
144+
sp_cleanup.remove_redundant_semicolons=true
145+
sp_cleanup.remove_redundant_type_arguments=true
101146
sp_cleanup.remove_trailing_whitespaces=true
102147
sp_cleanup.remove_trailing_whitespaces_all=true
103148
sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -106,23 +151,51 @@ sp_cleanup.remove_unnecessary_casts=true
106151
sp_cleanup.remove_unnecessary_nls_tags=true
107152
sp_cleanup.remove_unused_imports=true
108153
sp_cleanup.remove_unused_local_variables=false
154+
sp_cleanup.remove_unused_method_parameters=false
109155
sp_cleanup.remove_unused_private_fields=true
110-
sp_cleanup.remove_unused_private_members=true
156+
sp_cleanup.remove_unused_private_members=false
111157
sp_cleanup.remove_unused_private_methods=true
112158
sp_cleanup.remove_unused_private_types=true
113-
sp_cleanup.simplify_lambda_expression_and_method_ref=false
159+
sp_cleanup.replace_deprecated_calls=false
160+
sp_cleanup.return_expression=false
161+
sp_cleanup.simplify_lambda_expression_and_method_ref=true
162+
sp_cleanup.single_used_field=false
114163
sp_cleanup.sort_members=false
115164
sp_cleanup.sort_members_all=false
165+
sp_cleanup.standard_comparison=false
166+
sp_cleanup.static_inner_class=false
167+
sp_cleanup.strictly_equal_or_different=false
168+
sp_cleanup.stringbuffer_to_stringbuilder=false
169+
sp_cleanup.stringbuilder=false
170+
sp_cleanup.stringbuilder_for_local_vars=true
171+
sp_cleanup.stringconcat_stringbuffer_stringbuilder=false
172+
sp_cleanup.stringconcat_to_textblock=false
173+
sp_cleanup.substring=false
174+
sp_cleanup.switch=false
175+
sp_cleanup.system_property=false
176+
sp_cleanup.system_property_boolean=false
177+
sp_cleanup.system_property_file_encoding=false
178+
sp_cleanup.system_property_file_separator=false
179+
sp_cleanup.system_property_line_separator=false
180+
sp_cleanup.system_property_path_separator=false
181+
sp_cleanup.ternary_operator=false
182+
sp_cleanup.try_with_resource=false
183+
sp_cleanup.unlooped_while=false
184+
sp_cleanup.unreachable_block=false
116185
sp_cleanup.use_anonymous_class_creation=false
117186
sp_cleanup.use_autoboxing=false
118187
sp_cleanup.use_blocks=false
119188
sp_cleanup.use_blocks_only_for_return_and_throw=false
120189
sp_cleanup.use_directly_map_method=false
121-
sp_cleanup.use_lambda=false
190+
sp_cleanup.use_lambda=true
122191
sp_cleanup.use_parentheses_in_expressions=false
192+
sp_cleanup.use_string_is_blank=false
123193
sp_cleanup.use_this_for_non_static_field_access=false
124194
sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
125195
sp_cleanup.use_this_for_non_static_method_access=false
126196
sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
127197
sp_cleanup.use_unboxing=false
128198
sp_cleanup.use_var=false
199+
sp_cleanup.useless_continue=false
200+
sp_cleanup.useless_return=false
201+
sp_cleanup.valueof_rather_than_instantiation=false

‎ant/org.eclipse.ant.core/forceQualifierUpdate.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ Bug 403352 - Update all parent versions to match our build stream
33
Bug 465126 - Comparator errors related to Eclipse-SourceBundle
44
Bug 534597 - Unanticipated comparator errors in I20180511-2000
55
https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1184
6+
https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1659

‎ant/org.eclipse.ant.launching/.settings/org.eclipse.jdt.ui.prefs‎

Lines changed: 84 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
5656
formatter_settings_version=12
5757
org.eclipse.jdt.ui.ondemandthreshold=99
5858
org.eclipse.jdt.ui.staticondemandthreshold=99
59+
sp_cleanup.add_all=false
5960
sp_cleanup.add_default_serial_version_id=true
6061
sp_cleanup.add_generated_serial_version_id=false
6162
sp_cleanup.add_missing_annotations=true
@@ -65,39 +66,83 @@ sp_cleanup.add_missing_nls_tags=false
6566
sp_cleanup.add_missing_override_annotations=true
6667
sp_cleanup.add_missing_override_annotations_interface_methods=true
6768
sp_cleanup.add_serial_version_id=false
69+
sp_cleanup.also_simplify_lambda=true
6870
sp_cleanup.always_use_blocks=true
6971
sp_cleanup.always_use_parentheses_in_expressions=false
7072
sp_cleanup.always_use_this_for_non_static_field_access=false
7173
sp_cleanup.always_use_this_for_non_static_method_access=false
72-
sp_cleanup.convert_functional_interfaces=false
73-
sp_cleanup.convert_to_enhanced_for_loop=false
74-
sp_cleanup.convert_to_enhanced_for_loop_if_loop_var_used=false
75-
sp_cleanup.correct_indentation=true
74+
sp_cleanup.array_with_curly=false
75+
sp_cleanup.arrays_fill=false
76+
sp_cleanup.bitwise_conditional_expression=false
77+
sp_cleanup.boolean_literal=false
78+
sp_cleanup.boolean_value_rather_than_comparison=true
79+
sp_cleanup.break_loop=false
80+
sp_cleanup.collection_cloning=false
81+
sp_cleanup.comparing_on_criteria=false
82+
sp_cleanup.comparison_statement=false
83+
sp_cleanup.controlflow_merge=false
84+
sp_cleanup.convert_functional_interfaces=true
85+
sp_cleanup.convert_to_enhanced_for_loop=true
86+
sp_cleanup.convert_to_enhanced_for_loop_if_loop_var_used=true
87+
sp_cleanup.convert_to_switch_expressions=false
88+
sp_cleanup.correct_indentation=false
89+
sp_cleanup.do_while_rather_than_while=false
90+
sp_cleanup.double_negation=false
91+
sp_cleanup.else_if=false
92+
sp_cleanup.embedded_if=false
93+
sp_cleanup.evaluate_nullable=false
94+
sp_cleanup.extract_increment=false
7695
sp_cleanup.format_source_code=true
7796
sp_cleanup.format_source_code_changes_only=true
97+
sp_cleanup.hash=false
98+
sp_cleanup.if_condition=false
7899
sp_cleanup.insert_inferred_type_arguments=false
100+
sp_cleanup.instanceof=false
101+
sp_cleanup.instanceof_keyword=false
102+
sp_cleanup.invert_equals=false
103+
sp_cleanup.join=false
79104
sp_cleanup.lazy_logical_operator=false
80-
sp_cleanup.make_local_variable_final=false
105+
sp_cleanup.make_local_variable_final=true
81106
sp_cleanup.make_parameters_final=false
82107
sp_cleanup.make_private_fields_final=true
83108
sp_cleanup.make_type_abstract_if_missing_method=false
84109
sp_cleanup.make_variable_declarations_final=false
110+
sp_cleanup.map_cloning=false
85111
sp_cleanup.merge_conditional_blocks=false
112+
sp_cleanup.multi_catch=false
86113
sp_cleanup.never_use_blocks=false
87114
sp_cleanup.never_use_parentheses_in_expressions=true
115+
sp_cleanup.no_string_creation=false
116+
sp_cleanup.no_super=false
88117
sp_cleanup.number_suffix=false
118+
sp_cleanup.objects_equals=false
89119
sp_cleanup.on_save_use_additional_actions=true
120+
sp_cleanup.one_if_rather_than_duplicate_blocks_that_fall_through=true
121+
sp_cleanup.operand_factorization=false
90122
sp_cleanup.organize_imports=true
123+
sp_cleanup.overridden_assignment=false
124+
sp_cleanup.overridden_assignment_move_decl=true
125+
sp_cleanup.plain_replacement=false
126+
sp_cleanup.precompile_regex=false
127+
sp_cleanup.primitive_comparison=false
128+
sp_cleanup.primitive_parsing=false
129+
sp_cleanup.primitive_rather_than_wrapper=true
130+
sp_cleanup.primitive_serialization=false
131+
sp_cleanup.pull_out_if_from_if_else=false
132+
sp_cleanup.pull_up_assignment=false
91133
sp_cleanup.push_down_negation=false
92134
sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
93135
sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
94136
sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
95-
sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
137+
sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
96138
sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
139+
sp_cleanup.reduce_indentation=false
140+
sp_cleanup.redundant_comparator=false
141+
sp_cleanup.redundant_falling_through_block_end=false
97142
sp_cleanup.remove_private_constructors=true
98143
sp_cleanup.remove_redundant_modifiers=false
99-
sp_cleanup.remove_redundant_semicolons=false
100-
sp_cleanup.remove_redundant_type_arguments=false
144+
sp_cleanup.remove_redundant_semicolons=true
145+
sp_cleanup.remove_redundant_type_arguments=true
101146
sp_cleanup.remove_trailing_whitespaces=true
102147
sp_cleanup.remove_trailing_whitespaces_all=true
103148
sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -106,23 +151,51 @@ sp_cleanup.remove_unnecessary_casts=true
106151
sp_cleanup.remove_unnecessary_nls_tags=true
107152
sp_cleanup.remove_unused_imports=true
108153
sp_cleanup.remove_unused_local_variables=false
154+
sp_cleanup.remove_unused_method_parameters=false
109155
sp_cleanup.remove_unused_private_fields=true
110-
sp_cleanup.remove_unused_private_members=true
156+
sp_cleanup.remove_unused_private_members=false
111157
sp_cleanup.remove_unused_private_methods=true
112158
sp_cleanup.remove_unused_private_types=true
113-
sp_cleanup.simplify_lambda_expression_and_method_ref=false
159+
sp_cleanup.replace_deprecated_calls=false
160+
sp_cleanup.return_expression=false
161+
sp_cleanup.simplify_lambda_expression_and_method_ref=true
162+
sp_cleanup.single_used_field=false
114163
sp_cleanup.sort_members=false
115164
sp_cleanup.sort_members_all=false
165+
sp_cleanup.standard_comparison=false
166+
sp_cleanup.static_inner_class=false
167+
sp_cleanup.strictly_equal_or_different=false
168+
sp_cleanup.stringbuffer_to_stringbuilder=false
169+
sp_cleanup.stringbuilder=false
170+
sp_cleanup.stringbuilder_for_local_vars=true
171+
sp_cleanup.stringconcat_stringbuffer_stringbuilder=false
172+
sp_cleanup.stringconcat_to_textblock=false
173+
sp_cleanup.substring=false
174+
sp_cleanup.switch=false
175+
sp_cleanup.system_property=false
176+
sp_cleanup.system_property_boolean=false
177+
sp_cleanup.system_property_file_encoding=false
178+
sp_cleanup.system_property_file_separator=false
179+
sp_cleanup.system_property_line_separator=false
180+
sp_cleanup.system_property_path_separator=false
181+
sp_cleanup.ternary_operator=false
182+
sp_cleanup.try_with_resource=false
183+
sp_cleanup.unlooped_while=false
184+
sp_cleanup.unreachable_block=false
116185
sp_cleanup.use_anonymous_class_creation=false
117186
sp_cleanup.use_autoboxing=false
118187
sp_cleanup.use_blocks=false
119188
sp_cleanup.use_blocks_only_for_return_and_throw=false
120189
sp_cleanup.use_directly_map_method=false
121-
sp_cleanup.use_lambda=false
190+
sp_cleanup.use_lambda=true
122191
sp_cleanup.use_parentheses_in_expressions=false
192+
sp_cleanup.use_string_is_blank=false
123193
sp_cleanup.use_this_for_non_static_field_access=false
124194
sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
125195
sp_cleanup.use_this_for_non_static_method_access=false
126196
sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
127197
sp_cleanup.use_unboxing=false
128198
sp_cleanup.use_var=false
199+
sp_cleanup.useless_continue=false
200+
sp_cleanup.useless_return=false
201+
sp_cleanup.valueof_rather_than_instantiation=false

‎ant/org.eclipse.ant.launching/forceQualifierUpdate.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ Bug 403352 - Update all parent versions to match our build stream
33
Bug 465126 - Comparator errors related to Eclipse-SourceBundle
44
Bug 480835 - Failures in build due to changes not being picked up by tests
55
https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1184
6+
https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1659

0 commit comments

Comments
 (0)