Skip to content

Commit db78fd8

Browse files
scottslewisscottslewis
authored
Merge pull request #112 from scottslewis/master
Fix for karaf-features.xml
2 parents a63abed + 13d38d8 commit db78fd8

File tree

26 files changed

+51
-155
lines changed

26 files changed

+51
-155
lines changed

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
<additionalArgument>-Xdoclint:none</additionalArgument>
3131
<additionalArgument>-splitindex</additionalArgument>
3232
<additionalArgument>-use</additionalArgument>
33-
<additionalArgument>-doctitle "Eclipse Communication Framework (ECF) 3.15.0 API"</additionalArgument>
34-
<additionalArgument>-windowtitle "Eclipse Communication Framework (ECF) 3.15.0 API"</additionalArgument>
33+
<additionalArgument>-doctitle "Eclipse Communication Framework (ECF) 3.15.1 API"</additionalArgument>
34+
<additionalArgument>-windowtitle "Eclipse Communication Framework (ECF) 3.15.1 API"</additionalArgument>
3535
<additionalArgument>-link https://docs.oracle.com/en/java/javase/11/docs/api/</additionalArgument>
3636
<additionalArgument>-link https://docs.osgi.org/javadoc/osgi.core/7.0.0/</additionalArgument>
3737
<additionalArgument>-tag 'noimplement:a:Restriction:'</additionalArgument>

‎framework/bundles/org.eclipse.ecf.console/META-INF/MANIFEST.MF

-1
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,4 @@ Import-Package: org.apache.felix.service.command;version="[0.10.0,2.0.0)";resolu
1717
Bundle-Localization: plugin
1818
Require-Bundle: org.eclipse.equinox.common;bundle-version="[3.0.0,4.0.0)",
1919
org.apache.felix.gogo.runtime;bundle-version="[0.10.0,2.0.0)";resolution:=optional
20-
Service-Component: OSGI-INF/org.eclipse.ecf.internal.console.ContainerCommand.xml
2120
Export-Package: org.eclipse.ecf.console;version="1.0.0"

‎framework/bundles/org.eclipse.ecf.console/OSGI-INF/org.eclipse.ecf.internal.console.ContainerCommand.xml

-20
This file was deleted.

‎framework/bundles/org.eclipse.ecf.console/build.properties

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ bin.includes = META-INF/,\
44
.,\
55
plugin.properties,\
66
about.html,\
7-
OSGI-INF/org.eclipse.ecf.internal.console.ContainerCommand.xml,\
87
OSGI-INF/
98
src.includes = about.html
109
jre.compilation.profile = JavaSE-11

‎osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin.console/META-INF/MANIFEST.MF

-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,5 @@ Import-Package: org.apache.felix.service.command;version="[0.10.0,2.0.0)";resolu
1616
Require-Bundle: org.eclipse.equinox.common;bundle-version="[3.0.0,4.0.0)",
1717
org.apache.felix.gogo.runtime;bundle-version="[0.10.0,2.0.0)";resolution:=optional,
1818
org.eclipse.ecf;bundle-version="[3.8.0,4.0.0)"
19-
Service-Component: OSGI-INF/org.eclipse.ecf.osgi.services.remoteserviceadmin.console.RSACommand.xml
2019
Automatic-Module-Name: org.eclipse.ecf.osgi.services.remoteserviceadmin.console
2120

‎osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin.console/OSGI-INF/org.eclipse.ecf.osgi.services.remoteserviceadmin.console.RSACommand.xml

-28
This file was deleted.

‎osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin.console/build.properties

-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,4 @@ bin.includes = META-INF/,\
33
.,\
44
about.html,\
55
bundle.properties,\
6-
OSGI-INF/org.eclipse.ecf.osgi.services.remoteserviceadmin.console.RSACommand.xml,\
76
OSGI-INF/

‎providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45.win32/OSGI-INF/services/org.eclipse.ecf.internal.provider.filetransfer.httpclient45.win32.Win32HttpClientConfigurationModifier.xml

-4
This file was deleted.

‎providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45.win32/OSGI-INF/services/org.eclipse.ecf.internal.provider.filetransfer.httpclient45.win32.Win32NTLMProxyHandler.xml

-7
This file was deleted.

‎providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45/OSGI-INF/services/org.eclipse.ecf.internal.provider.filetransfer.httpclient45.ECFHttpClientFactory.xml

-7
This file was deleted.

‎providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient5.win32/OSGI-INF/services/org.eclipse.ecf.internal.provider.filetransfer.httpclient5.win32.Win32HttpClientConfigurationModifier.xml

-4
This file was deleted.

‎providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient5.win32/OSGI-INF/services/org.eclipse.ecf.internal.provider.filetransfer.httpclient5.win32.Win32NTLMProxyHandler.xml

-7
This file was deleted.

‎providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient5/META-INF/MANIFEST.MF

-1
Original file line numberDiff line numberDiff line change
@@ -63,4 +63,3 @@ Bundle-ActivationPolicy: lazy
6363
Export-Package: org.eclipse.ecf.internal.provider.filetransfer.httpclient5;version="1.0.0",
6464
org.eclipse.ecf.provider.filetransfer.httpclient5;version="1.0.0"
6565
Bundle-Activator: org.eclipse.ecf.internal.provider.filetransfer.httpclient5.Activator
66-
Service-Component: OSGI-INF/org.eclipse.ecf.internal.provider.filetransfer.httpclient5.ECFHttpClientFactory.xml

‎providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient5/OSGI-INF/org.eclipse.ecf.internal.provider.filetransfer.httpclient5.ECFHttpClientFactory.xml

-7
This file was deleted.

‎providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclientjava/META-INF/MANIFEST.MF

-1
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,3 @@ Bundle-ActivationPolicy: lazy
3030
Export-Package: org.eclipse.ecf.internal.provider.filetransfer.httpclientjava;version="1.0.0",
3131
org.eclipse.ecf.provider.filetransfer.httpclientjava;version="1.0.0"
3232
Bundle-Activator: org.eclipse.ecf.internal.provider.filetransfer.httpclientjava.Activator
33-
Service-Component: OSGI-INF/org.eclipse.ecf.internal.provider.filetransfer.httpclientjava.ECFHttpClientFactory.xml

‎providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclientjava/OSGI-INF/org.eclipse.ecf.internal.provider.filetransfer.httpclientjava.ECFHttpClientFactory.xml

-7
This file was deleted.

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<feature
33
id="org.eclipse.ecf.core"
44
label="ECF SDK for Eclipse"
5-
version="3.15.0.qualifier"
5+
version="3.15.1.qualifier"
66
provider-name="%providerName"
77
plugin="org.eclipse.ecf"
88
license-feature="org.eclipse.license"

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010
</parent>
1111
<groupId>org.eclipse.ecf</groupId>
1212
<artifactId>org.eclipse.ecf.core</artifactId>
13-
<version>3.15.0-SNAPSHOT</version>
13+
<version>3.15.1-SNAPSHOT</version>
1414
<packaging>eclipse-feature</packaging>
1515
</project>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<feature
33
id="org.eclipse.ecf.remoteservice.sdk.feature"
44
label="ECF Remote Services SDK"
5-
version="3.15.0.qualifier"
5+
version="3.15.1.qualifier"
66
provider-name="%providerName"
77
license-feature="org.eclipse.license"
88
license-feature-version="0.0.0">

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010
</parent>
1111
<groupId>org.eclipse.ecf</groupId>
1212
<artifactId>org.eclipse.ecf.remoteservice.sdk.feature</artifactId>
13-
<version>3.15.0-SNAPSHOT</version>
13+
<version>3.15.1-SNAPSHOT</version>
1414
<packaging>eclipse-feature</packaging>
1515
</project>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<feature
33
id="org.eclipse.ecf.sdk"
44
label="%featureName"
5-
version="3.15.0.qualifier"
5+
version="3.15.1.qualifier"
66
provider-name="%providerName"
77
license-feature="org.eclipse.license"
88
license-feature-version="0.0.0">

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

+43-43
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
3-
name="ecf-remoteservices-sdk-3.15.0">
4-
<feature name="ecf-rs-dependencies" version="3.15.0"
5-
description="ECF 3.15.0 RemoteServices External Dependencies. https://wiki.eclipse.org/ECF#OSGi_Remote_Services">
3+
name="ecf-remoteservices-sdk-3.15.1">
4+
<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">
5+
<bundle>mvn:org.eclipse.platform/org.eclipse.equinox.supplement/1.7.0</bundle>
6+
</feature>
7+
8+
<feature name="ecf-rs-dependencies" version="3.15.1"
9+
description="ECF 3.15.1 RemoteServices External Dependencies. https://wiki.eclipse.org/ECF#OSGi_Remote_Services">
10+
<feature version="3.15.1">ecf-rs-dependencies-supplement</feature>
611
<bundle>
712
mvn:org.eclipse.platform/org.eclipse.equinox.common/3.9.0
813
</bundle>
@@ -16,9 +21,9 @@
1621
<feature>eventadmin</feature>
1722
</feature>
1823

19-
<feature name="ecf-rs-core" version="3.15.0"
24+
<feature name="ecf-rs-core" version="3.15.1"
2025
description="ECF Core">
21-
<feature version="3.15.0">ecf-rs-dependencies</feature>
26+
<feature version="3.15.1">ecf-rs-dependencies</feature>
2227
<bundle> mvn:org.eclipse.ecf/org.eclipse.ecf.identity</bundle>
2328
<bundle> mvn:org.eclipse.ecf/org.eclipse.ecf</bundle>
2429
<bundle>
@@ -34,16 +39,16 @@
3439
mvn:org.eclipse.ecf/org.eclipse.ecf.remoteservice
3540
</bundle>
3641
</feature>
37-
<feature name="ecf-rs-console" version="3.15.0"
42+
<feature name="ecf-rs-console" version="3.15.1"
3843
description="ECF Console">
3944
<bundle> mvn:org.eclipse.ecf/org.eclipse.ecf.console</bundle>
4045
<bundle>
4146
mvn:org.eclipse.ecf/org.eclipse.ecf.osgi.services.remoteserviceadmin.console
4247
</bundle>
4348
</feature>
44-
<feature name="ecf-rs-rsa-impl" version="3.15.0"
49+
<feature name="ecf-rs-rsa-impl" version="3.15.1"
4550
description="ECF RemoteServices OSGi R7 Remote Service Admin (RSA) Impl. See https://wiki.eclipse.org/Remote_Services_Admin">
46-
<feature version="3.15.0">ecf-rs-core</feature>
51+
<feature version="3.15.1">ecf-rs-core</feature>
4752
<bundle>
4853
mvn:org.eclipse.ecf/org.eclipse.osgi.services.remoteserviceadmin
4954
</bundle>
@@ -54,28 +59,28 @@
5459
mvn:org.eclipse.ecf/org.eclipse.ecf.osgi.services.remoteserviceadmin
5560
</bundle>
5661
</feature>
57-
<feature name="ecf-rs-rsa-topology-manager" version="3.15.0"
62+
<feature name="ecf-rs-rsa-topology-manager" version="3.15.1"
5863
description="ECF RemoteServices OSGi R7 Default Topology Manager (promiscuous). See https://wiki.eclipse.org/Remote_Services_Admin">
5964
<bundle>
6065
mvn:org.eclipse.ecf/org.eclipse.ecf.osgi.services.distribution
6166
</bundle>
6267
</feature>
63-
<feature name="ecf-rs-rsa" version="3.15.0"
64-
description="ECF 3.15.0 Remote Service Admin">
65-
<feature version="3.15.0">ecf-rs-rsa-impl</feature>
66-
<feature version="3.15.0">ecf-rs-rsa-topology-manager</feature>
68+
<feature name="ecf-rs-rsa" version="3.15.1"
69+
description="ECF 3.15.1 Remote Service Admin">
70+
<feature version="3.15.1">ecf-rs-rsa-impl</feature>
71+
<feature version="3.15.1">ecf-rs-rsa-topology-manager</feature>
6772
</feature>
68-
<feature name="ecf-rs-distribution-generic" version="3.15.0"
73+
<feature name="ecf-rs-distribution-generic" version="3.15.1"
6974
description="ECF RemoteServices Generic Distribution Provider. https://wiki.eclipse.org/EIG:Configuration_Properties">
70-
<feature version="3.15.0">ecf-rs-rsa</feature>
75+
<feature version="3.15.1">ecf-rs-rsa</feature>
7176
<bundle> mvn:org.eclipse.ecf/org.eclipse.ecf.provider</bundle>
7277
<bundle>
7378
mvn:org.eclipse.ecf/org.eclipse.ecf.provider.remoteservice
7479
</bundle>
7580
</feature>
76-
<feature name="ecf-rs-distribution-rosgi" version="3.15.0"
81+
<feature name="ecf-rs-distribution-rosgi" version="3.15.1"
7782
description="ECF RemoteService ROSGi Distribution Provider. https://wiki.eclipse.org/EIG:Configuration_Properties">
78-
<feature version="3.15.0">ecf-rs-rsa</feature>
83+
<feature version="3.15.1">ecf-rs-rsa</feature>
7984
<bundle>mvn:org.eclipse.ecf/org.objectweb.asm</bundle>
8085
<bundle>
8186
mvn:org.eclipse.ecf/ch.ethz.iks.r_osgi.remote
@@ -85,60 +90,57 @@
8590
mvn:org.eclipse.ecf/org.eclipse.ecf.provider.r_osgi
8691
</bundle>
8792
</feature>
88-
<feature name="ecf-rs-discovery-jmdns" version="3.15.0"
93+
<feature name="ecf-rs-discovery-jmdns" version="3.15.1"
8994
description="ECF RemoteServices JMDNS Discovery Provider">
90-
<feature version="3.15.0">ecf-rs-rsa</feature>
95+
<feature version="3.15.1">ecf-rs-rsa</feature>
9196
<bundle>
9297
mvn:org.eclipse.ecf/org.eclipse.ecf.provider.jmdns
9398
</bundle>
9499
</feature>
95-
<feature name="ecf-rs-eventadmin" version="3.15.0"
96-
description="ECF 3.15.0 RemoteServices SDK Distributed EventAdmin">
97-
<feature version="3.15.0">ecf-rs-rsa</feature>
100+
<feature name="ecf-rs-eventadmin" version="3.15.1"
101+
description="ECF 3.15.1 RemoteServices SDK Distributed EventAdmin">
102+
<feature version="3.15.1">ecf-rs-rsa</feature>
98103
<bundle>
99104
mvn:org.eclipse.ecf/org.eclipse.ecf.remoteservice.eventadmin
100105
</bundle>
101106
</feature>
102107
<feature name="ecf-rs-examples-timeservice-api"
103-
version="3.15.0"
108+
version="3.15.1"
104109
description="ECF RemoteService TimeService Example API. See https://wiki.eclipse.org/Tutorial:_Building_your_first_OSGi_Remote_Service">
105110
<bundle>
106111
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
107112
</bundle>
108113
</feature>
109114
<feature name="ecf-rs-examples-timeservice-host"
110-
version="3.15.0"
115+
version="3.15.1"
111116
description="ECF RemoteService TimeService Example Host. See https://wiki.eclipse.org/Tutorial:_Building_your_first_OSGi_Remote_Service">
112-
<feature version="3.15.0">ecf-rs-examples-timeservice-api</feature>
117+
<feature version="3.15.1">ecf-rs-examples-timeservice-api</feature>
113118
<bundle>
114119
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
115120
</bundle>
116121
</feature>
117122
<feature name="ecf-rs-examples-timeservice-consumer-async"
118-
version="3.15.0"
123+
version="3.15.1"
119124
description="ECF RemoteService TimeService Async Example Consumer. See https://wiki.eclipse.org/Tutorial:_Building_your_first_OSGi_Remote_Service">
120-
<feature version="3.15.0">ecf-rs-examples-timeservice-api</feature>
125+
<feature version="3.15.1">ecf-rs-examples-timeservice-api</feature>
121126
<bundle>
122127
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
123128
</bundle>
124129
</feature>
125-
<feature name="ecf-rs-sdk" version="3.15.0"
126-
description="ECF 3.15.0 RemoteServices SDK with Generic Distribution Provider and Zeroconf Multicast LAN Discovery Provider">
127-
<feature version="3.15.0">ecf-rs-distribution-generic</feature>
128-
<feature version="3.15.0">ecf-rs-discovery-jmdns</feature>
129-
<feature version="3.15.0">ecf-rs-console</feature>
130+
<feature name="ecf-rs-sdk" version="3.15.1"
131+
description="ECF 3.15.1 RemoteServices SDK with Generic Distribution Provider and Zeroconf Multicast LAN Discovery Provider">
132+
<feature version="3.15.1">ecf-rs-distribution-generic</feature>
133+
<feature version="3.15.1">ecf-rs-discovery-jmdns</feature>
134+
<feature version="3.15.1">ecf-rs-console</feature>
130135
</feature>
131136
<feature name="ecf-rs-sdk-examples-timeservicehost"
132-
version="3.15.0"
133-
description="ECF 3.15.0 RemoteServices SDK with Generic Distribution Provider and Zeroconf Multicast LAN Discovery Provider">
134-
<feature version="3.15.0">ecf-rs-distribution-generic</feature>
135-
<feature version="3.15.0">ecf-rs-discovery-jmdns</feature>
136-
<feature version="3.15.0">ecf-rs-console</feature>
137-
<feature version="3.15.0">ecf-rs-examples-timeservice-host</feature>
137+
version="3.15.1"
138+
description="ECF 3.15.1 RemoteServices SDK with Generic Distribution Provider and Zeroconf Multicast LAN Discovery Provider">
139+
<feature version="3.15.1">ecf-rs-distribution-generic</feature>
140+
<feature version="3.15.1">ecf-rs-discovery-jmdns</feature>
141+
<feature version="3.15.1">ecf-rs-console</feature>
142+
<feature version="3.15.1">ecf-rs-examples-timeservice-host</feature>
138143
</feature>
139-
<!-- Include etcd discovery provider -->
140-
<repository>https://raw.githubusercontent.com/ECF/etcd-provider/master/build/karaf-features.xml</repository>
141-
<!-- Include XmlRpc provider -->
142144
<repository>https://raw.githubusercontent.com/ECF/XmlRpcProvider/master/build/karaf-features.xml</repository>
143145
<!-- Include Py4j RemoteServicesProvider -->
144146
<repository>https://raw.githubusercontent.com/ECF/Py4j-RemoteServicesProvider/master/build/karaf-features.xml</repository>
@@ -152,8 +154,6 @@
152154
<repository>https://raw.githubusercontent.com/ECF/ROSGI-Websockets-Provider/master/build/karaf-features.xml</repository>
153155
<!-- Include Hazelcast repo -->
154156
<repository>https://raw.githubusercontent.com/ECF/HazelcastProvider/master/build/karaf-features.xml</repository>
155-
<!-- Include Dubbo repo -->
156-
<repository>https://raw.githubusercontent.com/ECF/DubboProvider/master/build/karaf-features.xml</repository>
157157
<!-- Include gRPC repo -->
158158
<repository>https://raw.githubusercontent.com/ECF/grpc-RemoteServicesProvider/master/build/karaf-features.xml</repository>
159159

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</parent>
1111
<groupId>org.eclipse.ecf</groupId>
1212
<artifactId>org.eclipse.ecf.releng.repository</artifactId>
13-
<version>3.15.0-SNAPSHOT</version>
13+
<version>3.15.1-SNAPSHOT</version>
1414
<packaging>eclipse-repository</packaging>
1515

1616
<name>ECF p2 Repository</name>

‎tooling/plugins/org.eclipse.ecf.remoteservices.tooling.bndtools/META-INF/MANIFEST.MF

-1
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,4 @@ Require-Bundle: org.eclipse.core.runtime,
1515
Bundle-RequiredExecutionEnvironment: JavaSE-17
1616
Automatic-Module-Name: org.eclipse.ecf.remoteservices.tooling.bndtools
1717
Bundle-ActivationPolicy: lazy
18-
Service-Component: OSGI-INF/org.eclipse.ecf.remoteservices.tooling.bndtools.PreferencesComponent.xml
1918
Bundle-Localization: plugin

0 commit comments

Comments
 (0)