ace-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject svn commit: r1726789 - in /ace/trunk: cnf/ cnf/buildrepo/osgi.core/ cnf/localrepo/ cnf/localrepo/org.apache.felix.framework/ org.apache.ace.agent.controller.itest/ org.apache.ace.agent.itest/ org.apache.ace.agent.itest/src/org/apache/ace/agent/itest/ o...
Date Tue, 26 Jan 2016 13:09:39 GMT
Author: jawi
Date: Tue Jan 26 13:09:38 2016
New Revision: 1726789

URL: http://svn.apache.org/viewvc?rev=1726789&view=rev
Log:
ACE-522 - upgrade to OSGi R6:

- use OSGi R6 as dependency for all but the agent bundles;
- the agent remains at OSGi R4 to allow it to be used for
  older frameworks as well;
- all relevant tests now use a R6 compliant framework.


Added:
    ace/trunk/cnf/buildrepo/osgi.core/osgi.core-6.0.0.jar   (with props)
    ace/trunk/cnf/localrepo/org.apache.felix.framework/org.apache.felix.framework-5.2.0.jar   (with props)
Modified:
    ace/trunk/cnf/bnd.bnd
    ace/trunk/cnf/build.bnd
    ace/trunk/cnf/buildrepo/osgi.core/osgi.core-4.3.1.jar   (props changed)
    ace/trunk/cnf/localrepo/index.xml
    ace/trunk/cnf/localrepo/index.xml.sha
    ace/trunk/org.apache.ace.agent.controller.itest/bnd.bnd
    ace/trunk/org.apache.ace.agent.itest/bnd.bnd
    ace/trunk/org.apache.ace.agent.itest/src/org/apache/ace/agent/itest/AgentExtensionTest.java
    ace/trunk/org.apache.ace.agent.launcher/bnd.bnd
    ace/trunk/org.apache.ace.agent.launcher/felix.bnd
    ace/trunk/org.apache.ace.agent.launcher/launch.bndrun
    ace/trunk/org.apache.ace.agent.update.itest/bnd.bnd
    ace/trunk/org.apache.ace.agent/bnd.bnd
    ace/trunk/org.apache.ace.authentication.itest/bnd.bnd
    ace/trunk/org.apache.ace.authentication/bnd.bnd
    ace/trunk/org.apache.ace.bnd/bnd.bnd
    ace/trunk/org.apache.ace.builder/bnd.bnd
    ace/trunk/org.apache.ace.client.automation/bnd.bnd
    ace/trunk/org.apache.ace.client.automation/src/org/apache/ace/client/automation/AutoTargetOperator.java
    ace/trunk/org.apache.ace.client.repository.itest/bnd.bnd
    ace/trunk/org.apache.ace.client.repository/bnd.bnd
    ace/trunk/org.apache.ace.client.rest.itest/bnd.bnd
    ace/trunk/org.apache.ace.client.rest/bnd.bnd
    ace/trunk/org.apache.ace.client.workspace/bnd.bnd
    ace/trunk/org.apache.ace.configurator.useradmin.itest/bnd.bnd
    ace/trunk/org.apache.ace.configurator/bnd.bnd
    ace/trunk/org.apache.ace.connectionfactory/bnd.bnd
    ace/trunk/org.apache.ace.connectionfactory/src/org/apache/ace/connectionfactory/impl/Activator.java
    ace/trunk/org.apache.ace.consolelogger/bnd.bnd
    ace/trunk/org.apache.ace.deployment.itest/bnd.bnd
    ace/trunk/org.apache.ace.deployment.itest/src/org/apache/ace/it/deployment/DeploymentIntegrationTest.java
    ace/trunk/org.apache.ace.deployment/bnd.bnd
    ace/trunk/org.apache.ace.discovery/bnd.bnd
    ace/trunk/org.apache.ace.feedback.common/bnd.bnd
    ace/trunk/org.apache.ace.gogo.servlet/bnd.bnd
    ace/trunk/org.apache.ace.gogo/bnd.bnd
    ace/trunk/org.apache.ace.http.itest/bnd.bnd
    ace/trunk/org.apache.ace.http/bnd.bnd
    ace/trunk/org.apache.ace.identification/bnd.bnd
    ace/trunk/org.apache.ace.location.upnp/bnd.bnd
    ace/trunk/org.apache.ace.log.itest/bnd.bnd
    ace/trunk/org.apache.ace.log.server.store.itest/bnd.bnd
    ace/trunk/org.apache.ace.log.server.ui/bnd.bnd
    ace/trunk/org.apache.ace.log/bnd.bnd
    ace/trunk/org.apache.ace.nodelauncher/bnd.bnd
    ace/trunk/org.apache.ace.obr/bnd.bnd
    ace/trunk/org.apache.ace.processlauncher.itest/bnd.bnd
    ace/trunk/org.apache.ace.processlauncher.itest/src/org/apache/ace/processlauncher/itest/ProcessLauncherServiceIntegrationTest.java
    ace/trunk/org.apache.ace.processlauncher/bnd.bnd
    ace/trunk/org.apache.ace.range.api/bnd.bnd
    ace/trunk/org.apache.ace.repository.itest/bnd.bnd
    ace/trunk/org.apache.ace.repository/bnd.bnd
    ace/trunk/org.apache.ace.resourceprocessor.useradmin/bnd.bnd
    ace/trunk/org.apache.ace.scheduler/bnd.bnd
    ace/trunk/org.apache.ace.tageditor/bnd.bnd
    ace/trunk/org.apache.ace.target.mgmt.ui/bnd.bnd
    ace/trunk/org.apache.ace.test/bnd.bnd
    ace/trunk/org.apache.ace.useradmin.ui.itest/bnd.bnd
    ace/trunk/org.apache.ace.useradmin.ui/bnd.bnd
    ace/trunk/org.apache.ace.verifier/bnd.bnd
    ace/trunk/org.apache.ace.verifier/src/org/apache/ace/deployment/verifier/impl/VerifierBundleRevision.java
    ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/resolver/HostBundleRevision.java
    ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/wiring/BundleCapabilityImpl.java
    ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/wiring/BundleRequirementImpl.java
    ace/trunk/org.apache.ace.webui.vaadin/bnd.bnd
    ace/trunk/run-client/client.bndrun
    ace/trunk/run-develop/develop.bndrun
    ace/trunk/run-obr/obr.bndrun
    ace/trunk/run-relay/relay.bndrun
    ace/trunk/run-server-allinone/server-allinone.bndrun
    ace/trunk/run-server/server.bndrun
    ace/trunk/run-target/target.bndrun

Modified: ace/trunk/cnf/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/cnf/bnd.bnd?rev=1726789&r1=1726788&r2=1726789&view=diff
==============================================================================
--- ace/trunk/cnf/bnd.bnd (original)
+++ ace/trunk/cnf/bnd.bnd Tue Jan 26 13:09:38 2016
@@ -1,3 +1,4 @@
 -nobundles: true
--buildpath: biz.aQute.bnd;version=2.2.0,\
+-buildpath: \
+	biz.aQute.bnd;version=2.2.0,\
 	org.osgi.impl.bundle.bindex
\ No newline at end of file

Modified: ace/trunk/cnf/build.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/cnf/build.bnd?rev=1726789&r1=1726788&r2=1726789&view=diff
==============================================================================
--- ace/trunk/cnf/build.bnd (original)
+++ ace/trunk/cnf/build.bnd Tue Jan 26 13:09:38 2016
@@ -9,6 +9,8 @@
 ## For example, to add one addtional plugin to the list defined in ext/repositories.bnd:
 # -plugin: ${ext.repositories.-plugin}, org.example.MyPlugin
 
+javac.source:          1.7
+javac.target:          1.7
 
 ## If you use git, you might want to uncomment the following lines:
 # Git-Descriptor: ${system-allow-fail;git describe --dirty --always}

Propchange: ace/trunk/cnf/buildrepo/osgi.core/osgi.core-4.3.1.jar
            ('svn:mime-type' removed)

Added: ace/trunk/cnf/buildrepo/osgi.core/osgi.core-6.0.0.jar
URL: http://svn.apache.org/viewvc/ace/trunk/cnf/buildrepo/osgi.core/osgi.core-6.0.0.jar?rev=1726789&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ace/trunk/cnf/buildrepo/osgi.core/osgi.core-6.0.0.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: ace/trunk/cnf/localrepo/index.xml
URL: http://svn.apache.org/viewvc/ace/trunk/cnf/localrepo/index.xml?rev=1726789&r1=1726788&r2=1726789&view=diff
==============================================================================
--- ace/trunk/cnf/localrepo/index.xml (original)
+++ ace/trunk/cnf/localrepo/index.xml Tue Jan 26 13:09:38 2016
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<repository increment="1453471155000" name="Local" xmlns="http://www.osgi.org/xmlns/repository/v1.0.0">
+<repository increment="1453801257000" name="Local" xmlns="http://www.osgi.org/xmlns/repository/v1.0.0">
   <resource>
     <capability namespace="osgi.identity">
       <attribute name="osgi.identity" value="aws-common"/>
@@ -7678,6 +7678,170 @@
   </resource>
   <resource>
     <capability namespace="osgi.identity">
+      <attribute name="osgi.identity" value="org.apache.felix.framework"/>
+      <attribute name="type" value="osgi.bundle"/>
+      <attribute name="version" type="Version" value="5.2.0"/>
+    </capability>
+    <capability namespace="osgi.content">
+      <attribute name="osgi.content" value="29d64139d8b1827b0ecbbb38982942238e2eeed1ee91dce8d3e2672b5a6960fb"/>
+      <attribute name="url" value="org.apache.felix.framework/org.apache.felix.framework-5.2.0.jar"/>
+      <attribute name="size" type="Long" value="677905"/>
+      <attribute name="mime" value="application/vnd.osgi.bundle"/>
+    </capability>
+    <capability namespace="osgi.wiring.bundle">
+      <attribute name="osgi.wiring.bundle" value="org.apache.felix.framework"/>
+      <attribute name="bundle-version" type="Version" value="5.2.0"/>
+    </capability>
+    <capability namespace="osgi.wiring.host">
+      <attribute name="osgi.wiring.host" value="org.apache.felix.framework"/>
+      <attribute name="bundle-version" type="Version" value="5.2.0"/>
+    </capability>
+    <capability namespace="osgi.wiring.package">
+      <attribute name="osgi.wiring.package" value="org.osgi.framework"/>
+      <attribute name="version" type="Version" value="1.8.0"/>
+      <attribute name="bundle-symbolic-name" value="org.apache.felix.framework"/>
+      <attribute name="bundle-version" type="Version" value="5.2.0"/>
+    </capability>
+    <capability namespace="osgi.wiring.package">
+      <attribute name="osgi.wiring.package" value="org.osgi.framework.dto"/>
+      <attribute name="version" type="Version" value="1.8.0"/>
+      <attribute name="bundle-symbolic-name" value="org.apache.felix.framework"/>
+      <attribute name="bundle-version" type="Version" value="5.2.0"/>
+      <directive name="uses" value="org.osgi.dto"/>
+    </capability>
+    <capability namespace="osgi.wiring.package">
+      <attribute name="osgi.wiring.package" value="org.osgi.framework.hooks.bundle"/>
+      <attribute name="version" type="Version" value="1.1.0"/>
+      <attribute name="bundle-symbolic-name" value="org.apache.felix.framework"/>
+      <attribute name="bundle-version" type="Version" value="5.2.0"/>
+      <directive name="uses" value="org.osgi.framework"/>
+    </capability>
+    <capability namespace="osgi.wiring.package">
+      <attribute name="osgi.wiring.package" value="org.osgi.framework.hooks.resolver"/>
+      <attribute name="version" type="Version" value="1.0.0"/>
+      <attribute name="bundle-symbolic-name" value="org.apache.felix.framework"/>
+      <attribute name="bundle-version" type="Version" value="5.2.0"/>
+      <directive name="uses" value="org.osgi.framework.wiring"/>
+    </capability>
+    <capability namespace="osgi.wiring.package">
+      <attribute name="osgi.wiring.package" value="org.osgi.framework.hooks.service"/>
+      <attribute name="version" type="Version" value="1.1.0"/>
+      <attribute name="bundle-symbolic-name" value="org.apache.felix.framework"/>
+      <attribute name="bundle-version" type="Version" value="5.2.0"/>
+      <directive name="uses" value="org.osgi.framework"/>
+    </capability>
+    <capability namespace="osgi.wiring.package">
+      <attribute name="osgi.wiring.package" value="org.osgi.framework.hooks.weaving"/>
+      <attribute name="version" type="Version" value="1.1.0"/>
+      <attribute name="bundle-symbolic-name" value="org.apache.felix.framework"/>
+      <attribute name="bundle-version" type="Version" value="5.2.0"/>
+      <directive name="uses" value="org.osgi.framework.wiring"/>
+    </capability>
+    <capability namespace="osgi.wiring.package">
+      <attribute name="osgi.wiring.package" value="org.osgi.framework.launch"/>
+      <attribute name="version" type="Version" value="1.2.0"/>
+      <attribute name="bundle-symbolic-name" value="org.apache.felix.framework"/>
+      <attribute name="bundle-version" type="Version" value="5.2.0"/>
+      <directive name="uses" value="org.osgi.framework"/>
+    </capability>
+    <capability namespace="osgi.wiring.package">
+      <attribute name="osgi.wiring.package" value="org.osgi.framework.namespace"/>
+      <attribute name="version" type="Version" value="1.1.0"/>
+      <attribute name="bundle-symbolic-name" value="org.apache.felix.framework"/>
+      <attribute name="bundle-version" type="Version" value="5.2.0"/>
+      <directive name="uses" value="org.osgi.resource"/>
+    </capability>
+    <capability namespace="osgi.wiring.package">
+      <attribute name="osgi.wiring.package" value="org.osgi.framework.startlevel"/>
+      <attribute name="version" type="Version" value="1.0.0"/>
+      <attribute name="bundle-symbolic-name" value="org.apache.felix.framework"/>
+      <attribute name="bundle-version" type="Version" value="5.2.0"/>
+      <directive name="uses" value="org.osgi.framework"/>
+    </capability>
+    <capability namespace="osgi.wiring.package">
+      <attribute name="osgi.wiring.package" value="org.osgi.framework.startlevel.dto"/>
+      <attribute name="version" type="Version" value="1.0.0"/>
+      <attribute name="bundle-symbolic-name" value="org.apache.felix.framework"/>
+      <attribute name="bundle-version" type="Version" value="5.2.0"/>
+      <directive name="uses" value="org.osgi.dto"/>
+    </capability>
+    <capability namespace="osgi.wiring.package">
+      <attribute name="osgi.wiring.package" value="org.osgi.framework.wiring"/>
+      <attribute name="version" type="Version" value="1.2.0"/>
+      <attribute name="bundle-symbolic-name" value="org.apache.felix.framework"/>
+      <attribute name="bundle-version" type="Version" value="5.2.0"/>
+      <directive name="uses" value="org.osgi.framework,org.osgi.resource"/>
+    </capability>
+    <capability namespace="osgi.wiring.package">
+      <attribute name="osgi.wiring.package" value="org.osgi.framework.wiring.dto"/>
+      <attribute name="version" type="Version" value="1.2.0"/>
+      <attribute name="bundle-symbolic-name" value="org.apache.felix.framework"/>
+      <attribute name="bundle-version" type="Version" value="5.2.0"/>
+      <directive name="uses" value="org.osgi.dto,org.osgi.resource.dto"/>
+    </capability>
+    <capability namespace="osgi.wiring.package">
+      <attribute name="osgi.wiring.package" value="org.osgi.resource"/>
+      <attribute name="version" type="Version" value="1.0.0"/>
+      <attribute name="bundle-symbolic-name" value="org.apache.felix.framework"/>
+      <attribute name="bundle-version" type="Version" value="5.2.0"/>
+    </capability>
+    <capability namespace="osgi.wiring.package">
+      <attribute name="osgi.wiring.package" value="org.osgi.resource.dto"/>
+      <attribute name="version" type="Version" value="1.0.0"/>
+      <attribute name="bundle-symbolic-name" value="org.apache.felix.framework"/>
+      <attribute name="bundle-version" type="Version" value="5.2.0"/>
+      <directive name="uses" value="org.osgi.dto"/>
+    </capability>
+    <capability namespace="osgi.wiring.package">
+      <attribute name="osgi.wiring.package" value="org.osgi.service.packageadmin"/>
+      <attribute name="version" type="Version" value="1.2.0"/>
+      <attribute name="bundle-symbolic-name" value="org.apache.felix.framework"/>
+      <attribute name="bundle-version" type="Version" value="5.2.0"/>
+      <directive name="uses" value="org.osgi.framework"/>
+    </capability>
+    <capability namespace="osgi.wiring.package">
+      <attribute name="osgi.wiring.package" value="org.osgi.service.startlevel"/>
+      <attribute name="version" type="Version" value="1.1.0"/>
+      <attribute name="bundle-symbolic-name" value="org.apache.felix.framework"/>
+      <attribute name="bundle-version" type="Version" value="5.2.0"/>
+      <directive name="uses" value="org.osgi.framework"/>
+    </capability>
+    <capability namespace="osgi.wiring.package">
+      <attribute name="osgi.wiring.package" value="org.osgi.service.url"/>
+      <attribute name="version" type="Version" value="1.0.0"/>
+      <attribute name="bundle-symbolic-name" value="org.apache.felix.framework"/>
+      <attribute name="bundle-version" type="Version" value="5.2.0"/>
+    </capability>
+    <capability namespace="osgi.wiring.package">
+      <attribute name="osgi.wiring.package" value="org.osgi.service.resolver"/>
+      <attribute name="version" type="Version" value="1.0.0"/>
+      <attribute name="bundle-symbolic-name" value="org.apache.felix.framework"/>
+      <attribute name="bundle-version" type="Version" value="5.2.0"/>
+      <directive name="uses" value="org.osgi.resource"/>
+    </capability>
+    <capability namespace="osgi.wiring.package">
+      <attribute name="osgi.wiring.package" value="org.osgi.util.tracker"/>
+      <attribute name="version" type="Version" value="1.5.1"/>
+      <attribute name="bundle-symbolic-name" value="org.apache.felix.framework"/>
+      <attribute name="bundle-version" type="Version" value="5.2.0"/>
+      <directive name="uses" value="org.osgi.framework"/>
+    </capability>
+    <capability namespace="osgi.wiring.package">
+      <attribute name="osgi.wiring.package" value="org.osgi.dto"/>
+      <attribute name="version" type="Version" value="1.0.0"/>
+      <attribute name="bundle-symbolic-name" value="org.apache.felix.framework"/>
+      <attribute name="bundle-version" type="Version" value="5.2.0"/>
+    </capability>
+    <capability namespace="osgi.contract">
+      <attribute name="osgi.contract" value="OSGiFramework"/>
+      <directive name="uses" value="org.osgi.framework,org.osgi.framework.dto,org.osgi.framework.hooks.bundle,org.osgi.framework.hooks.resolver,org.osgi.framework.hooks.service,org.osgi.framework.hooks.weaving,org.osgi.framework.launch,org.osgi.framework.namespace,org.osgi.framework.startlevel,org.osgi.framework.startlevel.dto,org.osgi.framework.wiring,org.osgi.framework.wiring.dto,org.osgi.resource,org.osgi.resource.dto,org.osgi.service.packageadmin,org.osgi.service.startlevel,org.osgi.service.url,org.osgi.service.resolver,org.osgi.util.tracker,org.osgi.dto"/>
+    </capability>
+    <requirement namespace="osgi.ee">
+      <directive name="filter" value="(&amp;(osgi.ee=JavaSE)(version=1.6))"/>
+    </requirement>
+  </resource>
+  <resource>
+    <capability namespace="osgi.identity">
       <attribute name="osgi.identity" value="org.apache.felix.gogo.command"/>
       <attribute name="type" value="osgi.bundle"/>
       <attribute name="version" type="Version" value="0.12.0"/>

Modified: ace/trunk/cnf/localrepo/index.xml.sha
URL: http://svn.apache.org/viewvc/ace/trunk/cnf/localrepo/index.xml.sha?rev=1726789&r1=1726788&r2=1726789&view=diff
==============================================================================
--- ace/trunk/cnf/localrepo/index.xml.sha (original)
+++ ace/trunk/cnf/localrepo/index.xml.sha Tue Jan 26 13:09:38 2016
@@ -1 +1 @@
-268ea703ab955c27bac260c994c9c12aaa72566cddf6b7ac053fbc8d34cf9d05
\ No newline at end of file
+9f55200dab88670ffa750a9152fe96ca89b17362c17d453a9f0d417afdd47442
\ No newline at end of file

Added: ace/trunk/cnf/localrepo/org.apache.felix.framework/org.apache.felix.framework-5.2.0.jar
URL: http://svn.apache.org/viewvc/ace/trunk/cnf/localrepo/org.apache.felix.framework/org.apache.felix.framework-5.2.0.jar?rev=1726789&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ace/trunk/cnf/localrepo/org.apache.felix.framework/org.apache.felix.framework-5.2.0.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: ace/trunk/org.apache.ace.agent.controller.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.agent.controller.itest/bnd.bnd?rev=1726789&r1=1726788&r2=1726789&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.agent.controller.itest/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.agent.controller.itest/bnd.bnd Tue Jan 26 13:09:38 2016
@@ -26,7 +26,8 @@ Private-Package: \
 -runee: JavaSE-1.6
 -runvm: -ea
 -runfw: org.apache.felix.framework;version='[4,5)'
--buildpath: osgi.core;version='[4.2,5)',\
+-buildpath: \
+	osgi.core;version=4.2,\
 	org.apache.ace.agent;version=latest,\
 	org.apache.ace.builder;version=latest,\
 	org.apache.ace.test;version=latest,\

Modified: ace/trunk/org.apache.ace.agent.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.agent.itest/bnd.bnd?rev=1726789&r1=1726788&r2=1726789&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.agent.itest/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.agent.itest/bnd.bnd Tue Jan 26 13:09:38 2016
@@ -12,14 +12,14 @@
 -runvm: -ea
 -runfw: org.apache.felix.framework;version='[4,5)'
 -buildpath: \
-	osgi.core;version='[4.2,5)',\
+	osgi.core;version=4.2,\
 	org.apache.ace.agent;version=latest,\
 	org.apache.ace.builder;version=latest,\
 	org.apache.ace.test;version=latest,\
 	org.apache.felix.dependencymanager,\
 	org.apache.felix.http.jetty,\
 	junit.osgi,\
-	org.mockito.mockito-all	
+	org.mockito.mockito-all
 -runsystempackages: sun.reflect
 -runproperties: \
 	org.apache.felix.eventadmin.Timeout=0,\

Modified: ace/trunk/org.apache.ace.agent.itest/src/org/apache/ace/agent/itest/AgentExtensionTest.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.agent.itest/src/org/apache/ace/agent/itest/AgentExtensionTest.java?rev=1726789&r1=1726788&r2=1726789&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.agent.itest/src/org/apache/ace/agent/itest/AgentExtensionTest.java (original)
+++ ace/trunk/org.apache.ace.agent.itest/src/org/apache/ace/agent/itest/AgentExtensionTest.java Tue Jan 26 13:09:38 2016
@@ -21,6 +21,8 @@ package org.apache.ace.agent.itest;
 import java.io.IOException;
 import java.net.URL;
 import java.net.URLConnection;
+import java.util.Dictionary;
+import java.util.Hashtable;
 import java.util.Properties;
 
 import org.apache.ace.agent.AgentConstants;
@@ -82,6 +84,8 @@ public class AgentExtensionTest extends
     }
 
     private ServiceRegistration registerIdentification(final String id, final int rank) {
+        Dictionary<String, Object> props = new Hashtable<>();
+        props.put(Constants.SERVICE_RANKING, rank);
         return m_bundleContext.registerService(IdentificationHandler.class.getName(), new IdentificationHandler() {
             @Override
             public String getAgentId() {
@@ -92,15 +96,12 @@ public class AgentExtensionTest extends
             public String toString() {
                 return id;
             }
-        }, new Properties() {
-            {
-                put(Constants.SERVICE_RANKING, rank);
-            }
-        });
-
+        }, props);
     }
 
     private ServiceRegistration registerDiscovery(final URL url, final int rank) {
+        Dictionary<String, Object> props = new Hashtable<>();
+        props.put(Constants.SERVICE_RANKING, rank);
         return m_bundleContext
             .registerService(DiscoveryHandler.class.getName(), new DiscoveryHandler() {
 
@@ -108,12 +109,7 @@ public class AgentExtensionTest extends
                 public URL getServerUrl() {
                     return url;
                 }
-            }, new Properties() {
-                {
-                    put(Constants.SERVICE_RANKING, rank);
-                }
-            });
-
+            }, props);
     }
 
     private ServiceRegistration registerConnectionHandler() {

Modified: ace/trunk/org.apache.ace.agent.launcher/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.agent.launcher/bnd.bnd?rev=1726789&r1=1726788&r2=1726789&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.agent.launcher/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.agent.launcher/bnd.bnd Tue Jan 26 13:09:38 2016
@@ -1,5 +1,6 @@
--buildpath: ${^-buildpath},\
-	osgi.core;version='[4.3,5)',\
+-buildpath: \
+	${^-buildpath},\
+	osgi.core;version=6.0.0,\
 	org.apache.commons.cli,\
 	org.apache.ace.agent;version=latest
 -sources: false

Modified: ace/trunk/org.apache.ace.agent.launcher/felix.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.agent.launcher/felix.bnd?rev=1726789&r1=1726788&r2=1726789&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.agent.launcher/felix.bnd (original)
+++ ace/trunk/org.apache.ace.agent.launcher/felix.bnd Tue Jan 26 13:09:38 2016
@@ -6,7 +6,7 @@ Bundle-Name: Apache ACE Agent Felix laun
 Bundle-Description: Standalone launcher that start a Felix framework with an embedded ACE Agent
 
 # Include the felix defaults
-felix.version=4.2.1
+felix.version=5.2.0
 
 Include-Resource: @${repo;org.apache.felix.framework;${felix.version}}!/default.properties,\
     @${repo;org.apache.felix.framework;${felix.version}}!/META-INF/services/*,\

Modified: ace/trunk/org.apache.ace.agent.launcher/launch.bndrun
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.agent.launcher/launch.bndrun?rev=1726789&r1=1726788&r2=1726789&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.agent.launcher/launch.bndrun (original)
+++ ace/trunk/org.apache.ace.agent.launcher/launch.bndrun Tue Jan 26 13:09:38 2016
@@ -1,4 +1,4 @@
--runfw: org.apache.felix.framework;version='[4,5)'
+-runfw: org.apache.felix.framework;version='[5.2.0,6)'
 -runee: JavaSE-1.6
 
 -runbundles:\

Modified: ace/trunk/org.apache.ace.agent.update.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.agent.update.itest/bnd.bnd?rev=1726789&r1=1726788&r2=1726789&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.agent.update.itest/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.agent.update.itest/bnd.bnd Tue Jan 26 13:09:38 2016
@@ -23,15 +23,16 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;j
 Private-Package: org.apache.ace.agent.itest
 -runee: JavaSE-1.6
 -runvm: -ea
--runfw: org.apache.felix.framework;version='[4,5)'
--buildpath: osgi.core;version='[4.2,5)',\
+-runfw: org.apache.felix.framework;version='[5.2.0,6)'
+-buildpath: \
+	osgi.core;version=6.0.0,\
 	org.apache.ace.agent;version=latest,\
 	org.apache.ace.test;version=latest,\
 	org.apache.felix.dependencymanager,\
 	org.apache.felix.http.jetty,\
 	biz.aQute.bnd,\
 	junit.osgi,\
-	org.mockito.mockito-all	
+	org.mockito.mockito-all
 -runsystempackages: sun.reflect
 -runproperties: \
 	org.apache.felix.eventadmin.Timeout=0,\

Modified: ace/trunk/org.apache.ace.agent/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.agent/bnd.bnd?rev=1726789&r1=1726788&r2=1726789&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.agent/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.agent/bnd.bnd Tue Jan 26 13:09:38 2016
@@ -29,7 +29,8 @@ Export-Package: org.apache.ace.agent,\
 # offline
 #javac.debug:  off
 
--buildpath: ${^-buildpath},\
+-buildpath: \
+	${^-buildpath},\
 	osgi.core;version=4.2,\
 	osgi.cmpn;version=4.2,\
 	javax.servlet;version=2.5,\
@@ -41,10 +42,3 @@ Export-Package: org.apache.ace.agent,\
 	org.apache.ace.feedback.common;version=latest
 
 -sources false
--runfw: org.apache.felix.framework;version='[4,5)'
--runee: JavaSE-1.6
--runbundles: org.apache.felix.gogo.command,\
-	org.apache.felix.gogo.runtime,\
-	org.apache.felix.gogo.shell
--runproperties: agent.controller.syncdelay=1,\
-	agent.identification.agentid=demo

Modified: ace/trunk/org.apache.ace.authentication.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.authentication.itest/bnd.bnd?rev=1726789&r1=1726788&r2=1726789&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.authentication.itest/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.authentication.itest/bnd.bnd Tue Jan 26 13:09:38 2016
@@ -1,6 +1,7 @@
 Test-Cases: ${classes;CONCRETE;EXTENDS;org.apache.ace.it.authentication.AuthenticationTestBase}
--buildpath: junit.osgi,\
-	osgi.core,\
+-buildpath: \
+	junit.osgi,\
+	osgi.core;version=6.0.0,\
 	osgi.cmpn,\
 	org.apache.ace.test;version=latest,\
 	org.apache.felix.dependencymanager,\
@@ -16,9 +17,9 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;o
 	org.apache.ace.http.listener;version=latest,\
 	org.apache.ace.range.api;version=latest,\
 	org.apache.ace.obr.storage;version=latest,\
-    org.apache.ace.log.api;version=latest,\
+	org.apache.ace.log.api;version=latest,\
 	org.apache.ace.feedback.common;version=latest
--runfw: org.apache.felix.framework;version='[4,5)'
+-runfw: org.apache.felix.framework;version='[5.2.0,6)'
 -runvm: -ea
 -runbundles: osgi.cmpn,\
 	org.apache.felix.log,\

Modified: ace/trunk/org.apache.ace.authentication/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.authentication/bnd.bnd?rev=1726789&r1=1726788&r2=1726789&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.authentication/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.authentication/bnd.bnd Tue Jan 26 13:09:38 2016
@@ -1,5 +1,6 @@
--buildpath: ${^-buildpath},\
-	osgi.core,\
+-buildpath: \
+	${^-buildpath},\
+	osgi.core;version=6.0.0,\
 	osgi.cmpn,\
 	org.mockito.mockito-all,\
 	org.apache.felix.dependencymanager,\

Modified: ace/trunk/org.apache.ace.bnd/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.bnd/bnd.bnd?rev=1726789&r1=1726788&r2=1726789&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.bnd/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.bnd/bnd.bnd Tue Jan 26 13:09:38 2016
@@ -1,3 +1,4 @@
 -sub: *.bnd
--buildpath: biz.aQute.bnd,\
+-buildpath: \
+	biz.aQute.bnd,\
 	biz.aQute.repository

Modified: ace/trunk/org.apache.ace.builder/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.builder/bnd.bnd?rev=1726789&r1=1726788&r2=1726789&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.builder/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.builder/bnd.bnd Tue Jan 26 13:09:38 2016
@@ -1,4 +1,5 @@
--buildpath: ${^-buildpath},\
+-buildpath: \
+	${^-buildpath},\
 	org.apache.ace.test;version=latest
 Export-Package: org.apache.ace.builder
 Bundle-Version: 2.0.0

Modified: ace/trunk/org.apache.ace.client.automation/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.automation/bnd.bnd?rev=1726789&r1=1726788&r2=1726789&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.automation/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.client.automation/bnd.bnd Tue Jan 26 13:09:38 2016
@@ -1,5 +1,6 @@
--buildpath: ${^-buildpath},\
-	osgi.core,\
+-buildpath: \
+	${^-buildpath},\
+	osgi.core;version=6.0.0,\
 	osgi.cmpn,\
 	org.apache.felix.dependencymanager,\
 	org.apache.ace.scheduler.api;version=latest,\

Modified: ace/trunk/org.apache.ace.client.automation/src/org/apache/ace/client/automation/AutoTargetOperator.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.automation/src/org/apache/ace/client/automation/AutoTargetOperator.java?rev=1726789&r1=1726788&r2=1726789&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.automation/src/org/apache/ace/client/automation/AutoTargetOperator.java (original)
+++ ace/trunk/org.apache.ace.client.automation/src/org/apache/ace/client/automation/AutoTargetOperator.java Tue Jan 26 13:09:38 2016
@@ -21,6 +21,7 @@ package org.apache.ace.client.automation
 import java.io.IOException;
 import java.net.URL;
 import java.util.Dictionary;
+import java.util.Hashtable;
 import java.util.List;
 import java.util.Properties;
 
@@ -80,7 +81,7 @@ public class AutoTargetOperator implemen
             m_reposAdmin.login(loginContext);
 
             // start refresh task
-            Properties props = new Properties();
+            Dictionary<String, Object> props = new Hashtable<>();
             props.put(SchedulerConstants.SCHEDULER_NAME_KEY, SCHEDULER_NAME);
             m_serviceReg = m_bundleContext.registerService(Runnable.class.getName(), m_task, props);
         }

Modified: ace/trunk/org.apache.ace.client.repository.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository.itest/bnd.bnd?rev=1726789&r1=1726788&r2=1726789&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository.itest/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.client.repository.itest/bnd.bnd Tue Jan 26 13:09:38 2016
@@ -1,6 +1,7 @@
 Test-Cases: ${classes;CONCRETE;EXTENDS;org.apache.ace.it.IntegrationTestBase}
--buildpath: junit.osgi,\
-	osgi.core,\
+-buildpath: \
+	junit.osgi,\
+	osgi.core;version=6.0.0,\
 	osgi.cmpn,\
 	org.apache.felix.dependencymanager,\
 	org.apache.ace.test;version=latest,\
@@ -21,7 +22,7 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;o
 	org.apache.ace.client.repository.helper.bundle;version=latest,\
 	org.apache.ace.log.server.store.api;version=latest,\
 	org.apache.ace.feedback.common;version=latest
--runfw: org.apache.felix.framework;version='[4,5)'
+-runfw: org.apache.felix.framework;version='[5.2.0,6)'
 -runvm: -ea
 -runbundles: osgi.cmpn,\
 	org.apache.felix.dependencymanager,\

Modified: ace/trunk/org.apache.ace.client.repository/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/bnd.bnd?rev=1726789&r1=1726788&r2=1726789&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.client.repository/bnd.bnd Tue Jan 26 13:09:38 2016
@@ -1,5 +1,6 @@
--buildpath: ${^-buildpath},\
-	osgi.core,\
+-buildpath: \
+	${^-buildpath},\
+	osgi.core;version=6.0.0,\
 	osgi.cmpn,\
 	org.mockito.mockito-all,\
 	xpp3;version=1.1.4,\

Modified: ace/trunk/org.apache.ace.client.rest.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.rest.itest/bnd.bnd?rev=1726789&r1=1726788&r2=1726789&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.rest.itest/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.client.rest.itest/bnd.bnd Tue Jan 26 13:09:38 2016
@@ -1,5 +1,5 @@
 -buildpath: \
-	osgi.core,\
+	osgi.core;version=6.0.0,\
 	osgi.cmpn,\
 	junit.osgi,\
 	javax.servlet,\
@@ -27,7 +27,7 @@
 	org.apache.ace.feedback.common;version=latest
 -runee: JavaSE-1.7
 -runvm: -ea
--runfw: org.apache.felix.framework;version='[4,5)'
+-runfw: org.apache.felix.framework;version='[5.2.0,6)'
 -runbundles: \
 	osgi.cmpn,\
 	com.sun.jersey.client,\

Modified: ace/trunk/org.apache.ace.client.rest/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.rest/bnd.bnd?rev=1726789&r1=1726788&r2=1726789&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.rest/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.client.rest/bnd.bnd Tue Jan 26 13:09:38 2016
@@ -1,5 +1,6 @@
--buildpath: ${^-buildpath},\
-	osgi.core,\
+-buildpath: \
+	${^-buildpath},\
+	osgi.core;version=6.0.0,\
 	osgi.cmpn,\
 	org.apache.felix.dependencymanager,\
 	org.apache.ace.client.repository.api;version=latest,\

Modified: ace/trunk/org.apache.ace.client.workspace/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.workspace/bnd.bnd?rev=1726789&r1=1726788&r2=1726789&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.workspace/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.client.workspace/bnd.bnd Tue Jan 26 13:09:38 2016
@@ -1,5 +1,6 @@
--buildpath: ${^-buildpath},\
-	osgi.core,\
+-buildpath: \
+	${^-buildpath},\
+	osgi.core;version=6.0.0,\
 	osgi.cmpn,\
 	org.apache.felix.dependencymanager,\
 	org.apache.ace.client.repository.api;version=latest,\

Modified: ace/trunk/org.apache.ace.configurator.useradmin.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.configurator.useradmin.itest/bnd.bnd?rev=1726789&r1=1726788&r2=1726789&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.configurator.useradmin.itest/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.configurator.useradmin.itest/bnd.bnd Tue Jan 26 13:09:38 2016
@@ -1,6 +1,7 @@
 Test-Cases: ${classes;CONCRETE;EXTENDS;org.apache.ace.it.IntegrationTestBase}
--buildpath: junit.osgi,\
-	osgi.core,\
+-buildpath: \
+	junit.osgi,\
+	osgi.core;version=6.0.0,\
 	osgi.cmpn,\
 	org.apache.felix.dependencymanager,\
 	org.apache.ace.test;version=latest,\
@@ -14,7 +15,7 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;o
 	org.apache.ace.repository.api;version=latest,\
 	org.apache.ace.repository.impl;version=latest,\
 	org.apache.ace.feedback.common;version=latest
--runfw: org.apache.felix.framework;version='[4,5)'
+-runfw: org.apache.felix.framework;version='[5.2.0,6)'
 -runvm: -ea
 -runbundles: org.apache.felix.dependencymanager,\
 	org.apache.felix.configadmin,\

Modified: ace/trunk/org.apache.ace.configurator/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.configurator/bnd.bnd?rev=1726789&r1=1726788&r2=1726789&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.configurator/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.configurator/bnd.bnd Tue Jan 26 13:09:38 2016
@@ -1,5 +1,6 @@
--buildpath: ${^-buildpath},\
-	osgi.core,\
+-buildpath: \
+	${^-buildpath},\
+	osgi.core;version=6.0.0,\
 	osgi.cmpn,\
 	org.apache.felix.dependencymanager,\
 	org.apache.ace.range.api;version=latest,\

Modified: ace/trunk/org.apache.ace.connectionfactory/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.connectionfactory/bnd.bnd?rev=1726789&r1=1726788&r2=1726789&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.connectionfactory/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.connectionfactory/bnd.bnd Tue Jan 26 13:09:38 2016
@@ -1,5 +1,6 @@
--buildpath: ${^-buildpath},\
-	osgi.core,\
+-buildpath: \
+	${^-buildpath},\
+	osgi.core;version=6.0.0,\
 	osgi.cmpn,\
 	org.apache.ace.test;version=latest,\
 	org.apache.commons.codec;version=1.4

Modified: ace/trunk/org.apache.ace.connectionfactory/src/org/apache/ace/connectionfactory/impl/Activator.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.connectionfactory/src/org/apache/ace/connectionfactory/impl/Activator.java?rev=1726789&r1=1726788&r2=1726789&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.connectionfactory/src/org/apache/ace/connectionfactory/impl/Activator.java (original)
+++ ace/trunk/org.apache.ace.connectionfactory/src/org/apache/ace/connectionfactory/impl/Activator.java Tue Jan 26 13:09:38 2016
@@ -19,6 +19,8 @@
 
 package org.apache.ace.connectionfactory.impl;
 
+import java.util.Dictionary;
+import java.util.Hashtable;
 import java.util.Properties;
 
 import org.apache.ace.connectionfactory.ConnectionFactory;
@@ -36,7 +38,7 @@ public class Activator implements Bundle
      * {@inheritDoc}
      */
     public void start(BundleContext context) throws Exception {
-        Properties props = new Properties();
+        Dictionary<String, Object> props = new Hashtable<>();
         props.put(Constants.SERVICE_PID, ConnectionFactoryImpl.FACTORY_PID);
         props.put("impl.type", "jdk");
 

Modified: ace/trunk/org.apache.ace.consolelogger/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.consolelogger/bnd.bnd?rev=1726789&r1=1726788&r2=1726789&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.consolelogger/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.consolelogger/bnd.bnd Tue Jan 26 13:09:38 2016
@@ -1,5 +1,6 @@
--buildpath: ${^-buildpath},\
-	osgi.core,\
+-buildpath: \
+	${^-buildpath},\
+	osgi.core;version=6.0.0,\
 	osgi.cmpn,\
 	org.apache.felix.dependencymanager
 Private-Package: org.apache.ace.consolelogger

Modified: ace/trunk/org.apache.ace.deployment.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.deployment.itest/bnd.bnd?rev=1726789&r1=1726788&r2=1726789&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.deployment.itest/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.deployment.itest/bnd.bnd Tue Jan 26 13:09:38 2016
@@ -1,6 +1,7 @@
 Test-Cases: ${classes;CONCRETE;EXTENDS;org.apache.ace.it.IntegrationTestBase}
--buildpath: junit.osgi,\
-	osgi.core,\
+-buildpath: \
+	junit.osgi,\
+	osgi.core;version=6.0.0,\
 	osgi.cmpn,\
 	javax.servlet,\
 	org.apache.felix.dependencymanager,\
@@ -19,7 +20,7 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;o
 	org.apache.ace.feedback.common;version=latest,\
 	org.apache.ace.deployment.provider.base;version=latest,\
 	org.apache.ace.deployment.task;version=latest
--runfw: org.apache.felix.framework;version='[4,5)'
+-runfw: org.apache.felix.framework;version='[5.2.0,6)'
 -runvm: -ea
 -runbundles: osgi.cmpn,\
 	org.apache.felix.dependencymanager,\

Modified: ace/trunk/org.apache.ace.deployment.itest/src/org/apache/ace/it/deployment/DeploymentIntegrationTest.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.deployment.itest/src/org/apache/ace/it/deployment/DeploymentIntegrationTest.java?rev=1726789&r1=1726788&r2=1726789&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.deployment.itest/src/org/apache/ace/it/deployment/DeploymentIntegrationTest.java (original)
+++ ace/trunk/org.apache.ace.deployment.itest/src/org/apache/ace/it/deployment/DeploymentIntegrationTest.java Tue Jan 26 13:09:38 2016
@@ -22,6 +22,8 @@ import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Arrays;
+import java.util.Dictionary;
+import java.util.Hashtable;
 import java.util.List;
 import java.util.Properties;
 import java.util.concurrent.ConcurrentHashMap;
@@ -333,7 +335,7 @@ public class DeploymentIntegrationTest e
     }
 
     private void executeTest() throws IOException, InterruptedException {
-        Properties props = new Properties();
+        Dictionary<String, Object> props = new Hashtable<>();
         props.put(EventConstants.EVENT_TOPIC, "org/osgi/service/deployment/COMPLETE");
         props.put(EventConstants.EVENT_FILTER, "(successful=true)");
 
@@ -387,7 +389,7 @@ public class DeploymentIntegrationTest e
     }
 
     private void registerDeploymentAdminProxy(DeploymentAdmin proxy) {
-        Properties props = new Properties();
+        Dictionary<String, Object> props = new Hashtable<>();
         props.put(org.osgi.framework.Constants.SERVICE_RANKING, 1);
         m_deploymentAdminProxyReg = m_bundleContext.registerService(DeploymentAdmin.class.getName(), proxy, props);
     }

Modified: ace/trunk/org.apache.ace.deployment/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.deployment/bnd.bnd?rev=1726789&r1=1726788&r2=1726789&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.deployment/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.deployment/bnd.bnd Tue Jan 26 13:09:38 2016
@@ -1,6 +1,6 @@
 -buildpath: \
 	${^-buildpath},\
-	osgi.core,\
+	osgi.core;version=6.0.0,\
 	osgi.cmpn,\
 	javax.servlet,\
 	org.apache.felix.dependencymanager,\

Modified: ace/trunk/org.apache.ace.discovery/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.discovery/bnd.bnd?rev=1726789&r1=1726788&r2=1726789&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.discovery/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.discovery/bnd.bnd Tue Jan 26 13:09:38 2016
@@ -1,4 +1,6 @@
--buildpath: ${^-buildpath}, osgi.core,\
+-buildpath: \
+	${^-buildpath},\
+	osgi.core;version=6.0.0,\
 	osgi.cmpn,\
 	org.apache.felix.dependencymanager,\
 	org.apache.ace.test;version=latest,\

Modified: ace/trunk/org.apache.ace.feedback.common/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.feedback.common/bnd.bnd?rev=1726789&r1=1726788&r2=1726789&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.feedback.common/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.feedback.common/bnd.bnd Tue Jan 26 13:09:38 2016
@@ -4,6 +4,7 @@ Export-Package: org.apache.ace.feedback
 Bundle-Version: 1.0.0
 Bundle-Name: Apache ACE Feedback API
 Bundle-Description: Provides the Apache ACE Feedback API packages
--buildpath: ${^-buildpath},\
+-buildpath: \
+	${^-buildpath},\
 	org.apache.ace.range.api;version=latest,\
 	org.apache.ace.test;version=latest
\ No newline at end of file

Modified: ace/trunk/org.apache.ace.gogo.servlet/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.gogo.servlet/bnd.bnd?rev=1726789&r1=1726788&r2=1726789&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.gogo.servlet/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.gogo.servlet/bnd.bnd Tue Jan 26 13:09:38 2016
@@ -1,6 +1,7 @@
 Bundle-Version: 1.0.0
--buildpath: ${^-buildpath},\
-	osgi.core,\
+-buildpath: \
+	${^-buildpath},\
+	osgi.core;version=6.0.0,\
 	osgi.cmpn,\
 	org.apache.felix.dependencymanager,\
 	javax.servlet,\

Modified: ace/trunk/org.apache.ace.gogo/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.gogo/bnd.bnd?rev=1726789&r1=1726788&r2=1726789&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.gogo/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.gogo/bnd.bnd Tue Jan 26 13:09:38 2016
@@ -1,5 +1,6 @@
--buildpath: ${^-buildpath},\
-	osgi.core,\
+-buildpath: \
+	${^-buildpath},\
+	osgi.core;version=6.0.0,\
 	biz.aQute.repository;version=2.1.0,\
 	biz.aQute.bnd;version=2.1.0,\
 	org.osgi.impl.bundle.repoindex.lib,\

Modified: ace/trunk/org.apache.ace.http.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.http.itest/bnd.bnd?rev=1726789&r1=1726788&r2=1726789&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.http.itest/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.http.itest/bnd.bnd Tue Jan 26 13:09:38 2016
@@ -1,6 +1,7 @@
 Test-Cases: ${classes;CONCRETE;EXTENDS;org.apache.ace.it.IntegrationTestBase}
--buildpath: junit.osgi,\
-	osgi.core,\
+-buildpath: \
+	junit.osgi,\
+	osgi.core;version=6.0.0,\
 	osgi.cmpn,\
 	org.apache.felix.dependencymanager,\
 	org.apache.ace.test;version=latest,\
@@ -12,7 +13,7 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;o
 	org.apache.ace.log.server.store.api;version=latest,\
 	javax.servlet,\
 	org.apache.ace.feedback.common;version=latest
--runfw: org.apache.felix.framework;version='[4,5)'
+-runfw: org.apache.felix.framework;version='[5.2.0,6)'
 -runvm: -ea
 -runbundles: osgi.cmpn,\
 	org.apache.felix.eventadmin,\

Modified: ace/trunk/org.apache.ace.http/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.http/bnd.bnd?rev=1726789&r1=1726788&r2=1726789&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.http/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.http/bnd.bnd Tue Jan 26 13:09:38 2016
@@ -1,5 +1,6 @@
--buildpath: ${^-buildpath},\
-	osgi.core,\
+-buildpath: \
+	${^-buildpath},\
+	osgi.core;version=6.0.0,\
 	osgi.cmpn,\
 	org.apache.felix.dependencymanager,\
 	javax.servlet

Modified: ace/trunk/org.apache.ace.identification/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.identification/bnd.bnd?rev=1726789&r1=1726788&r2=1726789&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.identification/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.identification/bnd.bnd Tue Jan 26 13:09:38 2016
@@ -1,5 +1,6 @@
--buildpath: ${^-buildpath},\
-	osgi.core,\
+-buildpath: \
+	${^-buildpath},\
+	osgi.core;version=6.0.0,\
 	osgi.cmpn,\
 	org.apache.felix.dependencymanager,\
 	org.mockito.mockito-all,\

Modified: ace/trunk/org.apache.ace.location.upnp/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.location.upnp/bnd.bnd?rev=1726789&r1=1726788&r2=1726789&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.location.upnp/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.location.upnp/bnd.bnd Tue Jan 26 13:09:38 2016
@@ -1,5 +1,6 @@
--buildpath: ${^-buildpath},\
-	osgi.core,\
+-buildpath: \
+	${^-buildpath},\
+	osgi.core;version=6.0.0,\
 	osgi.cmpn,\
 	org.apache.felix.dependencymanager,\
 	javax.servlet

Modified: ace/trunk/org.apache.ace.log.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.log.itest/bnd.bnd?rev=1726789&r1=1726788&r2=1726789&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.log.itest/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.log.itest/bnd.bnd Tue Jan 26 13:09:38 2016
@@ -1,7 +1,8 @@
 Test-Cases: ${classes;CONCRETE;EXTENDS;org.apache.ace.it.IntegrationTestBase}
--buildpath: ${^-buildpath},\
+-buildpath: \
+	${^-buildpath},\
 	junit.osgi,\
-	osgi.core,\
+	osgi.core;version=6.0.0,\
 	osgi.cmpn,\
 	org.apache.felix.dependencymanager,\
 	org.apache.ace.test;version=latest,\
@@ -13,7 +14,7 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;o
 	org.apache.ace.log.server.store.api;version=latest,\
 	org.apache.ace.feedback.common;version=latest,\
 	org.apache.ace.log.api;version=latest
--runfw: org.apache.felix.framework;version='[4,5)'
+-runfw: org.apache.felix.framework;version='[5.2.0,6)'
 -runbundles: javax.servlet,\
 	osgi.cmpn,\
 	org.apache.felix.dependencymanager,\

Modified: ace/trunk/org.apache.ace.log.server.store.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.log.server.store.itest/bnd.bnd?rev=1726789&r1=1726788&r2=1726789&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.log.server.store.itest/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.log.server.store.itest/bnd.bnd Tue Jan 26 13:09:38 2016
@@ -16,8 +16,9 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;o
 	org.apache.ace.feedback.common;version=latest
 Private-Package: org.apache.ace.log.server.store.tests
 -runvm: -ea
--runfw: org.apache.felix.framework;version='[4,5)'
--buildpath: osgi.core,\
+-runfw: org.apache.felix.framework;version='[5.2.0,6)'
+-buildpath: \
+	osgi.core;version=6.0.0,\
 	osgi.cmpn,\
 	junit.osgi,\
 	org.mongodb.mongo-java-driver,\

Modified: ace/trunk/org.apache.ace.log.server.ui/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.log.server.ui/bnd.bnd?rev=1726789&r1=1726788&r2=1726789&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.log.server.ui/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.log.server.ui/bnd.bnd Tue Jan 26 13:09:38 2016
@@ -1,5 +1,6 @@
--buildpath: ${^-buildpath},\
-	osgi.core,\
+-buildpath: \
+	${^-buildpath},\
+	osgi.core;version=6.0.0,\
 	osgi.cmpn,\
 	org.apache.felix.dependencymanager,\
 	org.apache.ace.client.repository.api;version=latest,\

Modified: ace/trunk/org.apache.ace.log/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.log/bnd.bnd?rev=1726789&r1=1726788&r2=1726789&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.log/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.log/bnd.bnd Tue Jan 26 13:09:38 2016
@@ -1,5 +1,6 @@
--buildpath: ${^-buildpath},\
-	osgi.core,\
+-buildpath: \
+	${^-buildpath},\
+	osgi.core;version=6.0.0,\
 	osgi.cmpn,\
 	javax.servlet,\
 	org.apache.felix.dependencymanager,\

Modified: ace/trunk/org.apache.ace.nodelauncher/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.nodelauncher/bnd.bnd?rev=1726789&r1=1726788&r2=1726789&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.nodelauncher/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.nodelauncher/bnd.bnd Tue Jan 26 13:09:38 2016
@@ -1,5 +1,6 @@
--buildpath: ${^-buildpath},\
-	osgi.core,\
+-buildpath: \
+	${^-buildpath},\
+	osgi.core;version=6.0.0,\
 	osgi.cmpn,\
 	org.apache.felix.dependencymanager,\
 	org.apache.ace.test;version=latest,\

Modified: ace/trunk/org.apache.ace.obr/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.obr/bnd.bnd?rev=1726789&r1=1726788&r2=1726789&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.obr/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.obr/bnd.bnd Tue Jan 26 13:09:38 2016
@@ -1,6 +1,7 @@
 -sub: *.bnd
--buildpath: ${^-buildpath},\
-	osgi.core,\
+-buildpath: \
+	${^-buildpath},\
+	osgi.core;version=6.0.0,\
 	osgi.cmpn,\
 	org.apache.felix.dependencymanager,\
 	javax.servlet,\

Modified: ace/trunk/org.apache.ace.processlauncher.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.processlauncher.itest/bnd.bnd?rev=1726789&r1=1726788&r2=1726789&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.processlauncher.itest/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.processlauncher.itest/bnd.bnd Tue Jan 26 13:09:38 2016
@@ -3,11 +3,11 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;o
 	${^-buildpath},\
 	org.apache.felix.dependencymanager,\
 	junit.osgi,\
-	osgi.core,\
+	osgi.core;version=6.0.0,\
 	osgi.cmpn,\
 	org.apache.ace.test;version=latest,\
 	org.apache.ace.processlauncher;version=latest
--runfw: org.apache.felix.framework;version='[4,5)'
+-runfw: org.apache.felix.framework;version='[5.2.0,6)'
 -runvm: -ea
 -runbundles: \
 	osgi.cmpn,\

Modified: ace/trunk/org.apache.ace.processlauncher.itest/src/org/apache/ace/processlauncher/itest/ProcessLauncherServiceIntegrationTest.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.processlauncher.itest/src/org/apache/ace/processlauncher/itest/ProcessLauncherServiceIntegrationTest.java?rev=1726789&r1=1726788&r2=1726789&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.processlauncher.itest/src/org/apache/ace/processlauncher/itest/ProcessLauncherServiceIntegrationTest.java (original)
+++ ace/trunk/org.apache.ace.processlauncher.itest/src/org/apache/ace/processlauncher/itest/ProcessLauncherServiceIntegrationTest.java Tue Jan 26 13:09:38 2016
@@ -24,6 +24,8 @@ import static org.apache.ace.processlaun
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.util.Dictionary;
+import java.util.Hashtable;
 import java.util.Properties;
 
 import org.apache.ace.it.IntegrationTestBase;
@@ -286,13 +288,13 @@ public class ProcessLauncherServiceInteg
         String className = ProcessStreamListener.class.getName();
         String extraFilter = "";
 
-        Properties props = new Properties();
+        Dictionary<String, Object> props = new Hashtable<>();
         for (int i = 0; i < properties.length; i += 2) {
             String key = properties[i];
             String value = properties[i + 1];
 
             extraFilter = String.format("%s(%s=%s)", extraFilter, key, value);
-            props.setProperty(key, value);
+            props.put(key, value);
         }
         
         m_context.registerService(className, processStreamListener, props);

Modified: ace/trunk/org.apache.ace.processlauncher/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.processlauncher/bnd.bnd?rev=1726789&r1=1726788&r2=1726789&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.processlauncher/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.processlauncher/bnd.bnd Tue Jan 26 13:09:38 2016
@@ -2,7 +2,7 @@
 	${^-buildpath},\
 	org.apache.felix.dependencymanager,\
 	org.mockito.mockito-all,\
-	osgi.core,\
+	osgi.core;version=6.0.0,\
 	osgi.cmpn,\
 	org.apache.ace.test;version=latest
 Private-Package: \

Modified: ace/trunk/org.apache.ace.range.api/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.range.api/bnd.bnd?rev=1726789&r1=1726788&r2=1726789&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.range.api/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.range.api/bnd.bnd Tue Jan 26 13:09:38 2016
@@ -1,4 +1,5 @@
--buildpath: ${^-buildpath},\
+-buildpath: \
+	${^-buildpath},\
 	org.apache.ace.test;version=latest
 Export-Package: org.apache.ace.range
 Bundle-Version: 1.1.0

Modified: ace/trunk/org.apache.ace.repository.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.repository.itest/bnd.bnd?rev=1726789&r1=1726788&r2=1726789&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.repository.itest/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.repository.itest/bnd.bnd Tue Jan 26 13:09:38 2016
@@ -1,6 +1,7 @@
 Test-Cases: ${classes;CONCRETE;EXTENDS;org.apache.ace.it.IntegrationTestBase}
--buildpath: junit.osgi,\
-	osgi.core;version='[4.1,5)',\
+-buildpath: \
+	junit.osgi,\
+	osgi.core;version=6.0.0,\
 	osgi.cmpn,\
 	org.mockito.mockito-all,\
 	org.apache.ace.test;version=latest,\
@@ -8,8 +9,8 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;o
 	org.apache.ace.repository.api;version=latest,\
 	org.apache.ace.repository.impl;version=latest,\
 	org.apache.ace.repository.servlet;version=latest,\
-	org.apache.felix.dependencymanager		
--runfw: org.apache.felix.framework;version='[4,5)'
+	org.apache.felix.dependencymanager
+-runfw: org.apache.felix.framework;version='[5.2.0,6)'
 -runvm: -ea
 -runbundles: osgi.cmpn,\
 	org.apache.felix.log,\

Modified: ace/trunk/org.apache.ace.repository/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.repository/bnd.bnd?rev=1726789&r1=1726788&r2=1726789&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.repository/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.repository/bnd.bnd Tue Jan 26 13:09:38 2016
@@ -1,5 +1,6 @@
--buildpath: ${^-buildpath},\
-	osgi.core,\
+-buildpath: \
+	${^-buildpath},\
+	osgi.core;version=6.0.0,\
 	osgi.cmpn,\
 	org.apache.felix.dependencymanager,\
 	javax.servlet,\

Modified: ace/trunk/org.apache.ace.resourceprocessor.useradmin/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.resourceprocessor.useradmin/bnd.bnd?rev=1726789&r1=1726788&r2=1726789&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.resourceprocessor.useradmin/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.resourceprocessor.useradmin/bnd.bnd Tue Jan 26 13:09:38 2016
@@ -1,5 +1,6 @@
--buildpath: ${^-buildpath},\
-	osgi.core,\
+-buildpath: \
+	${^-buildpath},\
+	osgi.core;version=6.0.0,\
 	osgi.cmpn,\
 	org.apache.felix.dependencymanager
 Private-Package: org.apache.ace.resourceprocessor.useradmin.impl

Modified: ace/trunk/org.apache.ace.scheduler/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.scheduler/bnd.bnd?rev=1726789&r1=1726788&r2=1726789&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.scheduler/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.scheduler/bnd.bnd Tue Jan 26 13:09:38 2016
@@ -1,5 +1,6 @@
--buildpath: ${^-buildpath},\
-	osgi.core,\
+-buildpath: \
+	${^-buildpath},\
+	osgi.core;version=6.0.0,\
 	osgi.cmpn,\
 	org.apache.felix.dependencymanager,\
 	org.apache.ace.test;version=latest

Modified: ace/trunk/org.apache.ace.tageditor/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.tageditor/bnd.bnd?rev=1726789&r1=1726788&r2=1726789&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.tageditor/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.tageditor/bnd.bnd Tue Jan 26 13:09:38 2016
@@ -1,5 +1,6 @@
--buildpath: ${^-buildpath},\
-	osgi.core,\
+-buildpath: \
+	${^-buildpath},\
+	osgi.core;version=6.0.0,\
 	osgi.cmpn,\
 	org.apache.felix.dependencymanager,\
 	org.apache.ace.client.repository.api;version=latest,\

Modified: ace/trunk/org.apache.ace.target.mgmt.ui/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.target.mgmt.ui/bnd.bnd?rev=1726789&r1=1726788&r2=1726789&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.target.mgmt.ui/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.target.mgmt.ui/bnd.bnd Tue Jan 26 13:09:38 2016
@@ -1,5 +1,6 @@
--buildpath: ${^-buildpath},\
-	osgi.core,\
+-buildpath: \
+	${^-buildpath},\
+	osgi.core;version=6.0.0,\
 	osgi.cmpn,\
 	org.apache.felix.dependencymanager,\
 	org.apache.ace.client.repository.api;version=latest,\

Modified: ace/trunk/org.apache.ace.test/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.test/bnd.bnd?rev=1726789&r1=1726788&r2=1726789&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.test/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.test/bnd.bnd Tue Jan 26 13:09:38 2016
@@ -1,5 +1,6 @@
--buildpath: ${^-buildpath},\
-	osgi.core,\
+-buildpath: \
+	${^-buildpath},\
+	osgi.core;version=4.2,\
 	osgi.cmpn,\
 	junit.osgi,\
 	org.apache.felix.gogo.runtime,\

Modified: ace/trunk/org.apache.ace.useradmin.ui.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.useradmin.ui.itest/bnd.bnd?rev=1726789&r1=1726788&r2=1726789&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.useradmin.ui.itest/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.useradmin.ui.itest/bnd.bnd Tue Jan 26 13:09:38 2016
@@ -1,7 +1,7 @@
 Test-Cases: ${classes;CONCRETE;EXTENDS;org.apache.ace.it.IntegrationTestBase}
 Private-Package: org.apache.ace.useradmin.ui.test
 -runvm: -ea
--runfw: org.apache.felix.framework;version='[4,5)'
+-runfw: org.apache.felix.framework;version='[5.2.0,6)'
 -runbundles: osgi.cmpn,\
 	com.vaadin,\
 	org.apache.felix.configadmin,\
@@ -36,7 +36,8 @@ Private-Package: org.apache.ace.useradmi
 	org.apache.ace.authentication.api;version=latest,\
 	org.apache.ace.log.server.store.api;version=latest,\
 	org.apache.ace.feedback.common;version=latest
--buildpath: osgi.core;version='[4.1,5)',\
+-buildpath: \
+	osgi.core;version=6.0.0,\
 	osgi.cmpn,\
 	junit.osgi,\
 	org.mockito.mockito-all,\

Modified: ace/trunk/org.apache.ace.useradmin.ui/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.useradmin.ui/bnd.bnd?rev=1726789&r1=1726788&r2=1726789&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.useradmin.ui/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.useradmin.ui/bnd.bnd Tue Jan 26 13:09:38 2016
@@ -1,6 +1,7 @@
--buildpath: ${^-buildpath},\
+-buildpath: \
+	${^-buildpath},\
 	org.apache.felix.dependencymanager,\
-	osgi.core,\
+	osgi.core;version=6.0.0,\
 	osgi.cmpn,\
 	com.vaadin,\
 	org.apache.ace.client.repository.api;version=latest,\

Modified: ace/trunk/org.apache.ace.verifier/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.verifier/bnd.bnd?rev=1726789&r1=1726788&r2=1726789&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.verifier/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.verifier/bnd.bnd Tue Jan 26 13:09:38 2016
@@ -1,5 +1,6 @@
--buildpath: ${^-buildpath},\
-	osgi.core;version=4.3.1,\
+-buildpath: \
+	${^-buildpath},\
+	osgi.core;version=6.0.0,\
 	osgi.cmpn;version=4.3.1,\
 	javax.servlet,\
 	org.apache.felix.dependencymanager,\

Modified: ace/trunk/org.apache.ace.verifier/src/org/apache/ace/deployment/verifier/impl/VerifierBundleRevision.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.verifier/src/org/apache/ace/deployment/verifier/impl/VerifierBundleRevision.java?rev=1726789&r1=1726788&r2=1726789&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.verifier/src/org/apache/ace/deployment/verifier/impl/VerifierBundleRevision.java (original)
+++ ace/trunk/org.apache.ace.verifier/src/org/apache/ace/deployment/verifier/impl/VerifierBundleRevision.java Tue Jan 26 13:09:38 2016
@@ -37,6 +37,8 @@ import org.osgi.framework.wiring.BundleC
 import org.osgi.framework.wiring.BundleRequirement;
 import org.osgi.framework.wiring.BundleRevision;
 import org.osgi.framework.wiring.BundleWiring;
+import org.osgi.resource.Capability;
+import org.osgi.resource.Requirement;
 
 /**
  *
@@ -141,6 +143,13 @@ public class VerifierBundleRevision impl
 	public List<BundleCapability> getDeclaredCapabilities(String namespace) {
 		return m_declaredCaps;
 	}
+	
+    /**
+     * {@inheritDoc}
+     */
+	public List<Capability> getCapabilities(String namespace) {
+	    return new ArrayList<Capability>(m_declaredCaps);
+	}
 
     /**
      * {@inheritDoc}
@@ -148,6 +157,13 @@ public class VerifierBundleRevision impl
 	public List<BundleRequirement> getDeclaredRequirements(String namespace) {
 		return m_declaredReqs;
 	}
+
+    /**
+     * {@inheritDoc}
+     */
+	public List<Requirement> getRequirements(String namespace) {
+	    return new ArrayList<Requirement>(m_declaredReqs);
+	}
 	
     /**
      * {@inheritDoc}

Modified: ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/resolver/HostBundleRevision.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/resolver/HostBundleRevision.java?rev=1726789&r1=1726788&r2=1726789&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/resolver/HostBundleRevision.java (original)
+++ ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/resolver/HostBundleRevision.java Tue Jan 26 13:09:38 2016
@@ -29,6 +29,8 @@ import org.osgi.framework.wiring.BundleC
 import org.osgi.framework.wiring.BundleRequirement;
 import org.osgi.framework.wiring.BundleRevision;
 import org.osgi.framework.wiring.BundleWiring;
+import org.osgi.resource.Capability;
+import org.osgi.resource.Requirement;
 
 class HostBundleRevision implements BundleRevision
 {
@@ -93,6 +95,10 @@ class HostBundleRevision implements Bund
         return m_cachedCapabilities;
     }
 
+    public List<Capability> getCapabilities(String namespace) {
+        return new ArrayList<Capability>(getCapabilities(namespace));
+    }
+    
     public List<BundleRequirement> getDeclaredRequirements(String namespace)
     {
         if (m_cachedRequirements == null)
@@ -123,6 +129,10 @@ class HostBundleRevision implements Bund
         }
         return m_cachedRequirements;
     }
+    
+    public List<Requirement> getRequirements(String namespace) {
+        return new ArrayList<Requirement>(getDeclaredRequirements(namespace));
+    }
 
     public int getTypes()
     {

Modified: ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/wiring/BundleCapabilityImpl.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/wiring/BundleCapabilityImpl.java?rev=1726789&r1=1726788&r2=1726789&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/wiring/BundleCapabilityImpl.java (original)
+++ ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/wiring/BundleCapabilityImpl.java Tue Jan 26 13:09:38 2016
@@ -133,6 +133,10 @@ public class BundleCapabilityImpl implem
     {
         return m_revision;
     }
+    
+    public BundleRevision getResource() {
+        return getRevision();
+    }
 
     public String getNamespace()
     {

Modified: ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/wiring/BundleRequirementImpl.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/wiring/BundleRequirementImpl.java?rev=1726789&r1=1726788&r2=1726789&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/wiring/BundleRequirementImpl.java (original)
+++ ace/trunk/org.apache.ace.verifier/src/org/apache/felix/framework/wiring/BundleRequirementImpl.java Tue Jan 26 13:09:38 2016
@@ -83,6 +83,10 @@ public class BundleRequirementImpl imple
     {
         return m_revision;
     }
+    
+    public BundleRevision getResource() {
+        return getRevision();
+    }
 
     public boolean matches(BundleCapability cap)
     {

Modified: ace/trunk/org.apache.ace.webui.vaadin/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.webui.vaadin/bnd.bnd?rev=1726789&r1=1726788&r2=1726789&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.webui.vaadin/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.webui.vaadin/bnd.bnd Tue Jan 26 13:09:38 2016
@@ -1,4 +1,5 @@
--buildpath: ${^-buildpath},\
+-buildpath: \
+	${^-buildpath},\
 	osgi.cmpn,\
 	org.apache.felix.dependencymanager,\
 	com.vaadin;version=latest,\
@@ -7,7 +8,7 @@
 	org.apache.ace.authentication.api;version=latest,\
 	org.apache.ace.authentication.impl;version=latest,\
 	javax.servlet,\
-	osgi.core;version=4.1.0
+	osgi.core;version=6.0.0
 Private-Package: org.apache.ace.webui.domain,\
 	org.apache.ace.webui.vaadin,\
 	org.apache.ace.webui.vaadin.component

Modified: ace/trunk/run-client/client.bndrun
URL: http://svn.apache.org/viewvc/ace/trunk/run-client/client.bndrun?rev=1726789&r1=1726788&r2=1726789&view=diff
==============================================================================
--- ace/trunk/run-client/client.bndrun (original)
+++ ace/trunk/run-client/client.bndrun Tue Jan 26 13:09:38 2016
@@ -1,4 +1,4 @@
--runfw: org.apache.felix.framework;version='[4,5)'
+-runfw: org.apache.felix.framework;version='[5.2.0,6)'
 -runee: JavaSE-1.6
 -runbundles: org.apache.felix.dependencymanager,\
 	org.apache.felix.useradmin,\

Modified: ace/trunk/run-develop/develop.bndrun
URL: http://svn.apache.org/viewvc/ace/trunk/run-develop/develop.bndrun?rev=1726789&r1=1726788&r2=1726789&view=diff
==============================================================================
--- ace/trunk/run-develop/develop.bndrun (original)
+++ ace/trunk/run-develop/develop.bndrun Tue Jan 26 13:09:38 2016
@@ -1,4 +1,4 @@
--runfw: org.apache.felix.framework;version='[4,5)'
+-runfw: org.apache.felix.framework;version='[5.2.0,6)'
 -runee: JavaSE-1.6
 -runbundles: org.apache.felix.gogo.command,\
 	org.apache.felix.gogo.runtime,\

Modified: ace/trunk/run-obr/obr.bndrun
URL: http://svn.apache.org/viewvc/ace/trunk/run-obr/obr.bndrun?rev=1726789&r1=1726788&r2=1726789&view=diff
==============================================================================
--- ace/trunk/run-obr/obr.bndrun (original)
+++ ace/trunk/run-obr/obr.bndrun Tue Jan 26 13:09:38 2016
@@ -1,4 +1,4 @@
--runfw: org.apache.felix.framework;version='[4,5)'
+-runfw: org.apache.felix.framework;version='[5.2.0,6)'
 -runee: JavaSE-1.6
 -runbundles: org.apache.felix.dependencymanager,\
 	org.apache.felix.dependencymanager.shell,\

Modified: ace/trunk/run-relay/relay.bndrun
URL: http://svn.apache.org/viewvc/ace/trunk/run-relay/relay.bndrun?rev=1726789&r1=1726788&r2=1726789&view=diff
==============================================================================
--- ace/trunk/run-relay/relay.bndrun (original)
+++ ace/trunk/run-relay/relay.bndrun Tue Jan 26 13:09:38 2016
@@ -1,4 +1,4 @@
--runfw: org.apache.felix.framework;version='[4,5)'
+-runfw: org.apache.felix.framework;version='[5.2.0,6)'
 -runee: JavaSE-1.6
 -runbundles: org.apache.felix.dependencymanager,\
 	org.apache.felix.useradmin,\

Modified: ace/trunk/run-server-allinone/server-allinone.bndrun
URL: http://svn.apache.org/viewvc/ace/trunk/run-server-allinone/server-allinone.bndrun?rev=1726789&r1=1726788&r2=1726789&view=diff
==============================================================================
--- ace/trunk/run-server-allinone/server-allinone.bndrun (original)
+++ ace/trunk/run-server-allinone/server-allinone.bndrun Tue Jan 26 13:09:38 2016
@@ -1,4 +1,4 @@
--runfw: org.apache.felix.framework;version='[4,5)'
+-runfw: org.apache.felix.framework;version='[5.2.0,6)'
 -runee: JavaSE-1.6
 -runbundles: org.apache.felix.dependencymanager,\
 	org.apache.felix.useradmin,\

Modified: ace/trunk/run-server/server.bndrun
URL: http://svn.apache.org/viewvc/ace/trunk/run-server/server.bndrun?rev=1726789&r1=1726788&r2=1726789&view=diff
==============================================================================
--- ace/trunk/run-server/server.bndrun (original)
+++ ace/trunk/run-server/server.bndrun Tue Jan 26 13:09:38 2016
@@ -1,4 +1,4 @@
--runfw: org.apache.felix.framework;version='[4,5)'
+-runfw: org.apache.felix.framework;version='[5.2.0,6)'
 -runee: JavaSE-1.6
 -runbundles: org.apache.felix.dependencymanager,\
 	org.apache.felix.useradmin,\

Modified: ace/trunk/run-target/target.bndrun
URL: http://svn.apache.org/viewvc/ace/trunk/run-target/target.bndrun?rev=1726789&r1=1726788&r2=1726789&view=diff
==============================================================================
--- ace/trunk/run-target/target.bndrun (original)
+++ ace/trunk/run-target/target.bndrun Tue Jan 26 13:09:38 2016
@@ -1,4 +1,4 @@
--runfw: org.apache.felix.framework;version='[4,5)'
+-runfw: org.apache.felix.framework;version='[5.2.0,6)'
 -runee: JavaSE-1.6
 -runbundles:  \
 	org.apache.ace.agent;version=latest



Mime
View raw message