Upgrade config admin to 1.8.6 for tests. Updated release repo for baselining.
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1683503 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/dependencymanager/cnf/localrepo/index.xml b/dependencymanager/cnf/localrepo/index.xml
index f1808d8..9a07ca9 100644
--- a/dependencymanager/cnf/localrepo/index.xml
+++ b/dependencymanager/cnf/localrepo/index.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<repository increment="1430498223597" name="Local" xmlns="http://www.osgi.org/xmlns/repository/v1.0.0">
+<repository increment="1433353416809" name="Local" xmlns="http://www.osgi.org/xmlns/repository/v1.0.0">
<resource>
<capability namespace="osgi.identity">
<attribute name="osgi.identity" value="de.twentyeleven.skysail.org.json-osgi"/>
@@ -31,40 +31,40 @@
<capability namespace="osgi.identity">
<attribute name="osgi.identity" value="org.apache.felix.configadmin"/>
<attribute name="type" value="osgi.bundle"/>
- <attribute name="version" type="Version" value="1.8.4"/>
+ <attribute name="version" type="Version" value="1.8.6"/>
</capability>
<capability namespace="osgi.content">
- <attribute name="osgi.content" value="31f1a7d770288b798234ad1b3f2a4a8fcbf3095a513d8927a47516b96a8d4cf4"/>
- <attribute name="url" value="org.apache.felix.configadmin/org.apache.felix.configadmin-1.8.4.jar"/>
- <attribute name="size" type="Long" value="128897"/>
+ <attribute name="osgi.content" value="d4b3b03a0f847ffb7e66b602255b84e6ba3b0867d709ddf3d7eed86f155bf339"/>
+ <attribute name="url" value="org.apache.felix.configadmin/org.apache.felix.configadmin-1.8.6.jar"/>
+ <attribute name="size" type="Long" value="129363"/>
<attribute name="mime" value="application/vnd.osgi.bundle"/>
</capability>
<capability namespace="osgi.wiring.bundle">
<attribute name="osgi.wiring.bundle" value="org.apache.felix.configadmin"/>
- <attribute name="bundle-version" type="Version" value="1.8.4"/>
+ <attribute name="bundle-version" type="Version" value="1.8.6"/>
</capability>
<capability namespace="osgi.wiring.host">
<attribute name="osgi.wiring.host" value="org.apache.felix.configadmin"/>
- <attribute name="bundle-version" type="Version" value="1.8.4"/>
+ <attribute name="bundle-version" type="Version" value="1.8.6"/>
</capability>
<capability namespace="osgi.wiring.package">
<attribute name="osgi.wiring.package" value="org.apache.felix.cm"/>
<attribute name="version" type="Version" value="1.0.0"/>
<attribute name="bundle-symbolic-name" value="org.apache.felix.configadmin"/>
- <attribute name="bundle-version" type="Version" value="1.8.4"/>
+ <attribute name="bundle-version" type="Version" value="1.8.6"/>
</capability>
<capability namespace="osgi.wiring.package">
<attribute name="osgi.wiring.package" value="org.apache.felix.cm.file"/>
<attribute name="version" type="Version" value="1.0.0"/>
<attribute name="bundle-symbolic-name" value="org.apache.felix.configadmin"/>
- <attribute name="bundle-version" type="Version" value="1.8.4"/>
+ <attribute name="bundle-version" type="Version" value="1.8.6"/>
<directive name="uses" value="org.apache.felix.cm,org.osgi.framework"/>
</capability>
<capability namespace="osgi.wiring.package">
<attribute name="osgi.wiring.package" value="org.osgi.service.cm"/>
<attribute name="version" type="Version" value="1.5.0"/>
<attribute name="bundle-symbolic-name" value="org.apache.felix.configadmin"/>
- <attribute name="bundle-version" type="Version" value="1.8.4"/>
+ <attribute name="bundle-version" type="Version" value="1.8.6"/>
<directive name="uses" value="org.osgi.framework"/>
</capability>
<capability namespace="osgi.service">
diff --git a/dependencymanager/cnf/localrepo/index.xml.sha b/dependencymanager/cnf/localrepo/index.xml.sha
index 097e638..603bc79 100644
--- a/dependencymanager/cnf/localrepo/index.xml.sha
+++ b/dependencymanager/cnf/localrepo/index.xml.sha
@@ -1 +1 @@
-74c7162246fd72477fa040b08a61ae95f31f6e78ff46c35b44a59cc9fc48f77c
\ No newline at end of file
+a4e367f8a05ce72180f72c15facb71ab29ff89ffbd257130ba33fe87f412ad64
\ No newline at end of file
diff --git a/dependencymanager/cnf/localrepo/org.apache.felix.configadmin/org.apache.felix.configadmin-1.8.4.jar b/dependencymanager/cnf/localrepo/org.apache.felix.configadmin/org.apache.felix.configadmin-1.8.6.jar
similarity index 61%
rename from dependencymanager/cnf/localrepo/org.apache.felix.configadmin/org.apache.felix.configadmin-1.8.4.jar
rename to dependencymanager/cnf/localrepo/org.apache.felix.configadmin/org.apache.felix.configadmin-1.8.6.jar
index 29123d1..8ac0d15 100644
--- a/dependencymanager/cnf/localrepo/org.apache.felix.configadmin/org.apache.felix.configadmin-1.8.4.jar
+++ b/dependencymanager/cnf/localrepo/org.apache.felix.configadmin/org.apache.felix.configadmin-1.8.6.jar
Binary files differ
diff --git a/dependencymanager/cnf/releaserepo/index.xml b/dependencymanager/cnf/releaserepo/index.xml
index 5c6d06c..3751886 100644
--- a/dependencymanager/cnf/releaserepo/index.xml
+++ b/dependencymanager/cnf/releaserepo/index.xml
@@ -1,30 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
-<repository increment="1430498223569" name="Release" xmlns="http://www.osgi.org/xmlns/repository/v1.0.0">
+<repository increment="1433353416787" name="Release" xmlns="http://www.osgi.org/xmlns/repository/v1.0.0">
<resource>
<capability namespace="osgi.identity">
<attribute name="osgi.identity" value="org.apache.felix.dependencymanager.annotation"/>
<attribute name="type" value="osgi.bundle"/>
- <attribute name="version" type="Version" value="4.0.0"/>
+ <attribute name="version" type="Version" value="4.0.1"/>
</capability>
<capability namespace="osgi.content">
- <attribute name="osgi.content" value="abbf6a81daccc472530b216fdaacf3c184dd901ec28900666e7aad288bb8daf2"/>
- <attribute name="url" value="org.apache.felix.dependencymanager.annotation/org.apache.felix.dependencymanager.annotation-4.0.0.jar"/>
- <attribute name="size" type="Long" value="93763"/>
+ <attribute name="osgi.content" value="f0354985434d8644d9a32aaabe285b8632d449de8d32ebe8c1b125888a581021"/>
+ <attribute name="url" value="org.apache.felix.dependencymanager.annotation/org.apache.felix.dependencymanager.annotation-4.0.1.jar"/>
+ <attribute name="size" type="Long" value="93799"/>
<attribute name="mime" value="application/vnd.osgi.bundle"/>
</capability>
<capability namespace="osgi.wiring.bundle">
<attribute name="osgi.wiring.bundle" value="org.apache.felix.dependencymanager.annotation"/>
- <attribute name="bundle-version" type="Version" value="4.0.0"/>
+ <attribute name="bundle-version" type="Version" value="4.0.1"/>
</capability>
<capability namespace="osgi.wiring.host">
<attribute name="osgi.wiring.host" value="org.apache.felix.dependencymanager.annotation"/>
- <attribute name="bundle-version" type="Version" value="4.0.0"/>
+ <attribute name="bundle-version" type="Version" value="4.0.1"/>
</capability>
<capability namespace="osgi.wiring.package">
<attribute name="osgi.wiring.package" value="org.apache.felix.dm.annotation.api"/>
<attribute name="version" type="Version" value="1.0.0"/>
<attribute name="bundle-symbolic-name" value="org.apache.felix.dependencymanager.annotation"/>
- <attribute name="bundle-version" type="Version" value="4.0.0"/>
+ <attribute name="bundle-version" type="Version" value="4.0.1"/>
</capability>
<requirement namespace="osgi.wiring.package">
<directive name="filter" value="(&(osgi.wiring.package=aQute.bnd.osgi)(version>=2.3.0)(!(version>=3.0.0)))"/>
@@ -133,43 +133,50 @@
<capability namespace="osgi.identity">
<attribute name="osgi.identity" value="org.apache.felix.dependencymanager"/>
<attribute name="type" value="osgi.bundle"/>
- <attribute name="version" type="Version" value="4.0.1"/>
+ <attribute name="version" type="Version" value="4.1.0"/>
</capability>
<capability namespace="osgi.content">
- <attribute name="osgi.content" value="7d3f3fad1451af2a6750ab9419b7da16dd8c45ce7aab2f28b6ed9d1755cf078e"/>
- <attribute name="url" value="org.apache.felix.dependencymanager/org.apache.felix.dependencymanager-4.0.1.jar"/>
- <attribute name="size" type="Long" value="220465"/>
+ <attribute name="osgi.content" value="09d4f34ae9dde3db339773aa44547692b0b98814eb62d04142f6abad2a784d13"/>
+ <attribute name="url" value="org.apache.felix.dependencymanager/org.apache.felix.dependencymanager-4.1.0.jar"/>
+ <attribute name="size" type="Long" value="233947"/>
<attribute name="mime" value="application/vnd.osgi.bundle"/>
</capability>
<capability namespace="osgi.wiring.bundle">
<attribute name="osgi.wiring.bundle" value="org.apache.felix.dependencymanager"/>
- <attribute name="bundle-version" type="Version" value="4.0.1"/>
+ <attribute name="bundle-version" type="Version" value="4.1.0"/>
</capability>
<capability namespace="osgi.wiring.host">
<attribute name="osgi.wiring.host" value="org.apache.felix.dependencymanager"/>
- <attribute name="bundle-version" type="Version" value="4.0.1"/>
+ <attribute name="bundle-version" type="Version" value="4.1.0"/>
</capability>
<capability namespace="osgi.wiring.package">
<attribute name="osgi.wiring.package" value="org.apache.felix.dm"/>
- <attribute name="version" type="Version" value="4.0.0"/>
+ <attribute name="version" type="Version" value="4.1.0"/>
<attribute name="bundle-symbolic-name" value="org.apache.felix.dependencymanager"/>
- <attribute name="bundle-version" type="Version" value="4.0.1"/>
+ <attribute name="bundle-version" type="Version" value="4.1.0"/>
<directive name="uses" value="org.osgi.framework"/>
</capability>
<capability namespace="osgi.wiring.package">
<attribute name="osgi.wiring.package" value="org.apache.felix.dm.tracker"/>
<attribute name="version" type="Version" value="4.0.0"/>
<attribute name="bundle-symbolic-name" value="org.apache.felix.dependencymanager"/>
- <attribute name="bundle-version" type="Version" value="4.0.1"/>
+ <attribute name="bundle-version" type="Version" value="4.1.0"/>
<directive name="uses" value="org.osgi.framework"/>
</capability>
<capability namespace="osgi.wiring.package">
<attribute name="osgi.wiring.package" value="org.apache.felix.dm.context"/>
<attribute name="version" type="Version" value="4.0.0"/>
<attribute name="bundle-symbolic-name" value="org.apache.felix.dependencymanager"/>
- <attribute name="bundle-version" type="Version" value="4.0.1"/>
+ <attribute name="bundle-version" type="Version" value="4.1.0"/>
<directive name="uses" value="org.apache.felix.dm,org.osgi.framework"/>
</capability>
+ <capability namespace="osgi.wiring.package">
+ <attribute name="osgi.wiring.package" value="org.apache.felix.dm.diagnostics"/>
+ <attribute name="version" type="Version" value="1.0.0"/>
+ <attribute name="bundle-symbolic-name" value="org.apache.felix.dependencymanager"/>
+ <attribute name="bundle-version" type="Version" value="4.1.0"/>
+ <directive name="uses" value="org.apache.felix.dm"/>
+ </capability>
<requirement namespace="osgi.wiring.package">
<directive name="filter" value="(&(osgi.wiring.package=org.apache.felix.dm.context)(version>=4.0.0)(!(version>=5.0.0)))"/>
</requirement>
diff --git a/dependencymanager/cnf/releaserepo/index.xml.sha b/dependencymanager/cnf/releaserepo/index.xml.sha
index eae1964..0eaebc4 100644
--- a/dependencymanager/cnf/releaserepo/index.xml.sha
+++ b/dependencymanager/cnf/releaserepo/index.xml.sha
@@ -1 +1 @@
-90709c8e86096357b04b1154a5df392a8a9adbd37e4efdc98266e4ff2dd15dc7
\ No newline at end of file
+ea44431753ac5168b353bab37544d943d45da35038b1fc777f223099e2bd44ad
\ No newline at end of file
diff --git a/dependencymanager/cnf/releaserepo/org.apache.felix.dependencymanager.annotation/org.apache.felix.dependencymanager.annotation-4.0.0.jar b/dependencymanager/cnf/releaserepo/org.apache.felix.dependencymanager.annotation/org.apache.felix.dependencymanager.annotation-4.0.1.jar
similarity index 87%
rename from dependencymanager/cnf/releaserepo/org.apache.felix.dependencymanager.annotation/org.apache.felix.dependencymanager.annotation-4.0.0.jar
rename to dependencymanager/cnf/releaserepo/org.apache.felix.dependencymanager.annotation/org.apache.felix.dependencymanager.annotation-4.0.1.jar
index 164454f..11ed0ff 100644
--- a/dependencymanager/cnf/releaserepo/org.apache.felix.dependencymanager.annotation/org.apache.felix.dependencymanager.annotation-4.0.0.jar
+++ b/dependencymanager/cnf/releaserepo/org.apache.felix.dependencymanager.annotation/org.apache.felix.dependencymanager.annotation-4.0.1.jar
Binary files differ
diff --git a/dependencymanager/cnf/releaserepo/org.apache.felix.dependencymanager/org.apache.felix.dependencymanager-4.0.1.jar b/dependencymanager/cnf/releaserepo/org.apache.felix.dependencymanager/org.apache.felix.dependencymanager-4.1.0.jar
similarity index 64%
rename from dependencymanager/cnf/releaserepo/org.apache.felix.dependencymanager/org.apache.felix.dependencymanager-4.0.1.jar
rename to dependencymanager/cnf/releaserepo/org.apache.felix.dependencymanager/org.apache.felix.dependencymanager-4.1.0.jar
index 8f75112..39f551f 100644
--- a/dependencymanager/cnf/releaserepo/org.apache.felix.dependencymanager/org.apache.felix.dependencymanager-4.0.1.jar
+++ b/dependencymanager/cnf/releaserepo/org.apache.felix.dependencymanager/org.apache.felix.dependencymanager-4.1.0.jar
Binary files differ