Skip to content

Commit 85965b7

Browse files
scottslewisscottslewis
authored
Merge pull request #177 from scottslewis/master
Update version for dependencies fix
2 parents ec635af + 5cf5bd3 commit 85965b7

File tree

14 files changed

+52
-55
lines changed

14 files changed

+52
-55
lines changed

‎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.6.qualifier"
5+
version="3.15.7.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.6-SNAPSHOT</version>
13+
<version>3.15.7-SNAPSHOT</version>
1414
<packaging>eclipse-feature</packaging>
1515
</project>

‎releng/features/org.eclipse.ecf.remoteservice.sdk.bndtools.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.bndtools.feature"
44
label="ECF Remote Services SDK for Bndtools"
5-
version="3.15.6.qualifier"
5+
version="3.15.7.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.bndtools.feature/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
<relativePath>../../../</relativePath>
1010
</parent>
1111
<artifactId>org.eclipse.ecf.remoteservice.sdk.bndtools.feature</artifactId>
12-
<version>3.15.6-SNAPSHOT</version>
12+
<version>3.15.7-SNAPSHOT</version>
1313
<packaging>eclipse-feature</packaging>
1414
</project>

‎releng/features/org.eclipse.ecf.remoteservice.sdk.eclipse.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.eclipse.feature"
44
label="ECF Remote Services SDK for Eclipse"
5-
version="3.15.6.qualifier"
5+
version="3.15.7.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.eclipse.feature/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
<relativePath>../../../</relativePath>
1010
</parent>
1111
<artifactId>org.eclipse.ecf.remoteservice.sdk.eclipse.feature</artifactId>
12-
<version>3.15.6-SNAPSHOT</version>
12+
<version>3.15.7-SNAPSHOT</version>
1313
<packaging>eclipse-feature</packaging>
1414
</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 for OSGi clients and servers"
5-
version="3.15.6.qualifier"
5+
version="3.15.7.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.6-SNAPSHOT</version>
13+
<version>3.15.7-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.6.qualifier"
5+
version="3.15.7.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

+40-40
Original file line numberDiff line numberDiff line change
@@ -1,13 +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.6">
4-
<feature name="ecf-rs-dependencies-supplement" version="3.15.6" description="ECF 3.15.6 RemoteServices External Dependencies Supplemental. https://wiki.eclipse.org/ECF#OSGi_Remote_Services">
3+
name="ecf-remoteservices-sdk-3.15.7">
4+
<feature name="ecf-rs-dependencies-supplement" version="3.15.7" description="ECF 3.15.7 RemoteServices External Dependencies Supplemental. https://wiki.eclipse.org/ECF#OSGi_Remote_Services">
55
<bundle>mvn:org.eclipse.platform/org.eclipse.equinox.supplement/1.7.0</bundle>
66
</feature>
77

8-
<feature name="ecf-rs-dependencies" version="3.15.6"
9-
description="ECF 3.15.6 RemoteServices External Dependencies. https://wiki.eclipse.org/ECF#OSGi_Remote_Services">
10-
<feature version="3.15.6">ecf-rs-dependencies-supplement</feature>
8+
<feature name="ecf-rs-dependencies" version="3.15.7"
9+
description="ECF 3.15.7 RemoteServices External Dependencies. https://wiki.eclipse.org/ECF#OSGi_Remote_Services">
10+
<feature version="3.15.7">ecf-rs-dependencies-supplement</feature>
1111
<bundle>
1212
mvn:org.eclipse.platform/org.eclipse.equinox.common/3.9.0
1313
</bundle>
@@ -21,9 +21,9 @@
2121
<feature>eventadmin</feature>
2222
</feature>
2323

24-
<feature name="ecf-rs-core" version="3.15.6"
24+
<feature name="ecf-rs-core" version="3.15.7"
2525
description="ECF Core">
26-
<feature version="3.15.6">ecf-rs-dependencies</feature>
26+
<feature version="3.15.7">ecf-rs-dependencies</feature>
2727
<bundle> mvn:org.eclipse.ecf/org.eclipse.ecf.identity</bundle>
2828
<bundle> mvn:org.eclipse.ecf/org.eclipse.ecf</bundle>
2929
<bundle>
@@ -39,16 +39,16 @@
3939
mvn:org.eclipse.ecf/org.eclipse.ecf.remoteservice
4040
</bundle>
4141
</feature>
42-
<feature name="ecf-rs-console" version="3.15.6"
42+
<feature name="ecf-rs-console" version="3.15.7"
4343
description="ECF Console">
4444
<bundle> mvn:org.eclipse.ecf/org.eclipse.ecf.console</bundle>
4545
<bundle>
4646
mvn:org.eclipse.ecf/org.eclipse.ecf.osgi.services.remoteserviceadmin.console
4747
</bundle>
4848
</feature>
49-
<feature name="ecf-rs-rsa-impl" version="3.15.6"
49+
<feature name="ecf-rs-rsa-impl" version="3.15.7"
5050
description="ECF RemoteServices OSGi R7 Remote Service Admin (RSA) Impl. See https://wiki.eclipse.org/Remote_Services_Admin">
51-
<feature version="3.15.6">ecf-rs-core</feature>
51+
<feature version="3.15.7">ecf-rs-core</feature>
5252
<bundle>
5353
mvn:org.eclipse.ecf/org.eclipse.osgi.services.remoteserviceadmin
5454
</bundle>
@@ -59,28 +59,28 @@
5959
mvn:org.eclipse.ecf/org.eclipse.ecf.osgi.services.remoteserviceadmin
6060
</bundle>
6161
</feature>
62-
<feature name="ecf-rs-rsa-topology-manager" version="3.15.6"
62+
<feature name="ecf-rs-rsa-topology-manager" version="3.15.7"
6363
description="ECF RemoteServices OSGi R7 Default Topology Manager (promiscuous). See https://wiki.eclipse.org/Remote_Services_Admin">
6464
<bundle>
6565
mvn:org.eclipse.ecf/org.eclipse.ecf.osgi.services.distribution
6666
</bundle>
6767
</feature>
68-
<feature name="ecf-rs-rsa" version="3.15.6"
69-
description="ECF 3.15.6 Remote Service Admin">
70-
<feature version="3.15.6">ecf-rs-rsa-impl</feature>
71-
<feature version="3.15.6">ecf-rs-rsa-topology-manager</feature>
68+
<feature name="ecf-rs-rsa" version="3.15.7"
69+
description="ECF 3.15.7 Remote Service Admin">
70+
<feature version="3.15.7">ecf-rs-rsa-impl</feature>
71+
<feature version="3.15.7">ecf-rs-rsa-topology-manager</feature>
7272
</feature>
73-
<feature name="ecf-rs-distribution-generic" version="3.15.6"
73+
<feature name="ecf-rs-distribution-generic" version="3.15.7"
7474
description="ECF RemoteServices Generic Distribution Provider. https://wiki.eclipse.org/EIG:Configuration_Properties">
75-
<feature version="3.15.6">ecf-rs-rsa</feature>
75+
<feature version="3.15.7">ecf-rs-rsa</feature>
7676
<bundle> mvn:org.eclipse.ecf/org.eclipse.ecf.provider</bundle>
7777
<bundle>
7878
mvn:org.eclipse.ecf/org.eclipse.ecf.provider.remoteservice
7979
</bundle>
8080
</feature>
81-
<feature name="ecf-rs-distribution-rosgi" version="3.15.6"
81+
<feature name="ecf-rs-distribution-rosgi" version="3.15.7"
8282
description="ECF RemoteService ROSGi Distribution Provider. https://wiki.eclipse.org/EIG:Configuration_Properties">
83-
<feature version="3.15.6">ecf-rs-rsa</feature>
83+
<feature version="3.15.7">ecf-rs-rsa</feature>
8484
<bundle>mvn:org.eclipse.ecf/org.objectweb.asm</bundle>
8585
<bundle>
8686
mvn:org.eclipse.ecf/ch.ethz.iks.r_osgi.remote
@@ -90,56 +90,56 @@
9090
mvn:org.eclipse.ecf/org.eclipse.ecf.provider.r_osgi
9191
</bundle>
9292
</feature>
93-
<feature name="ecf-rs-discovery-jmdns" version="3.15.6"
93+
<feature name="ecf-rs-discovery-jmdns" version="3.15.7"
9494
description="ECF RemoteServices JMDNS Discovery Provider">
95-
<feature version="3.15.6">ecf-rs-rsa</feature>
95+
<feature version="3.15.7">ecf-rs-rsa</feature>
9696
<bundle>
9797
mvn:org.eclipse.ecf/org.eclipse.ecf.provider.jmdns
9898
</bundle>
9999
</feature>
100-
<feature name="ecf-rs-eventadmin" version="3.15.6"
101-
description="ECF 3.15.6 RemoteServices SDK Distributed EventAdmin">
102-
<feature version="3.15.6">ecf-rs-rsa</feature>
100+
<feature name="ecf-rs-eventadmin" version="3.15.7"
101+
description="ECF 3.15.7 RemoteServices SDK Distributed EventAdmin">
102+
<feature version="3.15.7">ecf-rs-rsa</feature>
103103
<bundle>
104104
mvn:org.eclipse.ecf/org.eclipse.ecf.remoteservice.eventadmin
105105
</bundle>
106106
</feature>
107107
<feature name="ecf-rs-examples-timeservice-api"
108-
version="3.15.6"
108+
version="3.15.7"
109109
description="ECF RemoteService TimeService Example API. See https://wiki.eclipse.org/Tutorial:_Building_your_first_OSGi_Remote_Service">
110110
<bundle>
111111
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
112112
</bundle>
113113
</feature>
114114
<feature name="ecf-rs-examples-timeservice-host"
115-
version="3.15.6"
115+
version="3.15.7"
116116
description="ECF RemoteService TimeService Example Host. See https://wiki.eclipse.org/Tutorial:_Building_your_first_OSGi_Remote_Service">
117-
<feature version="3.15.6">ecf-rs-examples-timeservice-api</feature>
117+
<feature version="3.15.7">ecf-rs-examples-timeservice-api</feature>
118118
<bundle>
119119
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
120120
</bundle>
121121
</feature>
122122
<feature name="ecf-rs-examples-timeservice-consumer-async"
123-
version="3.15.6"
123+
version="3.15.7"
124124
description="ECF RemoteService TimeService Async Example Consumer. See https://wiki.eclipse.org/Tutorial:_Building_your_first_OSGi_Remote_Service">
125-
<feature version="3.15.6">ecf-rs-examples-timeservice-api</feature>
125+
<feature version="3.15.7">ecf-rs-examples-timeservice-api</feature>
126126
<bundle>
127127
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
128128
</bundle>
129129
</feature>
130-
<feature name="ecf-rs-sdk" version="3.15.6"
131-
description="ECF 3.15.6 RemoteServices SDK with Generic Distribution Provider and Zeroconf Multicast LAN Discovery Provider">
132-
<feature version="3.15.6">ecf-rs-distribution-generic</feature>
133-
<feature version="3.15.6">ecf-rs-discovery-jmdns</feature>
134-
<feature version="3.15.6">ecf-rs-console</feature>
130+
<feature name="ecf-rs-sdk" version="3.15.7"
131+
description="ECF 3.15.7 RemoteServices SDK with Generic Distribution Provider and Zeroconf Multicast LAN Discovery Provider">
132+
<feature version="3.15.7">ecf-rs-distribution-generic</feature>
133+
<feature version="3.15.7">ecf-rs-discovery-jmdns</feature>
134+
<feature version="3.15.7">ecf-rs-console</feature>
135135
</feature>
136136
<feature name="ecf-rs-sdk-examples-timeservicehost"
137-
version="3.15.6"
138-
description="ECF 3.15.6 RemoteServices SDK with Generic Distribution Provider and Zeroconf Multicast LAN Discovery Provider">
139-
<feature version="3.15.6">ecf-rs-distribution-generic</feature>
140-
<feature version="3.15.6">ecf-rs-discovery-jmdns</feature>
141-
<feature version="3.15.6">ecf-rs-console</feature>
142-
<feature version="3.15.6">ecf-rs-examples-timeservice-host</feature>
137+
version="3.15.7"
138+
description="ECF 3.15.7 RemoteServices SDK with Generic Distribution Provider and Zeroconf Multicast LAN Discovery Provider">
139+
<feature version="3.15.7">ecf-rs-distribution-generic</feature>
140+
<feature version="3.15.7">ecf-rs-discovery-jmdns</feature>
141+
<feature version="3.15.7">ecf-rs-console</feature>
142+
<feature version="3.15.7">ecf-rs-examples-timeservice-host</feature>
143143
</feature>
144144
<repository>https://raw.githubusercontent.com/ECF/XmlRpcProvider/master/build/karaf-features.xml</repository>
145145
<!-- Include Py4j RemoteServicesProvider -->

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<relativePath>../../</relativePath>
1010
</parent>
1111
<artifactId>org.eclipse.ecf.releng.repository</artifactId>
12-
<version>3.15.6-SNAPSHOT</version>
12+
<version>3.15.7-SNAPSHOT</version>
1313
<packaging>eclipse-repository</packaging>
1414

1515
<name>ECF p2 Repository</name>

‎tooling/plugins/org.eclipse.ecf.remoteservices.tooling.bndtools/ECF Remote Service Bndtools Tooling.launch

-3
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,6 @@
8181
<setEntry value="org.eclipse.ecf.provider.dnssd"/>
8282
<setEntry value="org.eclipse.ecf.provider.filetransfer"/>
8383
<setEntry value="org.eclipse.ecf.provider.filetransfer.efs"/>
84-
<setEntry value="org.eclipse.ecf.provider.filetransfer.httpclient45"/>
85-
<setEntry value="org.eclipse.ecf.provider.filetransfer.httpclient45.win32"/>
8684
<setEntry value="org.eclipse.ecf.provider.filetransfer.httpclient5"/>
8785
<setEntry value="org.eclipse.ecf.provider.filetransfer.httpclient5.win32"/>
8886
<setEntry value="org.eclipse.ecf.provider.filetransfer.httpclientjava"/>
@@ -126,7 +124,6 @@
126124
<setEntry value="org.eclipse.ecf.tests.datashare"/>
127125
<setEntry value="org.eclipse.ecf.tests.discovery"/>
128126
<setEntry value="org.eclipse.ecf.tests.filetransfer"/>
129-
<setEntry value="org.eclipse.ecf.tests.filetransfer.httpclient45"/>
130127
<setEntry value="org.eclipse.ecf.tests.filetransfer.httpclient5"/>
131128
<setEntry value="org.eclipse.ecf.tests.filetransfer.httpclientjava"/>
132129
<setEntry value="org.eclipse.ecf.tests.filetransfer.jreprovider"/>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: %plugin.name
44
Bundle-SymbolicName: org.eclipse.ecf.remoteservices.tooling.bndtools;singleton:=true
5-
Bundle-Version: 1.4.0.qualifier
5+
Bundle-Version: 1.4.1.qualifier
66
Import-Package: org.eclipse.core.resources,
77
org.eclipse.jface.resource,
88
org.osgi.service.component.annotations;version="1.3.0";resolution:=optional

‎tooling/plugins/org.eclipse.ecf.remoteservices.tooling.bndtools/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
<relativePath>../../../</relativePath>
1010
</parent>
1111
<artifactId>org.eclipse.ecf.remoteservices.tooling.bndtools</artifactId>
12-
<version>1.4.0-SNAPSHOT</version>
12+
<version>1.4.1-SNAPSHOT</version>
1313
<packaging>eclipse-plugin</packaging>
1414
</project>

0 commit comments

Comments
 (0)