Update top-level version to 3.14.28
Change-Id: I65967ffeb5a726fced1690cd7c57994a3af62fb3
diff --git a/doc/bundles/org.eclipse.ecf.doc/pom.xml b/doc/bundles/org.eclipse.ecf.doc/pom.xml
index 26eb45b..87a8985 100644
--- 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.14.27 API"</additionalArgument>
- <additionalArgument>-windowtitle "Eclipse Communication Framework (ECF) 3.14.27 API"</additionalArgument>
+ <additionalArgument>-doctitle "Eclipse Communication Framework (ECF) 3.14.28 API"</additionalArgument>
+ <additionalArgument>-windowtitle "Eclipse Communication Framework (ECF) 3.14.28 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/releng/features/org.eclipse.ecf.core/feature.xml b/releng/features/org.eclipse.ecf.core/feature.xml
index 559a2fc..f24d4e4 100644
--- 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.14.27.qualifier"
+ version="3.14.28.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
index 84f47c8..b876b7c 100644
--- 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.14.27-SNAPSHOT</version>
+ <version>3.14.28-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/releng/features/org.eclipse.ecf.filetransfer.httpclient4.feature/feature.xml b/releng/features/org.eclipse.ecf.filetransfer.httpclient4.feature/feature.xml
index da4180a..abb6e5d 100644
--- a/releng/features/org.eclipse.ecf.filetransfer.httpclient4.feature/feature.xml
+++ b/releng/features/org.eclipse.ecf.filetransfer.httpclient4.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.ecf.filetransfer.httpclient4.feature"
label="%featureName"
- version="3.14.27.qualifier"
+ version="3.14.28.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/releng/features/org.eclipse.ecf.filetransfer.httpclient4.feature/pom.xml b/releng/features/org.eclipse.ecf.filetransfer.httpclient4.feature/pom.xml
index 19540ef..60708ee 100644
--- a/releng/features/org.eclipse.ecf.filetransfer.httpclient4.feature/pom.xml
+++ b/releng/features/org.eclipse.ecf.filetransfer.httpclient4.feature/pom.xml
@@ -10,6 +10,6 @@
</parent>
<groupId>org.eclipse.ecf</groupId>
<artifactId>org.eclipse.ecf.filetransfer.httpclient4.feature</artifactId>
- <version>3.14.27-SNAPSHOT</version>
+ <version>3.14.28-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
index 711b5ce..929ca7f 100644
--- 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.14.27.qualifier"
+ version="3.14.28.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
index 163c340..6286cf2 100644
--- 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.14.27-SNAPSHOT</version>
+ <version>3.14.28-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
index 615d328..d873e62 100644
--- 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.14.27.qualifier"
+ version="3.14.28.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
index caa9f93..19e25b5 100644
--- 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,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.27">
- <feature name="ecf-rs-dependencies" version="3.14.27"
- description="ECF 3.14.27 RemoteServices External Dependencies. https://wiki.eclipse.org/ECF#OSGi_Remote_Services">
+ name="ecf-remoteservices-sdk-3.14.28">
+ <feature name="ecf-rs-dependencies" version="3.14.28"
+ description="ECF 3.14.28 RemoteServices External Dependencies. https://wiki.eclipse.org/ECF#OSGi_Remote_Services">
<bundle>
mvn:org.eclipse.platform/org.eclipse.equinox.supplement/1.7.0
</bundle>
@@ -19,9 +19,9 @@
<feature>eventadmin</feature>
</feature>
- <feature name="ecf-rs-core" version="3.14.27"
+ <feature name="ecf-rs-core" version="3.14.28"
description="ECF Core">
- <feature version="3.14.27">ecf-rs-dependencies</feature>
+ <feature version="3.14.28">ecf-rs-dependencies</feature>
<bundle> mvn:org.eclipse.ecf/org.eclipse.ecf.identity</bundle>
<bundle> mvn:org.eclipse.ecf/org.eclipse.ecf</bundle>
<bundle>
@@ -37,16 +37,16 @@
mvn:org.eclipse.ecf/org.eclipse.ecf.remoteservice
</bundle>
</feature>
- <feature name="ecf-rs-console" version="3.14.27"
+ <feature name="ecf-rs-console" version="3.14.28"
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.27"
+ <feature name="ecf-rs-rsa-impl" version="3.14.28"
description="ECF RemoteServices OSGi R7 Remote Service Admin (RSA) Impl. See https://wiki.eclipse.org/Remote_Services_Admin">
- <feature version="3.14.27">ecf-rs-core</feature>
+ <feature version="3.14.28">ecf-rs-core</feature>
<bundle>
mvn:org.eclipse.ecf/org.eclipse.osgi.services.remoteserviceadmin
</bundle>
@@ -57,28 +57,28 @@
mvn:org.eclipse.ecf/org.eclipse.ecf.osgi.services.remoteserviceadmin
</bundle>
</feature>
- <feature name="ecf-rs-rsa-topology-manager" version="3.14.27"
+ <feature name="ecf-rs-rsa-topology-manager" version="3.14.28"
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.27"
- description="ECF 3.14.27 Remote Service Admin">
- <feature version="3.14.27">ecf-rs-rsa-impl</feature>
- <feature version="3.14.27">ecf-rs-rsa-topology-manager</feature>
+ <feature name="ecf-rs-rsa" version="3.14.28"
+ description="ECF 3.14.28 Remote Service Admin">
+ <feature version="3.14.28">ecf-rs-rsa-impl</feature>
+ <feature version="3.14.28">ecf-rs-rsa-topology-manager</feature>
</feature>
- <feature name="ecf-rs-distribution-generic" version="3.14.27"
+ <feature name="ecf-rs-distribution-generic" version="3.14.28"
description="ECF RemoteServices Generic Distribution Provider. https://wiki.eclipse.org/EIG:Configuration_Properties">
- <feature version="3.14.27">ecf-rs-rsa</feature>
+ <feature version="3.14.28">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.27"
+ <feature name="ecf-rs-distribution-rosgi" version="3.14.28"
description="ECF RemoteService ROSGi Distribution Provider. https://wiki.eclipse.org/EIG:Configuration_Properties">
- <feature version="3.14.27">ecf-rs-rsa</feature>
+ <feature version="3.14.28">ecf-rs-rsa</feature>
<bundle>mvn:org.eclipse.ecf/org.objectweb.asm</bundle>
<bundle>
mvn:org.eclipse.ecf/ch.ethz.iks.r_osgi.remote
@@ -88,56 +88,56 @@
mvn:org.eclipse.ecf/org.eclipse.ecf.provider.r_osgi
</bundle>
</feature>
- <feature name="ecf-rs-discovery-jmdns" version="3.14.27"
+ <feature name="ecf-rs-discovery-jmdns" version="3.14.28"
description="ECF RemoteServices JMDNS Discovery Provider">
- <feature version="3.14.27">ecf-rs-rsa</feature>
+ <feature version="3.14.28">ecf-rs-rsa</feature>
<bundle>
mvn:org.eclipse.ecf/org.eclipse.ecf.provider.jmdns
</bundle>
</feature>
- <feature name="ecf-rs-eventadmin" version="3.14.27"
- description="ECF 3.14.27 RemoteServices SDK Distributed EventAdmin">
- <feature version="3.14.27">ecf-rs-rsa</feature>
+ <feature name="ecf-rs-eventadmin" version="3.14.28"
+ description="ECF 3.14.28 RemoteServices SDK Distributed EventAdmin">
+ <feature version="3.14.28">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.27"
+ version="3.14.28"
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.27"
+ version="3.14.28"
description="ECF RemoteService TimeService Example Host. See https://wiki.eclipse.org/Tutorial:_Building_your_first_OSGi_Remote_Service">
- <feature version="3.14.27">ecf-rs-examples-timeservice-api</feature>
+ <feature version="3.14.28">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.27"
+ version="3.14.28"
description="ECF RemoteService TimeService Async Example Consumer. See https://wiki.eclipse.org/Tutorial:_Building_your_first_OSGi_Remote_Service">
- <feature version="3.14.27">ecf-rs-examples-timeservice-api</feature>
+ <feature version="3.14.28">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.27"
- description="ECF 3.14.27 RemoteServices SDK with Generic Distribution Provider and Zeroconf Multicast LAN Discovery Provider">
- <feature version="3.14.27">ecf-rs-distribution-generic</feature>
- <feature version="3.14.27">ecf-rs-discovery-jmdns</feature>
- <feature version="3.14.27">ecf-rs-console</feature>
+ <feature name="ecf-rs-sdk" version="3.14.28"
+ description="ECF 3.14.28 RemoteServices SDK with Generic Distribution Provider and Zeroconf Multicast LAN Discovery Provider">
+ <feature version="3.14.28">ecf-rs-distribution-generic</feature>
+ <feature version="3.14.28">ecf-rs-discovery-jmdns</feature>
+ <feature version="3.14.28">ecf-rs-console</feature>
</feature>
<feature name="ecf-rs-sdk-examples-timeservicehost"
- version="3.14.27"
- description="ECF 3.14.27 RemoteServices SDK with Generic Distribution Provider and Zeroconf Multicast LAN Discovery Provider">
- <feature version="3.14.27">ecf-rs-distribution-generic</feature>
- <feature version="3.14.27">ecf-rs-discovery-jmdns</feature>
- <feature version="3.14.27">ecf-rs-console</feature>
- <feature version="3.14.27">ecf-rs-examples-timeservice-host</feature>
+ version="3.14.28"
+ description="ECF 3.14.28 RemoteServices SDK with Generic Distribution Provider and Zeroconf Multicast LAN Discovery Provider">
+ <feature version="3.14.28">ecf-rs-distribution-generic</feature>
+ <feature version="3.14.28">ecf-rs-discovery-jmdns</feature>
+ <feature version="3.14.28">ecf-rs-console</feature>
+ <feature version="3.14.28">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>
diff --git a/releng/org.eclipse.ecf.releng.repository/pom.xml b/releng/org.eclipse.ecf.releng.repository/pom.xml
index 8ebe72b..8c89acd 100644
--- 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.14.27-SNAPSHOT</version>
+ <version>3.14.28-SNAPSHOT</version>
<packaging>eclipse-repository</packaging>
<name>ECF p2 Repository</name>
diff --git a/tests/bundles/org.eclipse.ecf.tests.filetransfer/ECF Filetransfer Tests- Httpclient5.launch b/tests/bundles/org.eclipse.ecf.tests.filetransfer/ECF Filetransfer Tests- Httpclient5.launch
index 84b16d4..45309b6 100644
--- a/tests/bundles/org.eclipse.ecf.tests.filetransfer/ECF Filetransfer Tests- Httpclient5.launch
+++ b/tests/bundles/org.eclipse.ecf.tests.filetransfer/ECF Filetransfer Tests- Httpclient5.launch
@@ -39,15 +39,17 @@
<booleanAttribute key="run_in_ui_thread" value="true"/>
<setAttribute key="selected_target_bundles">
<setEntry value="com.ibm.icu@default:default"/>
- <setEntry value="com.sun.jna.platform@default:default"/>
- <setEntry value="com.sun.jna@default:default"/>
+ <setEntry value="com.sun.jna*4.5.1.v20210503-0343@default:default"/>
+ <setEntry value="com.sun.jna*5.8.0.v20210503-0343@default:default"/>
+ <setEntry value="com.sun.jna.platform*4.5.1.v20190425-1842@default:default"/>
+ <setEntry value="com.sun.jna.platform*5.8.0.v20210406-1004@default:default"/>
<setEntry value="javax.annotation@default:default"/>
<setEntry value="javax.inject@default:default"/>
<setEntry value="org.apache.batik.constants@default:default"/>
<setEntry value="org.apache.batik.css@default:default"/>
<setEntry value="org.apache.batik.i18n@default:default"/>
<setEntry value="org.apache.batik.util@default:default"/>
- <setEntry value="org.apache.commons.codec*1.14.0.v20200818-1422@default:default"/>
+ <setEntry value="org.apache.commons.codec@default:default"/>
<setEntry value="org.apache.commons.httpclient@default:default"/>
<setEntry value="org.apache.commons.io@default:default"/>
<setEntry value="org.apache.commons.jxpath@default:default"/>
@@ -56,14 +58,17 @@
<setEntry value="org.apache.felix.gogo.runtime@default:default"/>
<setEntry value="org.apache.felix.gogo.shell@default:default"/>
<setEntry value="org.apache.felix.scr@1:true"/>
+ <setEntry value="org.apache.httpcomponents.client5.httpclient5-win@default:default"/>
<setEntry value="org.apache.httpcomponents.client5.httpclient5@default:default"/>
<setEntry value="org.apache.httpcomponents.core5.httpcore5-h2@default:default"/>
<setEntry value="org.apache.httpcomponents.core5.httpcore5@default:default"/>
- <setEntry value="org.apache.httpcomponents.httpclient*4.5.13.v20210128-2225@default:default"/>
<setEntry value="org.apache.httpcomponents.httpclient.win*4.5.13.v20210128-2225@default:default"/>
- <setEntry value="org.apache.httpcomponents.httpcore*4.4.14.v20210128-2225@default:default"/>
+ <setEntry value="org.apache.httpcomponents.httpclient@default:default"/>
+ <setEntry value="org.apache.httpcomponents.httpcore@default:default"/>
<setEntry value="org.apache.log4j@default:default"/>
<setEntry value="org.apache.xmlgraphics@default:default"/>
+ <setEntry value="org.bouncycastle.bcpg@default:default"/>
+ <setEntry value="org.bouncycastle.bcprov@default:default"/>
<setEntry value="org.conscrypt.conscrypt-openjdk-uber@default:default"/>
<setEntry value="org.eclipse.ant.core@default:default"/>
<setEntry value="org.eclipse.compare.core@default:default"/>
@@ -106,6 +111,8 @@
<setEntry value="org.eclipse.e4.ui.workbench.swt@default:default"/>
<setEntry value="org.eclipse.e4.ui.workbench3@default:default"/>
<setEntry value="org.eclipse.e4.ui.workbench@default:default"/>
+ <setEntry value="org.eclipse.ecf.provider.filetransfer.ssl@default:false"/>
+ <setEntry value="org.eclipse.ecf.ssl@default:false"/>
<setEntry value="org.eclipse.emf.common@default:default"/>
<setEntry value="org.eclipse.emf.ecore.change@default:default"/>
<setEntry value="org.eclipse.emf.ecore.xmi@default:default"/>
@@ -116,8 +123,10 @@
<setEntry value="org.eclipse.equinox.concurrent@default:default"/>
<setEntry value="org.eclipse.equinox.console@default:default"/>
<setEntry value="org.eclipse.equinox.event@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.artifact.repository@default:default"/>
<setEntry value="org.eclipse.equinox.p2.core@default:default"/>
<setEntry value="org.eclipse.equinox.p2.engine@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.jarprocessor@default:default"/>
<setEntry value="org.eclipse.equinox.p2.metadata.repository@default:default"/>
<setEntry value="org.eclipse.equinox.p2.metadata@default:default"/>
<setEntry value="org.eclipse.equinox.p2.repository@default:default"/>
@@ -135,7 +144,6 @@
<setEntry value="org.eclipse.osgi.util@default:default"/>
<setEntry value="org.eclipse.osgi@-1:true"/>
<setEntry value="org.eclipse.pde.ds.lib@default:default"/>
- <setEntry value="org.eclipse.swt.browser.chromium.win32.win32.x86_64@default:false"/>
<setEntry value="org.eclipse.swt.win32.win32.x86_64@default:false"/>
<setEntry value="org.eclipse.swt@default:default"/>
<setEntry value="org.eclipse.team.core@default:default"/>
@@ -160,16 +168,11 @@
<setAttribute key="selected_workspace_bundles">
<setEntry value="org.eclipse.ecf.filetransfer@default:true"/>
<setEntry value="org.eclipse.ecf.identity@default:default"/>
- <setEntry value="org.eclipse.ecf.provider.filetransfer.httpclient4.ssl@default:false"/>
- <setEntry value="org.eclipse.ecf.provider.filetransfer.httpclient45.win32*1.0.400.qualifier@default:default"/>
- <setEntry value="org.eclipse.ecf.provider.filetransfer.httpclient45@default:default"/>
- <setEntry value="org.eclipse.ecf.provider.filetransfer.httpclient4@default:default"/>
+ <setEntry value="org.eclipse.ecf.provider.filetransfer.httpclient5.win32@default:default"/>
<setEntry value="org.eclipse.ecf.provider.filetransfer.httpclient5@default:default"/>
<setEntry value="org.eclipse.ecf.provider.filetransfer@default:default"/>
- <setEntry value="org.eclipse.ecf.ssl@default:false"/>
<setEntry value="org.eclipse.ecf.tests.apache.httpclient.server@default:default"/>
- <setEntry value="org.eclipse.ecf.tests.filetransfer.httpclient45@default:false"/>
- <setEntry value="org.eclipse.ecf.tests.filetransfer.httpclient4@default:false"/>
+ <setEntry value="org.eclipse.ecf.tests.filetransfer.httpclient5@default:false"/>
<setEntry value="org.eclipse.ecf.tests.filetransfer.httpserver@default:default"/>
<setEntry value="org.eclipse.ecf.tests.filetransfer@default:default"/>
<setEntry value="org.eclipse.ecf.tests@default:default"/>
