Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for karaf-features.xml #112

Merged
merged 2 commits into from
Jul 3, 2024
Merged

Fix for karaf-features.xml #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd2575d
Fix for karaf-features.xml and update features to 3.15.1
scottslewis Jul 3, 2024
13d38d8
Merge branch 'master' of https://github.com/scottslewis/ecf
scottslewis Jul 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions doc/bundles/org.eclipse.ecf.doc/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion framework/bundles/org.eclipse.ecf.console/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
20 changes: 0 additions & 20 deletions ...es/org.eclipse.ecf.console/OSGI-INF/org.eclipse.ecf.internal.console.ContainerCommand.xml
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion framework/bundles/org.eclipse.ecf.console/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin.console/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

28 changes: 0 additions & 28 deletions ....console/OSGI-INF/org.eclipse.ecf.osgi.services.remoteserviceadmin.console.RSACommand.xml
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin.console/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/
4 changes: 0 additions & 4 deletions ...nternal.provider.filetransfer.httpclient45.win32.Win32HttpClientConfigurationModifier.xml
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions ...g.eclipse.ecf.internal.provider.filetransfer.httpclient45.win32.Win32NTLMProxyHandler.xml
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions ...ices/org.eclipse.ecf.internal.provider.filetransfer.httpclient45.ECFHttpClientFactory.xml
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions ...internal.provider.filetransfer.httpclient5.win32.Win32HttpClientConfigurationModifier.xml
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions ...rg.eclipse.ecf.internal.provider.filetransfer.httpclient5.win32.Win32NTLMProxyHandler.xml
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient5/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
7 changes: 0 additions & 7 deletions ...I-INF/org.eclipse.ecf.internal.provider.filetransfer.httpclient5.ECFHttpClientFactory.xml
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclientjava/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
7 changes: 0 additions & 7 deletions ...NF/org.eclipse.ecf.internal.provider.filetransfer.httpclientjava.ECFHttpClientFactory.xml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion releng/features/org.eclipse.ecf.core/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion releng/features/org.eclipse.ecf.core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
2 changes: 1 addition & 1 deletion releng/features/org.eclipse.ecf.remoteservice.sdk.feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion releng/features/org.eclipse.ecf.remoteservice.sdk.feature/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
2 changes: 1 addition & 1 deletion releng/features/org.eclipse.ecf.sdk/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
86 changes: 43 additions & 43 deletions releng/org.eclipse.ecf.releng.bm/karaf/features/karaf-features.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand All @@ -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
Expand All @@ -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>
Expand All @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion releng/org.eclipse.ecf.releng.repository/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion tooling/plugins/org.eclipse.ecf.remoteservices.tooling.bndtools/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading
Loading