From 491892afe33ef74a0dbb8a278cbd57f2d8c6cce2 Mon Sep 17 00:00:00 2001 From: Scott Lewis Date: Sat, 21 Oct 2023 13:15:00 -0700 Subject: [PATCH 01/17] Updated version numbers for recent contributions --- .../org.eclipse.ecf.example.collab/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 37 +++++++-- .../META-INF/MANIFEST.MF | 4 +- .../org.eclipse.ecf.example.collab/pom.xml | 2 +- .../collab/share/GenericSharedObject.java | 81 ++++++------------- .../org.eclipse.ecf.provider/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 10 ++- .../META-INF/MANIFEST.MF | 4 +- .../bundles/org.eclipse.ecf.provider/pom.xml | 2 +- .../.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 42 +++++++--- .../META-INF/MANIFEST.MF | 2 +- .../pom.xml | 2 +- .../ch.ethz.iks.r_osgi.remote/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 8 +- .../META-INF/MANIFEST.MF | 4 +- .../bundles/ch.ethz.iks.r_osgi.remote/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../pom.xml | 2 +- .../META-INF/MANIFEST.MF | 4 +- .../bundles/org.jivesoftware.smack/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../pom.xml | 2 +- .../.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 14 ++-- .../META-INF/MANIFEST.MF | 5 +- .../org.eclipse.ecf.provider.irc.ui/pom.xml | 2 +- .../org.eclipse.ecf.provider.jmdns/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 38 +++++++-- .../META-INF/MANIFEST.MF | 5 +- .../org.eclipse.ecf.provider.jmdns/pom.xml | 2 +- .../internal/provider/jmdns/JMDNSPlugin.java | 4 +- .../org.eclipse.ecf.server.generic/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 38 +++++++-- .../META-INF/MANIFEST.MF | 4 +- .../org.eclipse.ecf.server.generic/pom.xml | 2 +- 36 files changed, 202 insertions(+), 140 deletions(-) diff --git a/examples/bundles/org.eclipse.ecf.example.collab/.classpath b/examples/bundles/org.eclipse.ecf.example.collab/.classpath index 2fbb7a23e1..e801ebfb46 100644 --- a/examples/bundles/org.eclipse.ecf.example.collab/.classpath +++ b/examples/bundles/org.eclipse.ecf.example.collab/.classpath @@ -1,6 +1,6 @@ - + diff --git a/examples/bundles/org.eclipse.ecf.example.collab/.settings/org.eclipse.jdt.core.prefs b/examples/bundles/org.eclipse.ecf.example.collab/.settings/org.eclipse.jdt.core.prefs index 793ce3562b..7b0fca11d7 100644 --- a/examples/bundles/org.eclipse.ecf.example.collab/.settings/org.eclipse.jdt.core.prefs +++ b/examples/bundles/org.eclipse.ecf.example.collab/.settings/org.eclipse.jdt.core.prefs @@ -16,9 +16,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul org.eclipse.jdt.core.compiler.annotation.nullable.secondary= org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.4 +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 @@ -36,6 +36,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled 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 @@ -89,6 +90,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=igno 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=ignore org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled @@ -127,23 +129,28 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error 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.source=1.3 +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 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_enum_constant=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 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=0 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_logical_operator=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_parameters_in_constructor_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 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 @@ -213,11 +220,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert 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=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 @@ -247,6 +255,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=inser org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert 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_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 @@ -270,12 +280,16 @@ org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert 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_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 @@ -321,6 +335,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do n org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert 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_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 @@ -356,8 +372,11 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser 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_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 @@ -380,6 +399,10 @@ org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false org.eclipse.jdt.core.formatter.tabulation.char=tab org.eclipse.jdt.core.formatter.tabulation.size=4 org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true +org.eclipse.jdt.core.formatter.wrap_before_bitwise_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_string_concatenation=true org.eclipse.jdt.core.incompatibleJDKLevel=ignore org.eclipse.jdt.core.incompleteClasspath=error diff --git a/examples/bundles/org.eclipse.ecf.example.collab/META-INF/MANIFEST.MF b/examples/bundles/org.eclipse.ecf.example.collab/META-INF/MANIFEST.MF index 9f5c7c75f6..6ebf04ea27 100644 --- a/examples/bundles/org.eclipse.ecf.example.collab/META-INF/MANIFEST.MF +++ b/examples/bundles/org.eclipse.ecf.example.collab/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-Name: %plugin.name Bundle-SymbolicName: org.eclipse.ecf.example.collab;singleton:=true Automatic-Module-Name: org.eclipse.ecf.example.collab -Bundle-Version: 2.0.202.qualifier +Bundle-Version: 2.1.0.qualifier Bundle-Activator: org.eclipse.ecf.internal.example.collab.ClientPlugin Bundle-Vendor: %plugin.provider Bundle-Localization: plugin @@ -16,7 +16,7 @@ Export-Package: org.eclipse.ecf.example.collab.share;version="2.0.0", org.eclipse.ecf.internal.example.collab.ui.hyperlink;x-internal:=true Eclipse-LazyStart: true Bundle-ManifestVersion: 2 -Bundle-RequiredExecutionEnvironment: J2SE-1.4 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.eclipse.core.runtime, org.eclipse.ui, org.eclipse.core.resources, diff --git a/examples/bundles/org.eclipse.ecf.example.collab/pom.xml b/examples/bundles/org.eclipse.ecf.example.collab/pom.xml index 66312e0842..69e66a4e4a 100644 --- a/examples/bundles/org.eclipse.ecf.example.collab/pom.xml +++ b/examples/bundles/org.eclipse.ecf.example.collab/pom.xml @@ -10,6 +10,6 @@ org.eclipse.ecf org.eclipse.ecf.example.collab - 2.0.202-SNAPSHOT + 2.1.0-SNAPSHOT eclipse-plugin diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/GenericSharedObject.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/GenericSharedObject.java index 2a2d761d63..ba5d02ae2b 100644 --- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/GenericSharedObject.java +++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/GenericSharedObject.java @@ -17,24 +17,13 @@ import java.io.Serializable; import java.security.SecureRandom; import java.util.Hashtable; -import java.util.Random; - import org.eclipse.core.runtime.Assert; import org.eclipse.ecf.core.events.IContainerConnectedEvent; import org.eclipse.ecf.core.events.IContainerDisconnectedEvent; import org.eclipse.ecf.core.identity.ID; import org.eclipse.ecf.core.identity.IDFactory; -import org.eclipse.ecf.core.sharedobject.ISharedObject; -import org.eclipse.ecf.core.sharedobject.ISharedObjectConfig; -import org.eclipse.ecf.core.sharedobject.ISharedObjectContainerTransaction; -import org.eclipse.ecf.core.sharedobject.ISharedObjectContext; -import org.eclipse.ecf.core.sharedobject.ReplicaSharedObjectDescription; -import org.eclipse.ecf.core.sharedobject.SharedObjectInitException; -import org.eclipse.ecf.core.sharedobject.events.ISharedObjectActivatedEvent; -import org.eclipse.ecf.core.sharedobject.events.ISharedObjectCreateResponseEvent; -import org.eclipse.ecf.core.sharedobject.events.ISharedObjectDeactivatedEvent; -import org.eclipse.ecf.core.sharedobject.events.ISharedObjectMessageEvent; -import org.eclipse.ecf.core.sharedobject.events.RemoteSharedObjectEvent; +import org.eclipse.ecf.core.sharedobject.*; +import org.eclipse.ecf.core.sharedobject.events.*; import org.eclipse.ecf.core.sharedobject.util.IQueueEnqueue; import org.eclipse.ecf.core.sharedobject.util.QueueException; import org.eclipse.ecf.core.util.Event; @@ -96,8 +85,7 @@ public void destroySelf() { } public void destroySelfLocal() { - getContext().getSharedObjectManager().removeSharedObject( - getConfig().getSharedObjectID()); + getContext().getSharedObjectManager().removeSharedObject(getConfig().getSharedObjectID()); } /* @@ -112,8 +100,7 @@ protected void execMsg(ID fromID, SharedObjectMsg msg) { try { MsgMap m = null; synchronized (msgMapLock) { - m = (MsgMap) ((msgMap == null) ? null : (msgMap.get(msg - .getMethodName()))); + m = (MsgMap) ((msgMap == null) ? null : (msgMap.get(msg.getMethodName()))); } Object o = this; String methName = null; @@ -126,8 +113,7 @@ protected void execMsg(ID fromID, SharedObjectMsg msg) { } } if (methName != null) { - msg = SharedObjectMsg.createMsg(msg.getClassName(), methName, - msg.getArgs()); + msg = SharedObjectMsg.createMsg(msg.getClassName(), methName, msg.getArgs()); } if (currentMsgFromObjID == null) currentMsgFromObjID = getID(); @@ -142,9 +128,9 @@ protected void execMsg(ID fromID, SharedObjectMsg msg) { } } - protected void execMsgInvoke(SharedObjectMsg msg, ID fromID, Object o) - throws Exception { - if (msg == null || fromID == null || o == null) return; + protected void execMsgInvoke(SharedObjectMsg msg, ID fromID, Object o) throws Exception { + if (msg == null || fromID == null || o == null) + return; try { msg.invoke(o); } catch (NoSuchMethodException e) { @@ -156,10 +142,8 @@ protected void forwardMsgHome(SharedObjectMsg msg) throws IOException { forwardMsgTo(config.getHomeContainerID(), msg); } - protected void forwardMsgTo(ID toID, SharedObjectMsg msg) - throws IOException { - getContext().sendMessage(toID, - new RemoteSharedObjectMsgEvent(getID(), toID, msg)); + protected void forwardMsgTo(ID toID, SharedObjectMsg msg) throws IOException { + getContext().sendMessage(toID, new RemoteSharedObjectMsgEvent(getID(), toID, msg)); } /* @@ -168,8 +152,7 @@ protected void forwardMsgTo(ID toID, SharedObjectMsg msg) * @see org.eclipse.ecf.core.ISharedObject#getAdapter(java.lang.Class) */ public Object getAdapter(Class clazz) { - if (clazz.equals(ISharedObjectContainerTransaction.class) - && (this instanceof ISharedObjectContainerTransaction)) { + if (clazz.equals(ISharedObjectContainerTransaction.class) && (this instanceof ISharedObjectContainerTransaction)) { return this; } return null; @@ -192,9 +175,7 @@ public ID getID() { } protected ReplicaSharedObjectDescription getReplicaDescription(ID receiver) { - return new ReplicaSharedObjectDescription(getClass(), getID(), - getHomeContainerID(), getConfig().getProperties(), - getNextReplicateID()); + return new ReplicaSharedObjectDescription(getClass(), getID(), getHomeContainerID(), getConfig().getProperties(), getNextReplicateID()); } protected void handleCreateResponse(ID fromID, Throwable t, Long identifier) { @@ -212,8 +193,7 @@ public void handleEvent(Event event) { if (myID == null) return; if (myID.equals(ae.getActivatedID())) { - activated(getContext().getSharedObjectManager() - .getSharedObjectIDs()); + activated(getContext().getSharedObjectManager().getSharedObjectIDs()); } else { otherActivated(ae.getActivatedID()); } @@ -236,16 +216,14 @@ public void handleEvent(Event event) { } } - protected void handleSharedObjectMessageEvent( - ISharedObjectMessageEvent event) { + protected void handleSharedObjectMessageEvent(ISharedObjectMessageEvent event) { if (event instanceof RemoteSharedObjectEvent) { if (event instanceof ISharedObjectCreateResponseEvent) { handleCreateResponseMessageEvent((ISharedObjectCreateResponseEvent) event); } else if (event instanceof RemoteSharedObjectMsgEvent) { handleSelfSendMessageEvent((RemoteSharedObjectMsgEvent) event); } else { - RemoteSharedObjectMsgEvent me = (RemoteSharedObjectMsgEvent) event - .getData(); + RemoteSharedObjectMsgEvent me = (RemoteSharedObjectMsgEvent) event.getData(); SharedObjectMsg msg = me.getMsg(); execMsg(me.getRemoteContainerID(), msg); } @@ -256,10 +234,8 @@ protected void handleSelfSendMessageEvent(RemoteSharedObjectMsgEvent event) { execMsg(event.getRemoteContainerID(), event.getMsg()); } - protected void handleCreateResponseMessageEvent( - ISharedObjectCreateResponseEvent event) { - handleCreateResponse(event.getRemoteContainerID(), - event.getException(), new Long(event.getSequence())); + protected void handleCreateResponseMessageEvent(ISharedObjectCreateResponseEvent event) { + handleCreateResponse(event.getRemoteContainerID(), event.getException(), new Long(event.getSequence())); } /* @@ -295,8 +271,7 @@ protected void ignoreSharedObjectMsg(ID fromID, SharedObjectMsg aMsg) { * * @see org.eclipse.ecf.core.ISharedObject#init(org.eclipse.ecf.core.ISharedObjectConfig) */ - public void init(ISharedObjectConfig initData) - throws SharedObjectInitException { + public void init(ISharedObjectConfig initData) throws SharedObjectInitException { this.config = initData; this.localContainerID = getContext().getLocalContainerID(); } @@ -352,9 +327,8 @@ protected void registerProxy(Object target, String msg, String method) { if (msgMap == null) msgMap = new Hashtable(); else if (msgMap.containsKey(msg)) - throw new IllegalArgumentException( - "registerProxy: proxy already registered for " //$NON-NLS-1$ - + method + " by " + target); //$NON-NLS-1$ + throw new IllegalArgumentException("registerProxy: proxy already registered for " //$NON-NLS-1$ + + method + " by " + target); //$NON-NLS-1$ // Then put entry into table with msg as key msgMap.put(msg, new MsgMap(target, method)); } @@ -381,8 +355,7 @@ protected void replicate(ID remote) { protected void sendSelf(SharedObjectMsg msg) { IQueueEnqueue queue = getContext().getQueue(); try { - queue.enqueue(new RemoteSharedObjectMsgEvent(getID(), getContext() - .getLocalContainerID(), msg)); + queue.enqueue(new RemoteSharedObjectMsgEvent(getID(), getContext().getLocalContainerID(), msg)); } catch (QueueException e) { log("QueueException enqueing message to self", e); //$NON-NLS-1$ } @@ -405,23 +378,19 @@ protected void log(String msg, Throwable t) { ClientPlugin.log(msg, t); } - public ID createObject(ID target, ReplicaSharedObjectDescription desc) - throws Exception { + public ID createObject(ID target, ReplicaSharedObjectDescription desc) throws Exception { if (target == null) { if (desc.getID() == null) { - desc.setID(IDFactory.getDefault().createStringID( - getUniqueString())); + desc.setID(IDFactory.getDefault().createStringID(getUniqueString())); } try { - return getContext().getSharedObjectManager() - .createSharedObject(desc); + return getContext().getSharedObjectManager().createSharedObject(desc); } catch (Exception e) { log("Exception creating replicated object", e); //$NON-NLS-1$ throw e; } } else - throw new Exception( - "Cannot send object creation request direct to target"); //$NON-NLS-1$ + throw new Exception("Cannot send object creation request direct to target"); //$NON-NLS-1$ } public String getUniqueString() { diff --git a/framework/bundles/org.eclipse.ecf.provider/.classpath b/framework/bundles/org.eclipse.ecf.provider/.classpath index eca7bdba8f..e801ebfb46 100644 --- a/framework/bundles/org.eclipse.ecf.provider/.classpath +++ b/framework/bundles/org.eclipse.ecf.provider/.classpath @@ -1,6 +1,6 @@ - + diff --git a/framework/bundles/org.eclipse.ecf.provider/.settings/org.eclipse.jdt.core.prefs b/framework/bundles/org.eclipse.ecf.provider/.settings/org.eclipse.jdt.core.prefs index 6781fd970f..8689ba769a 100644 --- a/framework/bundles/org.eclipse.ecf.provider/.settings/org.eclipse.jdt.core.prefs +++ b/framework/bundles/org.eclipse.ecf.provider/.settings/org.eclipse.jdt.core.prefs @@ -17,9 +17,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul org.eclipse.jdt.core.compiler.annotation.nullable.secondary= org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -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 @@ -37,6 +37,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled org.eclipse.jdt.core.compiler.problem.discouragedReference=warning 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 @@ -90,6 +91,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=igno 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 @@ -128,8 +130,8 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=ignore 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_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 diff --git a/framework/bundles/org.eclipse.ecf.provider/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.provider/META-INF/MANIFEST.MF index c99d509a7c..c9bff436a0 100644 --- a/framework/bundles/org.eclipse.ecf.provider/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.provider/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-SymbolicName: org.eclipse.ecf.provider;singleton:=true Automatic-Module-Name: org.eclipse.ecf.provider -Bundle-Version: 4.9.1.qualifier +Bundle-Version: 4.10.0.qualifier Bundle-Name: %plugin.name Bundle-Vendor: %plugin.provider Bundle-Activator: org.eclipse.ecf.internal.provider.ProviderPlugin @@ -20,7 +20,7 @@ Require-Bundle: org.eclipse.equinox.common;bundle-version="[3.0.0,4.0.0)", Import-Package: org.osgi.framework;version="[1.3.0,2.0.0)", org.osgi.service.log;version="[1.3.0,2.0.0)", org.osgi.util.tracker;version="[1.3.2,2.0.0)" -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ActivationPolicy: lazy DynamicImport-Package: * diff --git a/framework/bundles/org.eclipse.ecf.provider/pom.xml b/framework/bundles/org.eclipse.ecf.provider/pom.xml index c325555956..905114549b 100644 --- a/framework/bundles/org.eclipse.ecf.provider/pom.xml +++ b/framework/bundles/org.eclipse.ecf.provider/pom.xml @@ -10,6 +10,6 @@ org.eclipse.ecf org.eclipse.ecf.provider - 4.9.1-SNAPSHOT + 4.10.0-SNAPSHOT eclipse-plugin diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.rest/.classpath b/framework/bundles/org.eclipse.ecf.remoteservice.rest/.classpath index 2fbb7a23e1..e801ebfb46 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.rest/.classpath +++ b/framework/bundles/org.eclipse.ecf.remoteservice.rest/.classpath @@ -1,6 +1,6 @@ - + diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.rest/.settings/org.eclipse.jdt.core.prefs b/framework/bundles/org.eclipse.ecf.remoteservice.rest/.settings/org.eclipse.jdt.core.prefs index c3aa323821..efe359dc83 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.rest/.settings/org.eclipse.jdt.core.prefs +++ b/framework/bundles/org.eclipse.ecf.remoteservice.rest/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,3 @@ -#Tue Nov 17 10:53:34 PST 2009 eclipse.preferences.version=1 org.eclipse.jdt.core.builder.cleanOutputFolder=clean org.eclipse.jdt.core.builder.duplicateResourceTask=warning @@ -8,16 +7,16 @@ org.eclipse.jdt.core.circularClasspath=error org.eclipse.jdt.core.classpath.exclusionPatterns=enabled org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.4 +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 org.eclipse.jdt.core.compiler.doc.comment.support=enabled org.eclipse.jdt.core.compiler.maxProblemPerUnit=1000 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.autoboxing=ignore org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning org.eclipse.jdt.core.compiler.problem.deadCode=warning @@ -26,7 +25,8 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore org.eclipse.jdt.core.compiler.problem.emptyStatement=warning -org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled org.eclipse.jdt.core.compiler.problem.fieldHiding=warning @@ -68,6 +68,7 @@ org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=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.suppressWarnings=enabled @@ -93,23 +94,28 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enab org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.3 +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 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_enum_constant=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 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=0 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_logical_operator=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_parameters_in_constructor_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 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 @@ -179,11 +185,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert 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=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 @@ -213,6 +220,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=inser org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert 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_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 @@ -236,12 +245,16 @@ org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert 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_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 @@ -287,6 +300,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do n org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert 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_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 @@ -322,8 +337,11 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser 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_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 @@ -346,6 +364,10 @@ org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false org.eclipse.jdt.core.formatter.tabulation.char=tab org.eclipse.jdt.core.formatter.tabulation.size=4 org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true +org.eclipse.jdt.core.formatter.wrap_before_bitwise_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_string_concatenation=true org.eclipse.jdt.core.incompatibleJDKLevel=ignore org.eclipse.jdt.core.incompleteClasspath=error diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.rest/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.remoteservice.rest/META-INF/MANIFEST.MF index f46390e900..0ffd7c65e2 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.rest/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.remoteservice.rest/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: %plugin.name Bundle-Vendor: %plugin.provider Bundle-SymbolicName: org.eclipse.ecf.remoteservice.rest;singleton:=true Automatic-Module-Name: org.eclipse.ecf.remoteservice.rest -Bundle-Version: 2.8.0.qualifier +Bundle-Version: 2.8.1.qualifier Bundle-Activator: org.eclipse.ecf.internal.remoteservice.rest.Activator Bundle-ActivationPolicy: lazy Eclipse-BuddyPolicy: global diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.rest/pom.xml b/framework/bundles/org.eclipse.ecf.remoteservice.rest/pom.xml index dd24f623ae..fcc16a0e0f 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.rest/pom.xml +++ b/framework/bundles/org.eclipse.ecf.remoteservice.rest/pom.xml @@ -10,6 +10,6 @@ org.eclipse.ecf org.eclipse.ecf.remoteservice.rest - 2.8.0-SNAPSHOT + 2.8.1-SNAPSHOT eclipse-plugin diff --git a/protocols/bundles/ch.ethz.iks.r_osgi.remote/.classpath b/protocols/bundles/ch.ethz.iks.r_osgi.remote/.classpath index c0b4c7e112..b931e34ba4 100644 --- a/protocols/bundles/ch.ethz.iks.r_osgi.remote/.classpath +++ b/protocols/bundles/ch.ethz.iks.r_osgi.remote/.classpath @@ -1,6 +1,6 @@ - + diff --git a/protocols/bundles/ch.ethz.iks.r_osgi.remote/.settings/org.eclipse.jdt.core.prefs b/protocols/bundles/ch.ethz.iks.r_osgi.remote/.settings/org.eclipse.jdt.core.prefs index f14b48c79c..4da2b34875 100644 --- a/protocols/bundles/ch.ethz.iks.r_osgi.remote/.settings/org.eclipse.jdt.core.prefs +++ b/protocols/bundles/ch.ethz.iks.r_osgi.remote/.settings/org.eclipse.jdt.core.prefs @@ -18,9 +18,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary= 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.7 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.7 +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 @@ -136,7 +136,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=ignore org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=ignore -org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=1.7 +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 org.eclipse.jdt.core.incompatibleJDKLevel=ignore org.eclipse.jdt.core.incompleteClasspath=error diff --git a/protocols/bundles/ch.ethz.iks.r_osgi.remote/META-INF/MANIFEST.MF b/protocols/bundles/ch.ethz.iks.r_osgi.remote/META-INF/MANIFEST.MF index 04017d47e2..c8d93b3d32 100644 --- a/protocols/bundles/ch.ethz.iks.r_osgi.remote/META-INF/MANIFEST.MF +++ b/protocols/bundles/ch.ethz.iks.r_osgi.remote/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin.name Bundle-SymbolicName: ch.ethz.iks.r_osgi.remote Automatic-Module-Name: ch.ethz.iks.r_osgi.remote -Bundle-Version: 1.2.500.qualifier +Bundle-Version: 1.3.0.qualifier Bundle-Vendor: %plugin.provider Import-Package: org.eclipse.ecf.remoteservice;version="7.3.0", org.eclipse.ecf.remoteservice.asyncproxy;version="[1.0.0,3.0.0)", @@ -22,7 +22,7 @@ Export-Package: ch.ethz.iks.r_osgi;version="1.0.9", DynamicImport-Package: * Bundle-ClassPath: . Bundle-Activator: ch.ethz.iks.r_osgi.impl.RemoteOSGiActivator -Bundle-RequiredExecutionEnvironment: JavaSE-1.7 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Eclipse-LazyStart: true Bundle-ActivationPolicy: lazy Bundle-Localization: plugin diff --git a/protocols/bundles/ch.ethz.iks.r_osgi.remote/pom.xml b/protocols/bundles/ch.ethz.iks.r_osgi.remote/pom.xml index 0fddcd5fae..5fbbf31294 100644 --- a/protocols/bundles/ch.ethz.iks.r_osgi.remote/pom.xml +++ b/protocols/bundles/ch.ethz.iks.r_osgi.remote/pom.xml @@ -10,6 +10,6 @@ org.eclipse.ecf ch.ethz.iks.r_osgi.remote - 1.2.500-SNAPSHOT + 1.3.0-SNAPSHOT eclipse-plugin diff --git a/protocols/bundles/org.eclipse.ecf.protocol.bittorrent/META-INF/MANIFEST.MF b/protocols/bundles/org.eclipse.ecf.protocol.bittorrent/META-INF/MANIFEST.MF index 88aafc2308..3a31428e6b 100644 --- a/protocols/bundles/org.eclipse.ecf.protocol.bittorrent/META-INF/MANIFEST.MF +++ b/protocols/bundles/org.eclipse.ecf.protocol.bittorrent/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.ecf.protocol.bittorrent Automatic-Module-Name: org.eclipse.ecf.protocol.bittorrent -Bundle-Version: 0.3.202.qualifier +Bundle-Version: 0.3.300.qualifier Bundle-Localization: plugin Export-Package: org.eclipse.ecf.protocol.bittorrent;version="1.0.0", org.eclipse.ecf.protocol.bittorrent.internal.encode;x-internal:=true, diff --git a/protocols/bundles/org.eclipse.ecf.protocol.bittorrent/pom.xml b/protocols/bundles/org.eclipse.ecf.protocol.bittorrent/pom.xml index dc4cbee6ce..ec0f50e4ae 100644 --- a/protocols/bundles/org.eclipse.ecf.protocol.bittorrent/pom.xml +++ b/protocols/bundles/org.eclipse.ecf.protocol.bittorrent/pom.xml @@ -10,6 +10,6 @@ org.eclipse.ecf org.eclipse.ecf.protocol.bittorrent - 0.3.202-SNAPSHOT + 0.3.300-SNAPSHOT eclipse-plugin diff --git a/protocols/bundles/org.jivesoftware.smack/META-INF/MANIFEST.MF b/protocols/bundles/org.jivesoftware.smack/META-INF/MANIFEST.MF index 933b1ec664..dd837e5e58 100644 --- a/protocols/bundles/org.jivesoftware.smack/META-INF/MANIFEST.MF +++ b/protocols/bundles/org.jivesoftware.smack/META-INF/MANIFEST.MF @@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin.name Bundle-SymbolicName: org.jivesoftware.smack Automatic-Module-Name: org.jivesoftware.smack -Bundle-Version: 3.3.301.qualifier -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-Version: 3.4.0.qualifier +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-Vendor: %plugin.provider Bundle-Localization: plugin Export-Package: org.jivesoftware.smack, diff --git a/protocols/bundles/org.jivesoftware.smack/pom.xml b/protocols/bundles/org.jivesoftware.smack/pom.xml index cd25505933..dc23b80794 100644 --- a/protocols/bundles/org.jivesoftware.smack/pom.xml +++ b/protocols/bundles/org.jivesoftware.smack/pom.xml @@ -10,6 +10,6 @@ org.eclipse.ecf org.jivesoftware.smack - 3.3.301-SNAPSHOT + 3.4.0-SNAPSHOT eclipse-plugin diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclientjava/META-INF/MANIFEST.MF b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclientjava/META-INF/MANIFEST.MF index 52d8cd9ecb..11c7245470 100644 --- a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclientjava/META-INF/MANIFEST.MF +++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclientjava/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin.name Bundle-SymbolicName: org.eclipse.ecf.provider.filetransfer.httpclientjava;singleton:=true -Bundle-Version: 2.0.100.qualifier +Bundle-Version: 2.0.200.qualifier Bundle-Vendor: %plugin.provider Bundle-Localization: plugin Automatic-Module-Name: org.eclipse.ecf.provider.filetransfer.httpclientjava diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclientjava/pom.xml b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclientjava/pom.xml index dc112c9735..4fd5c83a64 100644 --- a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclientjava/pom.xml +++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclientjava/pom.xml @@ -9,7 +9,7 @@ ../../../ org.eclipse.ecf.provider.filetransfer.httpclientjava - 2.0.100-SNAPSHOT + 2.0.200-SNAPSHOT eclipse-plugin diff --git a/providers/bundles/org.eclipse.ecf.provider.irc.ui/.classpath b/providers/bundles/org.eclipse.ecf.provider.irc.ui/.classpath index 6f3b481acd..e801ebfb46 100644 --- a/providers/bundles/org.eclipse.ecf.provider.irc.ui/.classpath +++ b/providers/bundles/org.eclipse.ecf.provider.irc.ui/.classpath @@ -1,6 +1,6 @@ - + diff --git a/providers/bundles/org.eclipse.ecf.provider.irc.ui/.settings/org.eclipse.jdt.core.prefs b/providers/bundles/org.eclipse.ecf.provider.irc.ui/.settings/org.eclipse.jdt.core.prefs index 881a924d33..624ebe1ade 100644 --- a/providers/bundles/org.eclipse.ecf.provider.irc.ui/.settings/org.eclipse.jdt.core.prefs +++ b/providers/bundles/org.eclipse.ecf.provider.irc.ui/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,3 @@ -#Mon Feb 09 22:51:44 CET 2009 eclipse.preferences.version=1 org.eclipse.jdt.core.builder.cleanOutputFolder=clean org.eclipse.jdt.core.builder.duplicateResourceTask=warning @@ -8,11 +7,11 @@ org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch org.eclipse.jdt.core.circularClasspath=error org.eclipse.jdt.core.classpath.exclusionPatterns=enabled org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2 -org.eclipse.jdt.core.compiler.compliance=1.4 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.maxProblemPerUnit=100 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.autoboxing=ignore org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning org.eclipse.jdt.core.compiler.problem.deadCode=warning @@ -21,7 +20,8 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled org.eclipse.jdt.core.compiler.problem.discouragedReference=warning org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore -org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore @@ -50,6 +50,7 @@ org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=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.suppressWarnings=enabled @@ -75,6 +76,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.3 +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 org.eclipse.jdt.core.incompatibleJDKLevel=ignore org.eclipse.jdt.core.incompleteClasspath=error diff --git a/providers/bundles/org.eclipse.ecf.provider.irc.ui/META-INF/MANIFEST.MF b/providers/bundles/org.eclipse.ecf.provider.irc.ui/META-INF/MANIFEST.MF index 51b724faa8..b6101000c7 100644 --- a/providers/bundles/org.eclipse.ecf.provider.irc.ui/META-INF/MANIFEST.MF +++ b/providers/bundles/org.eclipse.ecf.provider.irc.ui/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin.name Bundle-SymbolicName: org.eclipse.ecf.provider.irc.ui;singleton:=true Automatic-Module-Name: org.eclipse.ecf.provider.irc.ui -Bundle-Version: 1.3.201.qualifier +Bundle-Version: 1.4.0.qualifier Bundle-Activator: org.eclipse.ecf.internal.irc.ui.Activator Bundle-Localization: plugin Require-Bundle: org.eclipse.core.runtime, @@ -18,7 +18,6 @@ Require-Bundle: org.eclipse.core.runtime, Eclipse-LazyStart: true Export-Package: org.eclipse.ecf.internal.irc.ui;x-internal:=true, org.eclipse.ecf.internal.irc.ui.wizards;x-internal:=true -Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1, - J2SE-1.4 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-Vendor: %plugin.provider Bundle-ActivationPolicy: lazy diff --git a/providers/bundles/org.eclipse.ecf.provider.irc.ui/pom.xml b/providers/bundles/org.eclipse.ecf.provider.irc.ui/pom.xml index ab8315927a..2dab6fb4d5 100644 --- a/providers/bundles/org.eclipse.ecf.provider.irc.ui/pom.xml +++ b/providers/bundles/org.eclipse.ecf.provider.irc.ui/pom.xml @@ -10,6 +10,6 @@ org.eclipse.ecf org.eclipse.ecf.provider.irc.ui - 1.3.201-SNAPSHOT + 1.4.0-SNAPSHOT eclipse-plugin diff --git a/providers/bundles/org.eclipse.ecf.provider.jmdns/.classpath b/providers/bundles/org.eclipse.ecf.provider.jmdns/.classpath index 800163ad37..b6dffac370 100644 --- a/providers/bundles/org.eclipse.ecf.provider.jmdns/.classpath +++ b/providers/bundles/org.eclipse.ecf.provider.jmdns/.classpath @@ -1,6 +1,6 @@ - + diff --git a/providers/bundles/org.eclipse.ecf.provider.jmdns/.settings/org.eclipse.jdt.core.prefs b/providers/bundles/org.eclipse.ecf.provider.jmdns/.settings/org.eclipse.jdt.core.prefs index 9c2a433179..5e30605a36 100644 --- a/providers/bundles/org.eclipse.ecf.provider.jmdns/.settings/org.eclipse.jdt.core.prefs +++ b/providers/bundles/org.eclipse.ecf.provider.jmdns/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,3 @@ -#Tue Jan 11 17:12:15 PST 2011 eclipse.preferences.version=1 org.eclipse.jdt.core.builder.cleanOutputFolder=clean org.eclipse.jdt.core.builder.duplicateResourceTask=warning @@ -8,9 +7,9 @@ org.eclipse.jdt.core.circularClasspath=error org.eclipse.jdt.core.classpath.exclusionPatterns=enabled org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.4 +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 @@ -26,6 +25,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled org.eclipse.jdt.core.compiler.problem.discouragedReference=error org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled @@ -69,6 +69,7 @@ org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=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 @@ -96,23 +97,28 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enab org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.3 +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 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_enum_constant=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 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=0 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_logical_operator=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_parameters_in_constructor_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 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 @@ -182,11 +188,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert 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=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 @@ -216,6 +223,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=inser org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert 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_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 @@ -239,12 +248,16 @@ org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert 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_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 @@ -290,6 +303,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do n org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert 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_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 @@ -325,8 +340,11 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser 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_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 @@ -349,6 +367,10 @@ org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false org.eclipse.jdt.core.formatter.tabulation.char=tab org.eclipse.jdt.core.formatter.tabulation.size=4 org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true +org.eclipse.jdt.core.formatter.wrap_before_bitwise_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_string_concatenation=true org.eclipse.jdt.core.incompatibleJDKLevel=ignore org.eclipse.jdt.core.incompleteClasspath=error diff --git a/providers/bundles/org.eclipse.ecf.provider.jmdns/META-INF/MANIFEST.MF b/providers/bundles/org.eclipse.ecf.provider.jmdns/META-INF/MANIFEST.MF index a83aa9acff..66449a8ace 100644 --- a/providers/bundles/org.eclipse.ecf.provider.jmdns/META-INF/MANIFEST.MF +++ b/providers/bundles/org.eclipse.ecf.provider.jmdns/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.ecf.provider.jmdns;singleton:=true Automatic-Module-Name: org.eclipse.ecf.provider.jmdns -Bundle-Version: 4.3.302.qualifier +Bundle-Version: 4.4.0.qualifier Bundle-Activator: org.eclipse.ecf.internal.provider.jmdns.JMDNSPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -12,8 +12,7 @@ Require-Bundle: org.eclipse.equinox.common, org.eclipse.ecf.discovery Eclipse-LazyStart: true Bundle-ClassPath: . -Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1, - J2SE-1.4 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.eclipse.ecf.internal.provider.jmdns;x-internal:=true, org.eclipse.ecf.provider.jmdns.container;version="4.1.0", org.eclipse.ecf.provider.jmdns.identity;version="4.1.0" diff --git a/providers/bundles/org.eclipse.ecf.provider.jmdns/pom.xml b/providers/bundles/org.eclipse.ecf.provider.jmdns/pom.xml index f30f3173a4..fec5c4e858 100644 --- a/providers/bundles/org.eclipse.ecf.provider.jmdns/pom.xml +++ b/providers/bundles/org.eclipse.ecf.provider.jmdns/pom.xml @@ -10,6 +10,6 @@ org.eclipse.ecf org.eclipse.ecf.provider.jmdns - 4.3.302-SNAPSHOT + 4.4.0-SNAPSHOT eclipse-plugin diff --git a/providers/bundles/org.eclipse.ecf.provider.jmdns/src/org/eclipse/ecf/internal/provider/jmdns/JMDNSPlugin.java b/providers/bundles/org.eclipse.ecf.provider.jmdns/src/org/eclipse/ecf/internal/provider/jmdns/JMDNSPlugin.java index ffb554949d..0369b0c3e9 100644 --- a/providers/bundles/org.eclipse.ecf.provider.jmdns/src/org/eclipse/ecf/internal/provider/jmdns/JMDNSPlugin.java +++ b/providers/bundles/org.eclipse.ecf.provider.jmdns/src/org/eclipse/ecf/internal/provider/jmdns/JMDNSPlugin.java @@ -12,6 +12,7 @@ *****************************************************************************/ package org.eclipse.ecf.internal.provider.jmdns; +import java.util.Dictionary; import java.util.Properties; import org.eclipse.core.runtime.IAdapterManager; import org.eclipse.core.runtime.SafeRunner; @@ -70,6 +71,7 @@ public IAdapterManager getAdapterManager() { /** * This method is called upon plug-in activation */ + @SuppressWarnings("unchecked") public void start(final BundleContext ctxt) throws Exception { this.context = ctxt; @@ -77,7 +79,7 @@ public void start(final BundleContext ctxt) throws Exception { props.put(IDiscoveryService.CONTAINER_NAME, NAME); props.put(Constants.SERVICE_RANKING, Integer.valueOf(750)); String[] clazzes = new String[] {IDiscoveryService.class.getName(), IDiscoveryLocator.class.getName(), IDiscoveryAdvertiser.class.getName()}; - serviceRegistration = context.registerService(clazzes, serviceFactory, props); + serviceRegistration = context.registerService(clazzes, serviceFactory, (Dictionary) props); SafeRunner.run(new ExtensionRegistryRunnable(ctxt) { protected void runWithoutRegistry() throws Exception { ctxt.registerService(Namespace.class, new JMDNSNamespace("JMDNS Discovery Namespace"), null); diff --git a/server-side/bundles/org.eclipse.ecf.server.generic/.classpath b/server-side/bundles/org.eclipse.ecf.server.generic/.classpath index 2fbb7a23e1..e801ebfb46 100644 --- a/server-side/bundles/org.eclipse.ecf.server.generic/.classpath +++ b/server-side/bundles/org.eclipse.ecf.server.generic/.classpath @@ -1,6 +1,6 @@ - + diff --git a/server-side/bundles/org.eclipse.ecf.server.generic/.settings/org.eclipse.jdt.core.prefs b/server-side/bundles/org.eclipse.ecf.server.generic/.settings/org.eclipse.jdt.core.prefs index e71baa66d5..c9adb10716 100644 --- a/server-side/bundles/org.eclipse.ecf.server.generic/.settings/org.eclipse.jdt.core.prefs +++ b/server-side/bundles/org.eclipse.ecf.server.generic/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,3 @@ -#Mon Feb 09 23:09:01 CET 2009 eclipse.preferences.version=1 org.eclipse.jdt.core.builder.cleanOutputFolder=clean org.eclipse.jdt.core.builder.duplicateResourceTask=warning @@ -8,9 +7,9 @@ org.eclipse.jdt.core.circularClasspath=error org.eclipse.jdt.core.classpath.exclusionPatterns=enabled org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.4 +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 @@ -24,6 +23,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled 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.fieldHiding=warning org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore @@ -51,6 +51,7 @@ org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning +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.suppressWarnings=enabled @@ -71,23 +72,28 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=en org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enabled org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.3 +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 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_enum_constant=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 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=0 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_logical_operator=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_parameters_in_constructor_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 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 @@ -157,11 +163,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert 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=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 @@ -191,6 +198,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=inser org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert 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_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 @@ -214,12 +223,16 @@ org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert 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_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 @@ -265,6 +278,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do n org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert 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_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 @@ -300,8 +315,11 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser 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_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 @@ -324,6 +342,10 @@ org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false org.eclipse.jdt.core.formatter.tabulation.char=tab org.eclipse.jdt.core.formatter.tabulation.size=4 org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true +org.eclipse.jdt.core.formatter.wrap_before_bitwise_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_string_concatenation=true org.eclipse.jdt.core.incompatibleJDKLevel=ignore org.eclipse.jdt.core.incompleteClasspath=error diff --git a/server-side/bundles/org.eclipse.ecf.server.generic/META-INF/MANIFEST.MF b/server-side/bundles/org.eclipse.ecf.server.generic/META-INF/MANIFEST.MF index b2c5418326..654875518e 100644 --- a/server-side/bundles/org.eclipse.ecf.server.generic/META-INF/MANIFEST.MF +++ b/server-side/bundles/org.eclipse.ecf.server.generic/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin.name Bundle-SymbolicName: org.eclipse.ecf.server.generic;singleton:=true Automatic-Module-Name: org.eclipse.ecf.server.generic -Bundle-Version: 8.1.102.qualifier +Bundle-Version: 8.2.0.qualifier Bundle-Activator: org.eclipse.ecf.internal.server.generic.Activator Bundle-Vendor: %plugin.provider Bundle-Localization: plugin @@ -25,5 +25,5 @@ Import-Package: javax.xml.parsers, org.osgi.service.log, org.osgi.util.tracker, org.w3c.dom -Bundle-RequiredExecutionEnvironment: J2SE-1.4 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ActivationPolicy: lazy diff --git a/server-side/bundles/org.eclipse.ecf.server.generic/pom.xml b/server-side/bundles/org.eclipse.ecf.server.generic/pom.xml index 40a04ad0f2..8edc0be664 100644 --- a/server-side/bundles/org.eclipse.ecf.server.generic/pom.xml +++ b/server-side/bundles/org.eclipse.ecf.server.generic/pom.xml @@ -10,6 +10,6 @@ org.eclipse.ecf org.eclipse.ecf.server.generic - 8.1.102-SNAPSHOT + 8.2.0-SNAPSHOT eclipse-plugin From b33ed62f879fed7fbecde181492635bad832e0a3 Mon Sep 17 00:00:00 2001 From: Scott Lewis Date: Sat, 21 Oct 2023 13:30:30 -0700 Subject: [PATCH 02/17] Updates to jre.compilation.profile --- .../org.eclipse.ecf.presence.bot.kosmos/build.properties | 2 +- .../org.eclipse.ecf.osgi.services.distribution/build.properties | 2 +- .../bundles/org.eclipse.ecf.example.clients/build.properties | 2 +- .../org.eclipse.ecf.example.collab.editor/build.properties | 2 +- .../bundles/org.eclipse.ecf.example.pubsub/build.properties | 2 +- .../org.eclipse.ecf.examples.eventadmin.app/build.properties | 2 +- .../org.eclipse.ecf.examples.provider.trivial/build.properties | 2 +- .../build.properties | 2 +- .../build.properties | 2 +- .../build.properties | 2 +- .../build.properties | 2 +- framework/bundles/org.eclipse.ecf.console/build.properties | 2 +- .../org.eclipse.ecf.discovery.ui.browser/build.properties | 2 +- .../bundles/org.eclipse.ecf.discovery.ui.edit/build.properties | 2 +- .../bundles/org.eclipse.ecf.discovery.ui.model/build.properties | 2 +- .../build.properties | 2 +- .../org.eclipse.ecf.discovery.ui.properties/build.properties | 2 +- framework/bundles/org.eclipse.ecf.discovery.ui/build.properties | 2 +- .../bundles/org.eclipse.ecf.filetransfer.ui/build.properties | 2 +- .../bundles/org.eclipse.ecf.presence.collab.ui/build.properties | 2 +- .../bundles/org.eclipse.ecf.remoteservice.rpc/build.properties | 2 +- framework/bundles/org.eclipse.ecf.storage/build.properties | 2 +- framework/bundles/org.eclipse.ecf.sync/build.properties | 2 +- .../bundles/org.eclipse.ecf.telephony.call.ui/build.properties | 2 +- .../bundles/org.eclipse.ecf.telephony.call/build.properties | 2 +- .../bundles/org.eclipse.ecf.ui.capabilities/build.properties | 2 +- framework/bundles/org.eclipse.ecf.ui/build.properties | 2 +- .../build.properties | 2 +- .../build.properties | 2 +- protocols/bundles/org.eclipse.ecf.protocol.msn/build.properties | 2 +- protocols/bundles/org.jivesoftware.smack/build.properties | 2 +- .../org.eclipse.ecf.provider.bittorrent.ui/build.properties | 2 +- .../org.eclipse.ecf.provider.bittorrent/build.properties | 2 +- .../bundles/org.eclipse.ecf.provider.irc.ui/build.properties | 2 +- providers/bundles/org.eclipse.ecf.provider.irc/build.properties | 2 +- .../bundles/org.eclipse.ecf.provider.jmdns/build.properties | 2 +- .../bundles/org.eclipse.ecf.provider.jslp/build.properties | 2 +- .../bundles/org.eclipse.ecf.provider.local/build.properties | 2 +- providers/bundles/org.eclipse.ecf.provider.msn/build.properties | 2 +- .../bundles/org.eclipse.ecf.provider.r_osgi/build.properties | 2 +- providers/bundles/org.eclipse.ecf.provider.rss/build.properties | 2 +- providers/bundles/org.eclipse.ecf.provider.ui/build.properties | 2 +- .../org.eclipse.ecf.remoteservice.eventadmin/build.properties | 2 +- server-side/bundles/org.eclipse.ecf.server/build.properties | 2 +- .../build.properties | 2 +- .../build.properties | 2 +- .../org.eclipse.ecf.examples.updatesite.client/build.properties | 2 +- tests/bundles/org.eclipse.ecf.tests.datashare/build.properties | 2 +- tests/bundles/org.eclipse.ecf.tests.discovery/build.properties | 2 +- .../bundles/org.eclipse.ecf.tests.protocol.msn/build.properties | 2 +- .../org.eclipse.ecf.tests.provider.discovery/build.properties | 2 +- .../org.eclipse.ecf.tests.provider.dnssd/build.properties | 2 +- .../org.eclipse.ecf.tests.provider.jmdns/build.properties | 2 +- .../org.eclipse.ecf.tests.provider.jslp/build.properties | 2 +- tests/bundles/org.eclipse.ecf.tests/build.properties | 2 +- 55 files changed, 55 insertions(+), 55 deletions(-) diff --git a/applications/kosmos/bundles/org.eclipse.ecf.presence.bot.kosmos/build.properties b/applications/kosmos/bundles/org.eclipse.ecf.presence.bot.kosmos/build.properties index 7aa33a14f7..e4ac2ca2fd 100644 --- a/applications/kosmos/bundles/org.eclipse.ecf.presence.bot.kosmos/build.properties +++ b/applications/kosmos/bundles/org.eclipse.ecf.presence.bot.kosmos/build.properties @@ -6,4 +6,4 @@ bin.includes = META-INF/,\ messages.properties,\ operators.properties,\ plugin.properties -jre.compilation.profile = J2SE-1.4 +jre.compilation.profile = J2SE-11 diff --git a/compendium/bundles/org.eclipse.ecf.osgi.services.distribution/build.properties b/compendium/bundles/org.eclipse.ecf.osgi.services.distribution/build.properties index b1f3ff88a9..9020258064 100644 --- a/compendium/bundles/org.eclipse.ecf.osgi.services.distribution/build.properties +++ b/compendium/bundles/org.eclipse.ecf.osgi.services.distribution/build.properties @@ -8,4 +8,4 @@ src.includes = about.html javacErrors.. = -assertIdentifier,\ -enumIdentifier source.. = src/ -jre.compilation.profile = J2SE-1.5 +jre.compilation.profile = J2SE-11 diff --git a/examples/bundles/org.eclipse.ecf.example.clients/build.properties b/examples/bundles/org.eclipse.ecf.example.clients/build.properties index cb9ee74290..8f39d92fa5 100644 --- a/examples/bundles/org.eclipse.ecf.example.clients/build.properties +++ b/examples/bundles/org.eclipse.ecf.example.clients/build.properties @@ -10,5 +10,5 @@ src.includes = about.html,\ products/ source.. = src/ output.. = bin/ -jre.compilation.profile = J2SE-1.4 +jre.compilation.profile = J2SE-11 javacErrors.. = -assertIdentifier,-enumIdentifier diff --git a/examples/bundles/org.eclipse.ecf.example.collab.editor/build.properties b/examples/bundles/org.eclipse.ecf.example.collab.editor/build.properties index 574556db71..045869a55d 100644 --- a/examples/bundles/org.eclipse.ecf.example.collab.editor/build.properties +++ b/examples/bundles/org.eclipse.ecf.example.collab.editor/build.properties @@ -6,5 +6,5 @@ src.includes = about.html source.. = src/ output.. = bin/ -jre.compilation.profile = J2SE-1.4 +jre.compilation.profile = J2SE-11 javacErrors.. = -assertIdentifier,-enumIdentifier diff --git a/examples/bundles/org.eclipse.ecf.example.pubsub/build.properties b/examples/bundles/org.eclipse.ecf.example.pubsub/build.properties index 149a9f6211..ec8291153d 100644 --- a/examples/bundles/org.eclipse.ecf.example.pubsub/build.properties +++ b/examples/bundles/org.eclipse.ecf.example.pubsub/build.properties @@ -8,4 +8,4 @@ bin.includes = META-INF/,\ about.html src.includes = schema/,\ about.html -jre.compilation.profile = J2SE-1.4 +jre.compilation.profile = J2SE-11 diff --git a/examples/bundles/org.eclipse.ecf.examples.eventadmin.app/build.properties b/examples/bundles/org.eclipse.ecf.examples.eventadmin.app/build.properties index 0937329297..24d0e317d3 100644 --- a/examples/bundles/org.eclipse.ecf.examples.eventadmin.app/build.properties +++ b/examples/bundles/org.eclipse.ecf.examples.eventadmin.app/build.properties @@ -9,4 +9,4 @@ bin.includes = META-INF/,\ src.includes = about.html,\ bundle.properties,\ products/ -jre.compilation.profile = J2SE-1.4 +jre.compilation.profile = J2SE-11 diff --git a/examples/bundles/org.eclipse.ecf.examples.provider.trivial/build.properties b/examples/bundles/org.eclipse.ecf.examples.provider.trivial/build.properties index 473c7b3ef6..7283d28272 100644 --- a/examples/bundles/org.eclipse.ecf.examples.provider.trivial/build.properties +++ b/examples/bundles/org.eclipse.ecf.examples.provider.trivial/build.properties @@ -5,5 +5,5 @@ bin.includes = META-INF/,\ plugin.xml,\ products/,\ bundle.properties -jre.compilation.profile = J2SE-1.4 +jre.compilation.profile = J2SE-11 src.includes = products/ diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer.rs/build.properties b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer.rs/build.properties index 14781fbff0..2a7687a3bb 100644 --- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer.rs/build.properties +++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer.rs/build.properties @@ -7,4 +7,4 @@ bin.includes = META-INF/,\ src.includes = about.html,\ bundle.properties,\ products/Hello Service Consumer RS.product -jre.compilation.profile = J2SE-1.4 +jre.compilation.profile = J2SE-11 diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.host/build.properties b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.host/build.properties index 4402b987b0..42b2a42220 100644 --- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.host/build.properties +++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.host/build.properties @@ -11,5 +11,5 @@ source.. = src/ src.includes = bundle.properties,\ about.html,\ products/ -jre.compilation.profile = J2SE-1.5 +jre.compilation.profile = J2SE-11 \ No newline at end of file diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host.rs/build.properties b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host.rs/build.properties index bd299cbda9..084356cbbd 100644 --- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host.rs/build.properties +++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host.rs/build.properties @@ -7,4 +7,4 @@ bin.includes = META-INF/,\ src.includes = bundle.properties,\ about.html,\ products/Hello Service Host RS.product -jre.compilation.profile = J2SE-1.4 +jre.compilation.profile = J2SE-11 diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/build.properties b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/build.properties index 919786014d..b4ac1fcd46 100644 --- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/build.properties +++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/build.properties @@ -9,5 +9,5 @@ bin.includes = META-INF/,\ src.includes = about.html,\ bundle.properties,\ products/ -jre.compilation.profile = J2SE-1.5 +jre.compilation.profile = J2SE-11 javacErrors.. = -assertIdentifier,-enumIdentifier diff --git a/framework/bundles/org.eclipse.ecf.console/build.properties b/framework/bundles/org.eclipse.ecf.console/build.properties index 2f7cdf4a08..363cf247db 100644 --- a/framework/bundles/org.eclipse.ecf.console/build.properties +++ b/framework/bundles/org.eclipse.ecf.console/build.properties @@ -7,4 +7,4 @@ bin.includes = META-INF/,\ OSGI-INF/org.eclipse.ecf.internal.console.ContainerCommand.xml,\ OSGI-INF/ src.includes = about.html -jre.compilation.profile = JavaSE-1.7 +jre.compilation.profile = J2SE-11 diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.browser/build.properties b/framework/bundles/org.eclipse.ecf.discovery.ui.browser/build.properties index 1a57e0c2f0..d60b77b9ab 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.browser/build.properties +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.browser/build.properties @@ -6,4 +6,4 @@ bin.includes = META-INF/,\ about.html,\ plugin.properties src.includes = about.html -jre.compilation.profile = J2SE-1.4 +jre.compilation.profile = J2SE-11 diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.edit/build.properties b/framework/bundles/org.eclipse.ecf.discovery.ui.edit/build.properties index db876eb385..26dfa71992 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.edit/build.properties +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.edit/build.properties @@ -8,4 +8,4 @@ jars.compile.order = . source.. = src/ output.. = bin/ src.includes = about.html -jre.compilation.profile = J2SE-1.4 +jre.compilation.profile = J2SE-11 diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.model/build.properties b/framework/bundles/org.eclipse.ecf.discovery.ui.model/build.properties index bc7cc27386..7266c8e240 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.model/build.properties +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.model/build.properties @@ -9,4 +9,4 @@ source.. = src/ output.. = bin/ src.includes = model/,\ about.html -jre.compilation.profile = J2SE-1.4 +jre.compilation.profile = J2SE-11 diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.properties.tabbed/build.properties b/framework/bundles/org.eclipse.ecf.discovery.ui.properties.tabbed/build.properties index b3540d04a8..f67f6c225e 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.properties.tabbed/build.properties +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.properties.tabbed/build.properties @@ -7,4 +7,4 @@ bin.includes = META-INF/,\ plugin.properties src.includes = fragment.xml,\ about.html -jre.compilation.profile = J2SE-1.4 +jre.compilation.profile = J2SE-11 diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.properties/build.properties b/framework/bundles/org.eclipse.ecf.discovery.ui.properties/build.properties index b32b721a0f..7e379cb9bf 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.properties/build.properties +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.properties/build.properties @@ -7,4 +7,4 @@ bin.includes = META-INF/,\ plugin.properties src.includes = fragment.xml,\ about.html -jre.compilation.profile = J2SE-1.4 +jre.compilation.profile = J2SE-11 diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui/build.properties b/framework/bundles/org.eclipse.ecf.discovery.ui/build.properties index d4e3cbbf24..056fd33ce8 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui/build.properties +++ b/framework/bundles/org.eclipse.ecf.discovery.ui/build.properties @@ -9,4 +9,4 @@ source.. = src/ output.. = bin/ src.includes = icons/,\ about.html -jre.compilation.profile = J2SE-1.4 +jre.compilation.profile = J2SE-11 diff --git a/framework/bundles/org.eclipse.ecf.filetransfer.ui/build.properties b/framework/bundles/org.eclipse.ecf.filetransfer.ui/build.properties index 427b2eda65..10dfcd03bc 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer.ui/build.properties +++ b/framework/bundles/org.eclipse.ecf.filetransfer.ui/build.properties @@ -17,5 +17,5 @@ bin.includes = plugin.xml,\ about.html,\ icons/ src.includes = about.html -jre.compilation.profile = J2SE-1.4 +jre.compilation.profile = J2SE-11 javacErrors.. = -assertIdentifier,-enumIdentifier diff --git a/framework/bundles/org.eclipse.ecf.presence.collab.ui/build.properties b/framework/bundles/org.eclipse.ecf.presence.collab.ui/build.properties index 6e045305f6..cab31b761c 100644 --- a/framework/bundles/org.eclipse.ecf.presence.collab.ui/build.properties +++ b/framework/bundles/org.eclipse.ecf.presence.collab.ui/build.properties @@ -7,5 +7,5 @@ bin.includes = META-INF/,\ plugin.properties,\ about.html src.includes = about.html -jre.compilation.profile = J2SE-1.4 +jre.compilation.profile = J2SE-11 javacErrors.. = -assertIdentifier,-enumIdentifier diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.rpc/build.properties b/framework/bundles/org.eclipse.ecf.remoteservice.rpc/build.properties index f504881882..a28ad63f7a 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.rpc/build.properties +++ b/framework/bundles/org.eclipse.ecf.remoteservice.rpc/build.properties @@ -14,4 +14,4 @@ bin.includes = META-INF/,\ plugin.xml,\ plugin.properties jars.extra.classpath = platform:/plugin/org.eclipse.equinox.concurrent -jre.compilation.profile = J2SE-1.4 +jre.compilation.profile = J2SE-11 diff --git a/framework/bundles/org.eclipse.ecf.storage/build.properties b/framework/bundles/org.eclipse.ecf.storage/build.properties index 7f5f525ba2..e564ca49ca 100644 --- a/framework/bundles/org.eclipse.ecf.storage/build.properties +++ b/framework/bundles/org.eclipse.ecf.storage/build.properties @@ -6,4 +6,4 @@ bin.includes = META-INF/,\ about.html,\ plugin.xml src.includes = about.html -jre.compilation.profile = J2SE-1.4 +jre.compilation.profile = J2SE-11 diff --git a/framework/bundles/org.eclipse.ecf.sync/build.properties b/framework/bundles/org.eclipse.ecf.sync/build.properties index c6fa7d5a71..b0b6307298 100644 --- a/framework/bundles/org.eclipse.ecf.sync/build.properties +++ b/framework/bundles/org.eclipse.ecf.sync/build.properties @@ -5,4 +5,4 @@ bin.includes = META-INF/,\ about.html,\ plugin.properties src.includes = about.html -jre.compilation.profile = J2SE-1.4 +jre.compilation.profile = J2SE-11 diff --git a/framework/bundles/org.eclipse.ecf.telephony.call.ui/build.properties b/framework/bundles/org.eclipse.ecf.telephony.call.ui/build.properties index e096bc66cc..11db29a4ce 100644 --- a/framework/bundles/org.eclipse.ecf.telephony.call.ui/build.properties +++ b/framework/bundles/org.eclipse.ecf.telephony.call.ui/build.properties @@ -5,5 +5,5 @@ bin.includes = META-INF/,\ about.html,\ plugin.properties src.includes = about.html -jre.compilation.profile = J2SE-1.3 +jre.compilation.profile = J2SE-11 javacWarnings.. = -assertIdentifier,-enumIdentifier diff --git a/framework/bundles/org.eclipse.ecf.telephony.call/build.properties b/framework/bundles/org.eclipse.ecf.telephony.call/build.properties index 162586d2f1..91908a6b43 100644 --- a/framework/bundles/org.eclipse.ecf.telephony.call/build.properties +++ b/framework/bundles/org.eclipse.ecf.telephony.call/build.properties @@ -14,5 +14,5 @@ bin.includes = .,\ src.includes = about.html source.. = src/ output.. = bin/ -jre.compilation.profile = J2SE-1.3 +jre.compilation.profile = J2SE-11 javacWarnings.. = -assertIdentifier,-enumIdentifier diff --git a/framework/bundles/org.eclipse.ecf.ui.capabilities/build.properties b/framework/bundles/org.eclipse.ecf.ui.capabilities/build.properties index 7872d161c3..3f335181dc 100644 --- a/framework/bundles/org.eclipse.ecf.ui.capabilities/build.properties +++ b/framework/bundles/org.eclipse.ecf.ui.capabilities/build.properties @@ -3,6 +3,6 @@ bin.includes = META-INF/,\ plugin.xml,\ plugin.properties,\ about.html -jre.compilation.profile = J2SE-1.4 +jre.compilation.profile = J2SE-11 javacWarnings.. = -assertIdentifier,-enumIdentifier src.includes = about.html diff --git a/framework/bundles/org.eclipse.ecf.ui/build.properties b/framework/bundles/org.eclipse.ecf.ui/build.properties index 90ca133059..a23fecfc2c 100644 --- a/framework/bundles/org.eclipse.ecf.ui/build.properties +++ b/framework/bundles/org.eclipse.ecf.ui/build.properties @@ -10,5 +10,5 @@ src.includes = about.html,\ jars.compile.order = . source.. = src/ output.. = bin/ -jre.compilation.profile = J2SE-1.4 +jre.compilation.profile = J2SE-11 javacErrors.. = -assertIdentifier,-enumIdentifier diff --git a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/build.properties b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/build.properties index 6f840c0177..a46b9668d0 100644 --- a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/build.properties +++ b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/build.properties @@ -8,4 +8,4 @@ bin.includes = META-INF/,\ OSGI-INF/ src.includes = about.html,\ bundle.properties -jre.compilation.profile = JavaSE-1.8 +jre.compilation.profile = J2SE-11 diff --git a/osgi/bundles/org.eclipse.osgi.services.remoteserviceadmin/build.properties b/osgi/bundles/org.eclipse.osgi.services.remoteserviceadmin/build.properties index b022929611..22aa5b4614 100644 --- a/osgi/bundles/org.eclipse.osgi.services.remoteserviceadmin/build.properties +++ b/osgi/bundles/org.eclipse.osgi.services.remoteserviceadmin/build.properties @@ -21,6 +21,6 @@ output.. = bin/ jars.extra.classpath = osgi/osgi.annotation.jar jars.compile.order = . source.. = src/ -jre.compilation.profile = JavaSE-1.6 +jre.compilation.profile = J2SE-11 \ No newline at end of file diff --git a/protocols/bundles/org.eclipse.ecf.protocol.msn/build.properties b/protocols/bundles/org.eclipse.ecf.protocol.msn/build.properties index 0cf7c26ef8..483df6f64e 100644 --- a/protocols/bundles/org.eclipse.ecf.protocol.msn/build.properties +++ b/protocols/bundles/org.eclipse.ecf.protocol.msn/build.properties @@ -14,5 +14,5 @@ bin.includes = META-INF/,\ plugin.properties,\ about.html src.includes = about.html -jre.compilation.profile = J2SE-1.4 +jre.compilation.profile = J2SE-11 javacErrors.. = -assertIdentifier,-enumIdentifier diff --git a/protocols/bundles/org.jivesoftware.smack/build.properties b/protocols/bundles/org.jivesoftware.smack/build.properties index eb2978be82..56c054ca4c 100644 --- a/protocols/bundles/org.jivesoftware.smack/build.properties +++ b/protocols/bundles/org.jivesoftware.smack/build.properties @@ -11,5 +11,5 @@ src.includes = asl-v20.txt,\ META-INF/eclipse.inf javacSource = 1.5 javacTarget = 1.5 -jre.compilation.profile = J2SE-1.5 +jre.compilation.profile = J2SE-11 \ No newline at end of file diff --git a/providers/bundles/org.eclipse.ecf.provider.bittorrent.ui/build.properties b/providers/bundles/org.eclipse.ecf.provider.bittorrent.ui/build.properties index 0920a52a3f..3ee3b91be4 100644 --- a/providers/bundles/org.eclipse.ecf.provider.bittorrent.ui/build.properties +++ b/providers/bundles/org.eclipse.ecf.provider.bittorrent.ui/build.properties @@ -18,4 +18,4 @@ bin.includes = META-INF/,\ plugin.properties src.includes = about.html,\ icons/ -jre.compilation.profile = J2SE-1.4 +jre.compilation.profile = J2SE-11 diff --git a/providers/bundles/org.eclipse.ecf.provider.bittorrent/build.properties b/providers/bundles/org.eclipse.ecf.provider.bittorrent/build.properties index 1a57e0c2f0..d60b77b9ab 100644 --- a/providers/bundles/org.eclipse.ecf.provider.bittorrent/build.properties +++ b/providers/bundles/org.eclipse.ecf.provider.bittorrent/build.properties @@ -6,4 +6,4 @@ bin.includes = META-INF/,\ about.html,\ plugin.properties src.includes = about.html -jre.compilation.profile = J2SE-1.4 +jre.compilation.profile = J2SE-11 diff --git a/providers/bundles/org.eclipse.ecf.provider.irc.ui/build.properties b/providers/bundles/org.eclipse.ecf.provider.irc.ui/build.properties index 19958f0a3d..d2e7eade16 100644 --- a/providers/bundles/org.eclipse.ecf.provider.irc.ui/build.properties +++ b/providers/bundles/org.eclipse.ecf.provider.irc.ui/build.properties @@ -7,4 +7,4 @@ bin.includes = META-INF/,\ about.html,\ plugin.properties src.includes = about.html -jre.compilation.profile = J2SE-1.4 +jre.compilation.profile = J2SE-11 diff --git a/providers/bundles/org.eclipse.ecf.provider.irc/build.properties b/providers/bundles/org.eclipse.ecf.provider.irc/build.properties index 39c8faa718..0cd434a371 100644 --- a/providers/bundles/org.eclipse.ecf.provider.irc/build.properties +++ b/providers/bundles/org.eclipse.ecf.provider.irc/build.properties @@ -11,4 +11,4 @@ src.includes = about.html,\ asl-v20.txt source.. = src/ output.. = bin/ -jre.compilation.profile = J2SE-1.4 +jre.compilation.profile = J2SE-11 diff --git a/providers/bundles/org.eclipse.ecf.provider.jmdns/build.properties b/providers/bundles/org.eclipse.ecf.provider.jmdns/build.properties index b4f9837824..72acd714a3 100644 --- a/providers/bundles/org.eclipse.ecf.provider.jmdns/build.properties +++ b/providers/bundles/org.eclipse.ecf.provider.jmdns/build.properties @@ -11,7 +11,7 @@ src.includes = about.html,\ source.. = src/,\ jmdns/ output.. = bin/ -jre.compilation.profile = J2SE-1.4 +jre.compilation.profile = J2SE-11 javacErrors.. = -assertIdentifier,-enumIdentifier additional.bundles = org.eclipse.equinox.concurrent jars.extra.classpath = platform:/plugin/org.eclipse.equinox.concurrent diff --git a/providers/bundles/org.eclipse.ecf.provider.jslp/build.properties b/providers/bundles/org.eclipse.ecf.provider.jslp/build.properties index b3c328cd86..ce33d9dafc 100644 --- a/providers/bundles/org.eclipse.ecf.provider.jslp/build.properties +++ b/providers/bundles/org.eclipse.ecf.provider.jslp/build.properties @@ -8,7 +8,7 @@ bin.includes = META-INF/,\ .options source.. = src/ src.includes = about.html -jre.compilation.profile = J2SE-1.5 +jre.compilation.profile = J2SE-11 additional.bundles = org.eclipse.equinox.concurrent jars.extra.classpath = platform:/plugin/org.eclipse.equinox.concurrent javacErrors.. = -assertIdentifier,-enumIdentifier diff --git a/providers/bundles/org.eclipse.ecf.provider.local/build.properties b/providers/bundles/org.eclipse.ecf.provider.local/build.properties index b58e86b5de..fe59fcfde0 100644 --- a/providers/bundles/org.eclipse.ecf.provider.local/build.properties +++ b/providers/bundles/org.eclipse.ecf.provider.local/build.properties @@ -4,4 +4,4 @@ bin.includes = META-INF/,\ .,\ plugin.xml,\ bundle.properties -jre.compilation.profile = J2SE-1.4 +jre.compilation.profile = J2SE-11 diff --git a/providers/bundles/org.eclipse.ecf.provider.msn/build.properties b/providers/bundles/org.eclipse.ecf.provider.msn/build.properties index c3881d7292..058b00f229 100644 --- a/providers/bundles/org.eclipse.ecf.provider.msn/build.properties +++ b/providers/bundles/org.eclipse.ecf.provider.msn/build.properties @@ -15,5 +15,5 @@ bin.includes = META-INF/,\ plugin.xml,\ about.html src.includes = about.html -jre.compilation.profile = J2SE-1.4 +jre.compilation.profile = J2SE-11 javacErrors.. = -assertIdentifier,-enumIdentifier diff --git a/providers/bundles/org.eclipse.ecf.provider.r_osgi/build.properties b/providers/bundles/org.eclipse.ecf.provider.r_osgi/build.properties index 0128926dd1..98d632874f 100644 --- a/providers/bundles/org.eclipse.ecf.provider.r_osgi/build.properties +++ b/providers/bundles/org.eclipse.ecf.provider.r_osgi/build.properties @@ -6,5 +6,5 @@ bin.includes = META-INF/,\ plugin.properties,\ about.html src.includes = about.html -jre.compilation.profile = J2SE-1.5 +jre.compilation.profile = J2SE-11 javacErrors.. = -assertIdentifier,-enumIdentifier diff --git a/providers/bundles/org.eclipse.ecf.provider.rss/build.properties b/providers/bundles/org.eclipse.ecf.provider.rss/build.properties index 0b1ca9c985..ddef88030a 100644 --- a/providers/bundles/org.eclipse.ecf.provider.rss/build.properties +++ b/providers/bundles/org.eclipse.ecf.provider.rss/build.properties @@ -8,5 +8,5 @@ bin.includes = plugin.xml,\ lib/rss-sse.jar,\ plugin.properties src.includes = about.html -jre.compilation.profile = J2SE-1.4 +jre.compilation.profile = J2SE-11 javacErrors.. = -assertIdentifier,-enumIdentifier diff --git a/providers/bundles/org.eclipse.ecf.provider.ui/build.properties b/providers/bundles/org.eclipse.ecf.provider.ui/build.properties index b019613ca8..345c4af00b 100644 --- a/providers/bundles/org.eclipse.ecf.provider.ui/build.properties +++ b/providers/bundles/org.eclipse.ecf.provider.ui/build.properties @@ -7,4 +7,4 @@ bin.includes = META-INF/,\ plugin.properties,\ icons/ src.includes = about.html -jre.compilation.profile = J2SE-1.4 +jre.compilation.profile = J2SE-11 diff --git a/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/build.properties b/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/build.properties index 2e06f14788..edc30b782d 100644 --- a/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/build.properties +++ b/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/build.properties @@ -8,5 +8,5 @@ bin.includes = META-INF/,\ about.html src.includes = bundle.properties,\ about.html -jre.compilation.profile = J2SE-1.5 +jre.compilation.profile = J2SE-11 jars.extra.classpath=r7stubs.jar diff --git a/server-side/bundles/org.eclipse.ecf.server/build.properties b/server-side/bundles/org.eclipse.ecf.server/build.properties index b5c24a6175..c74ffe48f9 100644 --- a/server-side/bundles/org.eclipse.ecf.server/build.properties +++ b/server-side/bundles/org.eclipse.ecf.server/build.properties @@ -6,5 +6,5 @@ src.includes = about.html jars.compile.order = . output.. = bin/ source.. = src/ -jre.compilation.profile = J2SE-1.4 +jre.compilation.profile = J2SE-11 javacErrors.. = -assertIdentifier,-enumIdentifier diff --git a/server-side/examples/bundles/org.eclipse.ecf.examples.remoteservices.client/build.properties b/server-side/examples/bundles/org.eclipse.ecf.examples.remoteservices.client/build.properties index 5aa25b1367..5fb7d7ed31 100644 --- a/server-side/examples/bundles/org.eclipse.ecf.examples.remoteservices.client/build.properties +++ b/server-side/examples/bundles/org.eclipse.ecf.examples.remoteservices.client/build.properties @@ -5,4 +5,4 @@ bin.includes = META-INF/,\ about.html src.includes = fragment.xml,\ about.html -jre.compilation.profile = J2SE-1.4 +jre.compilation.profile = J2SE-11 diff --git a/server-side/examples/bundles/org.eclipse.ecf.examples.remoteservices.common/build.properties b/server-side/examples/bundles/org.eclipse.ecf.examples.remoteservices.common/build.properties index c6fa7d5a71..b0b6307298 100644 --- a/server-side/examples/bundles/org.eclipse.ecf.examples.remoteservices.common/build.properties +++ b/server-side/examples/bundles/org.eclipse.ecf.examples.remoteservices.common/build.properties @@ -5,4 +5,4 @@ bin.includes = META-INF/,\ about.html,\ plugin.properties src.includes = about.html -jre.compilation.profile = J2SE-1.4 +jre.compilation.profile = J2SE-11 diff --git a/server-side/examples/bundles/org.eclipse.ecf.examples.updatesite.client/build.properties b/server-side/examples/bundles/org.eclipse.ecf.examples.updatesite.client/build.properties index 0643099f26..e7dcccc87f 100644 --- a/server-side/examples/bundles/org.eclipse.ecf.examples.updatesite.client/build.properties +++ b/server-side/examples/bundles/org.eclipse.ecf.examples.updatesite.client/build.properties @@ -6,5 +6,5 @@ bin.includes = META-INF/,\ about.html,\ plugin.properties src.includes = about.html -jre.compilation.profile = J2SE-1.4 +jre.compilation.profile = J2SE-11 javacErrors.. = -assertIdentifier,-enumIdentifier diff --git a/tests/bundles/org.eclipse.ecf.tests.datashare/build.properties b/tests/bundles/org.eclipse.ecf.tests.datashare/build.properties index 5b90aa09e6..7d594a4a59 100644 --- a/tests/bundles/org.eclipse.ecf.tests.datashare/build.properties +++ b/tests/bundles/org.eclipse.ecf.tests.datashare/build.properties @@ -5,5 +5,5 @@ bin.includes = META-INF/,\ plugin.properties,\ about.html src.includes = about.html -jre.compilation.profile = J2SE-1.4 +jre.compilation.profile = J2SE-11 javacErrors.. = -assertIdentifier,-enumIdentifier diff --git a/tests/bundles/org.eclipse.ecf.tests.discovery/build.properties b/tests/bundles/org.eclipse.ecf.tests.discovery/build.properties index 5b90aa09e6..7d594a4a59 100644 --- a/tests/bundles/org.eclipse.ecf.tests.discovery/build.properties +++ b/tests/bundles/org.eclipse.ecf.tests.discovery/build.properties @@ -5,5 +5,5 @@ bin.includes = META-INF/,\ plugin.properties,\ about.html src.includes = about.html -jre.compilation.profile = J2SE-1.4 +jre.compilation.profile = J2SE-11 javacErrors.. = -assertIdentifier,-enumIdentifier diff --git a/tests/bundles/org.eclipse.ecf.tests.protocol.msn/build.properties b/tests/bundles/org.eclipse.ecf.tests.protocol.msn/build.properties index 5456857d8a..55aa36bfad 100644 --- a/tests/bundles/org.eclipse.ecf.tests.protocol.msn/build.properties +++ b/tests/bundles/org.eclipse.ecf.tests.protocol.msn/build.properties @@ -2,5 +2,5 @@ source.. = src/ output.. = bin/ bin.includes = META-INF/,\ . -jre.compilation.profile = J2SE-1.4 +jre.compilation.profile = J2SE-11 javacErrors.. = -assertIdentifier,-enumIdentifier diff --git a/tests/bundles/org.eclipse.ecf.tests.provider.discovery/build.properties b/tests/bundles/org.eclipse.ecf.tests.provider.discovery/build.properties index 3f4964bcf1..e4e790050f 100644 --- a/tests/bundles/org.eclipse.ecf.tests.provider.discovery/build.properties +++ b/tests/bundles/org.eclipse.ecf.tests.provider.discovery/build.properties @@ -2,4 +2,4 @@ source.. = src/ output.. = bin/ bin.includes = META-INF/,\ . -jre.compilation.profile = J2SE-1.4 +jre.compilation.profile = J2SE-11 diff --git a/tests/bundles/org.eclipse.ecf.tests.provider.dnssd/build.properties b/tests/bundles/org.eclipse.ecf.tests.provider.dnssd/build.properties index a346452e15..67ad960b11 100644 --- a/tests/bundles/org.eclipse.ecf.tests.provider.dnssd/build.properties +++ b/tests/bundles/org.eclipse.ecf.tests.provider.dnssd/build.properties @@ -2,6 +2,6 @@ source.. = src/ output.. = bin/ bin.includes = META-INF/,\ . -jre.compilation.profile = J2SE-1.4 +jre.compilation.profile = J2SE-11 additional.bundles = org.eclipse.equinox.concurrent jars.extra.classpath = platform:/plugin/org.eclipse.equinox.concurrent diff --git a/tests/bundles/org.eclipse.ecf.tests.provider.jmdns/build.properties b/tests/bundles/org.eclipse.ecf.tests.provider.jmdns/build.properties index 5456857d8a..55aa36bfad 100644 --- a/tests/bundles/org.eclipse.ecf.tests.provider.jmdns/build.properties +++ b/tests/bundles/org.eclipse.ecf.tests.provider.jmdns/build.properties @@ -2,5 +2,5 @@ source.. = src/ output.. = bin/ bin.includes = META-INF/,\ . -jre.compilation.profile = J2SE-1.4 +jre.compilation.profile = J2SE-11 javacErrors.. = -assertIdentifier,-enumIdentifier diff --git a/tests/bundles/org.eclipse.ecf.tests.provider.jslp/build.properties b/tests/bundles/org.eclipse.ecf.tests.provider.jslp/build.properties index 3f4964bcf1..e4e790050f 100755 --- a/tests/bundles/org.eclipse.ecf.tests.provider.jslp/build.properties +++ b/tests/bundles/org.eclipse.ecf.tests.provider.jslp/build.properties @@ -2,4 +2,4 @@ source.. = src/ output.. = bin/ bin.includes = META-INF/,\ . -jre.compilation.profile = J2SE-1.4 +jre.compilation.profile = J2SE-11 diff --git a/tests/bundles/org.eclipse.ecf.tests/build.properties b/tests/bundles/org.eclipse.ecf.tests/build.properties index 34271c2a1a..d60b77b9ab 100755 --- a/tests/bundles/org.eclipse.ecf.tests/build.properties +++ b/tests/bundles/org.eclipse.ecf.tests/build.properties @@ -6,4 +6,4 @@ bin.includes = META-INF/,\ about.html,\ plugin.properties src.includes = about.html -jre.compilation.profile = J2SE-1.5 +jre.compilation.profile = J2SE-11 From aed8994de87eee66fe5957ad733bea29cc866a37 Mon Sep 17 00:00:00 2001 From: Scott Lewis Date: Sat, 21 Oct 2023 13:42:44 -0700 Subject: [PATCH 03/17] Updated version --- framework/bundles/org.eclipse.ecf.console/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 9 ++++++--- .../bundles/org.eclipse.ecf.console/META-INF/MANIFEST.MF | 4 ++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/framework/bundles/org.eclipse.ecf.console/.classpath b/framework/bundles/org.eclipse.ecf.console/.classpath index 098194ca4b..e801ebfb46 100644 --- a/framework/bundles/org.eclipse.ecf.console/.classpath +++ b/framework/bundles/org.eclipse.ecf.console/.classpath @@ -1,6 +1,6 @@ - + diff --git a/framework/bundles/org.eclipse.ecf.console/.settings/org.eclipse.jdt.core.prefs b/framework/bundles/org.eclipse.ecf.console/.settings/org.eclipse.jdt.core.prefs index 7341ab1683..f2525a8b92 100644 --- a/framework/bundles/org.eclipse.ecf.console/.settings/org.eclipse.jdt.core.prefs +++ b/framework/bundles/org.eclipse.ecf.console/.settings/org.eclipse.jdt.core.prefs @@ -1,11 +1,14 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.7 +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 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.7 +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/framework/bundles/org.eclipse.ecf.console/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.console/META-INF/MANIFEST.MF index 7f4907d769..39f182c758 100644 --- a/framework/bundles/org.eclipse.ecf.console/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.console/META-INF/MANIFEST.MF @@ -4,9 +4,9 @@ Bundle-Name: %plugin.name Bundle-SymbolicName: org.eclipse.ecf.console Automatic-Module-Name: org.eclipse.ecf.console Bundle-Vendor: %plugin.provider -Bundle-Version: 1.3.101.qualifier +Bundle-Version: 1.4.0.qualifier Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: org.apache.felix.service.command;version="[0.10.0,2.0.0)";resolution:=optional, org.eclipse.ecf.core;version="[3.0.0,4.0.0)", org.eclipse.ecf.core.identity;version="[3.0.0,4.0.0)", From cb8b8a73052f33f2b263bce71c4c7400716d4856 Mon Sep 17 00:00:00 2001 From: Scott Lewis Date: Sat, 21 Oct 2023 13:44:41 -0700 Subject: [PATCH 04/17] Updated version --- framework/bundles/org.eclipse.ecf.console/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/bundles/org.eclipse.ecf.console/pom.xml b/framework/bundles/org.eclipse.ecf.console/pom.xml index e4e4d7ca7e..150fbac090 100644 --- a/framework/bundles/org.eclipse.ecf.console/pom.xml +++ b/framework/bundles/org.eclipse.ecf.console/pom.xml @@ -10,6 +10,6 @@ org.eclipse.ecf org.eclipse.ecf.console - 1.3.101-SNAPSHOT + 1.4.0-SNAPSHOT eclipse-plugin From e56012910ebe4287edf0926b501575c0537cbf86 Mon Sep 17 00:00:00 2001 From: Scott Lewis Date: Sat, 21 Oct 2023 13:47:23 -0700 Subject: [PATCH 05/17] Updated version --- framework/bundles/org.eclipse.ecf.console/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/bundles/org.eclipse.ecf.console/build.properties b/framework/bundles/org.eclipse.ecf.console/build.properties index 363cf247db..a98c8e7056 100644 --- a/framework/bundles/org.eclipse.ecf.console/build.properties +++ b/framework/bundles/org.eclipse.ecf.console/build.properties @@ -7,4 +7,4 @@ bin.includes = META-INF/,\ OSGI-INF/org.eclipse.ecf.internal.console.ContainerCommand.xml,\ OSGI-INF/ src.includes = about.html -jre.compilation.profile = J2SE-11 +jre.compilation.profile = JavaSE-11 From e750902bcc6bd9e47e51d01d3c678862378077a5 Mon Sep 17 00:00:00 2001 From: Scott Lewis Date: Sat, 21 Oct 2023 13:50:25 -0700 Subject: [PATCH 06/17] Updated version --- .../org.eclipse.ecf.presence.bot.kosmos/build.properties | 2 +- .../build.properties | 2 +- .../bundles/org.eclipse.ecf.example.clients/build.properties | 2 +- .../org.eclipse.ecf.example.collab.editor/build.properties | 2 +- .../bundles/org.eclipse.ecf.example.pubsub/build.properties | 2 +- .../org.eclipse.ecf.examples.eventadmin.app/build.properties | 2 +- .../org.eclipse.ecf.examples.provider.trivial/build.properties | 2 +- .../build.properties | 2 +- .../build.properties | 2 +- .../build.properties | 2 +- .../build.properties | 2 +- .../org.eclipse.ecf.discovery.ui.browser/build.properties | 2 +- .../bundles/org.eclipse.ecf.discovery.ui.edit/build.properties | 2 +- .../org.eclipse.ecf.discovery.ui.model/build.properties | 2 +- .../build.properties | 2 +- .../org.eclipse.ecf.discovery.ui.properties/build.properties | 2 +- .../bundles/org.eclipse.ecf.discovery.ui/build.properties | 2 +- .../bundles/org.eclipse.ecf.discovery/META-INF/MANIFEST.MF | 3 +-- framework/bundles/org.eclipse.ecf.discovery/pom.xml | 2 +- .../bundles/org.eclipse.ecf.filetransfer.ui/build.properties | 2 +- .../org.eclipse.ecf.presence.collab.ui/build.properties | 2 +- .../bundles/org.eclipse.ecf.remoteservice.rpc/build.properties | 2 +- framework/bundles/org.eclipse.ecf.storage/build.properties | 2 +- framework/bundles/org.eclipse.ecf.sync/build.properties | 2 +- .../bundles/org.eclipse.ecf.telephony.call.ui/build.properties | 2 +- .../bundles/org.eclipse.ecf.telephony.call/build.properties | 2 +- .../bundles/org.eclipse.ecf.ui.capabilities/build.properties | 2 +- framework/bundles/org.eclipse.ecf.ui/build.properties | 2 +- .../build.properties | 2 +- .../build.properties | 2 +- .../bundles/org.eclipse.ecf.protocol.msn/build.properties | 2 +- protocols/bundles/org.jivesoftware.smack/build.properties | 2 +- .../org.eclipse.ecf.provider.bittorrent.ui/build.properties | 2 +- .../org.eclipse.ecf.provider.bittorrent/build.properties | 2 +- .../bundles/org.eclipse.ecf.provider.irc.ui/build.properties | 2 +- .../bundles/org.eclipse.ecf.provider.irc/build.properties | 2 +- .../bundles/org.eclipse.ecf.provider.jmdns/build.properties | 2 +- .../bundles/org.eclipse.ecf.provider.jslp/build.properties | 2 +- .../bundles/org.eclipse.ecf.provider.local/build.properties | 2 +- .../bundles/org.eclipse.ecf.provider.msn/build.properties | 2 +- .../bundles/org.eclipse.ecf.provider.r_osgi/build.properties | 2 +- .../bundles/org.eclipse.ecf.provider.rss/build.properties | 2 +- providers/bundles/org.eclipse.ecf.provider.ui/build.properties | 2 +- .../org.eclipse.ecf.remoteservice.eventadmin/build.properties | 2 +- server-side/bundles/org.eclipse.ecf.server/build.properties | 2 +- .../build.properties | 2 +- .../build.properties | 2 +- .../build.properties | 2 +- tests/bundles/org.eclipse.ecf.tests.datashare/build.properties | 2 +- tests/bundles/org.eclipse.ecf.tests.discovery/build.properties | 2 +- .../org.eclipse.ecf.tests.protocol.msn/build.properties | 2 +- .../org.eclipse.ecf.tests.provider.discovery/build.properties | 2 +- .../org.eclipse.ecf.tests.provider.dnssd/build.properties | 2 +- .../org.eclipse.ecf.tests.provider.jmdns/build.properties | 2 +- .../org.eclipse.ecf.tests.provider.jslp/build.properties | 2 +- tests/bundles/org.eclipse.ecf.tests/build.properties | 2 +- 56 files changed, 56 insertions(+), 57 deletions(-) diff --git a/applications/kosmos/bundles/org.eclipse.ecf.presence.bot.kosmos/build.properties b/applications/kosmos/bundles/org.eclipse.ecf.presence.bot.kosmos/build.properties index e4ac2ca2fd..d142b4e48b 100644 --- a/applications/kosmos/bundles/org.eclipse.ecf.presence.bot.kosmos/build.properties +++ b/applications/kosmos/bundles/org.eclipse.ecf.presence.bot.kosmos/build.properties @@ -6,4 +6,4 @@ bin.includes = META-INF/,\ messages.properties,\ operators.properties,\ plugin.properties -jre.compilation.profile = J2SE-11 +jre.compilation.profile = JavaSE-11 diff --git a/compendium/bundles/org.eclipse.ecf.osgi.services.distribution/build.properties b/compendium/bundles/org.eclipse.ecf.osgi.services.distribution/build.properties index 9020258064..3e324343e8 100644 --- a/compendium/bundles/org.eclipse.ecf.osgi.services.distribution/build.properties +++ b/compendium/bundles/org.eclipse.ecf.osgi.services.distribution/build.properties @@ -8,4 +8,4 @@ src.includes = about.html javacErrors.. = -assertIdentifier,\ -enumIdentifier source.. = src/ -jre.compilation.profile = J2SE-11 +jre.compilation.profile = JavaSE-11 diff --git a/examples/bundles/org.eclipse.ecf.example.clients/build.properties b/examples/bundles/org.eclipse.ecf.example.clients/build.properties index 8f39d92fa5..b42fd7c1f9 100644 --- a/examples/bundles/org.eclipse.ecf.example.clients/build.properties +++ b/examples/bundles/org.eclipse.ecf.example.clients/build.properties @@ -10,5 +10,5 @@ src.includes = about.html,\ products/ source.. = src/ output.. = bin/ -jre.compilation.profile = J2SE-11 +jre.compilation.profile = JavaSE-11 javacErrors.. = -assertIdentifier,-enumIdentifier diff --git a/examples/bundles/org.eclipse.ecf.example.collab.editor/build.properties b/examples/bundles/org.eclipse.ecf.example.collab.editor/build.properties index 045869a55d..f3e6a6e314 100644 --- a/examples/bundles/org.eclipse.ecf.example.collab.editor/build.properties +++ b/examples/bundles/org.eclipse.ecf.example.collab.editor/build.properties @@ -6,5 +6,5 @@ src.includes = about.html source.. = src/ output.. = bin/ -jre.compilation.profile = J2SE-11 +jre.compilation.profile = JavaSE-11 javacErrors.. = -assertIdentifier,-enumIdentifier diff --git a/examples/bundles/org.eclipse.ecf.example.pubsub/build.properties b/examples/bundles/org.eclipse.ecf.example.pubsub/build.properties index ec8291153d..8e7494f82e 100644 --- a/examples/bundles/org.eclipse.ecf.example.pubsub/build.properties +++ b/examples/bundles/org.eclipse.ecf.example.pubsub/build.properties @@ -8,4 +8,4 @@ bin.includes = META-INF/,\ about.html src.includes = schema/,\ about.html -jre.compilation.profile = J2SE-11 +jre.compilation.profile = JavaSE-11 diff --git a/examples/bundles/org.eclipse.ecf.examples.eventadmin.app/build.properties b/examples/bundles/org.eclipse.ecf.examples.eventadmin.app/build.properties index 24d0e317d3..497b86621a 100644 --- a/examples/bundles/org.eclipse.ecf.examples.eventadmin.app/build.properties +++ b/examples/bundles/org.eclipse.ecf.examples.eventadmin.app/build.properties @@ -9,4 +9,4 @@ bin.includes = META-INF/,\ src.includes = about.html,\ bundle.properties,\ products/ -jre.compilation.profile = J2SE-11 +jre.compilation.profile = JavaSE-11 diff --git a/examples/bundles/org.eclipse.ecf.examples.provider.trivial/build.properties b/examples/bundles/org.eclipse.ecf.examples.provider.trivial/build.properties index 7283d28272..48e2f6953e 100644 --- a/examples/bundles/org.eclipse.ecf.examples.provider.trivial/build.properties +++ b/examples/bundles/org.eclipse.ecf.examples.provider.trivial/build.properties @@ -5,5 +5,5 @@ bin.includes = META-INF/,\ plugin.xml,\ products/,\ bundle.properties -jre.compilation.profile = J2SE-11 +jre.compilation.profile = JavaSE-11 src.includes = products/ diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer.rs/build.properties b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer.rs/build.properties index 2a7687a3bb..90ec9fcf81 100644 --- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer.rs/build.properties +++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer.rs/build.properties @@ -7,4 +7,4 @@ bin.includes = META-INF/,\ src.includes = about.html,\ bundle.properties,\ products/Hello Service Consumer RS.product -jre.compilation.profile = J2SE-11 +jre.compilation.profile = JavaSE-11 diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.host/build.properties b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.host/build.properties index 42b2a42220..86a47f1910 100644 --- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.host/build.properties +++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.host/build.properties @@ -11,5 +11,5 @@ source.. = src/ src.includes = bundle.properties,\ about.html,\ products/ -jre.compilation.profile = J2SE-11 +jre.compilation.profile = JavaSE-11 \ No newline at end of file diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host.rs/build.properties b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host.rs/build.properties index 084356cbbd..9dbaceff24 100644 --- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host.rs/build.properties +++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host.rs/build.properties @@ -7,4 +7,4 @@ bin.includes = META-INF/,\ src.includes = bundle.properties,\ about.html,\ products/Hello Service Host RS.product -jre.compilation.profile = J2SE-11 +jre.compilation.profile = JavaSE-11 diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/build.properties b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/build.properties index b4ac1fcd46..42556703d2 100644 --- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/build.properties +++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/build.properties @@ -9,5 +9,5 @@ bin.includes = META-INF/,\ src.includes = about.html,\ bundle.properties,\ products/ -jre.compilation.profile = J2SE-11 +jre.compilation.profile = JavaSE-11 javacErrors.. = -assertIdentifier,-enumIdentifier diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.browser/build.properties b/framework/bundles/org.eclipse.ecf.discovery.ui.browser/build.properties index d60b77b9ab..92670ea3de 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.browser/build.properties +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.browser/build.properties @@ -6,4 +6,4 @@ bin.includes = META-INF/,\ about.html,\ plugin.properties src.includes = about.html -jre.compilation.profile = J2SE-11 +jre.compilation.profile = JavaSE-11 diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.edit/build.properties b/framework/bundles/org.eclipse.ecf.discovery.ui.edit/build.properties index 26dfa71992..404a4a5336 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.edit/build.properties +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.edit/build.properties @@ -8,4 +8,4 @@ jars.compile.order = . source.. = src/ output.. = bin/ src.includes = about.html -jre.compilation.profile = J2SE-11 +jre.compilation.profile = JavaSE-11 diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.model/build.properties b/framework/bundles/org.eclipse.ecf.discovery.ui.model/build.properties index 7266c8e240..9ab327a9e5 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.model/build.properties +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.model/build.properties @@ -9,4 +9,4 @@ source.. = src/ output.. = bin/ src.includes = model/,\ about.html -jre.compilation.profile = J2SE-11 +jre.compilation.profile = JavaSE-11 diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.properties.tabbed/build.properties b/framework/bundles/org.eclipse.ecf.discovery.ui.properties.tabbed/build.properties index f67f6c225e..42e9ea44f6 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.properties.tabbed/build.properties +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.properties.tabbed/build.properties @@ -7,4 +7,4 @@ bin.includes = META-INF/,\ plugin.properties src.includes = fragment.xml,\ about.html -jre.compilation.profile = J2SE-11 +jre.compilation.profile = JavaSE-11 diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.properties/build.properties b/framework/bundles/org.eclipse.ecf.discovery.ui.properties/build.properties index 7e379cb9bf..d45a0e6dd9 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.properties/build.properties +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.properties/build.properties @@ -7,4 +7,4 @@ bin.includes = META-INF/,\ plugin.properties src.includes = fragment.xml,\ about.html -jre.compilation.profile = J2SE-11 +jre.compilation.profile = JavaSE-11 diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui/build.properties b/framework/bundles/org.eclipse.ecf.discovery.ui/build.properties index 056fd33ce8..721f0ab877 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui/build.properties +++ b/framework/bundles/org.eclipse.ecf.discovery.ui/build.properties @@ -9,4 +9,4 @@ source.. = src/ output.. = bin/ src.includes = icons/,\ about.html -jre.compilation.profile = J2SE-11 +jre.compilation.profile = JavaSE-11 diff --git a/framework/bundles/org.eclipse.ecf.discovery/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.discovery/META-INF/MANIFEST.MF index c3ad72cdab..59bb7d8112 100644 --- a/framework/bundles/org.eclipse.ecf.discovery/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.discovery/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin.name Bundle-SymbolicName: org.eclipse.ecf.discovery;singleton:=true Automatic-Module-Name: org.eclipse.ecf.discovery -Bundle-Version: 5.1.2.qualifier +Bundle-Version: 5.2.0.qualifier Bundle-Activator: org.eclipse.ecf.internal.discovery.DiscoveryPlugin Bundle-Vendor: %plugin.provider Bundle-Localization: plugin @@ -12,7 +12,6 @@ Export-Package: org.eclipse.ecf.discovery;version="4.1.0", org.eclipse.ecf.discovery.identity;version="3.0.0", org.eclipse.ecf.discovery.service;version="2.0.0", org.eclipse.ecf.internal.discovery;version="3.0.0";x-internal:=true -Bundle-RequiredExecutionEnvironment: J2SE-1.4 Require-Bundle: org.eclipse.equinox.common;bundle-version="[3.0.0,4.0.0)", org.eclipse.ecf;bundle-version="[3.4.0,4.0.0)" Import-Package: org.eclipse.core.runtime.jobs, diff --git a/framework/bundles/org.eclipse.ecf.discovery/pom.xml b/framework/bundles/org.eclipse.ecf.discovery/pom.xml index 7e53e9e0ab..a8f4a0930f 100644 --- a/framework/bundles/org.eclipse.ecf.discovery/pom.xml +++ b/framework/bundles/org.eclipse.ecf.discovery/pom.xml @@ -10,6 +10,6 @@ org.eclipse.ecf org.eclipse.ecf.discovery - 5.1.2-SNAPSHOT + 5.2.0-SNAPSHOT eclipse-plugin diff --git a/framework/bundles/org.eclipse.ecf.filetransfer.ui/build.properties b/framework/bundles/org.eclipse.ecf.filetransfer.ui/build.properties index 10dfcd03bc..367fe153f2 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer.ui/build.properties +++ b/framework/bundles/org.eclipse.ecf.filetransfer.ui/build.properties @@ -17,5 +17,5 @@ bin.includes = plugin.xml,\ about.html,\ icons/ src.includes = about.html -jre.compilation.profile = J2SE-11 +jre.compilation.profile = JavaSE-11 javacErrors.. = -assertIdentifier,-enumIdentifier diff --git a/framework/bundles/org.eclipse.ecf.presence.collab.ui/build.properties b/framework/bundles/org.eclipse.ecf.presence.collab.ui/build.properties index cab31b761c..77c9716c58 100644 --- a/framework/bundles/org.eclipse.ecf.presence.collab.ui/build.properties +++ b/framework/bundles/org.eclipse.ecf.presence.collab.ui/build.properties @@ -7,5 +7,5 @@ bin.includes = META-INF/,\ plugin.properties,\ about.html src.includes = about.html -jre.compilation.profile = J2SE-11 +jre.compilation.profile = JavaSE-11 javacErrors.. = -assertIdentifier,-enumIdentifier diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.rpc/build.properties b/framework/bundles/org.eclipse.ecf.remoteservice.rpc/build.properties index a28ad63f7a..5a8fd46fbd 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.rpc/build.properties +++ b/framework/bundles/org.eclipse.ecf.remoteservice.rpc/build.properties @@ -14,4 +14,4 @@ bin.includes = META-INF/,\ plugin.xml,\ plugin.properties jars.extra.classpath = platform:/plugin/org.eclipse.equinox.concurrent -jre.compilation.profile = J2SE-11 +jre.compilation.profile = JavaSE-11 diff --git a/framework/bundles/org.eclipse.ecf.storage/build.properties b/framework/bundles/org.eclipse.ecf.storage/build.properties index e564ca49ca..82ff3b4e51 100644 --- a/framework/bundles/org.eclipse.ecf.storage/build.properties +++ b/framework/bundles/org.eclipse.ecf.storage/build.properties @@ -6,4 +6,4 @@ bin.includes = META-INF/,\ about.html,\ plugin.xml src.includes = about.html -jre.compilation.profile = J2SE-11 +jre.compilation.profile = JavaSE-11 diff --git a/framework/bundles/org.eclipse.ecf.sync/build.properties b/framework/bundles/org.eclipse.ecf.sync/build.properties index b0b6307298..185ed82667 100644 --- a/framework/bundles/org.eclipse.ecf.sync/build.properties +++ b/framework/bundles/org.eclipse.ecf.sync/build.properties @@ -5,4 +5,4 @@ bin.includes = META-INF/,\ about.html,\ plugin.properties src.includes = about.html -jre.compilation.profile = J2SE-11 +jre.compilation.profile = JavaSE-11 diff --git a/framework/bundles/org.eclipse.ecf.telephony.call.ui/build.properties b/framework/bundles/org.eclipse.ecf.telephony.call.ui/build.properties index 11db29a4ce..fd230d8580 100644 --- a/framework/bundles/org.eclipse.ecf.telephony.call.ui/build.properties +++ b/framework/bundles/org.eclipse.ecf.telephony.call.ui/build.properties @@ -5,5 +5,5 @@ bin.includes = META-INF/,\ about.html,\ plugin.properties src.includes = about.html -jre.compilation.profile = J2SE-11 +jre.compilation.profile = JavaSE-11 javacWarnings.. = -assertIdentifier,-enumIdentifier diff --git a/framework/bundles/org.eclipse.ecf.telephony.call/build.properties b/framework/bundles/org.eclipse.ecf.telephony.call/build.properties index 91908a6b43..0a8446cbb3 100644 --- a/framework/bundles/org.eclipse.ecf.telephony.call/build.properties +++ b/framework/bundles/org.eclipse.ecf.telephony.call/build.properties @@ -14,5 +14,5 @@ bin.includes = .,\ src.includes = about.html source.. = src/ output.. = bin/ -jre.compilation.profile = J2SE-11 +jre.compilation.profile = JavaSE-11 javacWarnings.. = -assertIdentifier,-enumIdentifier diff --git a/framework/bundles/org.eclipse.ecf.ui.capabilities/build.properties b/framework/bundles/org.eclipse.ecf.ui.capabilities/build.properties index 3f335181dc..8f66bf7231 100644 --- a/framework/bundles/org.eclipse.ecf.ui.capabilities/build.properties +++ b/framework/bundles/org.eclipse.ecf.ui.capabilities/build.properties @@ -3,6 +3,6 @@ bin.includes = META-INF/,\ plugin.xml,\ plugin.properties,\ about.html -jre.compilation.profile = J2SE-11 +jre.compilation.profile = JavaSE-11 javacWarnings.. = -assertIdentifier,-enumIdentifier src.includes = about.html diff --git a/framework/bundles/org.eclipse.ecf.ui/build.properties b/framework/bundles/org.eclipse.ecf.ui/build.properties index a23fecfc2c..7fb2a47a0d 100644 --- a/framework/bundles/org.eclipse.ecf.ui/build.properties +++ b/framework/bundles/org.eclipse.ecf.ui/build.properties @@ -10,5 +10,5 @@ src.includes = about.html,\ jars.compile.order = . source.. = src/ output.. = bin/ -jre.compilation.profile = J2SE-11 +jre.compilation.profile = JavaSE-11 javacErrors.. = -assertIdentifier,-enumIdentifier diff --git a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/build.properties b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/build.properties index a46b9668d0..3efc595b15 100644 --- a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/build.properties +++ b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/build.properties @@ -8,4 +8,4 @@ bin.includes = META-INF/,\ OSGI-INF/ src.includes = about.html,\ bundle.properties -jre.compilation.profile = J2SE-11 +jre.compilation.profile = JavaSE-11 diff --git a/osgi/bundles/org.eclipse.osgi.services.remoteserviceadmin/build.properties b/osgi/bundles/org.eclipse.osgi.services.remoteserviceadmin/build.properties index 22aa5b4614..d86e3035e3 100644 --- a/osgi/bundles/org.eclipse.osgi.services.remoteserviceadmin/build.properties +++ b/osgi/bundles/org.eclipse.osgi.services.remoteserviceadmin/build.properties @@ -21,6 +21,6 @@ output.. = bin/ jars.extra.classpath = osgi/osgi.annotation.jar jars.compile.order = . source.. = src/ -jre.compilation.profile = J2SE-11 +jre.compilation.profile = JavaSE-11 \ No newline at end of file diff --git a/protocols/bundles/org.eclipse.ecf.protocol.msn/build.properties b/protocols/bundles/org.eclipse.ecf.protocol.msn/build.properties index 483df6f64e..980606451d 100644 --- a/protocols/bundles/org.eclipse.ecf.protocol.msn/build.properties +++ b/protocols/bundles/org.eclipse.ecf.protocol.msn/build.properties @@ -14,5 +14,5 @@ bin.includes = META-INF/,\ plugin.properties,\ about.html src.includes = about.html -jre.compilation.profile = J2SE-11 +jre.compilation.profile = JavaSE-11 javacErrors.. = -assertIdentifier,-enumIdentifier diff --git a/protocols/bundles/org.jivesoftware.smack/build.properties b/protocols/bundles/org.jivesoftware.smack/build.properties index 56c054ca4c..cbe9a7cfce 100644 --- a/protocols/bundles/org.jivesoftware.smack/build.properties +++ b/protocols/bundles/org.jivesoftware.smack/build.properties @@ -11,5 +11,5 @@ src.includes = asl-v20.txt,\ META-INF/eclipse.inf javacSource = 1.5 javacTarget = 1.5 -jre.compilation.profile = J2SE-11 +jre.compilation.profile = JavaSE-11 \ No newline at end of file diff --git a/providers/bundles/org.eclipse.ecf.provider.bittorrent.ui/build.properties b/providers/bundles/org.eclipse.ecf.provider.bittorrent.ui/build.properties index 3ee3b91be4..9cd2e44ee2 100644 --- a/providers/bundles/org.eclipse.ecf.provider.bittorrent.ui/build.properties +++ b/providers/bundles/org.eclipse.ecf.provider.bittorrent.ui/build.properties @@ -18,4 +18,4 @@ bin.includes = META-INF/,\ plugin.properties src.includes = about.html,\ icons/ -jre.compilation.profile = J2SE-11 +jre.compilation.profile = JavaSE-11 diff --git a/providers/bundles/org.eclipse.ecf.provider.bittorrent/build.properties b/providers/bundles/org.eclipse.ecf.provider.bittorrent/build.properties index d60b77b9ab..92670ea3de 100644 --- a/providers/bundles/org.eclipse.ecf.provider.bittorrent/build.properties +++ b/providers/bundles/org.eclipse.ecf.provider.bittorrent/build.properties @@ -6,4 +6,4 @@ bin.includes = META-INF/,\ about.html,\ plugin.properties src.includes = about.html -jre.compilation.profile = J2SE-11 +jre.compilation.profile = JavaSE-11 diff --git a/providers/bundles/org.eclipse.ecf.provider.irc.ui/build.properties b/providers/bundles/org.eclipse.ecf.provider.irc.ui/build.properties index d2e7eade16..126f2873e2 100644 --- a/providers/bundles/org.eclipse.ecf.provider.irc.ui/build.properties +++ b/providers/bundles/org.eclipse.ecf.provider.irc.ui/build.properties @@ -7,4 +7,4 @@ bin.includes = META-INF/,\ about.html,\ plugin.properties src.includes = about.html -jre.compilation.profile = J2SE-11 +jre.compilation.profile = JavaSE-11 diff --git a/providers/bundles/org.eclipse.ecf.provider.irc/build.properties b/providers/bundles/org.eclipse.ecf.provider.irc/build.properties index 0cd434a371..f4d84dc5d2 100644 --- a/providers/bundles/org.eclipse.ecf.provider.irc/build.properties +++ b/providers/bundles/org.eclipse.ecf.provider.irc/build.properties @@ -11,4 +11,4 @@ src.includes = about.html,\ asl-v20.txt source.. = src/ output.. = bin/ -jre.compilation.profile = J2SE-11 +jre.compilation.profile = JavaSE-11 diff --git a/providers/bundles/org.eclipse.ecf.provider.jmdns/build.properties b/providers/bundles/org.eclipse.ecf.provider.jmdns/build.properties index 72acd714a3..b014493ced 100644 --- a/providers/bundles/org.eclipse.ecf.provider.jmdns/build.properties +++ b/providers/bundles/org.eclipse.ecf.provider.jmdns/build.properties @@ -11,7 +11,7 @@ src.includes = about.html,\ source.. = src/,\ jmdns/ output.. = bin/ -jre.compilation.profile = J2SE-11 +jre.compilation.profile = JavaSE-11 javacErrors.. = -assertIdentifier,-enumIdentifier additional.bundles = org.eclipse.equinox.concurrent jars.extra.classpath = platform:/plugin/org.eclipse.equinox.concurrent diff --git a/providers/bundles/org.eclipse.ecf.provider.jslp/build.properties b/providers/bundles/org.eclipse.ecf.provider.jslp/build.properties index ce33d9dafc..2ce96026b7 100644 --- a/providers/bundles/org.eclipse.ecf.provider.jslp/build.properties +++ b/providers/bundles/org.eclipse.ecf.provider.jslp/build.properties @@ -8,7 +8,7 @@ bin.includes = META-INF/,\ .options source.. = src/ src.includes = about.html -jre.compilation.profile = J2SE-11 +jre.compilation.profile = JavaSE-11 additional.bundles = org.eclipse.equinox.concurrent jars.extra.classpath = platform:/plugin/org.eclipse.equinox.concurrent javacErrors.. = -assertIdentifier,-enumIdentifier diff --git a/providers/bundles/org.eclipse.ecf.provider.local/build.properties b/providers/bundles/org.eclipse.ecf.provider.local/build.properties index fe59fcfde0..926752973e 100644 --- a/providers/bundles/org.eclipse.ecf.provider.local/build.properties +++ b/providers/bundles/org.eclipse.ecf.provider.local/build.properties @@ -4,4 +4,4 @@ bin.includes = META-INF/,\ .,\ plugin.xml,\ bundle.properties -jre.compilation.profile = J2SE-11 +jre.compilation.profile = JavaSE-11 diff --git a/providers/bundles/org.eclipse.ecf.provider.msn/build.properties b/providers/bundles/org.eclipse.ecf.provider.msn/build.properties index 058b00f229..401470b159 100644 --- a/providers/bundles/org.eclipse.ecf.provider.msn/build.properties +++ b/providers/bundles/org.eclipse.ecf.provider.msn/build.properties @@ -15,5 +15,5 @@ bin.includes = META-INF/,\ plugin.xml,\ about.html src.includes = about.html -jre.compilation.profile = J2SE-11 +jre.compilation.profile = JavaSE-11 javacErrors.. = -assertIdentifier,-enumIdentifier diff --git a/providers/bundles/org.eclipse.ecf.provider.r_osgi/build.properties b/providers/bundles/org.eclipse.ecf.provider.r_osgi/build.properties index 98d632874f..43f91f680e 100644 --- a/providers/bundles/org.eclipse.ecf.provider.r_osgi/build.properties +++ b/providers/bundles/org.eclipse.ecf.provider.r_osgi/build.properties @@ -6,5 +6,5 @@ bin.includes = META-INF/,\ plugin.properties,\ about.html src.includes = about.html -jre.compilation.profile = J2SE-11 +jre.compilation.profile = JavaSE-11 javacErrors.. = -assertIdentifier,-enumIdentifier diff --git a/providers/bundles/org.eclipse.ecf.provider.rss/build.properties b/providers/bundles/org.eclipse.ecf.provider.rss/build.properties index ddef88030a..b17d1aca57 100644 --- a/providers/bundles/org.eclipse.ecf.provider.rss/build.properties +++ b/providers/bundles/org.eclipse.ecf.provider.rss/build.properties @@ -8,5 +8,5 @@ bin.includes = plugin.xml,\ lib/rss-sse.jar,\ plugin.properties src.includes = about.html -jre.compilation.profile = J2SE-11 +jre.compilation.profile = JavaSE-11 javacErrors.. = -assertIdentifier,-enumIdentifier diff --git a/providers/bundles/org.eclipse.ecf.provider.ui/build.properties b/providers/bundles/org.eclipse.ecf.provider.ui/build.properties index 345c4af00b..3017b2aa7b 100644 --- a/providers/bundles/org.eclipse.ecf.provider.ui/build.properties +++ b/providers/bundles/org.eclipse.ecf.provider.ui/build.properties @@ -7,4 +7,4 @@ bin.includes = META-INF/,\ plugin.properties,\ icons/ src.includes = about.html -jre.compilation.profile = J2SE-11 +jre.compilation.profile = JavaSE-11 diff --git a/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/build.properties b/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/build.properties index edc30b782d..5f70f5dfe3 100644 --- a/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/build.properties +++ b/server-side/bundles/org.eclipse.ecf.remoteservice.eventadmin/build.properties @@ -8,5 +8,5 @@ bin.includes = META-INF/,\ about.html src.includes = bundle.properties,\ about.html -jre.compilation.profile = J2SE-11 +jre.compilation.profile = JavaSE-11 jars.extra.classpath=r7stubs.jar diff --git a/server-side/bundles/org.eclipse.ecf.server/build.properties b/server-side/bundles/org.eclipse.ecf.server/build.properties index c74ffe48f9..aa1fcb3afe 100644 --- a/server-side/bundles/org.eclipse.ecf.server/build.properties +++ b/server-side/bundles/org.eclipse.ecf.server/build.properties @@ -6,5 +6,5 @@ src.includes = about.html jars.compile.order = . output.. = bin/ source.. = src/ -jre.compilation.profile = J2SE-11 +jre.compilation.profile = JavaSE-11 javacErrors.. = -assertIdentifier,-enumIdentifier diff --git a/server-side/examples/bundles/org.eclipse.ecf.examples.remoteservices.client/build.properties b/server-side/examples/bundles/org.eclipse.ecf.examples.remoteservices.client/build.properties index 5fb7d7ed31..e39610a7b0 100644 --- a/server-side/examples/bundles/org.eclipse.ecf.examples.remoteservices.client/build.properties +++ b/server-side/examples/bundles/org.eclipse.ecf.examples.remoteservices.client/build.properties @@ -5,4 +5,4 @@ bin.includes = META-INF/,\ about.html src.includes = fragment.xml,\ about.html -jre.compilation.profile = J2SE-11 +jre.compilation.profile = JavaSE-11 diff --git a/server-side/examples/bundles/org.eclipse.ecf.examples.remoteservices.common/build.properties b/server-side/examples/bundles/org.eclipse.ecf.examples.remoteservices.common/build.properties index b0b6307298..185ed82667 100644 --- a/server-side/examples/bundles/org.eclipse.ecf.examples.remoteservices.common/build.properties +++ b/server-side/examples/bundles/org.eclipse.ecf.examples.remoteservices.common/build.properties @@ -5,4 +5,4 @@ bin.includes = META-INF/,\ about.html,\ plugin.properties src.includes = about.html -jre.compilation.profile = J2SE-11 +jre.compilation.profile = JavaSE-11 diff --git a/server-side/examples/bundles/org.eclipse.ecf.examples.updatesite.client/build.properties b/server-side/examples/bundles/org.eclipse.ecf.examples.updatesite.client/build.properties index e7dcccc87f..3a0e2e1ca9 100644 --- a/server-side/examples/bundles/org.eclipse.ecf.examples.updatesite.client/build.properties +++ b/server-side/examples/bundles/org.eclipse.ecf.examples.updatesite.client/build.properties @@ -6,5 +6,5 @@ bin.includes = META-INF/,\ about.html,\ plugin.properties src.includes = about.html -jre.compilation.profile = J2SE-11 +jre.compilation.profile = JavaSE-11 javacErrors.. = -assertIdentifier,-enumIdentifier diff --git a/tests/bundles/org.eclipse.ecf.tests.datashare/build.properties b/tests/bundles/org.eclipse.ecf.tests.datashare/build.properties index 7d594a4a59..17178430bf 100644 --- a/tests/bundles/org.eclipse.ecf.tests.datashare/build.properties +++ b/tests/bundles/org.eclipse.ecf.tests.datashare/build.properties @@ -5,5 +5,5 @@ bin.includes = META-INF/,\ plugin.properties,\ about.html src.includes = about.html -jre.compilation.profile = J2SE-11 +jre.compilation.profile = JavaSE-11 javacErrors.. = -assertIdentifier,-enumIdentifier diff --git a/tests/bundles/org.eclipse.ecf.tests.discovery/build.properties b/tests/bundles/org.eclipse.ecf.tests.discovery/build.properties index 7d594a4a59..17178430bf 100644 --- a/tests/bundles/org.eclipse.ecf.tests.discovery/build.properties +++ b/tests/bundles/org.eclipse.ecf.tests.discovery/build.properties @@ -5,5 +5,5 @@ bin.includes = META-INF/,\ plugin.properties,\ about.html src.includes = about.html -jre.compilation.profile = J2SE-11 +jre.compilation.profile = JavaSE-11 javacErrors.. = -assertIdentifier,-enumIdentifier diff --git a/tests/bundles/org.eclipse.ecf.tests.protocol.msn/build.properties b/tests/bundles/org.eclipse.ecf.tests.protocol.msn/build.properties index 55aa36bfad..9405dd50d1 100644 --- a/tests/bundles/org.eclipse.ecf.tests.protocol.msn/build.properties +++ b/tests/bundles/org.eclipse.ecf.tests.protocol.msn/build.properties @@ -2,5 +2,5 @@ source.. = src/ output.. = bin/ bin.includes = META-INF/,\ . -jre.compilation.profile = J2SE-11 +jre.compilation.profile = JavaSE-11 javacErrors.. = -assertIdentifier,-enumIdentifier diff --git a/tests/bundles/org.eclipse.ecf.tests.provider.discovery/build.properties b/tests/bundles/org.eclipse.ecf.tests.provider.discovery/build.properties index e4e790050f..32300568cc 100644 --- a/tests/bundles/org.eclipse.ecf.tests.provider.discovery/build.properties +++ b/tests/bundles/org.eclipse.ecf.tests.provider.discovery/build.properties @@ -2,4 +2,4 @@ source.. = src/ output.. = bin/ bin.includes = META-INF/,\ . -jre.compilation.profile = J2SE-11 +jre.compilation.profile = JavaSE-11 diff --git a/tests/bundles/org.eclipse.ecf.tests.provider.dnssd/build.properties b/tests/bundles/org.eclipse.ecf.tests.provider.dnssd/build.properties index 67ad960b11..c31d449c3c 100644 --- a/tests/bundles/org.eclipse.ecf.tests.provider.dnssd/build.properties +++ b/tests/bundles/org.eclipse.ecf.tests.provider.dnssd/build.properties @@ -2,6 +2,6 @@ source.. = src/ output.. = bin/ bin.includes = META-INF/,\ . -jre.compilation.profile = J2SE-11 +jre.compilation.profile = JavaSE-11 additional.bundles = org.eclipse.equinox.concurrent jars.extra.classpath = platform:/plugin/org.eclipse.equinox.concurrent diff --git a/tests/bundles/org.eclipse.ecf.tests.provider.jmdns/build.properties b/tests/bundles/org.eclipse.ecf.tests.provider.jmdns/build.properties index 55aa36bfad..9405dd50d1 100644 --- a/tests/bundles/org.eclipse.ecf.tests.provider.jmdns/build.properties +++ b/tests/bundles/org.eclipse.ecf.tests.provider.jmdns/build.properties @@ -2,5 +2,5 @@ source.. = src/ output.. = bin/ bin.includes = META-INF/,\ . -jre.compilation.profile = J2SE-11 +jre.compilation.profile = JavaSE-11 javacErrors.. = -assertIdentifier,-enumIdentifier diff --git a/tests/bundles/org.eclipse.ecf.tests.provider.jslp/build.properties b/tests/bundles/org.eclipse.ecf.tests.provider.jslp/build.properties index e4e790050f..32300568cc 100755 --- a/tests/bundles/org.eclipse.ecf.tests.provider.jslp/build.properties +++ b/tests/bundles/org.eclipse.ecf.tests.provider.jslp/build.properties @@ -2,4 +2,4 @@ source.. = src/ output.. = bin/ bin.includes = META-INF/,\ . -jre.compilation.profile = J2SE-11 +jre.compilation.profile = JavaSE-11 diff --git a/tests/bundles/org.eclipse.ecf.tests/build.properties b/tests/bundles/org.eclipse.ecf.tests/build.properties index d60b77b9ab..92670ea3de 100755 --- a/tests/bundles/org.eclipse.ecf.tests/build.properties +++ b/tests/bundles/org.eclipse.ecf.tests/build.properties @@ -6,4 +6,4 @@ bin.includes = META-INF/,\ about.html,\ plugin.properties src.includes = about.html -jre.compilation.profile = J2SE-11 +jre.compilation.profile = JavaSE-11 From 13c4ac074768f699998c2037b6d8a1c42a0432fb Mon Sep 17 00:00:00 2001 From: Scott Lewis Date: Sat, 21 Oct 2023 13:54:30 -0700 Subject: [PATCH 07/17] Fixes for EE update --- .../src/org/apache/commons/httpclient/TestPartsNoHost.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/bundles/org.eclipse.ecf.tests.apache.httpclient.server/src/org/apache/commons/httpclient/TestPartsNoHost.java b/tests/bundles/org.eclipse.ecf.tests.apache.httpclient.server/src/org/apache/commons/httpclient/TestPartsNoHost.java index 142f662ba2..8f9057b81c 100644 --- a/tests/bundles/org.eclipse.ecf.tests.apache.httpclient.server/src/org/apache/commons/httpclient/TestPartsNoHost.java +++ b/tests/bundles/org.eclipse.ecf.tests.apache.httpclient.server/src/org/apache/commons/httpclient/TestPartsNoHost.java @@ -109,7 +109,7 @@ public void testFilePartNullFileResendsData() throws Exception { * written to. */ private File createTempTestFile() throws IOException { - File file = Files.createTempFile("FilePartTest", ".txt").toFile(); + File file = Files.createTempFile("FilePartTest", ".txt",null).toFile(); PrintWriter out = new PrintWriter(new FileWriter(file)); out.println(PART_DATA); out.flush(); From d59921164d73f722ef069047c9423df7bbcf4587 Mon Sep 17 00:00:00 2001 From: Scott Lewis Date: Sat, 21 Oct 2023 14:01:00 -0700 Subject: [PATCH 08/17] Updated version --- .../.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 14 ++++++++------ .../META-INF/MANIFEST.MF | 5 ++--- .../pom.xml | 2 +- .../app/AbstractEventAdminApplication.java | 7 ++++--- .../app/EventAdminClientApplication.java | 3 ++- .../app/EventAdminManagerApplication.java | 3 ++- 7 files changed, 20 insertions(+), 16 deletions(-) diff --git a/examples/bundles/org.eclipse.ecf.examples.eventadmin.app/.classpath b/examples/bundles/org.eclipse.ecf.examples.eventadmin.app/.classpath index 6f3b481acd..e801ebfb46 100644 --- a/examples/bundles/org.eclipse.ecf.examples.eventadmin.app/.classpath +++ b/examples/bundles/org.eclipse.ecf.examples.eventadmin.app/.classpath @@ -1,6 +1,6 @@ - + diff --git a/examples/bundles/org.eclipse.ecf.examples.eventadmin.app/.settings/org.eclipse.jdt.core.prefs b/examples/bundles/org.eclipse.ecf.examples.eventadmin.app/.settings/org.eclipse.jdt.core.prefs index 519a6e7e2d..c9545f06a4 100644 --- a/examples/bundles/org.eclipse.ecf.examples.eventadmin.app/.settings/org.eclipse.jdt.core.prefs +++ b/examples/bundles/org.eclipse.ecf.examples.eventadmin.app/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,9 @@ -#Wed Jun 10 10:27:34 PDT 2009 eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2 -org.eclipse.jdt.core.compiler.compliance=1.4 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning -org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning -org.eclipse.jdt.core.compiler.source=1.3 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/examples/bundles/org.eclipse.ecf.examples.eventadmin.app/META-INF/MANIFEST.MF b/examples/bundles/org.eclipse.ecf.examples.eventadmin.app/META-INF/MANIFEST.MF index d318c0f9f4..180b402314 100644 --- a/examples/bundles/org.eclipse.ecf.examples.eventadmin.app/META-INF/MANIFEST.MF +++ b/examples/bundles/org.eclipse.ecf.examples.eventadmin.app/META-INF/MANIFEST.MF @@ -3,11 +3,10 @@ Bundle-ManifestVersion: 2 Bundle-Name: %bundleName Bundle-SymbolicName: org.eclipse.ecf.examples.eventadmin.app;singleton:=true Automatic-Module-Name: org.eclipse.ecf.examples.eventadmin.app -Bundle-Version: 1.0.201.qualifier +Bundle-Version: 1.1.0.qualifier Bundle-Activator: org.eclipse.ecf.examples.internal.eventadmin.app.Activator Bundle-Vendor: %bundleProvider -Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1, - J2SE-1.4 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: org.eclipse.ecf.core;version="3.0.0", org.eclipse.ecf.core.identity, org.eclipse.ecf.core.sharedobject, diff --git a/examples/bundles/org.eclipse.ecf.examples.eventadmin.app/pom.xml b/examples/bundles/org.eclipse.ecf.examples.eventadmin.app/pom.xml index 51c4b4235d..8b131165cd 100644 --- a/examples/bundles/org.eclipse.ecf.examples.eventadmin.app/pom.xml +++ b/examples/bundles/org.eclipse.ecf.examples.eventadmin.app/pom.xml @@ -10,6 +10,6 @@ org.eclipse.ecf org.eclipse.ecf.examples.eventadmin.app - 1.0.201-SNAPSHOT + 1.1.0-SNAPSHOT eclipse-plugin diff --git a/examples/bundles/org.eclipse.ecf.examples.eventadmin.app/src/org/eclipse/ecf/examples/internal/eventadmin/app/AbstractEventAdminApplication.java b/examples/bundles/org.eclipse.ecf.examples.eventadmin.app/src/org/eclipse/ecf/examples/internal/eventadmin/app/AbstractEventAdminApplication.java index 57af4f5e91..ffd4757eea 100644 --- a/examples/bundles/org.eclipse.ecf.examples.eventadmin.app/src/org/eclipse/ecf/examples/internal/eventadmin/app/AbstractEventAdminApplication.java +++ b/examples/bundles/org.eclipse.ecf.examples.eventadmin.app/src/org/eclipse/ecf/examples/internal/eventadmin/app/AbstractEventAdminApplication.java @@ -13,6 +13,7 @@ package org.eclipse.ecf.examples.internal.eventadmin.app; import java.util.ArrayList; +import java.util.Dictionary; import java.util.List; import java.util.Properties; @@ -59,12 +60,12 @@ protected Object startup(IApplicationContext context) throws Exception { // register a serialization handler for the topic that sends // non-serializable event properties bundleContext.registerService(SerializationHandler.class, - new ExampleSerializationHandler(DEFAULT_TOPIC), null); + new ExampleSerializationHandler(DEFAULT_TOPIC), (Dictionary) null); // register a serialization handler for the topic that sends // non-serializable event properties bundleContext.registerService(SerializationHandler.class, - new ExampleSerializationHandler(DEFAULT_TOPIC), null); + new ExampleSerializationHandler(DEFAULT_TOPIC), (Dictionary) null); // Process Arguments final String[] args = mungeArguments((String[]) context.getArguments() @@ -83,7 +84,7 @@ protected Object startup(IApplicationContext context) throws Exception { Properties props = new Properties(); props.put(EventConstants.EVENT_TOPIC, topics); eventAdminRegistration = bundleContext.registerService( - "org.osgi.service.event.EventAdmin", eventAdminImpl, props); + "org.osgi.service.event.EventAdmin", eventAdminImpl, (Dictionary) props); return IApplication.EXIT_OK; } diff --git a/examples/bundles/org.eclipse.ecf.examples.eventadmin.app/src/org/eclipse/ecf/examples/internal/eventadmin/app/EventAdminClientApplication.java b/examples/bundles/org.eclipse.ecf.examples.eventadmin.app/src/org/eclipse/ecf/examples/internal/eventadmin/app/EventAdminClientApplication.java index 3c11a6337f..699ce7dbf8 100644 --- a/examples/bundles/org.eclipse.ecf.examples.eventadmin.app/src/org/eclipse/ecf/examples/internal/eventadmin/app/EventAdminClientApplication.java +++ b/examples/bundles/org.eclipse.ecf.examples.eventadmin.app/src/org/eclipse/ecf/examples/internal/eventadmin/app/EventAdminClientApplication.java @@ -12,6 +12,7 @@ *****************************************************************************/ package org.eclipse.ecf.examples.internal.eventadmin.app; +import java.util.Dictionary; import java.util.Properties; import org.eclipse.equinox.app.IApplication; @@ -34,7 +35,7 @@ protected Object run() { Properties props = new Properties(); props.put(EventConstants.EVENT_TOPIC, DEFAULT_TOPIC); testEventHandlerRegistration = bundleContext.registerService( - EventHandler.class.getName(), new TestEventHandler("Client"), props); + EventHandler.class.getName(), new TestEventHandler("Client"), (Dictionary) props); // XXX for testing, setup a test sender testSender = new TestSender(eventAdminImpl, topics, container.getID() diff --git a/examples/bundles/org.eclipse.ecf.examples.eventadmin.app/src/org/eclipse/ecf/examples/internal/eventadmin/app/EventAdminManagerApplication.java b/examples/bundles/org.eclipse.ecf.examples.eventadmin.app/src/org/eclipse/ecf/examples/internal/eventadmin/app/EventAdminManagerApplication.java index 9973fdda73..66d6188dba 100644 --- a/examples/bundles/org.eclipse.ecf.examples.eventadmin.app/src/org/eclipse/ecf/examples/internal/eventadmin/app/EventAdminManagerApplication.java +++ b/examples/bundles/org.eclipse.ecf.examples.eventadmin.app/src/org/eclipse/ecf/examples/internal/eventadmin/app/EventAdminManagerApplication.java @@ -12,6 +12,7 @@ *****************************************************************************/ package org.eclipse.ecf.examples.internal.eventadmin.app; +import java.util.Dictionary; import java.util.Properties; import org.eclipse.equinox.app.IApplication; @@ -32,7 +33,7 @@ protected Object run() { Properties props = new Properties(); props.put(EventConstants.EVENT_TOPIC, "*"); testEventHandlerRegistration = bundleContext.registerService( - EventHandler.class.getName(), new TestEventHandler("Server"), props); + EventHandler.class.getName(), new TestEventHandler("Server"), (Dictionary) props); // XXX for testing, setup a test sender testSender = new TestSender(eventAdminImpl, topics, container.getID() From edc744fc621fe6022a6a0dd83d25763784946f53 Mon Sep 17 00:00:00 2001 From: Scott Lewis Date: Sat, 21 Oct 2023 14:07:09 -0700 Subject: [PATCH 09/17] Updated version --- .../org.eclipse.ecf.tests.discovery/META-INF/MANIFEST.MF | 5 ++--- .../ecf/tests/discovery/DiscoveryServiceRegistryTest.java | 4 +++- .../eclipse/ecf/tests/discovery/DiscoveryServiceTest.java | 7 ++++--- .../ECF Filetransfer Tests- HttpclientJava.launch | 2 +- .../ecf/tests/provider/filetransfer/efs/RetrieveTest.java | 2 +- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/tests/bundles/org.eclipse.ecf.tests.discovery/META-INF/MANIFEST.MF b/tests/bundles/org.eclipse.ecf.tests.discovery/META-INF/MANIFEST.MF index b120dc257c..2517b79664 100755 --- a/tests/bundles/org.eclipse.ecf.tests.discovery/META-INF/MANIFEST.MF +++ b/tests/bundles/org.eclipse.ecf.tests.discovery/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin.name Bundle-SymbolicName: org.eclipse.ecf.tests.discovery Automatic-Module-Name: org.eclipse.ecf.tests.discovery -Bundle-Version: 2.0.102.qualifier +Bundle-Version: 2.1.0.qualifier Bundle-Activator: org.eclipse.ecf.tests.discovery.Activator Bundle-Vendor: %plugin.provider Bundle-Localization: plugin @@ -19,5 +19,4 @@ Import-Package: org.eclipse.equinox.concurrent.future;version="1.0.0", org.osgi.framework, org.osgi.util.tracker;version="1.3.0" Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1, - J2SE-1.4 +Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/tests/bundles/org.eclipse.ecf.tests.discovery/src/org/eclipse/ecf/tests/discovery/DiscoveryServiceRegistryTest.java b/tests/bundles/org.eclipse.ecf.tests.discovery/src/org/eclipse/ecf/tests/discovery/DiscoveryServiceRegistryTest.java index 9c835f9919..1077c2a57e 100644 --- a/tests/bundles/org.eclipse.ecf.tests.discovery/src/org/eclipse/ecf/tests/discovery/DiscoveryServiceRegistryTest.java +++ b/tests/bundles/org.eclipse.ecf.tests.discovery/src/org/eclipse/ecf/tests/discovery/DiscoveryServiceRegistryTest.java @@ -12,6 +12,8 @@ *****************************************************************************/ package org.eclipse.ecf.tests.discovery; +import java.util.Dictionary; + import org.eclipse.ecf.core.identity.IDFactory; import org.eclipse.ecf.discovery.IServiceInfo; import org.eclipse.ecf.discovery.ServiceInfo; @@ -58,7 +60,7 @@ protected void setUp() throws Exception { protected synchronized void registerService() { BundleContext context = Activator.getDefault().getContext(); - registerService = context.registerService(IServiceInfo.class, genericServiceInfo, null); + registerService = context.registerService(IServiceInfo.class, genericServiceInfo, (Dictionary) null); } protected synchronized void unregisterService() { diff --git a/tests/bundles/org.eclipse.ecf.tests.discovery/src/org/eclipse/ecf/tests/discovery/DiscoveryServiceTest.java b/tests/bundles/org.eclipse.ecf.tests.discovery/src/org/eclipse/ecf/tests/discovery/DiscoveryServiceTest.java index 226516a35d..12132974fc 100755 --- a/tests/bundles/org.eclipse.ecf.tests.discovery/src/org/eclipse/ecf/tests/discovery/DiscoveryServiceTest.java +++ b/tests/bundles/org.eclipse.ecf.tests.discovery/src/org/eclipse/ecf/tests/discovery/DiscoveryServiceTest.java @@ -16,6 +16,7 @@ import java.util.Arrays; import java.util.Collection; import java.util.Collections; +import java.util.Dictionary; import java.util.HashSet; import java.util.Properties; import java.util.Set; @@ -93,7 +94,7 @@ public void testAddServiceListenerWithRefresh() { assertTrue(eventsToExpect + " services must be registerd at this point " + (services.length > 0 ? "" : services.toString()), services.length == eventsToExpect); // Register listener with OSGi - ServiceRegistration registration = ctxt.registerService(IServiceListener.class.getName(), tsl, props); + ServiceRegistration registration = ctxt.registerService(IServiceListener.class.getName(), tsl, (Dictionary) props); // IServiceListener#triggerDiscovery should have triggered re-discovery // register a service which we expect the test listener to get notified of @@ -141,7 +142,7 @@ public void testAddServiceListenerIServiceListenerOSGi() throws ContainerConnect Properties props = new Properties(); props.put(IDiscoveryLocator.CONTAINER_NAME, containerUnderTest); BundleContext ctxt = Activator.getDefault().getContext(); - ServiceRegistration registration = ctxt.registerService(IServiceListener.class.getName(), tsl, props); + ServiceRegistration registration = ctxt.registerService(IServiceListener.class.getName(), tsl, (Dictionary) props); addListenerRegisterAndWait(tsl, serviceInfo); @@ -169,7 +170,7 @@ public void testAddServiceListenerIServiceTypeIDIServiceListenerOSGi() throws Co props.put(IDiscoveryLocator.CONTAINER_NAME, containerUnderTest); BundleContext ctxt = Activator.getDefault().getContext(); - ServiceRegistration registration = ctxt.registerService(IServiceListener.class.getName(), tsl, props); + ServiceRegistration registration = ctxt.registerService(IServiceListener.class.getName(), tsl, (Dictionary) props); addListenerRegisterAndWait(tsl, serviceInfo); diff --git a/tests/bundles/org.eclipse.ecf.tests.filetransfer/ECF Filetransfer Tests- HttpclientJava.launch b/tests/bundles/org.eclipse.ecf.tests.filetransfer/ECF Filetransfer Tests- HttpclientJava.launch index a61a4f002d..306c16e288 100644 --- a/tests/bundles/org.eclipse.ecf.tests.filetransfer/ECF Filetransfer Tests- HttpclientJava.launch +++ b/tests/bundles/org.eclipse.ecf.tests.filetransfer/ECF Filetransfer Tests- HttpclientJava.launch @@ -48,7 +48,7 @@ - + diff --git a/tests/bundles/org.eclipse.ecf.tests.provider.filetransfer.efs/src/org/eclipse/ecf/tests/provider/filetransfer/efs/RetrieveTest.java b/tests/bundles/org.eclipse.ecf.tests.provider.filetransfer.efs/src/org/eclipse/ecf/tests/provider/filetransfer/efs/RetrieveTest.java index ffb7633830..0bcd1d9d83 100755 --- a/tests/bundles/org.eclipse.ecf.tests.provider.filetransfer.efs/src/org/eclipse/ecf/tests/provider/filetransfer/efs/RetrieveTest.java +++ b/tests/bundles/org.eclipse.ecf.tests.provider.filetransfer.efs/src/org/eclipse/ecf/tests/provider/filetransfer/efs/RetrieveTest.java @@ -37,7 +37,7 @@ public class RetrieveTest extends AbstractRetrieveTestCase { */ protected void setUp() throws Exception { super.setUp(); - tmpFile = Files.createTempFile("ECFTest", "").toFile(); + tmpFile = Files.createTempFile("ECFTest", "", null).toFile(); } protected void handleStartEvent(IIncomingFileTransferReceiveStartEvent event) { From 2ba057fb93efa3eaf6e8a25ea5a39308cfd11307 Mon Sep 17 00:00:00 2001 From: Scott Lewis Date: Sat, 21 Oct 2023 14:07:19 -0700 Subject: [PATCH 10/17] Updated version --- .../org/eclipse/ecf/tests/discovery/DiscoveryServiceTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/bundles/org.eclipse.ecf.tests.discovery/src/org/eclipse/ecf/tests/discovery/DiscoveryServiceTest.java b/tests/bundles/org.eclipse.ecf.tests.discovery/src/org/eclipse/ecf/tests/discovery/DiscoveryServiceTest.java index 12132974fc..78c76ebd5b 100755 --- a/tests/bundles/org.eclipse.ecf.tests.discovery/src/org/eclipse/ecf/tests/discovery/DiscoveryServiceTest.java +++ b/tests/bundles/org.eclipse.ecf.tests.discovery/src/org/eclipse/ecf/tests/discovery/DiscoveryServiceTest.java @@ -197,7 +197,7 @@ public void testAddServiceListenerIServiceTypeIDIServiceListenerOSGiWildcards() props.put(IDiscoveryLocator.CONTAINER_NAME, containerUnderTest); BundleContext ctxt = Activator.getDefault().getContext(); - ServiceRegistration registration = ctxt.registerService(IServiceListener.class.getName(), tsl, props); + ServiceRegistration registration = ctxt.registerService(IServiceListener.class.getName(), tsl, (Dictionary) props); addListenerRegisterAndWait(tsl, serviceInfo); @@ -218,7 +218,7 @@ public void testAddServiceTypeListenerOSGi() throws ContainerConnectException { Properties props = new Properties(); props.put(IDiscoveryLocator.CONTAINER_NAME, containerUnderTest); BundleContext ctxt = Activator.getDefault().getContext(); - ServiceRegistration registration = ctxt.registerService(IServiceTypeListener.class.getName(), testTypeListener, props); + ServiceRegistration registration = ctxt.registerService(IServiceTypeListener.class.getName(), testTypeListener, (Dictionary) props); synchronized (testTypeListener) { // register a service which we expect the test listener to get notified of From 1f4e8ab93017b38dfc1d269b2df136b232743692 Mon Sep 17 00:00:00 2001 From: Scott Lewis Date: Sat, 21 Oct 2023 14:10:09 -0700 Subject: [PATCH 11/17] Updated version --- tests/bundles/org.eclipse.ecf.tests.discovery/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/bundles/org.eclipse.ecf.tests.discovery/pom.xml b/tests/bundles/org.eclipse.ecf.tests.discovery/pom.xml index 06e0337cd5..43bd6402da 100644 --- a/tests/bundles/org.eclipse.ecf.tests.discovery/pom.xml +++ b/tests/bundles/org.eclipse.ecf.tests.discovery/pom.xml @@ -10,6 +10,6 @@ org.eclipse.ecf org.eclipse.ecf.tests.discovery - 2.0.102-SNAPSHOT + 2.1.02-SNAPSHOT eclipse-test-plugin From 68bf28f9a8a91eaeaaf479ce7b468ab6c5fa43d4 Mon Sep 17 00:00:00 2001 From: Scott Lewis Date: Sat, 21 Oct 2023 14:13:19 -0700 Subject: [PATCH 12/17] Updated version --- tests/bundles/org.eclipse.ecf.tests.discovery/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/bundles/org.eclipse.ecf.tests.discovery/pom.xml b/tests/bundles/org.eclipse.ecf.tests.discovery/pom.xml index 43bd6402da..5d0521190a 100644 --- a/tests/bundles/org.eclipse.ecf.tests.discovery/pom.xml +++ b/tests/bundles/org.eclipse.ecf.tests.discovery/pom.xml @@ -10,6 +10,6 @@ org.eclipse.ecf org.eclipse.ecf.tests.discovery - 2.1.02-SNAPSHOT + 2.1.0-SNAPSHOT eclipse-test-plugin From d07c3ffadc195be33d625b8d550baa90b858d361 Mon Sep 17 00:00:00 2001 From: Scott Lewis Date: Sat, 21 Oct 2023 14:27:01 -0700 Subject: [PATCH 13/17] Updated version --- .../META-INF/MANIFEST.MF | 2 +- .../bundles/org.eclipse.ecf.osgi.services.distribution/pom.xml | 2 +- releng/features/org.eclipse.ecf.console.feature/feature.xml | 2 +- releng/features/org.eclipse.ecf.console.feature/pom.xml | 2 +- releng/features/org.eclipse.ecf.core.feature/feature.xml | 2 +- releng/features/org.eclipse.ecf.core.feature/pom.xml | 2 +- .../org.eclipse.ecf.discovery.jmdns.feature/feature.xml | 2 +- releng/features/org.eclipse.ecf.discovery.jmdns.feature/pom.xml | 2 +- .../org.eclipse.ecf.eventadmin.examples.feature/feature.xml | 2 +- .../org.eclipse.ecf.eventadmin.examples.feature/pom.xml | 2 +- releng/features/org.eclipse.ecf.eventadmin.feature/feature.xml | 2 +- releng/features/org.eclipse.ecf.eventadmin.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.ecf.filetransfer.httpclient5.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.ecf.filetransfer.httpclientjava.feature/pom.xml | 2 +- .../org.eclipse.ecf.filetransfer.ssl.feature/feature.xml | 2 +- .../features/org.eclipse.ecf.filetransfer.ssl.feature/pom.xml | 2 +- .../features/org.eclipse.ecf.osgi.services.feature/feature.xml | 2 +- releng/features/org.eclipse.ecf.osgi.services.feature/pom.xml | 2 +- releng/features/org.eclipse.ecf.presence.feature/feature.xml | 2 +- releng/features/org.eclipse.ecf.presence.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.ecf.provider.generic.datashare.feature/pom.xml | 2 +- .../org.eclipse.ecf.provider.generic.feature/feature.xml | 2 +- .../features/org.eclipse.ecf.provider.generic.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../pom.xml | 2 +- .../org.eclipse.ecf.remoteservice.examples.feature/feature.xml | 2 +- .../org.eclipse.ecf.remoteservice.examples.feature/pom.xml | 2 +- .../features/org.eclipse.ecf.remoteservice.feature/feature.xml | 2 +- releng/features/org.eclipse.ecf.remoteservice.feature/pom.xml | 2 +- .../org.eclipse.ecf.remoteservice.rest.feature/feature.xml | 2 +- .../features/org.eclipse.ecf.remoteservice.rest.feature/pom.xml | 2 +- .../org.eclipse.ecf.remoteservice.rest.synd.feature/feature.xml | 2 +- .../org.eclipse.ecf.remoteservice.rest.synd.feature/pom.xml | 2 +- .../org.eclipse.ecf.remoteservice.rosgi.feature/feature.xml | 2 +- .../org.eclipse.ecf.remoteservice.rosgi.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.ecf.remoteservice.sdk.examples.feature/pom.xml | 2 +- .../org.eclipse.ecf.remoteservice.servlet.feature/feature.xml | 2 +- .../org.eclipse.ecf.remoteservice.servlet.feature/pom.xml | 2 +- .../features/org.eclipse.ecf.sharedobject.feature/feature.xml | 2 +- releng/features/org.eclipse.ecf.sharedobject.feature/pom.xml | 2 +- releng/features/org.eclipse.ecf.xmpp.feature/feature.xml | 2 +- releng/features/org.eclipse.ecf.xmpp.feature/pom.xml | 2 +- .../features/org.eclipse.ecf.server.generic.feature/feature.xml | 2 +- .../features/org.eclipse.ecf.server.generic.feature/pom.xml | 2 +- 48 files changed, 48 insertions(+), 48 deletions(-) diff --git a/compendium/bundles/org.eclipse.ecf.osgi.services.distribution/META-INF/MANIFEST.MF b/compendium/bundles/org.eclipse.ecf.osgi.services.distribution/META-INF/MANIFEST.MF index e2b59d7c43..ec5e0e5971 100644 --- a/compendium/bundles/org.eclipse.ecf.osgi.services.distribution/META-INF/MANIFEST.MF +++ b/compendium/bundles/org.eclipse.ecf.osgi.services.distribution/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.ecf.osgi.services.distribution Automatic-Module-Name: org.eclipse.ecf.osgi.services.distribution -Bundle-Version: 2.1.600.qualifier +Bundle-Version: 2.1.700.qualifier Bundle-Vendor: %pluginProvider Bundle-RequiredExecutionEnvironment: J2SE-1.5 Import-Package: org.eclipse.ecf.core.util;version="3.6.0", diff --git a/compendium/bundles/org.eclipse.ecf.osgi.services.distribution/pom.xml b/compendium/bundles/org.eclipse.ecf.osgi.services.distribution/pom.xml index 1401344517..beb7422ed0 100644 --- a/compendium/bundles/org.eclipse.ecf.osgi.services.distribution/pom.xml +++ b/compendium/bundles/org.eclipse.ecf.osgi.services.distribution/pom.xml @@ -10,6 +10,6 @@ org.eclipse.ecf org.eclipse.ecf.osgi.services.distribution - 2.1.600-SNAPSHOT + 2.1.700-SNAPSHOT eclipse-plugin diff --git a/releng/features/org.eclipse.ecf.console.feature/feature.xml b/releng/features/org.eclipse.ecf.console.feature/feature.xml index 8eea8f063a..cb66098bb5 100644 --- a/releng/features/org.eclipse.ecf.console.feature/feature.xml +++ b/releng/features/org.eclipse.ecf.console.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/releng/features/org.eclipse.ecf.console.feature/pom.xml b/releng/features/org.eclipse.ecf.console.feature/pom.xml index 8c5eb64ee3..5d19281687 100644 --- a/releng/features/org.eclipse.ecf.console.feature/pom.xml +++ b/releng/features/org.eclipse.ecf.console.feature/pom.xml @@ -10,6 +10,6 @@ org.eclipse.ecf org.eclipse.ecf.console.feature - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT eclipse-feature diff --git a/releng/features/org.eclipse.ecf.core.feature/feature.xml b/releng/features/org.eclipse.ecf.core.feature/feature.xml index e650f594ec..b273b7e7ae 100644 --- a/releng/features/org.eclipse.ecf.core.feature/feature.xml +++ b/releng/features/org.eclipse.ecf.core.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/releng/features/org.eclipse.ecf.core.feature/pom.xml b/releng/features/org.eclipse.ecf.core.feature/pom.xml index fddc2f9dec..a6f11aa1a9 100644 --- a/releng/features/org.eclipse.ecf.core.feature/pom.xml +++ b/releng/features/org.eclipse.ecf.core.feature/pom.xml @@ -10,6 +10,6 @@ org.eclipse.ecf org.eclipse.ecf.core.feature - 1.6.1-SNAPSHOT + 1.6.2-SNAPSHOT eclipse-feature diff --git a/releng/features/org.eclipse.ecf.discovery.jmdns.feature/feature.xml b/releng/features/org.eclipse.ecf.discovery.jmdns.feature/feature.xml index 6a11b3fca6..7dad90fa90 100644 --- a/releng/features/org.eclipse.ecf.discovery.jmdns.feature/feature.xml +++ b/releng/features/org.eclipse.ecf.discovery.jmdns.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/releng/features/org.eclipse.ecf.discovery.jmdns.feature/pom.xml b/releng/features/org.eclipse.ecf.discovery.jmdns.feature/pom.xml index 3910668362..6a9939d3bf 100644 --- a/releng/features/org.eclipse.ecf.discovery.jmdns.feature/pom.xml +++ b/releng/features/org.eclipse.ecf.discovery.jmdns.feature/pom.xml @@ -10,6 +10,6 @@ org.eclipse.ecf org.eclipse.ecf.discovery.jmdns.feature - 1.0.102-SNAPSHOT + 1.0.103-SNAPSHOT eclipse-feature diff --git a/releng/features/org.eclipse.ecf.eventadmin.examples.feature/feature.xml b/releng/features/org.eclipse.ecf.eventadmin.examples.feature/feature.xml index a427e64f24..43e637a5d9 100644 --- a/releng/features/org.eclipse.ecf.eventadmin.examples.feature/feature.xml +++ b/releng/features/org.eclipse.ecf.eventadmin.examples.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/releng/features/org.eclipse.ecf.eventadmin.examples.feature/pom.xml b/releng/features/org.eclipse.ecf.eventadmin.examples.feature/pom.xml index d455b5e597..7bd1d108e9 100644 --- a/releng/features/org.eclipse.ecf.eventadmin.examples.feature/pom.xml +++ b/releng/features/org.eclipse.ecf.eventadmin.examples.feature/pom.xml @@ -10,6 +10,6 @@ org.eclipse.ecf org.eclipse.ecf.eventadmin.examples.feature - 1.0.201-SNAPSHOT + 1.0.202-SNAPSHOT eclipse-feature diff --git a/releng/features/org.eclipse.ecf.eventadmin.feature/feature.xml b/releng/features/org.eclipse.ecf.eventadmin.feature/feature.xml index 9515163d24..1bfab7224c 100644 --- a/releng/features/org.eclipse.ecf.eventadmin.feature/feature.xml +++ b/releng/features/org.eclipse.ecf.eventadmin.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/releng/features/org.eclipse.ecf.eventadmin.feature/pom.xml b/releng/features/org.eclipse.ecf.eventadmin.feature/pom.xml index 74c65ba432..e6e2164711 100644 --- a/releng/features/org.eclipse.ecf.eventadmin.feature/pom.xml +++ b/releng/features/org.eclipse.ecf.eventadmin.feature/pom.xml @@ -10,6 +10,6 @@ org.eclipse.ecf org.eclipse.ecf.eventadmin.feature - 2.0.201-SNAPSHOT + 2.0.202-SNAPSHOT eclipse-feature diff --git a/releng/features/org.eclipse.ecf.filetransfer.httpclient5.feature/feature.xml b/releng/features/org.eclipse.ecf.filetransfer.httpclient5.feature/feature.xml index a61df37c9f..852d187f34 100644 --- a/releng/features/org.eclipse.ecf.filetransfer.httpclient5.feature/feature.xml +++ b/releng/features/org.eclipse.ecf.filetransfer.httpclient5.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/releng/features/org.eclipse.ecf.filetransfer.httpclient5.feature/pom.xml b/releng/features/org.eclipse.ecf.filetransfer.httpclient5.feature/pom.xml index a43042689a..9b8e19cb63 100644 --- a/releng/features/org.eclipse.ecf.filetransfer.httpclient5.feature/pom.xml +++ b/releng/features/org.eclipse.ecf.filetransfer.httpclient5.feature/pom.xml @@ -10,5 +10,5 @@ org.eclipse.ecf.filetransfer.httpclient5.feature eclipse-feature - 1.1.701-SNAPSHOT + 1.1.702-SNAPSHOT diff --git a/releng/features/org.eclipse.ecf.filetransfer.httpclientjava.feature/feature.xml b/releng/features/org.eclipse.ecf.filetransfer.httpclientjava.feature/feature.xml index b756575597..53772449ff 100644 --- a/releng/features/org.eclipse.ecf.filetransfer.httpclientjava.feature/feature.xml +++ b/releng/features/org.eclipse.ecf.filetransfer.httpclientjava.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/releng/features/org.eclipse.ecf.filetransfer.httpclientjava.feature/pom.xml b/releng/features/org.eclipse.ecf.filetransfer.httpclientjava.feature/pom.xml index a11ff42cb4..7045c1989d 100644 --- a/releng/features/org.eclipse.ecf.filetransfer.httpclientjava.feature/pom.xml +++ b/releng/features/org.eclipse.ecf.filetransfer.httpclientjava.feature/pom.xml @@ -10,5 +10,5 @@ org.eclipse.ecf.filetransfer.httpclientjava.feature eclipse-feature - 2.0.100-SNAPSHOT + 2.0.200-SNAPSHOT diff --git a/releng/features/org.eclipse.ecf.filetransfer.ssl.feature/feature.xml b/releng/features/org.eclipse.ecf.filetransfer.ssl.feature/feature.xml index 2911f4f814..a30134188a 100644 --- a/releng/features/org.eclipse.ecf.filetransfer.ssl.feature/feature.xml +++ b/releng/features/org.eclipse.ecf.filetransfer.ssl.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/releng/features/org.eclipse.ecf.filetransfer.ssl.feature/pom.xml b/releng/features/org.eclipse.ecf.filetransfer.ssl.feature/pom.xml index 1d914c4aa1..0cf3db3b1a 100644 --- a/releng/features/org.eclipse.ecf.filetransfer.ssl.feature/pom.xml +++ b/releng/features/org.eclipse.ecf.filetransfer.ssl.feature/pom.xml @@ -9,6 +9,6 @@ ../../../ org.eclipse.ecf.filetransfer.ssl.feature - 1.1.401-SNAPSHOT + 1.1.402-SNAPSHOT eclipse-feature diff --git a/releng/features/org.eclipse.ecf.osgi.services.feature/feature.xml b/releng/features/org.eclipse.ecf.osgi.services.feature/feature.xml index 83b591b5d9..3644e2d400 100644 --- a/releng/features/org.eclipse.ecf.osgi.services.feature/feature.xml +++ b/releng/features/org.eclipse.ecf.osgi.services.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/releng/features/org.eclipse.ecf.osgi.services.feature/pom.xml b/releng/features/org.eclipse.ecf.osgi.services.feature/pom.xml index 600c67f755..9068385d16 100644 --- a/releng/features/org.eclipse.ecf.osgi.services.feature/pom.xml +++ b/releng/features/org.eclipse.ecf.osgi.services.feature/pom.xml @@ -10,6 +10,6 @@ org.eclipse.ecf org.eclipse.ecf.osgi.services.feature - 2.6.300-SNAPSHOT + 2.6.400-SNAPSHOT eclipse-feature diff --git a/releng/features/org.eclipse.ecf.presence.feature/feature.xml b/releng/features/org.eclipse.ecf.presence.feature/feature.xml index 336bc30143..080deec278 100644 --- a/releng/features/org.eclipse.ecf.presence.feature/feature.xml +++ b/releng/features/org.eclipse.ecf.presence.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/releng/features/org.eclipse.ecf.presence.feature/pom.xml b/releng/features/org.eclipse.ecf.presence.feature/pom.xml index fb35862291..ed9bfc5043 100644 --- a/releng/features/org.eclipse.ecf.presence.feature/pom.xml +++ b/releng/features/org.eclipse.ecf.presence.feature/pom.xml @@ -10,6 +10,6 @@ org.eclipse.ecf org.eclipse.ecf.presence.feature - 1.0.201-SNAPSHOT + 1.0.202-SNAPSHOT eclipse-feature diff --git a/releng/features/org.eclipse.ecf.provider.generic.datashare.feature/feature.xml b/releng/features/org.eclipse.ecf.provider.generic.datashare.feature/feature.xml index cc8a2ab5a0..c1bb29d5e9 100644 --- a/releng/features/org.eclipse.ecf.provider.generic.datashare.feature/feature.xml +++ b/releng/features/org.eclipse.ecf.provider.generic.datashare.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/releng/features/org.eclipse.ecf.provider.generic.datashare.feature/pom.xml b/releng/features/org.eclipse.ecf.provider.generic.datashare.feature/pom.xml index e04b79a9ab..262e8a5bb9 100644 --- a/releng/features/org.eclipse.ecf.provider.generic.datashare.feature/pom.xml +++ b/releng/features/org.eclipse.ecf.provider.generic.datashare.feature/pom.xml @@ -10,6 +10,6 @@ org.eclipse.ecf org.eclipse.ecf.provider.generic.datashare.feature - 1.0.201-SNAPSHOT + 1.0.202-SNAPSHOT eclipse-feature diff --git a/releng/features/org.eclipse.ecf.provider.generic.feature/feature.xml b/releng/features/org.eclipse.ecf.provider.generic.feature/feature.xml index 73c0f8c677..36f624a37a 100644 --- a/releng/features/org.eclipse.ecf.provider.generic.feature/feature.xml +++ b/releng/features/org.eclipse.ecf.provider.generic.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/releng/features/org.eclipse.ecf.provider.generic.feature/pom.xml b/releng/features/org.eclipse.ecf.provider.generic.feature/pom.xml index d1ee0ae9b5..8c8e23361d 100644 --- a/releng/features/org.eclipse.ecf.provider.generic.feature/pom.xml +++ b/releng/features/org.eclipse.ecf.provider.generic.feature/pom.xml @@ -10,6 +10,6 @@ org.eclipse.ecf org.eclipse.ecf.provider.generic.feature - 1.1.1-SNAPSHOT + 1.1.2-SNAPSHOT eclipse-feature diff --git a/releng/features/org.eclipse.ecf.provider.generic.remoteservice.feature/feature.xml b/releng/features/org.eclipse.ecf.provider.generic.remoteservice.feature/feature.xml index d77c1aee13..7307a12029 100644 --- a/releng/features/org.eclipse.ecf.provider.generic.remoteservice.feature/feature.xml +++ b/releng/features/org.eclipse.ecf.provider.generic.remoteservice.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/releng/features/org.eclipse.ecf.provider.generic.remoteservice.feature/pom.xml b/releng/features/org.eclipse.ecf.provider.generic.remoteservice.feature/pom.xml index e6d9333ac2..443ff58139 100644 --- a/releng/features/org.eclipse.ecf.provider.generic.remoteservice.feature/pom.xml +++ b/releng/features/org.eclipse.ecf.provider.generic.remoteservice.feature/pom.xml @@ -10,6 +10,6 @@ org.eclipse.ecf org.eclipse.ecf.provider.generic.remoteservice.feature - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT eclipse-feature diff --git a/releng/features/org.eclipse.ecf.remoteservice.examples.feature/feature.xml b/releng/features/org.eclipse.ecf.remoteservice.examples.feature/feature.xml index 189b9aba53..2d2e34fb84 100644 --- a/releng/features/org.eclipse.ecf.remoteservice.examples.feature/feature.xml +++ b/releng/features/org.eclipse.ecf.remoteservice.examples.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/releng/features/org.eclipse.ecf.remoteservice.examples.feature/pom.xml b/releng/features/org.eclipse.ecf.remoteservice.examples.feature/pom.xml index ece8f69399..ca3dccb2db 100644 --- a/releng/features/org.eclipse.ecf.remoteservice.examples.feature/pom.xml +++ b/releng/features/org.eclipse.ecf.remoteservice.examples.feature/pom.xml @@ -10,6 +10,6 @@ org.eclipse.ecf org.eclipse.ecf.remoteservice.examples.feature - 1.6.0-SNAPSHOT + 1.6.1-SNAPSHOT eclipse-feature diff --git a/releng/features/org.eclipse.ecf.remoteservice.feature/feature.xml b/releng/features/org.eclipse.ecf.remoteservice.feature/feature.xml index cbcddfdb6b..002b07eead 100644 --- a/releng/features/org.eclipse.ecf.remoteservice.feature/feature.xml +++ b/releng/features/org.eclipse.ecf.remoteservice.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/releng/features/org.eclipse.ecf.remoteservice.feature/pom.xml b/releng/features/org.eclipse.ecf.remoteservice.feature/pom.xml index 452a78de0b..a53e1290ed 100644 --- a/releng/features/org.eclipse.ecf.remoteservice.feature/pom.xml +++ b/releng/features/org.eclipse.ecf.remoteservice.feature/pom.xml @@ -10,6 +10,6 @@ org.eclipse.ecf org.eclipse.ecf.remoteservice.feature - 2.6.0-SNAPSHOT + 2.6.1-SNAPSHOT eclipse-feature diff --git a/releng/features/org.eclipse.ecf.remoteservice.rest.feature/feature.xml b/releng/features/org.eclipse.ecf.remoteservice.rest.feature/feature.xml index 553a6ed6ce..bbbaa2db67 100644 --- a/releng/features/org.eclipse.ecf.remoteservice.rest.feature/feature.xml +++ b/releng/features/org.eclipse.ecf.remoteservice.rest.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/releng/features/org.eclipse.ecf.remoteservice.rest.feature/pom.xml b/releng/features/org.eclipse.ecf.remoteservice.rest.feature/pom.xml index f5472dab66..6814fd5644 100644 --- a/releng/features/org.eclipse.ecf.remoteservice.rest.feature/pom.xml +++ b/releng/features/org.eclipse.ecf.remoteservice.rest.feature/pom.xml @@ -10,6 +10,6 @@ org.eclipse.ecf org.eclipse.ecf.remoteservice.rest.feature - 1.0.302-SNAPSHOT + 1.0.303-SNAPSHOT eclipse-feature diff --git a/releng/features/org.eclipse.ecf.remoteservice.rest.synd.feature/feature.xml b/releng/features/org.eclipse.ecf.remoteservice.rest.synd.feature/feature.xml index 2616d55092..064ff9d9d4 100644 --- a/releng/features/org.eclipse.ecf.remoteservice.rest.synd.feature/feature.xml +++ b/releng/features/org.eclipse.ecf.remoteservice.rest.synd.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/releng/features/org.eclipse.ecf.remoteservice.rest.synd.feature/pom.xml b/releng/features/org.eclipse.ecf.remoteservice.rest.synd.feature/pom.xml index 65948cc007..4dd7737cd1 100644 --- a/releng/features/org.eclipse.ecf.remoteservice.rest.synd.feature/pom.xml +++ b/releng/features/org.eclipse.ecf.remoteservice.rest.synd.feature/pom.xml @@ -10,6 +10,6 @@ org.eclipse.ecf org.eclipse.ecf.remoteservice.rest.synd.feature - 1.0.200-SNAPSHOT + 1.0.201-SNAPSHOT eclipse-feature diff --git a/releng/features/org.eclipse.ecf.remoteservice.rosgi.feature/feature.xml b/releng/features/org.eclipse.ecf.remoteservice.rosgi.feature/feature.xml index a26ed3abfb..b816d7791d 100644 --- a/releng/features/org.eclipse.ecf.remoteservice.rosgi.feature/feature.xml +++ b/releng/features/org.eclipse.ecf.remoteservice.rosgi.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/releng/features/org.eclipse.ecf.remoteservice.rosgi.feature/pom.xml b/releng/features/org.eclipse.ecf.remoteservice.rosgi.feature/pom.xml index 0ff08e53cc..4a062b823d 100644 --- a/releng/features/org.eclipse.ecf.remoteservice.rosgi.feature/pom.xml +++ b/releng/features/org.eclipse.ecf.remoteservice.rosgi.feature/pom.xml @@ -10,6 +10,6 @@ org.eclipse.ecf org.eclipse.ecf.remoteservice.rosgi.feature - 2.0.1-SNAPSHOT + 2.0.2-SNAPSHOT eclipse-feature diff --git a/releng/features/org.eclipse.ecf.remoteservice.sdk.examples.feature/feature.xml b/releng/features/org.eclipse.ecf.remoteservice.sdk.examples.feature/feature.xml index bc6e8ee8dc..310ad176f5 100644 --- a/releng/features/org.eclipse.ecf.remoteservice.sdk.examples.feature/feature.xml +++ b/releng/features/org.eclipse.ecf.remoteservice.sdk.examples.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/releng/features/org.eclipse.ecf.remoteservice.sdk.examples.feature/pom.xml b/releng/features/org.eclipse.ecf.remoteservice.sdk.examples.feature/pom.xml index bb5cc0359c..5fcc360e01 100644 --- a/releng/features/org.eclipse.ecf.remoteservice.sdk.examples.feature/pom.xml +++ b/releng/features/org.eclipse.ecf.remoteservice.sdk.examples.feature/pom.xml @@ -10,6 +10,6 @@ org.eclipse.ecf org.eclipse.ecf.remoteservice.sdk.examples.feature - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT eclipse-feature diff --git a/releng/features/org.eclipse.ecf.remoteservice.servlet.feature/feature.xml b/releng/features/org.eclipse.ecf.remoteservice.servlet.feature/feature.xml index 13a3db846c..52f7dbb78d 100644 --- a/releng/features/org.eclipse.ecf.remoteservice.servlet.feature/feature.xml +++ b/releng/features/org.eclipse.ecf.remoteservice.servlet.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/releng/features/org.eclipse.ecf.remoteservice.servlet.feature/pom.xml b/releng/features/org.eclipse.ecf.remoteservice.servlet.feature/pom.xml index 4cb03a7991..b8c337296a 100644 --- a/releng/features/org.eclipse.ecf.remoteservice.servlet.feature/pom.xml +++ b/releng/features/org.eclipse.ecf.remoteservice.servlet.feature/pom.xml @@ -10,6 +10,6 @@ org.eclipse.ecf org.eclipse.ecf.remoteservice.servlet.feature - 1.0.300-SNAPSHOT + 1.0.301-SNAPSHOT eclipse-feature diff --git a/releng/features/org.eclipse.ecf.sharedobject.feature/feature.xml b/releng/features/org.eclipse.ecf.sharedobject.feature/feature.xml index 6b80b68562..a04ff4768e 100644 --- a/releng/features/org.eclipse.ecf.sharedobject.feature/feature.xml +++ b/releng/features/org.eclipse.ecf.sharedobject.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/releng/features/org.eclipse.ecf.sharedobject.feature/pom.xml b/releng/features/org.eclipse.ecf.sharedobject.feature/pom.xml index c2bfc3a479..6f31cc4d70 100644 --- a/releng/features/org.eclipse.ecf.sharedobject.feature/pom.xml +++ b/releng/features/org.eclipse.ecf.sharedobject.feature/pom.xml @@ -10,6 +10,6 @@ org.eclipse.ecf org.eclipse.ecf.sharedobject.feature - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT eclipse-feature diff --git a/releng/features/org.eclipse.ecf.xmpp.feature/feature.xml b/releng/features/org.eclipse.ecf.xmpp.feature/feature.xml index 7902f55eef..6538294f5a 100644 --- a/releng/features/org.eclipse.ecf.xmpp.feature/feature.xml +++ b/releng/features/org.eclipse.ecf.xmpp.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/releng/features/org.eclipse.ecf.xmpp.feature/pom.xml b/releng/features/org.eclipse.ecf.xmpp.feature/pom.xml index f13d80a17a..e7a3a0078b 100644 --- a/releng/features/org.eclipse.ecf.xmpp.feature/pom.xml +++ b/releng/features/org.eclipse.ecf.xmpp.feature/pom.xml @@ -10,6 +10,6 @@ org.eclipse.ecf org.eclipse.ecf.xmpp.feature - 1.0.202-SNAPSHOT + 1.0.203-SNAPSHOT eclipse-feature diff --git a/server-side/features/org.eclipse.ecf.server.generic.feature/feature.xml b/server-side/features/org.eclipse.ecf.server.generic.feature/feature.xml index b56e68c723..edc9e5ac1a 100644 --- a/server-side/features/org.eclipse.ecf.server.generic.feature/feature.xml +++ b/server-side/features/org.eclipse.ecf.server.generic.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/server-side/features/org.eclipse.ecf.server.generic.feature/pom.xml b/server-side/features/org.eclipse.ecf.server.generic.feature/pom.xml index 74f963d003..c0c012902d 100644 --- a/server-side/features/org.eclipse.ecf.server.generic.feature/pom.xml +++ b/server-side/features/org.eclipse.ecf.server.generic.feature/pom.xml @@ -10,6 +10,6 @@ org.eclipse.ecf org.eclipse.ecf.server.generic.feature - 1.2.102-SNAPSHOT + 1.2.103-SNAPSHOT eclipse-feature From 42aa6d9ee3b7ea88de0588d9d8ae85281695b1a3 Mon Sep 17 00:00:00 2001 From: Scott Lewis Date: Sat, 21 Oct 2023 14:31:51 -0700 Subject: [PATCH 14/17] Fix for tycho feature source plugin --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index a055baacdd..b24c8d4098 100644 --- a/pom.xml +++ b/pom.xml @@ -309,14 +309,14 @@ org.eclipse.tycho.extras - tycho-source-feature-plugin + tycho-source-plugin ${tycho-version} false - source-feature + feature-source package source-feature From 9692d38ce66f83b8417ffa525670f8799486c0d3 Mon Sep 17 00:00:00 2001 From: Scott Lewis Date: Sat, 21 Oct 2023 14:33:45 -0700 Subject: [PATCH 15/17] Fix for tycho feature source plugin --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b24c8d4098..c49884dbbc 100644 --- a/pom.xml +++ b/pom.xml @@ -308,7 +308,7 @@ - org.eclipse.tycho.extras + org.eclipse.tycho tycho-source-plugin ${tycho-version} From 78b7d0dd5658ee24dff05a76c37040b2cd9b1536 Mon Sep 17 00:00:00 2001 From: Scott Lewis Date: Sat, 21 Oct 2023 14:36:35 -0700 Subject: [PATCH 16/17] Fix for tycho feature source plugin --- pom.xml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index c49884dbbc..eaa5856c5e 100644 --- a/pom.xml +++ b/pom.xml @@ -298,6 +298,9 @@ org.eclipse.tycho tycho-source-plugin ${tycho-version} + + false + plugin-source @@ -305,16 +308,6 @@ plugin-source - - - - org.eclipse.tycho - tycho-source-plugin - ${tycho-version} - - false - - feature-source package @@ -324,6 +317,13 @@ + + org.eclipse.tycho + tycho-source-plugin + ${tycho-version} + + + org.eclipse.tycho tycho-p2-plugin From 398e12746f5ad0b585b0b27df729caee23e02feb Mon Sep 17 00:00:00 2001 From: Scott Lewis Date: Sat, 21 Oct 2023 14:40:23 -0700 Subject: [PATCH 17/17] Fix for tycho feature source plugin --- pom.xml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pom.xml b/pom.xml index eaa5856c5e..a055baacdd 100644 --- a/pom.xml +++ b/pom.xml @@ -298,9 +298,6 @@ org.eclipse.tycho tycho-source-plugin ${tycho-version} - - false - plugin-source @@ -308,8 +305,18 @@ plugin-source + + + + org.eclipse.tycho.extras + tycho-source-feature-plugin + ${tycho-version} + + false + + - feature-source + source-feature package source-feature @@ -317,13 +324,6 @@ - - org.eclipse.tycho - tycho-source-plugin - ${tycho-version} - - - org.eclipse.tycho tycho-p2-plugin