Fix for karaf-features.xml and update features to 3.15.1

eclipse · Jul 3, 2024 · cd2575d · cd2575d
1 parent 07d1b48
commit cd2575d
Show file tree

Hide file tree

Showing 26 changed files with 51 additions and 155 deletions.
diff --git a/doc/bundles/org.eclipse.ecf.doc/pom.xml b/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.15.0 API"</additionalArgument>
-                  <additionalArgument>-windowtitle "Eclipse Communication Framework (ECF) 3.15.0 API"</additionalArgument>
+                  <additionalArgument>-doctitle "Eclipse Communication Framework (ECF) 3.15.1 API"</additionalArgument>
+                  <additionalArgument>-windowtitle "Eclipse Communication Framework (ECF) 3.15.1 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>

diff --git a/framework/bundles/org.eclipse.ecf.console/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.console/META-INF/MANIFEST.MF
@@ -17,5 +17,4 @@ Import-Package: org.apache.felix.service.command;version="[0.10.0,2.0.0)";resolu
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.equinox.common;bundle-version="[3.0.0,4.0.0)",
  org.apache.felix.gogo.runtime;bundle-version="[0.10.0,2.0.0)";resolution:=optional
-Service-Component: OSGI-INF/org.eclipse.ecf.internal.console.ContainerCommand.xml
 Export-Package: org.eclipse.ecf.console;version="1.0.0"
diff --git a/...es/org.eclipse.ecf.console/OSGI-INF/org.eclipse.ecf.internal.console.ContainerCommand.xml b/...es/org.eclipse.ecf.console/OSGI-INF/org.eclipse.ecf.internal.console.ContainerCommand.xml
diff --git a/framework/bundles/org.eclipse.ecf.console/build.properties b/framework/bundles/org.eclipse.ecf.console/build.properties
@@ -4,7 +4,6 @@ bin.includes = META-INF/,\
                .,\
                plugin.properties,\
                about.html,\
-               OSGI-INF/org.eclipse.ecf.internal.console.ContainerCommand.xml,\
                OSGI-INF/
 src.includes = about.html
 jre.compilation.profile = JavaSE-11
diff --git a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin.console/META-INF/MANIFEST.MF b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin.console/META-INF/MANIFEST.MF
@@ -16,6 +16,5 @@ Import-Package: org.apache.felix.service.command;version="[0.10.0,2.0.0)";resolu
 Require-Bundle: org.eclipse.equinox.common;bundle-version="[3.0.0,4.0.0)",
  org.apache.felix.gogo.runtime;bundle-version="[0.10.0,2.0.0)";resolution:=optional,
  org.eclipse.ecf;bundle-version="[3.8.0,4.0.0)"
-Service-Component: OSGI-INF/org.eclipse.ecf.osgi.services.remoteserviceadmin.console.RSACommand.xml
 Automatic-Module-Name: org.eclipse.ecf.osgi.services.remoteserviceadmin.console
 
diff --git a/....console/OSGI-INF/org.eclipse.ecf.osgi.services.remoteserviceadmin.console.RSACommand.xml b/....console/OSGI-INF/org.eclipse.ecf.osgi.services.remoteserviceadmin.console.RSACommand.xml
diff --git a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin.console/build.properties b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin.console/build.properties
@@ -3,5 +3,4 @@ bin.includes = META-INF/,\
                .,\
                about.html,\
                bundle.properties,\
-               OSGI-INF/org.eclipse.ecf.osgi.services.remoteserviceadmin.console.RSACommand.xml,\
                OSGI-INF/
diff --git a/...nternal.provider.filetransfer.httpclient45.win32.Win32HttpClientConfigurationModifier.xml b/...nternal.provider.filetransfer.httpclient45.win32.Win32HttpClientConfigurationModifier.xml
diff --git a/...g.eclipse.ecf.internal.provider.filetransfer.httpclient45.win32.Win32NTLMProxyHandler.xml b/...g.eclipse.ecf.internal.provider.filetransfer.httpclient45.win32.Win32NTLMProxyHandler.xml
diff --git a/...ices/org.eclipse.ecf.internal.provider.filetransfer.httpclient45.ECFHttpClientFactory.xml b/...ices/org.eclipse.ecf.internal.provider.filetransfer.httpclient45.ECFHttpClientFactory.xml
diff --git a/...internal.provider.filetransfer.httpclient5.win32.Win32HttpClientConfigurationModifier.xml b/...internal.provider.filetransfer.httpclient5.win32.Win32HttpClientConfigurationModifier.xml
diff --git a/...rg.eclipse.ecf.internal.provider.filetransfer.httpclient5.win32.Win32NTLMProxyHandler.xml b/...rg.eclipse.ecf.internal.provider.filetransfer.httpclient5.win32.Win32NTLMProxyHandler.xml
diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient5/META-INF/MANIFEST.MF b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient5/META-INF/MANIFEST.MF
@@ -63,4 +63,3 @@ Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.ecf.internal.provider.filetransfer.httpclient5;version="1.0.0",
  org.eclipse.ecf.provider.filetransfer.httpclient5;version="1.0.0"
 Bundle-Activator: org.eclipse.ecf.internal.provider.filetransfer.httpclient5.Activator
-Service-Component: OSGI-INF/org.eclipse.ecf.internal.provider.filetransfer.httpclient5.ECFHttpClientFactory.xml
diff --git a/...I-INF/org.eclipse.ecf.internal.provider.filetransfer.httpclient5.ECFHttpClientFactory.xml b/...I-INF/org.eclipse.ecf.internal.provider.filetransfer.httpclient5.ECFHttpClientFactory.xml
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
@@ -30,4 +30,3 @@ Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.ecf.internal.provider.filetransfer.httpclientjava;version="1.0.0",
  org.eclipse.ecf.provider.filetransfer.httpclientjava;version="1.0.0"
 Bundle-Activator: org.eclipse.ecf.internal.provider.filetransfer.httpclientjava.Activator
-Service-Component: OSGI-INF/org.eclipse.ecf.internal.provider.filetransfer.httpclientjava.ECFHttpClientFactory.xml
diff --git a/...NF/org.eclipse.ecf.internal.provider.filetransfer.httpclientjava.ECFHttpClientFactory.xml b/...NF/org.eclipse.ecf.internal.provider.filetransfer.httpclientjava.ECFHttpClientFactory.xml
diff --git a/releng/features/org.eclipse.ecf.core/feature.xml b/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.15.0.qualifier"
+      version="3.15.1.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.ecf"
       license-feature="org.eclipse.license"

diff --git a/releng/features/org.eclipse.ecf.core/pom.xml b/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.15.0-SNAPSHOT</version>
+  <version>3.15.1-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/releng/features/org.eclipse.ecf.remoteservice.sdk.feature/feature.xml b/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.15.0.qualifier"
+      version="3.15.1.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">

diff --git a/releng/features/org.eclipse.ecf.remoteservice.sdk.feature/pom.xml b/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.15.0-SNAPSHOT</version>
+  <version>3.15.1-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/releng/features/org.eclipse.ecf.sdk/feature.xml b/releng/features/org.eclipse.ecf.sdk/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.ecf.sdk"
       label="%featureName"
-      version="3.15.0.qualifier"
+      version="3.15.1.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">

diff --git a/releng/org.eclipse.ecf.releng.bm/karaf/features/karaf-features.xml b/releng/org.eclipse.ecf.releng.bm/karaf/features/karaf-features.xml
@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
-	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">
+	name="ecf-remoteservices-sdk-3.15.1">
+	<feature name="ecf-rs-dependencies-supplement" version="3.15.1" description="ECF 3.15.1 RemoteServices External Dependencies Supplemental. https://wiki.eclipse.org/ECF#OSGi_Remote_Services">
+		<bundle>mvn:org.eclipse.platform/org.eclipse.equinox.supplement/1.7.0</bundle>
+	</feature>		
+
+	<feature name="ecf-rs-dependencies" version="3.15.1"
+		description="ECF 3.15.1 RemoteServices External Dependencies. https://wiki.eclipse.org/ECF#OSGi_Remote_Services">
+		<feature version="3.15.1">ecf-rs-dependencies-supplement</feature>
 		<bundle>
 			mvn:org.eclipse.platform/org.eclipse.equinox.common/3.9.0
 		</bundle>
@@ -16,9 +21,9 @@
 		<feature>eventadmin</feature>
 	</feature>
 
-	<feature name="ecf-rs-core" version="3.15.0"
+	<feature name="ecf-rs-core" version="3.15.1"
 		description="ECF Core">
-		<feature version="3.15.0">ecf-rs-dependencies</feature>
+		<feature version="3.15.1">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 +39,16 @@
 			mvn:org.eclipse.ecf/org.eclipse.ecf.remoteservice
 		</bundle>
 	</feature>
-	<feature name="ecf-rs-console" version="3.15.0"
+	<feature name="ecf-rs-console" version="3.15.1"
 		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.15.0"
+	<feature name="ecf-rs-rsa-impl" version="3.15.1"
 		description="ECF RemoteServices OSGi R7 Remote Service Admin (RSA) Impl. See https://wiki.eclipse.org/Remote_Services_Admin">
-		<feature version="3.15.0">ecf-rs-core</feature>
+		<feature version="3.15.1">ecf-rs-core</feature>
 		<bundle>
 			mvn:org.eclipse.ecf/org.eclipse.osgi.services.remoteserviceadmin
 		</bundle>
@@ -54,28 +59,28 @@
 			mvn:org.eclipse.ecf/org.eclipse.ecf.osgi.services.remoteserviceadmin
 		</bundle>
 	</feature>
-	<feature name="ecf-rs-rsa-topology-manager" version="3.15.0"
+	<feature name="ecf-rs-rsa-topology-manager" version="3.15.1"
 		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.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 name="ecf-rs-rsa" version="3.15.1"
+		description="ECF 3.15.1 Remote Service Admin">
+		<feature version="3.15.1">ecf-rs-rsa-impl</feature>
+		<feature version="3.15.1">ecf-rs-rsa-topology-manager</feature>
 	</feature>
-	<feature name="ecf-rs-distribution-generic" version="3.15.0"
+	<feature name="ecf-rs-distribution-generic" version="3.15.1"
 		description="ECF RemoteServices Generic Distribution Provider. https://wiki.eclipse.org/EIG:Configuration_Properties">
-		<feature version="3.15.0">ecf-rs-rsa</feature>
+		<feature version="3.15.1">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.15.0"
+	<feature name="ecf-rs-distribution-rosgi" version="3.15.1"
 		description="ECF RemoteService ROSGi Distribution Provider. https://wiki.eclipse.org/EIG:Configuration_Properties">
-		<feature version="3.15.0">ecf-rs-rsa</feature>
+		<feature version="3.15.1">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,60 +90,57 @@
 			mvn:org.eclipse.ecf/org.eclipse.ecf.provider.r_osgi
 		</bundle>
 	</feature>
-	<feature name="ecf-rs-discovery-jmdns" version="3.15.0"
+	<feature name="ecf-rs-discovery-jmdns" version="3.15.1"
 		description="ECF RemoteServices JMDNS Discovery Provider">
-		<feature version="3.15.0">ecf-rs-rsa</feature>
+		<feature version="3.15.1">ecf-rs-rsa</feature>
 		<bundle>
 			mvn:org.eclipse.ecf/org.eclipse.ecf.provider.jmdns
 		</bundle>
 	</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>
+	<feature name="ecf-rs-eventadmin" version="3.15.1"
+		description="ECF 3.15.1 RemoteServices SDK Distributed EventAdmin">
+		<feature version="3.15.1">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.15.0"
+		version="3.15.1"
 		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.15.0"
+		version="3.15.1"
 		description="ECF RemoteService TimeService Example Host. See https://wiki.eclipse.org/Tutorial:_Building_your_first_OSGi_Remote_Service">
-		<feature version="3.15.0">ecf-rs-examples-timeservice-api</feature>
+		<feature version="3.15.1">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.15.0"
+		version="3.15.1"
 		description="ECF RemoteService TimeService Async Example Consumer.  See https://wiki.eclipse.org/Tutorial:_Building_your_first_OSGi_Remote_Service">
-		<feature version="3.15.0">ecf-rs-examples-timeservice-api</feature>
+		<feature version="3.15.1">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.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 name="ecf-rs-sdk" version="3.15.1"
+		description="ECF 3.15.1 RemoteServices SDK with Generic Distribution Provider and Zeroconf Multicast LAN Discovery Provider">
+		<feature version="3.15.1">ecf-rs-distribution-generic</feature>
+		<feature version="3.15.1">ecf-rs-discovery-jmdns</feature>
+		<feature version="3.15.1">ecf-rs-console</feature>
 	</feature>
 	<feature name="ecf-rs-sdk-examples-timeservicehost"
-		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>
+		version="3.15.1"
+		description="ECF 3.15.1 RemoteServices SDK with Generic Distribution Provider and Zeroconf Multicast LAN Discovery Provider">
+		<feature version="3.15.1">ecf-rs-distribution-generic</feature>
+		<feature version="3.15.1">ecf-rs-discovery-jmdns</feature>
+		<feature version="3.15.1">ecf-rs-console</feature>
+		<feature version="3.15.1">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>
-	<!-- Include XmlRpc provider -->
 	<repository>https://raw.githubusercontent.com/ECF/XmlRpcProvider/master/build/karaf-features.xml</repository>
 	<!-- Include Py4j RemoteServicesProvider -->
 	<repository>https://raw.githubusercontent.com/ECF/Py4j-RemoteServicesProvider/master/build/karaf-features.xml</repository>
@@ -152,8 +154,6 @@
 	<repository>https://raw.githubusercontent.com/ECF/ROSGI-Websockets-Provider/master/build/karaf-features.xml</repository>
 	<!-- Include Hazelcast repo -->
 	<repository>https://raw.githubusercontent.com/ECF/HazelcastProvider/master/build/karaf-features.xml</repository>
-	<!-- Include Dubbo repo -->
-	<repository>https://raw.githubusercontent.com/ECF/DubboProvider/master/build/karaf-features.xml</repository>
 	<!-- Include gRPC repo -->
 	<repository>https://raw.githubusercontent.com/ECF/grpc-RemoteServicesProvider/master/build/karaf-features.xml</repository>
 

diff --git a/releng/org.eclipse.ecf.releng.repository/pom.xml b/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.15.0-SNAPSHOT</version>
+  <version>3.15.1-SNAPSHOT</version>
   <packaging>eclipse-repository</packaging>
 
   <name>ECF p2 Repository</name>

diff --git a/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.bndtools/META-INF/MANIFEST.MF b/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.bndtools/META-INF/MANIFEST.MF
@@ -15,5 +15,4 @@ Require-Bundle: org.eclipse.core.runtime,
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Automatic-Module-Name: org.eclipse.ecf.remoteservices.tooling.bndtools
 Bundle-ActivationPolicy: lazy
-Service-Component: OSGI-INF/org.eclipse.ecf.remoteservices.tooling.bndtools.PreferencesComponent.xml
 Bundle-Localization: plugin