Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kurtakov2018-08-10 05:05:29 -0400
committerAlexander Kurtakov2019-06-10 07:40:13 -0400
commit4923fdc9a5aa667dc3f3f33efb1566120b46e1f6 (patch)
tree3080febd49884b8a2dfd494e60dbc16dd8905670
parent2ba7262a837f2a53b838f6415b537dea63f04d90 (diff)
downloadorg.eclipse.ecf-master.tar.gz
org.eclipse.ecf-master.tar.xz
org.eclipse.ecf-master.zip
Bug 537847 - Two versions of commons logging in the update siteHEADmaster
First iteration on removing 1.1.1 versions. Change-Id: I8e6c53e2975829b080bf8351f2ef6ec6a13522dd Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
-rw-r--r--releng/features/org.eclipse.ecf.remoteservice.rest.feature/feature.xml2
-rw-r--r--releng/org.eclipse.ecf.releng.bm/karaf/features/karaf-features.xml6
2 files changed, 4 insertions, 4 deletions
diff --git a/releng/features/org.eclipse.ecf.remoteservice.rest.feature/feature.xml b/releng/features/org.eclipse.ecf.remoteservice.rest.feature/feature.xml
index c2d08e75f..1c00e86a4 100644
--- a/releng/features/org.eclipse.ecf.remoteservice.rest.feature/feature.xml
+++ b/releng/features/org.eclipse.ecf.remoteservice.rest.feature/feature.xml
@@ -31,7 +31,7 @@ https://wiki.eclipse.org/ECF#OSGi_Remote_Services
<requires>
<import feature="org.eclipse.ecf.remoteservice.feature" version="2.1" match="compatible"/>
<import plugin="org.apache.commons.codec" version="1.6" match="compatible"/>
- <import plugin="org.apache.commons.logging" version="1.1.1" match="compatible"/>
+ <import plugin="org.apache.commons.logging" version="1.2.0" match="compatible"/>
<import plugin="org.apache.httpcomponents.httpclient" version="4.2" match="compatible"/>
<import plugin="org.apache.httpcomponents.httpcore" version="4.2" match="compatible"/>
<import plugin="org.json" version="1.0.0" match="compatible"/>
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 b396c51f5..2d4fb445e 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
@@ -104,7 +104,7 @@
description="ECF RemoteServices Zookeeper Discovery Provider. See https://wiki.eclipse.org/Zookeeper_Based_ECF_Discovery">
<feature version="3.14.4">ecf-rs-core</feature>
<bundle>
- mvn:org.eclipse.ecf/org.apache.commons.logging/1.1.1.v201101211721
+ mvn:org.eclipse.ecf/org.apache.commons.logging/1.2.0.v20180409-1502
</bundle>
<bundle>
mvn:org.eclipse.ecf/org.apache.hadoop.zookeeper/3.3.3.v201105210832
@@ -125,7 +125,7 @@
description="ECF Discovery REST Provider Support">
<feature version="3.14.4">ecf-rs-core</feature>
<bundle>
- mvn:org.eclipse.ecf/org.apache.commons.logging/1.1.1.v201101211721
+ mvn:org.eclipse.ecf/org.apache.commons.logging/1.2.0.v20180409-1502
</bundle>
<bundle>
mvn:org.eclipse.ecf/org.apache.commons.codec/1.9.0.v20170208-1614
@@ -222,7 +222,7 @@
<bundle>https://raw.githubusercontent.com/ECF/XmlRpcProvider/master/build/plugins/org.eclipse.ecf.provider.xmlrpc_1.2.1.201806122227.jar
</bundle>
<bundle>
- mvn:org.eclipse.ecf/org.apache.commons.logging/1.1.1.v201101211721
+ mvn:org.eclipse.ecf/org.apache.commons.logging/1.2.0.v20180409-1502
</bundle>
</feature>

Back to the top