You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ace.apache.org by ja...@apache.org on 2016/01/28 17:27:15 UTC

svn commit: r1727398 - in /ace/trunk: cnf/ext/ cnf/lib/testng/ cnf/localrepo/ cnf/localrepo/com.beust.jcommander/ cnf/localrepo/org.testng/ org.apache.ace.agent.launcher/ org.apache.ace.agent/ org.apache.ace.authentication/ org.apache.ace.builder/ org....

Author: jawi
Date: Thu Jan 28 16:27:14 2016
New Revision: 1727398

URL: http://svn.apache.org/viewvc?rev=1727398&view=rev
Log:
Fix bndtools warnings & upgrade TestNG:

- use TestNG as normal Bnd build dependency instead of referencing it from the
  Eclipse classpath;
- upgrade to the latest TestNG version (which uses a separate dependency for
  its operation);
- define a single macro to reference the TestNG libraries in the projects,
  similar as the junit macro created by Bndtools.


Added:
    ace/trunk/cnf/ext/testng.bnd
    ace/trunk/cnf/localrepo/com.beust.jcommander/
    ace/trunk/cnf/localrepo/com.beust.jcommander/com.beust.jcommander-1.48.0.jar   (with props)
    ace/trunk/cnf/localrepo/org.testng/
    ace/trunk/cnf/localrepo/org.testng/org.testng-6.9.10.jar   (with props)
Removed:
    ace/trunk/cnf/lib/testng/
Modified:
    ace/trunk/cnf/localrepo/index.xml
    ace/trunk/cnf/localrepo/index.xml.sha
    ace/trunk/org.apache.ace.agent.launcher/.classpath
    ace/trunk/org.apache.ace.agent.launcher/bnd.bnd
    ace/trunk/org.apache.ace.agent/.classpath
    ace/trunk/org.apache.ace.agent/bnd.bnd
    ace/trunk/org.apache.ace.authentication/.classpath
    ace/trunk/org.apache.ace.authentication/bnd.bnd
    ace/trunk/org.apache.ace.builder/.classpath
    ace/trunk/org.apache.ace.builder/bnd.bnd
    ace/trunk/org.apache.ace.client.automation/bnd.bnd
    ace/trunk/org.apache.ace.client.repository/.classpath
    ace/trunk/org.apache.ace.client.repository/bnd.bnd
    ace/trunk/org.apache.ace.client.rest/.classpath
    ace/trunk/org.apache.ace.client.rest/bnd.bnd
    ace/trunk/org.apache.ace.client.workspace/.classpath
    ace/trunk/org.apache.ace.client.workspace/bnd.bnd
    ace/trunk/org.apache.ace.configurator/.classpath
    ace/trunk/org.apache.ace.configurator/bnd.bnd
    ace/trunk/org.apache.ace.connectionfactory/.classpath
    ace/trunk/org.apache.ace.connectionfactory/bnd.bnd
    ace/trunk/org.apache.ace.deployment.itest/.classpath
    ace/trunk/org.apache.ace.deployment.itest/bnd.bnd
    ace/trunk/org.apache.ace.deployment/.classpath
    ace/trunk/org.apache.ace.deployment/bnd.bnd
    ace/trunk/org.apache.ace.discovery/.classpath
    ace/trunk/org.apache.ace.discovery/bnd.bnd
    ace/trunk/org.apache.ace.feedback.common/.classpath
    ace/trunk/org.apache.ace.feedback.common/bnd.bnd
    ace/trunk/org.apache.ace.identification/.classpath
    ace/trunk/org.apache.ace.identification/bnd.bnd
    ace/trunk/org.apache.ace.log/.classpath
    ace/trunk/org.apache.ace.log/bnd.bnd
    ace/trunk/org.apache.ace.obr/.classpath
    ace/trunk/org.apache.ace.obr/bnd.bnd
    ace/trunk/org.apache.ace.range.api/.classpath
    ace/trunk/org.apache.ace.range.api/bnd.bnd
    ace/trunk/org.apache.ace.repository/.classpath
    ace/trunk/org.apache.ace.repository/bnd.bnd
    ace/trunk/org.apache.ace.scheduler/.classpath
    ace/trunk/org.apache.ace.scheduler/bnd.bnd
    ace/trunk/org.apache.ace.verifier/.classpath
    ace/trunk/org.apache.ace.verifier/bnd.bnd

Added: ace/trunk/cnf/ext/testng.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/cnf/ext/testng.bnd?rev=1727398&view=auto
==============================================================================
--- ace/trunk/cnf/ext/testng.bnd (added)
+++ ace/trunk/cnf/ext/testng.bnd Thu Jan 28 16:27:14 2016
@@ -0,0 +1 @@
+testng: org.testng;version=6.9, com.beust.jcommander;version=1.48
\ No newline at end of file

Added: ace/trunk/cnf/localrepo/com.beust.jcommander/com.beust.jcommander-1.48.0.jar
URL: http://svn.apache.org/viewvc/ace/trunk/cnf/localrepo/com.beust.jcommander/com.beust.jcommander-1.48.0.jar?rev=1727398&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ace/trunk/cnf/localrepo/com.beust.jcommander/com.beust.jcommander-1.48.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=1727398&r1=1727397&r2=1727398&view=diff
==============================================================================
--- ace/trunk/cnf/localrepo/index.xml (original)
+++ ace/trunk/cnf/localrepo/index.xml Thu Jan 28 16:27:14 2016
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<repository increment="1453970219000" name="Local" xmlns="http://www.osgi.org/xmlns/repository/v1.0.0">
+<repository increment="1453997711000" name="Local" xmlns="http://www.osgi.org/xmlns/repository/v1.0.0">
   <resource>
     <capability namespace="osgi.identity">
       <attribute name="osgi.identity" value="bcpkix"/>
@@ -1792,6 +1792,77 @@
   </resource>
   <resource>
     <capability namespace="osgi.identity">
+      <attribute name="osgi.identity" value="com.beust.jcommander"/>
+      <attribute name="type" value="osgi.bundle"/>
+      <attribute name="version" type="Version" value="1.48.0"/>
+    </capability>
+    <capability namespace="osgi.content">
+      <attribute name="osgi.content" value="a7313fcfde070930e40ec79edf3c5948cf34e4f0d25cb3a09f9963d8bdd84113"/>
+      <attribute name="url" value="com.beust.jcommander/com.beust.jcommander-1.48.0.jar"/>
+      <attribute name="size" type="Long" value="63504"/>
+      <attribute name="mime" value="application/vnd.osgi.bundle"/>
+    </capability>
+    <capability namespace="osgi.wiring.bundle">
+      <attribute name="osgi.wiring.bundle" value="com.beust.jcommander"/>
+      <attribute name="bundle-version" type="Version" value="1.48.0"/>
+    </capability>
+    <capability namespace="osgi.wiring.host">
+      <attribute name="osgi.wiring.host" value="com.beust.jcommander"/>
+      <attribute name="bundle-version" type="Version" value="1.48.0"/>
+    </capability>
+    <capability namespace="osgi.wiring.package">
+      <attribute name="osgi.wiring.package" value="com.beust.jcommander"/>
+      <attribute name="version" type="Version" value="1.48.0"/>
+      <attribute name="bundle-symbolic-name" value="com.beust.jcommander"/>
+      <attribute name="bundle-version" type="Version" value="1.48.0"/>
+      <directive name="uses" value="com.beust.jcommander.internal,com.beust.jcommander.converters,com.beust.jcommander.validators"/>
+    </capability>
+    <capability namespace="osgi.wiring.package">
+      <attribute name="osgi.wiring.package" value="com.beust.jcommander.converters"/>
+      <attribute name="version" type="Version" value="1.48.0"/>
+      <attribute name="bundle-symbolic-name" value="com.beust.jcommander"/>
+      <attribute name="bundle-version" type="Version" value="1.48.0"/>
+      <directive name="uses" value="com.beust.jcommander"/>
+    </capability>
+    <capability namespace="osgi.wiring.package">
+      <attribute name="osgi.wiring.package" value="com.beust.jcommander.defaultprovider"/>
+      <attribute name="version" type="Version" value="1.48.0"/>
+      <attribute name="bundle-symbolic-name" value="com.beust.jcommander"/>
+      <attribute name="bundle-version" type="Version" value="1.48.0"/>
+      <directive name="uses" value="com.beust.jcommander"/>
+    </capability>
+    <capability namespace="osgi.wiring.package">
+      <attribute name="osgi.wiring.package" value="com.beust.jcommander.internal"/>
+      <attribute name="version" type="Version" value="1.48.0"/>
+      <attribute name="bundle-symbolic-name" value="com.beust.jcommander"/>
+      <attribute name="bundle-version" type="Version" value="1.48.0"/>
+      <directive name="uses" value="com.beust.jcommander,com.beust.jcommander.converters"/>
+    </capability>
+    <capability namespace="osgi.wiring.package">
+      <attribute name="osgi.wiring.package" value="com.beust.jcommander.validators"/>
+      <attribute name="version" type="Version" value="1.48.0"/>
+      <attribute name="bundle-symbolic-name" value="com.beust.jcommander"/>
+      <attribute name="bundle-version" type="Version" value="1.48.0"/>
+      <directive name="uses" value="com.beust.jcommander"/>
+    </capability>
+    <requirement namespace="osgi.wiring.package">
+      <directive name="filter" value="(&amp;(osgi.wiring.package=com.beust.jcommander)(version&gt;=1.48.0))"/>
+    </requirement>
+    <requirement namespace="osgi.wiring.package">
+      <directive name="filter" value="(&amp;(osgi.wiring.package=com.beust.jcommander.converters)(version&gt;=1.48.0))"/>
+    </requirement>
+    <requirement namespace="osgi.wiring.package">
+      <directive name="filter" value="(&amp;(osgi.wiring.package=com.beust.jcommander.defaultprovider)(version&gt;=1.48.0))"/>
+    </requirement>
+    <requirement namespace="osgi.wiring.package">
+      <directive name="filter" value="(&amp;(osgi.wiring.package=com.beust.jcommander.internal)(version&gt;=1.48.0))"/>
+    </requirement>
+    <requirement namespace="osgi.wiring.package">
+      <directive name="filter" value="(&amp;(osgi.wiring.package=com.beust.jcommander.validators)(version&gt;=1.48.0))"/>
+    </requirement>
+  </resource>
+  <resource>
+    <capability namespace="osgi.identity">
       <attribute name="osgi.identity" value="com.google.gson"/>
       <attribute name="type" value="osgi.bundle"/>
       <attribute name="version" type="Version" value="2.2.0"/>
@@ -6748,6 +6819,284 @@
     </requirement>
   </resource>
   <resource>
+    <capability namespace="osgi.identity">
+      <attribute name="osgi.identity" value="org.testng"/>
+      <attribute name="type" value="osgi.bundle"/>
+      <attribute name="version" type="Version" value="6.9.10"/>
+    </capability>
+    <capability namespace="osgi.content">
+      <attribute name="osgi.content" value="240ae7bbcf066aadff967b42a27a697693bf5a4e6a5ff4bf339b6bfe371288e4"/>
+      <attribute name="url" value="org.testng/org.testng-6.9.10.jar"/>
+      <attribute name="size" type="Long" value="870504"/>
+      <attribute name="mime" value="application/vnd.osgi.bundle"/>
+    </capability>
+    <capability namespace="osgi.wiring.bundle">
+      <attribute name="osgi.wiring.bundle" value="org.testng"/>
+      <attribute name="bundle-version" type="Version" value="6.9.10"/>
+    </capability>
+    <capability namespace="osgi.wiring.host">
+      <attribute name="osgi.wiring.host" value="org.testng"/>
+      <attribute name="bundle-version" type="Version" value="6.9.10"/>
+    </capability>
+    <capability namespace="osgi.wiring.package">
+      <attribute name="osgi.wiring.package" value="com.beust.testng"/>
+      <attribute name="version" type="Version" value="6.9.10"/>
+      <attribute name="bundle-symbolic-name" value="org.testng"/>
+      <attribute name="bundle-version" type="Version" value="6.9.10"/>
+      <directive name="uses" value="org.testng"/>
+    </capability>
+    <capability namespace="osgi.wiring.package">
+      <attribute name="osgi.wiring.package" value="org.testng"/>
+      <attribute name="version" type="Version" value="6.9.10"/>
+      <attribute name="bundle-symbolic-name" value="org.testng"/>
+      <attribute name="bundle-version" type="Version" value="6.9.10"/>
+      <directive name="uses" value="com.beust.jcommander,com.beust.jcommander.converters,com.google.inject,javax.xml.parsers,org.apache.tools.ant,org.apache.tools.ant.taskdefs,org.apache.tools.ant.types,org.testng.annotations,org.testng.internal,org.testng.internal.annotations,org.testng.internal.junit,org.testng.internal.thread.graph,org.testng.xml,org.xml.sax"/>
+    </capability>
+    <capability namespace="osgi.wiring.package">
+      <attribute name="osgi.wiring.package" value="org.testng.annotations"/>
+      <attribute name="version" type="Version" value="6.9.10"/>
+      <attribute name="bundle-symbolic-name" value="org.testng"/>
+      <attribute name="bundle-version" type="Version" value="6.9.10"/>
+      <directive name="uses" value="com.google.inject,org.testng,org.testng.internal.annotations"/>
+    </capability>
+    <capability namespace="osgi.wiring.package">
+      <attribute name="osgi.wiring.package" value="org.testng.asserts"/>
+      <attribute name="version" type="Version" value="6.9.10"/>
+      <attribute name="bundle-symbolic-name" value="org.testng"/>
+      <attribute name="bundle-version" type="Version" value="6.9.10"/>
+    </capability>
+    <capability namespace="osgi.wiring.package">
+      <attribute name="osgi.wiring.package" value="org.testng.collections"/>
+      <attribute name="version" type="Version" value="6.9.10"/>
+      <attribute name="bundle-symbolic-name" value="org.testng"/>
+      <attribute name="bundle-version" type="Version" value="6.9.10"/>
+    </capability>
+    <capability namespace="osgi.wiring.package">
+      <attribute name="osgi.wiring.package" value="org.testng.internal"/>
+      <attribute name="version" type="Version" value="6.9.10"/>
+      <attribute name="bundle-symbolic-name" value="org.testng"/>
+      <attribute name="bundle-version" type="Version" value="6.9.10"/>
+      <directive name="uses" value="com.google.inject,org.testng,org.testng.annotations,org.testng.collections,org.testng.internal.annotations,org.testng.internal.thread,org.testng.internal.thread.graph,org.testng.junit,org.testng.reporters,org.testng.xml"/>
+    </capability>
+    <capability namespace="osgi.wiring.package">
+      <attribute name="osgi.wiring.package" value="org.testng.internal.annotations"/>
+      <attribute name="version" type="Version" value="6.9.10"/>
+      <attribute name="bundle-symbolic-name" value="org.testng"/>
+      <attribute name="bundle-version" type="Version" value="6.9.10"/>
+      <directive name="uses" value="org.testng,org.testng.annotations,org.testng.xml"/>
+    </capability>
+    <capability namespace="osgi.wiring.package">
+      <attribute name="osgi.wiring.package" value="org.testng.internal.collections"/>
+      <attribute name="version" type="Version" value="6.9.10"/>
+      <attribute name="bundle-symbolic-name" value="org.testng"/>
+      <attribute name="bundle-version" type="Version" value="6.9.10"/>
+    </capability>
+    <capability namespace="osgi.wiring.package">
+      <attribute name="osgi.wiring.package" value="org.testng.internal.invokers"/>
+      <attribute name="version" type="Version" value="6.9.10"/>
+      <attribute name="bundle-symbolic-name" value="org.testng"/>
+      <attribute name="bundle-version" type="Version" value="6.9.10"/>
+      <directive name="uses" value="org.testng"/>
+    </capability>
+    <capability namespace="osgi.wiring.package">
+      <attribute name="osgi.wiring.package" value="org.testng.internal.junit"/>
+      <attribute name="version" type="Version" value="6.9.10"/>
+      <attribute name="bundle-symbolic-name" value="org.testng"/>
+      <attribute name="bundle-version" type="Version" value="6.9.10"/>
+    </capability>
+    <capability namespace="osgi.wiring.package">
+      <attribute name="osgi.wiring.package" value="org.testng.internal.remote"/>
+      <attribute name="version" type="Version" value="6.9.10"/>
+      <attribute name="bundle-symbolic-name" value="org.testng"/>
+      <attribute name="bundle-version" type="Version" value="6.9.10"/>
+      <directive name="uses" value="org.testng.remote"/>
+    </capability>
+    <capability namespace="osgi.wiring.package">
+      <attribute name="osgi.wiring.package" value="org.testng.internal.thread"/>
+      <attribute name="version" type="Version" value="6.9.10"/>
+      <attribute name="bundle-symbolic-name" value="org.testng"/>
+      <attribute name="bundle-version" type="Version" value="6.9.10"/>
+    </capability>
+    <capability namespace="osgi.wiring.package">
+      <attribute name="osgi.wiring.package" value="org.testng.internal.thread.graph"/>
+      <attribute name="version" type="Version" value="6.9.10"/>
+      <attribute name="bundle-symbolic-name" value="org.testng"/>
+      <attribute name="bundle-version" type="Version" value="6.9.10"/>
+      <directive name="uses" value="org.testng,org.testng.internal"/>
+    </capability>
+    <capability namespace="osgi.wiring.package">
+      <attribute name="osgi.wiring.package" value="org.testng.junit"/>
+      <attribute name="version" type="Version" value="6.9.10"/>
+      <attribute name="bundle-symbolic-name" value="org.testng"/>
+      <attribute name="bundle-version" type="Version" value="6.9.10"/>
+      <directive name="uses" value="junit.framework,org.junit.runner,org.testng,org.testng.internal,org.testng.internal.annotations,org.testng.xml"/>
+    </capability>
+    <capability namespace="osgi.wiring.package">
+      <attribute name="osgi.wiring.package" value="org.testng.log"/>
+      <attribute name="version" type="Version" value="6.9.10"/>
+      <attribute name="bundle-symbolic-name" value="org.testng"/>
+      <attribute name="bundle-version" type="Version" value="6.9.10"/>
+    </capability>
+    <capability namespace="osgi.wiring.package">
+      <attribute name="osgi.wiring.package" value="org.testng.log4testng"/>
+      <attribute name="version" type="Version" value="6.9.10"/>
+      <attribute name="bundle-symbolic-name" value="org.testng"/>
+      <attribute name="bundle-version" type="Version" value="6.9.10"/>
+    </capability>
+    <capability namespace="osgi.wiring.package">
+      <attribute name="osgi.wiring.package" value="org.testng.mustache"/>
+      <attribute name="version" type="Version" value="6.9.10"/>
+      <attribute name="bundle-symbolic-name" value="org.testng"/>
+      <attribute name="bundle-version" type="Version" value="6.9.10"/>
+    </capability>
+    <capability namespace="osgi.wiring.package">
+      <attribute name="osgi.wiring.package" value="org.testng.remote"/>
+      <attribute name="version" type="Version" value="6.9.10"/>
+      <attribute name="bundle-symbolic-name" value="org.testng"/>
+      <attribute name="bundle-version" type="Version" value="6.9.10"/>
+      <directive name="uses" value="com.beust.jcommander,org.testng,org.testng.internal,org.testng.internal.remote,org.testng.remote.adapter,org.testng.xml"/>
+    </capability>
+    <capability namespace="osgi.wiring.package">
+      <attribute name="osgi.wiring.package" value="org.testng.remote.adapter"/>
+      <attribute name="version" type="Version" value="6.9.10"/>
+      <attribute name="bundle-symbolic-name" value="org.testng"/>
+      <attribute name="bundle-version" type="Version" value="6.9.10"/>
+      <directive name="uses" value="org.testng,org.testng.xml"/>
+    </capability>
+    <capability namespace="osgi.wiring.package">
+      <attribute name="osgi.wiring.package" value="org.testng.remote.strprotocol"/>
+      <attribute name="version" type="Version" value="6.9.10"/>
+      <attribute name="bundle-symbolic-name" value="org.testng"/>
+      <attribute name="bundle-version" type="Version" value="6.9.10"/>
+      <directive name="uses" value="org.testng,org.testng.internal,org.testng.xml"/>
+    </capability>
+    <capability namespace="osgi.wiring.package">
+      <attribute name="osgi.wiring.package" value="org.testng.reporters"/>
+      <attribute name="version" type="Version" value="6.9.10"/>
+      <attribute name="bundle-symbolic-name" value="org.testng"/>
+      <attribute name="bundle-version" type="Version" value="6.9.10"/>
+      <directive name="uses" value="org.testng,org.testng.internal,org.testng.xml"/>
+    </capability>
+    <capability namespace="osgi.wiring.package">
+      <attribute name="osgi.wiring.package" value="org.testng.reporters.jq"/>
+      <attribute name="version" type="Version" value="6.9.10"/>
+      <attribute name="bundle-symbolic-name" value="org.testng"/>
+      <attribute name="bundle-version" type="Version" value="6.9.10"/>
+      <directive name="uses" value="org.testng,org.testng.reporters,org.testng.xml"/>
+    </capability>
+    <capability namespace="osgi.wiring.package">
+      <attribute name="osgi.wiring.package" value="org.testng.reporters.util"/>
+      <attribute name="version" type="Version" value="6.9.10"/>
+      <attribute name="bundle-symbolic-name" value="org.testng"/>
+      <attribute name="bundle-version" type="Version" value="6.9.10"/>
+      <directive name="uses" value="org.testng"/>
+    </capability>
+    <capability namespace="osgi.wiring.package">
+      <attribute name="osgi.wiring.package" value="org.testng.util"/>
+      <attribute name="version" type="Version" value="6.9.10"/>
+      <attribute name="bundle-symbolic-name" value="org.testng"/>
+      <attribute name="bundle-version" type="Version" value="6.9.10"/>
+      <directive name="uses" value="org.testng"/>
+    </capability>
+    <capability namespace="osgi.wiring.package">
+      <attribute name="osgi.wiring.package" value="org.testng.xml"/>
+      <attribute name="version" type="Version" value="6.9.10"/>
+      <attribute name="bundle-symbolic-name" value="org.testng"/>
+      <attribute name="bundle-version" type="Version" value="6.9.10"/>
+      <directive name="uses" value="javax.xml.parsers,org.testng,org.testng.remote.strprotocol,org.testng.reporters,org.testng.xml.dom,org.xml.sax,org.xml.sax.helpers"/>
+    </capability>
+    <capability namespace="osgi.wiring.package">
+      <attribute name="osgi.wiring.package" value="org.testng.xml.dom"/>
+      <attribute name="version" type="Version" value="6.9.10"/>
+      <attribute name="bundle-symbolic-name" value="org.testng"/>
+      <attribute name="bundle-version" type="Version" value="6.9.10"/>
+      <directive name="uses" value="javax.xml.parsers,javax.xml.xpath,org.testng,org.testng.internal.collections,org.testng.xml,org.w3c.dom,org.xml.sax"/>
+    </capability>
+    <requirement namespace="osgi.wiring.package">
+      <directive name="filter" value="(&amp;(osgi.wiring.package=bsh)(version&gt;=2.0.0)(!(version&gt;=3.0.0)))"/>
+      <directive name="resolution" value="optional"/>
+    </requirement>
+    <requirement namespace="osgi.wiring.package">
+      <directive name="filter" value="(&amp;(osgi.wiring.package=com.beust.jcommander)(version&gt;=1.7.0)(!(version&gt;=3.0.0)))"/>
+      <directive name="resolution" value="optional"/>
+    </requirement>
+    <requirement namespace="osgi.wiring.package">
+      <directive name="filter" value="(&amp;(osgi.wiring.package=com.beust.jcommander.converters)(version&gt;=1.7.0)(!(version&gt;=3.0.0)))"/>
+      <directive name="resolution" value="optional"/>
+    </requirement>
+    <requirement namespace="osgi.wiring.package">
+      <directive name="filter" value="(&amp;(osgi.wiring.package=com.google.inject)(version&gt;=1.2.0)(!(version&gt;=1.3.0)))"/>
+      <directive name="resolution" value="optional"/>
+    </requirement>
+    <requirement namespace="osgi.wiring.package">
+      <directive name="filter" value="(&amp;(osgi.wiring.package=junit.framework)(version&gt;=3.8.1)(!(version&gt;=5.0.0)))"/>
+      <directive name="resolution" value="optional"/>
+    </requirement>
+    <requirement namespace="osgi.wiring.package">
+      <directive name="filter" value="(osgi.wiring.package=org.junit)"/>
+      <directive name="resolution" value="optional"/>
+    </requirement>
+    <requirement namespace="osgi.wiring.package">
+      <directive name="filter" value="(osgi.wiring.package=org.junit.runner)"/>
+      <directive name="resolution" value="optional"/>
+    </requirement>
+    <requirement namespace="osgi.wiring.package">
+      <directive name="filter" value="(osgi.wiring.package=org.junit.runner.manipulation)"/>
+      <directive name="resolution" value="optional"/>
+    </requirement>
+    <requirement namespace="osgi.wiring.package">
+      <directive name="filter" value="(osgi.wiring.package=org.junit.runner.notification)"/>
+      <directive name="resolution" value="optional"/>
+    </requirement>
+    <requirement namespace="osgi.wiring.package">
+      <directive name="filter" value="(&amp;(osgi.wiring.package=org.apache.tools.ant)(version&gt;=1.7.0)(!(version&gt;=2.0.0)))"/>
+      <directive name="resolution" value="optional"/>
+    </requirement>
+    <requirement namespace="osgi.wiring.package">
+      <directive name="filter" value="(&amp;(osgi.wiring.package=org.apache.tools.ant.taskdefs)(version&gt;=1.7.0)(!(version&gt;=2.0.0)))"/>
+      <directive name="resolution" value="optional"/>
+    </requirement>
+    <requirement namespace="osgi.wiring.package">
+      <directive name="filter" value="(&amp;(osgi.wiring.package=org.apache.tools.ant.types)(version&gt;=1.7.0)(!(version&gt;=2.0.0)))"/>
+      <directive name="resolution" value="optional"/>
+    </requirement>
+    <requirement namespace="osgi.wiring.package">
+      <directive name="filter" value="(&amp;(osgi.wiring.package=org.apache.tools.ant.types.resources)(version&gt;=1.7.0)(!(version&gt;=2.0.0)))"/>
+      <directive name="resolution" value="optional"/>
+    </requirement>
+    <requirement namespace="osgi.wiring.package">
+      <directive name="filter" value="(&amp;(osgi.wiring.package=org.apache.tools.ant.types.selectors)(version&gt;=1.7.0)(!(version&gt;=2.0.0)))"/>
+      <directive name="resolution" value="optional"/>
+    </requirement>
+    <requirement namespace="osgi.wiring.package">
+      <directive name="filter" value="(&amp;(osgi.wiring.package=org.yaml.snakeyaml)(version&gt;=1.6.0)(!(version&gt;=2.0.0)))"/>
+      <directive name="resolution" value="optional"/>
+    </requirement>
+    <requirement namespace="osgi.wiring.package">
+      <directive name="filter" value="(&amp;(osgi.wiring.package=org.yaml.snakeyaml.constructor)(version&gt;=1.6.0)(!(version&gt;=2.0.0)))"/>
+      <directive name="resolution" value="optional"/>
+    </requirement>
+    <requirement namespace="osgi.wiring.package">
+      <directive name="filter" value="(&amp;(osgi.wiring.package=org.yaml.snakeyaml.nodes)(version&gt;=1.6.0)(!(version&gt;=2.0.0)))"/>
+      <directive name="resolution" value="optional"/>
+    </requirement>
+    <requirement namespace="osgi.wiring.package">
+      <directive name="filter" value="(osgi.wiring.package=javax.xml.parsers)"/>
+    </requirement>
+    <requirement namespace="osgi.wiring.package">
+      <directive name="filter" value="(osgi.wiring.package=javax.xml.xpath)"/>
+    </requirement>
+    <requirement namespace="osgi.wiring.package">
+      <directive name="filter" value="(osgi.wiring.package=org.w3c.dom)"/>
+    </requirement>
+    <requirement namespace="osgi.wiring.package">
+      <directive name="filter" value="(osgi.wiring.package=org.xml.sax)"/>
+    </requirement>
+    <requirement namespace="osgi.wiring.package">
+      <directive name="filter" value="(osgi.wiring.package=org.xml.sax.helpers)"/>
+    </requirement>
+  </resource>
+  <resource>
     <capability namespace="osgi.identity">
       <attribute name="osgi.identity" value="osgi.cmpn"/>
       <attribute name="type" value="osgi.bundle"/>

Modified: ace/trunk/cnf/localrepo/index.xml.sha
URL: http://svn.apache.org/viewvc/ace/trunk/cnf/localrepo/index.xml.sha?rev=1727398&r1=1727397&r2=1727398&view=diff
==============================================================================
--- ace/trunk/cnf/localrepo/index.xml.sha (original)
+++ ace/trunk/cnf/localrepo/index.xml.sha Thu Jan 28 16:27:14 2016
@@ -1 +1 @@
-17bb15571bb2122082122ee38135e4a4c4d98667808700d20f832ec1d958d89f
\ No newline at end of file
+e9bded8edf361ef528d842424bd0da1dad318bbdeb7c8e56c1fb54366fdc00e3
\ No newline at end of file

Added: ace/trunk/cnf/localrepo/org.testng/org.testng-6.9.10.jar
URL: http://svn.apache.org/viewvc/ace/trunk/cnf/localrepo/org.testng/org.testng-6.9.10.jar?rev=1727398&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ace/trunk/cnf/localrepo/org.testng/org.testng-6.9.10.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: ace/trunk/org.apache.ace.agent.launcher/.classpath
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.agent.launcher/.classpath?rev=1727398&r1=1727397&r2=1727398&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.agent.launcher/.classpath (original)
+++ ace/trunk/org.apache.ace.agent.launcher/.classpath Thu Jan 28 16:27:14 2016
@@ -4,6 +4,5 @@
 	<classpathentry kind="src" output="bin_test" path="test"/>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
     <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
-	<classpathentry kind="con" path="org.testng.TESTNG_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

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=1727398&r1=1727397&r2=1727398&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.agent.launcher/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.agent.launcher/bnd.bnd Thu Jan 28 16:27:14 2016
@@ -2,6 +2,7 @@
 
 -buildpath: \
 	${^-buildpath},\
+	${testng},\
 	osgi.core;version=6.0.0,\
 	org.apache.commons.cli,\
 	org.apache.ace.agent;version=latest

Modified: ace/trunk/org.apache.ace.agent/.classpath
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.agent/.classpath?rev=1727398&r1=1727397&r2=1727398&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.agent/.classpath (original)
+++ ace/trunk/org.apache.ace.agent/.classpath Thu Jan 28 16:27:14 2016
@@ -4,6 +4,5 @@
 	<classpathentry kind="src" output="bin_test" path="test"/>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
     <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
-	<classpathentry kind="con" path="org.testng.TESTNG_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

Modified: ace/trunk/org.apache.ace.agent/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.agent/bnd.bnd?rev=1727398&r1=1727397&r2=1727398&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.agent/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.agent/bnd.bnd Thu Jan 28 16:27:14 2016
@@ -38,6 +38,7 @@ mavenGroup: org.apache.ace
 
 -buildpath: \
 	${^-buildpath},\
+	${testng},\
 	osgi.core;version=4.3,\
 	osgi.cmpn;version=4.3,\
 	org.easymock,\

Modified: ace/trunk/org.apache.ace.authentication/.classpath
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.authentication/.classpath?rev=1727398&r1=1727397&r2=1727398&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.authentication/.classpath (original)
+++ ace/trunk/org.apache.ace.authentication/.classpath Thu Jan 28 16:27:14 2016
@@ -4,6 +4,5 @@
 	<classpathentry kind="src" output="bin_test" path="test"/>
     <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.testng.TESTNG_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

Modified: ace/trunk/org.apache.ace.authentication/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.authentication/bnd.bnd?rev=1727398&r1=1727397&r2=1727398&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.authentication/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.authentication/bnd.bnd Thu Jan 28 16:27:14 2016
@@ -2,6 +2,7 @@
 
 -buildpath: \
 	${^-buildpath},\
+	${testng},\
 	osgi.core;version=6.0.0,\
 	osgi.cmpn,\
 	org.mockito.mockito-all,\

Modified: ace/trunk/org.apache.ace.builder/.classpath
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.builder/.classpath?rev=1727398&r1=1727397&r2=1727398&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.builder/.classpath (original)
+++ ace/trunk/org.apache.ace.builder/.classpath Thu Jan 28 16:27:14 2016
@@ -4,6 +4,5 @@
 	<classpathentry kind="src" output="bin_test" path="test"/>
     <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.testng.TESTNG_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

Modified: ace/trunk/org.apache.ace.builder/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.builder/bnd.bnd?rev=1727398&r1=1727397&r2=1727398&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.builder/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.builder/bnd.bnd Thu Jan 28 16:27:14 2016
@@ -2,7 +2,9 @@
 
 -buildpath: \
 	${^-buildpath},\
+	${testng},\
 	org.apache.ace.test;version=latest
+
 Export-Package: org.apache.ace.builder
 Bundle-Version: 2.0.1
 Bundle-Name: Apache ACE Builder

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=1727398&r1=1727397&r2=1727398&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.automation/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.client.automation/bnd.bnd Thu Jan 28 16:27:14 2016
@@ -2,11 +2,13 @@
 
 -buildpath: \
 	${^-buildpath},\
+	${testng},\
 	osgi.core;version=6.0.0,\
 	osgi.cmpn,\
 	org.apache.felix.dependencymanager,\
 	org.apache.ace.scheduler.api;version=latest,\
 	org.apache.ace.client.repository.api;version=latest
+
 Private-Package: org.apache.ace.client.automation
 Bundle-Activator: org.apache.ace.client.automation.Activator
 Bundle-Version: 1.0.2

Modified: ace/trunk/org.apache.ace.client.repository/.classpath
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/.classpath?rev=1727398&r1=1727397&r2=1727398&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/.classpath (original)
+++ ace/trunk/org.apache.ace.client.repository/.classpath Thu Jan 28 16:27:14 2016
@@ -4,6 +4,5 @@
 	<classpathentry kind="src" output="bin_test" path="test"/>
     <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.testng.TESTNG_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

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=1727398&r1=1727397&r2=1727398&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.client.repository/bnd.bnd Thu Jan 28 16:27:14 2016
@@ -2,6 +2,7 @@
 
 -buildpath: \
 	${^-buildpath},\
+	${testng},\
 	osgi.core;version=6.0.0,\
 	osgi.cmpn,\
 	org.mockito.mockito-all,\

Modified: ace/trunk/org.apache.ace.client.rest/.classpath
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.rest/.classpath?rev=1727398&r1=1727397&r2=1727398&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.rest/.classpath (original)
+++ ace/trunk/org.apache.ace.client.rest/.classpath Thu Jan 28 16:27:14 2016
@@ -3,7 +3,6 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test"/>
     <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
-	<classpathentry kind="con" path="org.testng.TESTNG_CONTAINER"/>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

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=1727398&r1=1727397&r2=1727398&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.rest/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.client.rest/bnd.bnd Thu Jan 28 16:27:14 2016
@@ -2,6 +2,7 @@
 
 -buildpath: \
 	${^-buildpath},\
+	${testng},\
 	osgi.core;version=6.0.0,\
 	osgi.cmpn,\
 	org.apache.felix.http.servlet-api,\
@@ -15,6 +16,7 @@
 	org.apache.ace.feedback.common;version=latest,\
 	org.apache.ace.client.workspace;version=latest,\
 	org.apache.ace.test;version=latest
+
 Private-Package: \
 	org.apache.ace.client.rest,\
 	com.google.gson*

Modified: ace/trunk/org.apache.ace.client.workspace/.classpath
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.workspace/.classpath?rev=1727398&r1=1727397&r2=1727398&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.workspace/.classpath (original)
+++ ace/trunk/org.apache.ace.client.workspace/.classpath Thu Jan 28 16:27:14 2016
@@ -3,7 +3,6 @@
 	<classpathentry kind="src" output="bin" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test"/>
     <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
-	<classpathentry kind="con" path="org.testng.TESTNG_CONTAINER"/>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

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=1727398&r1=1727397&r2=1727398&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.workspace/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.client.workspace/bnd.bnd Thu Jan 28 16:27:14 2016
@@ -2,6 +2,7 @@
 
 -buildpath: \
 	${^-buildpath},\
+	${testng},\
 	osgi.core;version=6.0.0,\
 	osgi.cmpn,\
 	org.apache.felix.dependencymanager,\

Modified: ace/trunk/org.apache.ace.configurator/.classpath
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.configurator/.classpath?rev=1727398&r1=1727397&r2=1727398&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.configurator/.classpath (original)
+++ ace/trunk/org.apache.ace.configurator/.classpath Thu Jan 28 16:27:14 2016
@@ -3,7 +3,6 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test"/>
     <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
-	<classpathentry kind="con" path="org.testng.TESTNG_CONTAINER"/>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

Modified: ace/trunk/org.apache.ace.configurator/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.configurator/bnd.bnd?rev=1727398&r1=1727397&r2=1727398&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.configurator/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.configurator/bnd.bnd Thu Jan 28 16:27:14 2016
@@ -2,6 +2,7 @@
 
 -buildpath: \
 	${^-buildpath},\
+	${testng},\
 	osgi.core;version=6.0.0,\
 	osgi.cmpn,\
 	org.apache.felix.dependencymanager,\

Modified: ace/trunk/org.apache.ace.connectionfactory/.classpath
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.connectionfactory/.classpath?rev=1727398&r1=1727397&r2=1727398&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.connectionfactory/.classpath (original)
+++ ace/trunk/org.apache.ace.connectionfactory/.classpath Thu Jan 28 16:27:14 2016
@@ -4,6 +4,5 @@
 	<classpathentry kind="src" output="bin_test" path="test"/>
     <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.testng.TESTNG_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

Modified: ace/trunk/org.apache.ace.connectionfactory/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.connectionfactory/bnd.bnd?rev=1727398&r1=1727397&r2=1727398&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.connectionfactory/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.connectionfactory/bnd.bnd Thu Jan 28 16:27:14 2016
@@ -2,10 +2,12 @@
 
 -buildpath: \
 	${^-buildpath},\
+	${testng},\
 	osgi.core;version=6.0.0,\
 	osgi.cmpn,\
 	org.apache.ace.test;version=latest,\
 	org.apache.commons.codec;version=1.4
+
 Private-Package: org.apache.ace.connectionfactory.impl,\
 	org.apache.commons.codec,\
 	org.apache.commons.codec.binary

Modified: ace/trunk/org.apache.ace.deployment.itest/.classpath
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.deployment.itest/.classpath?rev=1727398&r1=1727397&r2=1727398&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.deployment.itest/.classpath (original)
+++ ace/trunk/org.apache.ace.deployment.itest/.classpath Thu Jan 28 16:27:14 2016
@@ -4,6 +4,5 @@
 	<classpathentry kind="src" output="bin_test" path="test"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.testng.TESTNG_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

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=1727398&r1=1727397&r2=1727398&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.deployment.itest/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.deployment.itest/bnd.bnd Thu Jan 28 16:27:14 2016
@@ -2,6 +2,8 @@
 
 Test-Cases: ${classes;CONCRETE;EXTENDS;org.apache.ace.it.IntegrationTestBase}
 -buildpath: \
+	${^-buildpath},\
+	${testng},\
 	junit.osgi,\
 	osgi.core;version=6.0.0,\
 	osgi.cmpn,\

Modified: ace/trunk/org.apache.ace.deployment/.classpath
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.deployment/.classpath?rev=1727398&r1=1727397&r2=1727398&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.deployment/.classpath (original)
+++ ace/trunk/org.apache.ace.deployment/.classpath Thu Jan 28 16:27:14 2016
@@ -4,6 +4,5 @@
 	<classpathentry kind="src" output="bin_test" path="test"/>
     <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.testng.TESTNG_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

Modified: ace/trunk/org.apache.ace.deployment/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.deployment/bnd.bnd?rev=1727398&r1=1727397&r2=1727398&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.deployment/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.deployment/bnd.bnd Thu Jan 28 16:27:14 2016
@@ -2,6 +2,7 @@
 
 -buildpath: \
 	${^-buildpath},\
+	${testng},\
 	osgi.core;version=6.0.0,\
 	osgi.cmpn,\
 	org.apache.felix.http.servlet-api,\

Modified: ace/trunk/org.apache.ace.discovery/.classpath
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.discovery/.classpath?rev=1727398&r1=1727397&r2=1727398&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.discovery/.classpath (original)
+++ ace/trunk/org.apache.ace.discovery/.classpath Thu Jan 28 16:27:14 2016
@@ -4,6 +4,5 @@
 	<classpathentry kind="src" output="bin_test" path="test"/>
     <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.testng.TESTNG_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

Modified: ace/trunk/org.apache.ace.discovery/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.discovery/bnd.bnd?rev=1727398&r1=1727397&r2=1727398&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.discovery/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.discovery/bnd.bnd Thu Jan 28 16:27:14 2016
@@ -2,6 +2,7 @@
 
 -buildpath: \
 	${^-buildpath},\
+	${testng},\
 	osgi.core;version=6.0.0,\
 	osgi.cmpn,\
 	org.apache.felix.dependencymanager,\

Modified: ace/trunk/org.apache.ace.feedback.common/.classpath
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.feedback.common/.classpath?rev=1727398&r1=1727397&r2=1727398&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.feedback.common/.classpath (original)
+++ ace/trunk/org.apache.ace.feedback.common/.classpath Thu Jan 28 16:27:14 2016
@@ -4,6 +4,5 @@
 	<classpathentry kind="src" output="bin_test" path="test"/>
     <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.testng.TESTNG_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

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=1727398&r1=1727397&r2=1727398&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.feedback.common/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.feedback.common/bnd.bnd Thu Jan 28 16:27:14 2016
@@ -1,12 +1,14 @@
 # Licensed to the Apache Software Foundation (ASF) under the terms of ASLv2 (http://www.apache.org/licenses/LICENSE-2.0).
 
+-buildpath: \
+	${^-buildpath},\
+	${testng},\
+	org.apache.ace.range.api;version=latest,\
+	org.apache.ace.test;version=latest
+
 Private-Package: org.apache.ace.feedback.util
 Export-Package: org.apache.ace.feedback
 
 Bundle-Version: 1.1.0
 Bundle-Name: Apache ACE Feedback API
 Bundle-Description: Provides the Apache ACE Feedback API packages
--buildpath: \
-	${^-buildpath},\
-	org.apache.ace.range.api;version=latest,\
-	org.apache.ace.test;version=latest

Modified: ace/trunk/org.apache.ace.identification/.classpath
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.identification/.classpath?rev=1727398&r1=1727397&r2=1727398&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.identification/.classpath (original)
+++ ace/trunk/org.apache.ace.identification/.classpath Thu Jan 28 16:27:14 2016
@@ -3,7 +3,6 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test"/>
     <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
-	<classpathentry kind="con" path="org.testng.TESTNG_CONTAINER"/>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

Modified: ace/trunk/org.apache.ace.identification/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.identification/bnd.bnd?rev=1727398&r1=1727397&r2=1727398&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.identification/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.identification/bnd.bnd Thu Jan 28 16:27:14 2016
@@ -2,6 +2,7 @@
 
 -buildpath: \
 	${^-buildpath},\
+	${testng},\
 	osgi.core;version=6.0.0,\
 	osgi.cmpn,\
 	org.apache.felix.dependencymanager,\

Modified: ace/trunk/org.apache.ace.log/.classpath
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.log/.classpath?rev=1727398&r1=1727397&r2=1727398&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.log/.classpath (original)
+++ ace/trunk/org.apache.ace.log/.classpath Thu Jan 28 16:27:14 2016
@@ -3,7 +3,6 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test"/>
     <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
-	<classpathentry kind="con" path="org.testng.TESTNG_CONTAINER"/>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

Modified: ace/trunk/org.apache.ace.log/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.log/bnd.bnd?rev=1727398&r1=1727397&r2=1727398&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.log/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.log/bnd.bnd Thu Jan 28 16:27:14 2016
@@ -2,6 +2,7 @@
 
 -buildpath: \
 	${^-buildpath},\
+	${testng},\
 	osgi.core;version=6.0.0,\
 	osgi.cmpn,\
 	org.apache.felix.http.servlet-api,\

Modified: ace/trunk/org.apache.ace.obr/.classpath
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.obr/.classpath?rev=1727398&r1=1727397&r2=1727398&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.obr/.classpath (original)
+++ ace/trunk/org.apache.ace.obr/.classpath Thu Jan 28 16:27:14 2016
@@ -4,6 +4,5 @@
 	<classpathentry kind="src" output="bin_test" path="test"/>
     <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.testng.TESTNG_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

Modified: ace/trunk/org.apache.ace.obr/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.obr/bnd.bnd?rev=1727398&r1=1727397&r2=1727398&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.obr/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.obr/bnd.bnd Thu Jan 28 16:27:14 2016
@@ -3,6 +3,7 @@
 -sub: *.bnd
 -buildpath: \
 	${^-buildpath},\
+	${testng},\
 	osgi.core;version=6.0.0,\
 	osgi.cmpn,\
 	org.apache.felix.dependencymanager,\

Modified: ace/trunk/org.apache.ace.range.api/.classpath
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.range.api/.classpath?rev=1727398&r1=1727397&r2=1727398&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.range.api/.classpath (original)
+++ ace/trunk/org.apache.ace.range.api/.classpath Thu Jan 28 16:27:14 2016
@@ -3,7 +3,6 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test"/>
     <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
-	<classpathentry kind="con" path="org.testng.TESTNG_CONTAINER"/>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

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=1727398&r1=1727397&r2=1727398&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.range.api/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.range.api/bnd.bnd Thu Jan 28 16:27:14 2016
@@ -2,8 +2,10 @@
 
 -buildpath: \
 	${^-buildpath},\
+	${testng},\
 	org.apache.ace.test;version=latest
+
 Export-Package: org.apache.ace.range
 Bundle-Version: 1.1.1
 Bundle-Name: Apache ACE Range API
-Bundle-Description: Provides the Apache ACE Range API packages
\ No newline at end of file
+Bundle-Description: Provides the Apache ACE Range API packages

Modified: ace/trunk/org.apache.ace.repository/.classpath
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.repository/.classpath?rev=1727398&r1=1727397&r2=1727398&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.repository/.classpath (original)
+++ ace/trunk/org.apache.ace.repository/.classpath Thu Jan 28 16:27:14 2016
@@ -4,6 +4,5 @@
 	<classpathentry kind="src" output="bin_test" path="test"/>
     <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.testng.TESTNG_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

Modified: ace/trunk/org.apache.ace.repository/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.repository/bnd.bnd?rev=1727398&r1=1727397&r2=1727398&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.repository/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.repository/bnd.bnd Thu Jan 28 16:27:14 2016
@@ -2,6 +2,7 @@
 
 -buildpath: \
 	${^-buildpath},\
+	${testng},\
 	osgi.core;version=6.0.0,\
 	osgi.cmpn,\
 	org.apache.felix.dependencymanager,\

Modified: ace/trunk/org.apache.ace.scheduler/.classpath
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.scheduler/.classpath?rev=1727398&r1=1727397&r2=1727398&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.scheduler/.classpath (original)
+++ ace/trunk/org.apache.ace.scheduler/.classpath Thu Jan 28 16:27:14 2016
@@ -3,7 +3,6 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" output="bin_test" path="test"/>
     <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
-	<classpathentry kind="con" path="org.testng.TESTNG_CONTAINER"/>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

Modified: ace/trunk/org.apache.ace.scheduler/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.scheduler/bnd.bnd?rev=1727398&r1=1727397&r2=1727398&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.scheduler/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.scheduler/bnd.bnd Thu Jan 28 16:27:14 2016
@@ -2,6 +2,7 @@
 
 -buildpath: \
 	${^-buildpath},\
+	${testng},\
 	osgi.core;version=6.0.0,\
 	osgi.cmpn,\
 	org.apache.felix.dependencymanager,\

Modified: ace/trunk/org.apache.ace.verifier/.classpath
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.verifier/.classpath?rev=1727398&r1=1727397&r2=1727398&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.verifier/.classpath (original)
+++ ace/trunk/org.apache.ace.verifier/.classpath Thu Jan 28 16:27:14 2016
@@ -4,6 +4,5 @@
 	<classpathentry kind="src" output="bin_test" path="test"/>
     <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<classpathentry kind="con" path="org.testng.TESTNG_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

Modified: ace/trunk/org.apache.ace.verifier/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.verifier/bnd.bnd?rev=1727398&r1=1727397&r2=1727398&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.verifier/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.verifier/bnd.bnd Thu Jan 28 16:27:14 2016
@@ -2,6 +2,7 @@
 
 -buildpath: \
 	${^-buildpath},\
+	${testng},\
 	osgi.core;version=6.0.0,\
 	osgi.cmpn;version=4.3.1,\
 	org.apache.felix.http.servlet-api,\