4 files changed, 22 insertions, 20 deletions
diff --git a/sca-java-2.x/trunk/modules/binding-rest-runtime/META-INF/MANIFEST.MF b/sca-java-2.x/trunk/modules/binding-rest-runtime/META-INF/MANIFEST.MF
index 3c9388cc25..e8df8bf846 100644
--- a/sca-java-2.x/trunk/modules/binding-rest-runtime/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/trunk/modules/binding-rest-runtime/META-INF/MANIFEST.MF
@@ -37,19 +37,20 @@ Import-Package: javax.jws,
  org.apache.tuscany.sca.invocation;version="2.0.0",
  org.apache.tuscany.sca.provider;version="2.0.0",
  org.apache.tuscany.sca.runtime;version="2.0.0",
- org.apache.wink.client;version="1.1.2.incubating",
- org.apache.wink.client.handlers;version="1.1.2.incubating",
- org.apache.wink.common;version="1.1.2.incubating",
- org.apache.wink.common.internal.registry;version="1.1.2.incubating",
- org.apache.wink.common.internal.registry.metadata;version="1.1.2.incubating",
- org.apache.wink.server.internal;version="1.1.2.incubating",
- org.apache.wink.server.internal.registry;version="1.1.2.incubating",
- org.apache.wink.server.internal.servlet;version="1.1.2.incubating",
- org.apache.wink.server.utils;version="1.1.2.incubating",
+ org.apache.wink.client,
+ org.apache.wink.client.handlers,
+ org.apache.wink.common,
+ org.apache.wink.common.internal.registry,
+ org.apache.wink.common.internal.registry.metadata,
+ org.apache.wink.server.internal,
+ org.apache.wink.server.internal.registry,
+ org.apache.wink.server.internal.servlet,
+ org.apache.wink.server.utils,
+ org.apache.wink.server.handlers,
  org.oasisopen.sca;version="2.0.0",
  org.oasisopen.sca.annotation;version="2.0.0"
 Bundle-SymbolicName: org.apache.tuscany.sca.binding.rest.runtime
 Bundle-DocURL: http://www.apache.org/
 Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6
-Require-Bundle: org.apache.wink.server
+
 
diff --git a/sca-java-2.x/trunk/modules/databinding-sdo/META-INF/MANIFEST.MF b/sca-java-2.x/trunk/modules/databinding-sdo/META-INF/MANIFEST.MF
index 98ea88ea0f..c4703c2065 100644
--- a/sca-java-2.x/trunk/modules/databinding-sdo/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/trunk/modules/databinding-sdo/META-INF/MANIFEST.MF
@@ -26,6 +26,7 @@ Import-Package: commonj.sdo;version="2.1",
  org.apache.tuscany.sca.databinding.impl;version="2.0.0",
  org.apache.tuscany.sca.databinding.util;version="2.0.0",
  org.apache.tuscany.sca.databinding.xml;version="2.0.0";resolution:=optional,
+ org.apache.tuscany.sca.extensibility;version="2.0.0",
  org.apache.tuscany.sca.interfacedef;version="2.0.0",
  org.apache.tuscany.sca.interfacedef.impl;version="2.0.0";resolution:=optional,
  org.apache.tuscany.sca.interfacedef.util;version="2.0.0",
@@ -34,4 +35,4 @@ Import-Package: commonj.sdo;version="2.1",
 Bundle-SymbolicName: org.apache.tuscany.sca.databinding.sdo
 Bundle-DocURL: http://www.apache.org/
 Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6
-Require-Bundle: org.apache.tuscany.sca.extensibility
+
diff --git a/sca-java-2.x/trunk/modules/implementation-jaxrs-runtime/META-INF/MANIFEST.MF b/sca-java-2.x/trunk/modules/implementation-jaxrs-runtime/META-INF/MANIFEST.MF
index 715e78d245..5fcf90c650 100644
--- a/sca-java-2.x/trunk/modules/implementation-jaxrs-runtime/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/trunk/modules/implementation-jaxrs-runtime/META-INF/MANIFEST.MF
@@ -22,11 +22,11 @@ Import-Package: javax.servlet,
  org.apache.tuscany.sca.policy;version="2.0.0",
  org.apache.tuscany.sca.provider;version="2.0.0",
  org.apache.tuscany.sca.runtime;version="2.0.0",
- org.apache.wink.server.internal;version="1.1.2.incubating",
- org.apache.wink.server.internal.handlers;version="1.1.2.incubating",
- org.apache.wink.server.internal.registry;version="1.1.2.incubating",
- org.apache.wink.server.internal.servlet;version="1.1.2.incubating",
- org.apache.wink.server.utils;version="1.1.2.incubating",
+ org.apache.wink.server.internal,
+ org.apache.wink.server.internal.handlers,
+ org.apache.wink.server.internal.registry,
+ org.apache.wink.server.internal.servlet,
+ org.apache.wink.server.utils,
  org.oasisopen.sca;version="2.0.0",
  org.oasisopen.sca.annotation;version="2.0.0"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6
diff --git a/sca-java-2.x/trunk/modules/wink/META-INF/MANIFEST.MF b/sca-java-2.x/trunk/modules/wink/META-INF/MANIFEST.MF
index f97eef973b..ffab9da88b 100644
--- a/sca-java-2.x/trunk/modules/wink/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/trunk/modules/wink/META-INF/MANIFEST.MF
@@ -8,10 +8,10 @@ Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
 Bundle-Description: Apache Tuscany SCA Wink
 Import-Package: javax.servlet,
  org.apache.tuscany.sca.implementation.web.runtime.utils;version="2.0",
- org.apache.wink.common;version="1.1.2.incubating",
- org.apache.wink.common.internal.registry;version="1.1.2.incubating",
- org.apache.wink.server.internal;version="1.1.2.incubating",
- org.apache.wink.server.internal.registry;version="1.1.2.incubating",
+ org.apache.wink.common,
+ org.apache.wink.common.internal.registry,
+ org.apache.wink.server.internal,
+ org.apache.wink.server.internal.registry,
  org.oasisopen.sca.annotation;version="2.0"
 Bundle-SymbolicName: org.apache.tuscany.sca.wink
 Bundle-DocURL: http://www.apache.org/