Fixes for master + 3.15.0

doc/bundles/org.eclipse.ecf.doc/pom.xml

@@ -30,8 +30,8 @@
                   <additionalArgument>-Xdoclint:none</additionalArgument>
                   <additionalArgument>-splitindex</additionalArgument>
                   <additionalArgument>-use</additionalArgument>
-                  <additionalArgument>-doctitle "Eclipse Communication Framework (ECF) 3.14.42 API"</additionalArgument>
-                  <additionalArgument>-windowtitle "Eclipse Communication Framework (ECF) 3.14.42 API"</additionalArgument>
+                  <additionalArgument>-doctitle "Eclipse Communication Framework (ECF) 3.15.0 API"</additionalArgument>
+                  <additionalArgument>-windowtitle "Eclipse Communication Framework (ECF) 3.15.0 API"</additionalArgument>
                   <additionalArgument>-link https://docs.oracle.com/en/java/javase/11/docs/api/</additionalArgument>
                   <additionalArgument>-link https://docs.osgi.org/javadoc/osgi.core/7.0.0/</additionalArgument>
                   <additionalArgument>-tag 'noimplement:a:Restriction:'</additionalArgument>

framework/bundles/org.eclipse.ecf/dev.properties

@@ -8,7 +8,6 @@ org.eclipse.sudoku.ecf=bin
 org.eclipse.ecf.datashare=bin
 org.eclipse.ecf.provider=bin
 org.eclipse.ecf.example.collab=bin
-org.eclipse.bittorrent=bin
 org.eclipse.ecf.test.discovery=bin
 org.eclipse.ecf.provider.datashare=bin
 org.eclipse.ecf.remoteservice=bin
@@ -26,10 +25,6 @@ org.eclipse.ecf.provider.xmpp=bin
 org.eclipse.ecf.example.provider=bin
 org.eclipse.sudoku.core=bin
 @ignoredot@=true
-org.eclipse.ecf.provider.bittorrent=bin
-org.eclipse.ecf.provider.msn=bin
-org.eclipse.ecf.example.rcpchat=bin
-org.eclipse.ecf.provider.aim=bin
 net.jxta=.
 org.eclipse.ecf.provider.jms=bin
 com.xaware.rcp=bin
@@ -68,10 +63,6 @@ org.eclipse.ecf.test.ui=bin
 JXTAPeerView=bin
 org.eclipse.sudoku.application=bin
 org.eclipse.ecf.provider.fileshare=bin
-org.eclipse.bittorrent.test=bin
-org.eclipse.sudoku.ui=bin
-org.eclipse.sudoku.factory.generator=bin
 org.eclipse.ecf.example.library=runtime
 org.eclipse.ecf.filetransfer=bin
-org.eclipse.bittorrent.example=bin
 org.eclipse.ecf.test.datashare=bin

framework/bundles/org.eclipse.ecf/javadoc.xml

@@ -53,7 +53,6 @@
 	        	<exclude name="**/org/eclipse/ecf/examples/**"/>
 	        	<exclude name="**/org/eclipse/ecf/example/**"/>
 	        	<exclude name="**/org/eclipse/ecf/presence/**"/>
-	        	<exclude name="**/org/eclipse/ecf/protocol/bittorrent/**"/>
 	        	<exclude name="**/org/eclipse/ecf/protocol/msn/**"/>
 	        	<exclude name="**/org/eclipse/ecf/provider/irc/**"/>
         		<exclude name="**/org/eclipse/ecf/provider/datashare/**"/>

pom.xml

@@ -158,8 +158,6 @@
     <module>protocols/bundles/ch.ethz.iks.slp</module>
     <module>protocols/bundles/org.jivesoftware.smack</module>
 
-    <module>providers/bundles/org.eclipse.ecf.provider.bittorrent</module>
-    <module>providers/bundles/org.eclipse.ecf.provider.bittorrent.ui</module>
     <module>providers/bundles/org.eclipse.ecf.provider.datashare</module>
     <module>providers/bundles/org.eclipse.ecf.provider.datashare.nio</module>
     <module>providers/bundles/org.eclipse.ecf.provider.discovery</module>

releng/features/org.eclipse.ecf.core/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.ecf.core"
       label="ECF SDK for Eclipse"
-      version="3.14.42.qualifier"
+      version="3.15.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.ecf"
       license-feature="org.eclipse.license"
@@ -81,27 +81,13 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.ecf.provider.bittorrent"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.eclipse.ecf.filetransfer.ui"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.ecf.provider.msn"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.eclipse.ecf.presence.bot"
          download-size="0"
@@ -137,13 +123,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.ecf.protocol.bittorrent"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.eclipse.ecf.discovery.ui.edit"
          download-size="0"
@@ -244,13 +223,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.ecf.provider.msn"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.eclipse.ecf.remoteservices.tooling.bndtools"
          download-size="0"

releng/features/org.eclipse.ecf.core/pom.xml

@@ -10,6 +10,6 @@
   </parent>
   <groupId>org.eclipse.ecf</groupId>
   <artifactId>org.eclipse.ecf.core</artifactId>
-  <version>3.14.42-SNAPSHOT</version>
+  <version>3.15.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>

releng/features/org.eclipse.ecf.remoteservice.sdk.feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.ecf.remoteservice.sdk.feature"
       label="ECF Remote Services SDK"
-      version="3.14.42.qualifier"
+      version="3.15.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">

releng/features/org.eclipse.ecf.remoteservice.sdk.feature/pom.xml

@@ -10,6 +10,6 @@
   </parent>
   <groupId>org.eclipse.ecf</groupId>
   <artifactId>org.eclipse.ecf.remoteservice.sdk.feature</artifactId>
-  <version>3.14.42-SNAPSHOT</version>
+  <version>3.15.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>

releng/features/org.eclipse.ecf.sdk/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.ecf.sdk"
       label="%featureName"
-      version="3.14.42.qualifier"
+      version="3.15.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">

releng/features/org.eclipse.ecf.tests.feature/buckminster.cspex

@@ -8,7 +8,6 @@
 		<dependency name="org.eclipse.jdt" componentType="eclipse.feature"/>
 		<dependency name="org.eclipse.ecf.sync" componentType="osgi.bundle"/>
 		<dependency name="org.eclipse.ecf.provider.datashare.nio" componentType="osgi.bundle"/>
-		<dependency name="org.eclipse.ecf.provider.msn" componentType="osgi.bundle"/>
 		<dependency name="org.eclipse.osgi.services.remoteserviceadmin" componentType="osgi.bundle"/>
 		<dependency name="org.eclipse.ecf.remoteservice.asyncproxy" componentType="osgi.bundle"/>
 	</dependencies>

releng/org.eclipse.ecf.releng.bm/karaf/features/karaf-features.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
-	name="ecf-remoteservices-sdk-3.14.42">
-	<feature name="ecf-rs-dependencies" version="3.14.42"
-		description="ECF 3.14.42 RemoteServices External Dependencies. https://wiki.eclipse.org/ECF#OSGi_Remote_Services">
+	name="ecf-remoteservices-sdk-3.15.0">
+	<feature name="ecf-rs-dependencies" version="3.15.0"
+		description="ECF 3.15.0 RemoteServices External Dependencies. https://wiki.eclipse.org/ECF#OSGi_Remote_Services">
 		<bundle>
 			mvn:org.eclipse.platform/org.eclipse.equinox.common/3.9.0
 		</bundle>
@@ -16,9 +16,9 @@
 		<feature>eventadmin</feature>
 	</feature>
 
-	<feature name="ecf-rs-core" version="3.14.42"
+	<feature name="ecf-rs-core" version="3.15.0"
 		description="ECF Core">
-		<feature version="3.14.42">ecf-rs-dependencies</feature>
+		<feature version="3.15.0">ecf-rs-dependencies</feature>
 		<bundle> mvn:org.eclipse.ecf/org.eclipse.ecf.identity</bundle>
 		<bundle> mvn:org.eclipse.ecf/org.eclipse.ecf</bundle>
 		<bundle>
@@ -34,16 +34,16 @@
 			mvn:org.eclipse.ecf/org.eclipse.ecf.remoteservice
 		</bundle>
 	</feature>
-	<feature name="ecf-rs-console" version="3.14.42"
+	<feature name="ecf-rs-console" version="3.15.0"
 		description="ECF Console">
 		<bundle> mvn:org.eclipse.ecf/org.eclipse.ecf.console</bundle>
 		<bundle>
 			mvn:org.eclipse.ecf/org.eclipse.ecf.osgi.services.remoteserviceadmin.console
 		</bundle>
 	</feature>
-	<feature name="ecf-rs-rsa-impl" version="3.14.42"
+	<feature name="ecf-rs-rsa-impl" version="3.15.0"
 		description="ECF RemoteServices OSGi R7 Remote Service Admin (RSA) Impl. See https://wiki.eclipse.org/Remote_Services_Admin">
-		<feature version="3.14.42">ecf-rs-core</feature>
+		<feature version="3.15.0">ecf-rs-core</feature>
 		<bundle>
 			mvn:org.eclipse.ecf/org.eclipse.osgi.services.remoteserviceadmin
 		</bundle>
@@ -54,28 +54,28 @@
 			mvn:org.eclipse.ecf/org.eclipse.ecf.osgi.services.remoteserviceadmin
 		</bundle>
 	</feature>
-	<feature name="ecf-rs-rsa-topology-manager" version="3.14.42"
+	<feature name="ecf-rs-rsa-topology-manager" version="3.15.0"
 		description="ECF RemoteServices OSGi R7 Default Topology Manager (promiscuous). See https://wiki.eclipse.org/Remote_Services_Admin">
 		<bundle>
 			mvn:org.eclipse.ecf/org.eclipse.ecf.osgi.services.distribution
 		</bundle>
 	</feature>
-	<feature name="ecf-rs-rsa" version="3.14.42"
-		description="ECF 3.14.42 Remote Service Admin">
-		<feature version="3.14.42">ecf-rs-rsa-impl</feature>
-		<feature version="3.14.42">ecf-rs-rsa-topology-manager</feature>
+	<feature name="ecf-rs-rsa" version="3.15.0"
+		description="ECF 3.15.0 Remote Service Admin">
+		<feature version="3.15.0">ecf-rs-rsa-impl</feature>
+		<feature version="3.15.0">ecf-rs-rsa-topology-manager</feature>
 	</feature>
-	<feature name="ecf-rs-distribution-generic" version="3.14.42"
+	<feature name="ecf-rs-distribution-generic" version="3.15.0"
 		description="ECF RemoteServices Generic Distribution Provider. https://wiki.eclipse.org/EIG:Configuration_Properties">
-		<feature version="3.14.42">ecf-rs-rsa</feature>
+		<feature version="3.15.0">ecf-rs-rsa</feature>
 		<bundle> mvn:org.eclipse.ecf/org.eclipse.ecf.provider</bundle>
 		<bundle>
 			mvn:org.eclipse.ecf/org.eclipse.ecf.provider.remoteservice
 		</bundle>
 	</feature>
-	<feature name="ecf-rs-distribution-rosgi" version="3.14.42"
+	<feature name="ecf-rs-distribution-rosgi" version="3.15.0"
 		description="ECF RemoteService ROSGi Distribution Provider. https://wiki.eclipse.org/EIG:Configuration_Properties">
-		<feature version="3.14.42">ecf-rs-rsa</feature>
+		<feature version="3.15.0">ecf-rs-rsa</feature>
 		<bundle>mvn:org.eclipse.ecf/org.objectweb.asm</bundle>
 		<bundle>
 			mvn:org.eclipse.ecf/ch.ethz.iks.r_osgi.remote
@@ -85,56 +85,56 @@
 			mvn:org.eclipse.ecf/org.eclipse.ecf.provider.r_osgi
 		</bundle>
 	</feature>
-	<feature name="ecf-rs-discovery-jmdns" version="3.14.42"
+	<feature name="ecf-rs-discovery-jmdns" version="3.15.0"
 		description="ECF RemoteServices JMDNS Discovery Provider">
-		<feature version="3.14.42">ecf-rs-rsa</feature>
+		<feature version="3.15.0">ecf-rs-rsa</feature>
 		<bundle>
 			mvn:org.eclipse.ecf/org.eclipse.ecf.provider.jmdns
 		</bundle>
 	</feature>
-	<feature name="ecf-rs-eventadmin" version="3.14.42"
-		description="ECF 3.14.42 RemoteServices SDK Distributed EventAdmin">
-		<feature version="3.14.42">ecf-rs-rsa</feature>
+	<feature name="ecf-rs-eventadmin" version="3.15.0"
+		description="ECF 3.15.0 RemoteServices SDK Distributed EventAdmin">
+		<feature version="3.15.0">ecf-rs-rsa</feature>
 		<bundle>
 			mvn:org.eclipse.ecf/org.eclipse.ecf.remoteservice.eventadmin
 		</bundle>
 	</feature>
 	<feature name="ecf-rs-examples-timeservice-api"
-		version="3.14.42"
+		version="3.15.0"
 		description="ECF RemoteService TimeService Example API. See https://wiki.eclipse.org/Tutorial:_Building_your_first_OSGi_Remote_Service">
 		<bundle>
 			https://download.eclipse.org/rt/ecf/3.14.19/site.p2/3.14.19.v20210101-2239/plugins/com.mycorp.examples.timeservice.async_2.1.100.v20200611-1508.jar
 		</bundle>
 	</feature>
 	<feature name="ecf-rs-examples-timeservice-host"
-		version="3.14.42"
+		version="3.15.0"
 		description="ECF RemoteService TimeService Example Host. See https://wiki.eclipse.org/Tutorial:_Building_your_first_OSGi_Remote_Service">
-		<feature version="3.14.42">ecf-rs-examples-timeservice-api</feature>
+		<feature version="3.15.0">ecf-rs-examples-timeservice-api</feature>
 		<bundle>
 			https://download.eclipse.org/rt/ecf/3.14.19/site.p2/3.14.19.v20210101-2239/plugins/com.mycorp.examples.timeservice.host_1.1.300.v20200611-1508.jar
 		</bundle>
 	</feature>
 	<feature name="ecf-rs-examples-timeservice-consumer-async"
-		version="3.14.42"
+		version="3.15.0"
 		description="ECF RemoteService TimeService Async Example Consumer.  See https://wiki.eclipse.org/Tutorial:_Building_your_first_OSGi_Remote_Service">
-		<feature version="3.14.42">ecf-rs-examples-timeservice-api</feature>
+		<feature version="3.15.0">ecf-rs-examples-timeservice-api</feature>
 		<bundle>
 			https://download.eclipse.org/rt/ecf/3.14.19/site.p2/3.14.19.v20210101-2239/plugins/com.mycorp.examples.timeservice.consumer.ds.async_1.0.200.v20200611-1508.jar
 		</bundle>
 	</feature>
-	<feature name="ecf-rs-sdk" version="3.14.42"
-		description="ECF 3.14.42 RemoteServices SDK with Generic Distribution Provider and Zeroconf Multicast LAN Discovery Provider">
-		<feature version="3.14.42">ecf-rs-distribution-generic</feature>
-		<feature version="3.14.42">ecf-rs-discovery-jmdns</feature>
-		<feature version="3.14.42">ecf-rs-console</feature>
+	<feature name="ecf-rs-sdk" version="3.15.0"
+		description="ECF 3.15.0 RemoteServices SDK with Generic Distribution Provider and Zeroconf Multicast LAN Discovery Provider">
+		<feature version="3.15.0">ecf-rs-distribution-generic</feature>
+		<feature version="3.15.0">ecf-rs-discovery-jmdns</feature>
+		<feature version="3.15.0">ecf-rs-console</feature>
 	</feature>
 	<feature name="ecf-rs-sdk-examples-timeservicehost"
-		version="3.14.42"
-		description="ECF 3.14.42 RemoteServices SDK with Generic Distribution Provider and Zeroconf Multicast LAN Discovery Provider">
-		<feature version="3.14.42">ecf-rs-distribution-generic</feature>
-		<feature version="3.14.42">ecf-rs-discovery-jmdns</feature>
-		<feature version="3.14.42">ecf-rs-console</feature>
-		<feature version="3.14.42">ecf-rs-examples-timeservice-host</feature>
+		version="3.15.0"
+		description="ECF 3.15.0 RemoteServices SDK with Generic Distribution Provider and Zeroconf Multicast LAN Discovery Provider">
+		<feature version="3.15.0">ecf-rs-distribution-generic</feature>
+		<feature version="3.15.0">ecf-rs-discovery-jmdns</feature>
+		<feature version="3.15.0">ecf-rs-console</feature>
+		<feature version="3.15.0">ecf-rs-examples-timeservice-host</feature>
 	</feature>
 	<!-- Include etcd discovery provider -->
 	<repository>https://raw.githubusercontent.com/ECF/etcd-provider/master/build/karaf-features.xml</repository>

releng/org.eclipse.ecf.releng.repository/pom.xml

@@ -10,7 +10,7 @@
   </parent>
   <groupId>org.eclipse.ecf</groupId>
   <artifactId>org.eclipse.ecf.releng.repository</artifactId>
-  <version>3.14.42-SNAPSHOT</version>
+  <version>3.15.0-SNAPSHOT</version>
   <packaging>eclipse-repository</packaging>
 
   <name>ECF p2 Repository</name>