Skip to content

Commit bbf5ffa

Browse files
authored
Merge pull request #74 from scottslewis/master
Updated version numbers for recent contributions
2 parents 6f8639a + 398e127 commit bbf5ffa

File tree

159 files changed

+352
-282
lines changed

Some content is hidden

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

159 files changed

+352
-282
lines changed

applications/kosmos/bundles/org.eclipse.ecf.presence.bot.kosmos/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ bin.includes = META-INF/,\
66
messages.properties,\
77
operators.properties,\
88
plugin.properties
9-
jre.compilation.profile = J2SE-1.4
9+
jre.compilation.profile = JavaSE-11

compendium/bundles/org.eclipse.ecf.osgi.services.distribution/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
33
Bundle-Name: %pluginName
44
Bundle-SymbolicName: org.eclipse.ecf.osgi.services.distribution
55
Automatic-Module-Name: org.eclipse.ecf.osgi.services.distribution
6-
Bundle-Version: 2.1.600.qualifier
6+
Bundle-Version: 2.1.700.qualifier
77
Bundle-Vendor: %pluginProvider
88
Bundle-RequiredExecutionEnvironment: J2SE-1.5
99
Import-Package: org.eclipse.ecf.core.util;version="3.6.0",

compendium/bundles/org.eclipse.ecf.osgi.services.distribution/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ src.includes = about.html
88
javacErrors.. = -assertIdentifier,\
99
-enumIdentifier
1010
source.. = src/
11-
jre.compilation.profile = J2SE-1.5
11+
jre.compilation.profile = JavaSE-11

compendium/bundles/org.eclipse.ecf.osgi.services.distribution/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010
</parent>
1111
<groupId>org.eclipse.ecf</groupId>
1212
<artifactId>org.eclipse.ecf.osgi.services.distribution</artifactId>
13-
<version>2.1.600-SNAPSHOT</version>
13+
<version>2.1.700-SNAPSHOT</version>
1414
<packaging>eclipse-plugin</packaging>
1515
</project>

examples/bundles/org.eclipse.ecf.example.clients/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ src.includes = about.html,\
1010
products/
1111
source.. = src/
1212
output.. = bin/
13-
jre.compilation.profile = J2SE-1.4
13+
jre.compilation.profile = JavaSE-11
1414
javacErrors.. = -assertIdentifier,-enumIdentifier

examples/bundles/org.eclipse.ecf.example.collab.editor/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ src.includes = about.html
66

77
source.. = src/
88
output.. = bin/
9-
jre.compilation.profile = J2SE-1.4
9+
jre.compilation.profile = JavaSE-11
1010
javacErrors.. = -assertIdentifier,-enumIdentifier

examples/bundles/org.eclipse.ecf.example.collab/.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/J2SE-1.4"/>
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
44
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
55
<classpathentry kind="src" path="src"/>
66
<classpathentry kind="output" path="bin"/>

examples/bundles/org.eclipse.ecf.example.collab/.settings/org.eclipse.jdt.core.prefs

Lines changed: 30 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul
1616
org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
1717
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
1818
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
19-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
19+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
2020
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
21-
org.eclipse.jdt.core.compiler.compliance=1.4
21+
org.eclipse.jdt.core.compiler.compliance=11
2222
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
2323
org.eclipse.jdt.core.compiler.debug.localVariable=generate
2424
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -36,6 +36,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
3636
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
3737
org.eclipse.jdt.core.compiler.problem.discouragedReference=error
3838
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
39+
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
3940
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
4041
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
4142
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -89,6 +90,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=igno
8990
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
9091
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
9192
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
93+
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
9294
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
9395
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=ignore
9496
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -127,23 +129,28 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
127129
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
128130
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
129131
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
130-
org.eclipse.jdt.core.compiler.source=1.3
132+
org.eclipse.jdt.core.compiler.release=enabled
133+
org.eclipse.jdt.core.compiler.source=11
131134
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
135+
org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16
132136
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
133137
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
134138
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
135139
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
136140
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
137141
org.eclipse.jdt.core.formatter.alignment_for_assignment=0
138-
org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
142+
org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16
139143
org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
140144
org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
141145
org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
142146
org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
147+
org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16
143148
org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
149+
org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16
144150
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
145151
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
146152
org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
153+
org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16
147154
org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
148155
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
149156
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
@@ -213,11 +220,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
213220
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
214221
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
215222
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
223+
org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert
216224
org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
217225
org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
218226
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
219227
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
220-
org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
228+
org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert
221229
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
222230
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
223231
org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
@@ -247,6 +255,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=inser
247255
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
248256
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
249257
org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
258+
org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert
259+
org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert
250260
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
251261
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
252262
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
@@ -270,12 +280,16 @@ org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
270280
org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
271281
org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
272282
org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
283+
org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert
273284
org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
285+
org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert
286+
org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert
274287
org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
288+
org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert
275289
org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
276290
org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
277291
org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
278-
org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
292+
org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert
279293
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
280294
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
281295
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
@@ -321,6 +335,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do n
321335
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
322336
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
323337
org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
338+
org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert
339+
org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert
324340
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
325341
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
326342
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
@@ -356,8 +372,11 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser
356372
org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
357373
org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
358374
org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
375+
org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert
359376
org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
360377
org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
378+
org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert
379+
org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert
361380
org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
362381
org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
363382
org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
@@ -380,6 +399,10 @@ org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false
380399
org.eclipse.jdt.core.formatter.tabulation.char=tab
381400
org.eclipse.jdt.core.formatter.tabulation.size=4
382401
org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
383-
org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
402+
org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true
403+
org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true
404+
org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true
405+
org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true
406+
org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true
384407
org.eclipse.jdt.core.incompatibleJDKLevel=ignore
385408
org.eclipse.jdt.core.incompleteClasspath=error

examples/bundles/org.eclipse.ecf.example.collab/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-Name: %plugin.name
33
Bundle-SymbolicName: org.eclipse.ecf.example.collab;singleton:=true
44
Automatic-Module-Name: org.eclipse.ecf.example.collab
5-
Bundle-Version: 2.0.202.qualifier
5+
Bundle-Version: 2.1.0.qualifier
66
Bundle-Activator: org.eclipse.ecf.internal.example.collab.ClientPlugin
77
Bundle-Vendor: %plugin.provider
88
Bundle-Localization: plugin
@@ -16,7 +16,7 @@ Export-Package: org.eclipse.ecf.example.collab.share;version="2.0.0",
1616
org.eclipse.ecf.internal.example.collab.ui.hyperlink;x-internal:=true
1717
Eclipse-LazyStart: true
1818
Bundle-ManifestVersion: 2
19-
Bundle-RequiredExecutionEnvironment: J2SE-1.4
19+
Bundle-RequiredExecutionEnvironment: JavaSE-11
2020
Require-Bundle: org.eclipse.core.runtime,
2121
org.eclipse.ui,
2222
org.eclipse.core.resources,

examples/bundles/org.eclipse.ecf.example.collab/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010
</parent>
1111
<groupId>org.eclipse.ecf</groupId>
1212
<artifactId>org.eclipse.ecf.example.collab</artifactId>
13-
<version>2.0.202-SNAPSHOT</version>
13+
<version>2.1.0-SNAPSHOT</version>
1414
<packaging>eclipse-plugin</packaging>
1515
</project>

0 commit comments

Comments
 (0)