diff --git a/org.eclipse.riena.client.ridgets/META-INF/MANIFEST.MF b/org.eclipse.riena.client.ridgets/META-INF/MANIFEST.MF
index 901e72d52..732f66c54 100644
--- a/org.eclipse.riena.client.ridgets/META-INF/MANIFEST.MF
+++ b/org.eclipse.riena.client.ridgets/META-INF/MANIFEST.MF
@@ -6,8 +6,7 @@ Bundle-Version: 6.2.0.qualifier
 Require-Bundle: org.eclipse.core.databinding;visibility:=reexport,
  org.eclipse.core.databinding.beans;visibility:=reexport,
  org.eclipse.core.databinding.property;visibility:=reexport,
- org.eclipse.jface.databinding;resolution:=optional;visibility:=reexport,
- org.eclipse.rap.jface.databinding;resolution:=optional;visibility:=reexport,
+ org.eclipse.jface.databinding;visibility:=reexport,
  org.eclipse.riena.beans.common;visibility:=reexport,
  org.eclipse.riena.core;visibility:=reexport,
  org.eclipse.riena.ui.common;visibility:=reexport,
@@ -15,8 +14,6 @@ Require-Bundle: org.eclipse.core.databinding;visibility:=reexport,
  org.eclipse.riena.ui.ridgets;visibility:=reexport,
  org.eclipse.riena.ui.ridgets.swt;visibility:=reexport,
  org.eclipse.riena.ui.swt;visibility:=reexport,
- org.eclipse.riena.ui.swt.rap;resolution:=optional;visibility:=reexport,
- org.eclipse.riena.ui.swt.rcp;resolution:=optional;visibility:=reexport,
- org.eclipse.ui;resolution:=optional;visibility:=reexport,
- org.eclipse.rap.ui;resolution:=optional;visibility:=reexport
+ org.eclipse.riena.ui.swt.rcp;visibility:=reexport,
+ org.eclipse.ui;visibility:=reexport
 Bundle-Vendor: Eclipse.org - Riena
diff --git a/org.eclipse.riena.client.ridgets/META-INF/p2.inf b/org.eclipse.riena.client.ridgets/META-INF/p2.inf
deleted file mode 100644
index 3eff59c0e..000000000
--- a/org.eclipse.riena.client.ridgets/META-INF/p2.inf
+++ /dev/null
@@ -1,39 +0,0 @@
-requires.0.namespace = osgi.bundle
-requires.0.name = org.eclipse.rap.jface.databinding
-requires.0.greedy = false
-requires.0.optional = true
-
-requires.1.namespace = osgi.bundle
-requires.1.name = org.eclipse.rap.jface
-requires.1.greedy = false
-requires.1.optional = true
-
-requires.2.namespace = osgi.bundle
-requires.2.name = org.eclipse.rap.rwt
-requires.2.greedy = false
-requires.2.optional = true
-
-requires.3.namespace = osgi.bundle
-requires.3.name = org.eclipse.rap.ui.workbench
-requires.3.greedy = false
-requires.3.optional = true
-
-requires.4.namespace = osgi.bundle
-requires.4.name = org.pushingpixels.trident
-requires.4.greedy = false
-requires.4.optional = true
-
-requires.5.namespace = osgi.bundle
-requires.5.name = org.eclipse.rap.ui.forms
-requires.5.optional = true
-requires.5.greedy = false
-
-requires.6.namespace = osgi.bundle
-requires.6.name = org.eclipse.rap.ui
-requires.6.optional = true
-requires.6.greedy = false
-
-requires.7.namespace = osgi.bundle
-requires.7.name = org.eclipse.rap.ui.workbench
-requires.7.optional = true
-requires.7.greedy = false
diff --git a/org.eclipse.riena.client/META-INF/MANIFEST.MF b/org.eclipse.riena.client/META-INF/MANIFEST.MF
index d637d44a8..06ae7d2cf 100644
--- a/org.eclipse.riena.client/META-INF/MANIFEST.MF
+++ b/org.eclipse.riena.client/META-INF/MANIFEST.MF
@@ -7,10 +7,8 @@ Require-Bundle: com.caucho.hessian;visibility:=reexport,
  org.eclipse.core.databinding;visibility:=reexport,
  org.eclipse.core.databinding.beans;visibility:=reexport,
  org.eclipse.core.databinding.property;visibility:=reexport,
- org.eclipse.jface.databinding;resolution:=optional;visibility:=reexport,
- org.eclipse.rap.jface.databinding;resolution:=optional;visibility:=reexport,
+ org.eclipse.jface.databinding;visibility:=reexport,
  org.eclipse.riena.beans.common;visibility:=reexport,
- org.eclipse.riena.communication.console;resolution:=optional;visibility:=reexport,
  org.eclipse.riena.communication.core;visibility:=reexport,
  org.eclipse.riena.communication.factory.hessian;visibility:=reexport,
  org.eclipse.riena.core;visibility:=reexport,
@@ -19,22 +17,16 @@ Require-Bundle: com.caucho.hessian;visibility:=reexport,
  org.eclipse.riena.ui.filter;visibility:=reexport,
  org.eclipse.riena.ui.ridgets;visibility:=reexport,
  org.eclipse.riena.ui.ridgets.swt;visibility:=reexport,
- org.eclipse.riena.ui.ridgets.swt.optional;resolution:=optional;visibility:=reexport,
  org.eclipse.riena.ui.swt;visibility:=reexport,
- org.eclipse.riena.ui.swt.3x;resolution:=optional,
- org.eclipse.riena.ui.swt.rap;resolution:=optional;visibility:=reexport,
- org.eclipse.riena.ui.swt.rcp;resolution:=optional;visibility:=reexport,
+ org.eclipse.riena.ui.swt.3x,
+ org.eclipse.riena.ui.swt.rcp;visibility:=reexport,
  org.eclipse.riena.ui.workarea;visibility:=reexport,
  org.eclipse.riena.navigation;visibility:=reexport,
  org.eclipse.riena.navigation.ui;visibility:=reexport,
  org.eclipse.riena.navigation.ui.swt;visibility:=reexport,
- org.eclipse.riena.navigation.ui.swt.rap;resolution:=optional,
- org.eclipse.riena.navigation.ui.swt.3x;resolution:=optional,
- org.eclipse.riena.navigation.ui.swt.e4;resolution:=optional,
- org.eclipse.ui;resolution:=optional;visibility:=reexport,
- org.eclipse.rap.ui;resolution:=optional;visibility:=reexport,
- org.apache.oro;bundle-version="2.0.8",
- org.eclipse.riena.communication.client.ui;resolution:=optional;visibility:=reexport
+ org.eclipse.riena.navigation.ui.swt.3x,
+ org.eclipse.ui;visibility:=reexport,
+ org.apache.oro;bundle-version="2.0.8"
 Eclipse-RegisterBuddy: org.eclipse.riena.communication.core
 Eclipse-BuddyPolicy: registered
 Bundle-Vendor: Eclipse.org - Riena
diff --git a/org.eclipse.riena.client/META-INF/p2.inf b/org.eclipse.riena.client/META-INF/p2.inf
deleted file mode 100644
index 3eff59c0e..000000000
--- a/org.eclipse.riena.client/META-INF/p2.inf
+++ /dev/null
@@ -1,39 +0,0 @@
-requires.0.namespace = osgi.bundle
-requires.0.name = org.eclipse.rap.jface.databinding
-requires.0.greedy = false
-requires.0.optional = true
-
-requires.1.namespace = osgi.bundle
-requires.1.name = org.eclipse.rap.jface
-requires.1.greedy = false
-requires.1.optional = true
-
-requires.2.namespace = osgi.bundle
-requires.2.name = org.eclipse.rap.rwt
-requires.2.greedy = false
-requires.2.optional = true
-
-requires.3.namespace = osgi.bundle
-requires.3.name = org.eclipse.rap.ui.workbench
-requires.3.greedy = false
-requires.3.optional = true
-
-requires.4.namespace = osgi.bundle
-requires.4.name = org.pushingpixels.trident
-requires.4.greedy = false
-requires.4.optional = true
-
-requires.5.namespace = osgi.bundle
-requires.5.name = org.eclipse.rap.ui.forms
-requires.5.optional = true
-requires.5.greedy = false
-
-requires.6.namespace = osgi.bundle
-requires.6.name = org.eclipse.rap.ui
-requires.6.optional = true
-requires.6.greedy = false
-
-requires.7.namespace = osgi.bundle
-requires.7.name = org.eclipse.rap.ui.workbench
-requires.7.optional = true
-requires.7.greedy = false
diff --git a/org.eclipse.riena.communication.client.ui/META-INF/MANIFEST.MF b/org.eclipse.riena.communication.client.ui/META-INF/MANIFEST.MF
index e41e7065e..6c36a6d08 100644
--- a/org.eclipse.riena.communication.client.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.riena.communication.client.ui/META-INF/MANIFEST.MF
@@ -8,8 +8,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.riena.communication.core,
  org.eclipse.riena.core,
  org.eclipse.osgi.services,
- org.eclipse.swt;resolution:=optional;visibility:=reexport,
- org.eclipse.rap.rwt;resolution:=optional;visibility:=reexport
+ org.eclipse.swt;visibility:=reexport
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.eclipse.riena.communication.client.ui.hooks
diff --git a/org.eclipse.riena.communication.client.ui/META-INF/p2.inf b/org.eclipse.riena.communication.client.ui/META-INF/p2.inf
deleted file mode 100644
index 3eff59c0e..000000000
--- a/org.eclipse.riena.communication.client.ui/META-INF/p2.inf
+++ /dev/null
@@ -1,39 +0,0 @@
-requires.0.namespace = osgi.bundle
-requires.0.name = org.eclipse.rap.jface.databinding
-requires.0.greedy = false
-requires.0.optional = true
-
-requires.1.namespace = osgi.bundle
-requires.1.name = org.eclipse.rap.jface
-requires.1.greedy = false
-requires.1.optional = true
-
-requires.2.namespace = osgi.bundle
-requires.2.name = org.eclipse.rap.rwt
-requires.2.greedy = false
-requires.2.optional = true
-
-requires.3.namespace = osgi.bundle
-requires.3.name = org.eclipse.rap.ui.workbench
-requires.3.greedy = false
-requires.3.optional = true
-
-requires.4.namespace = osgi.bundle
-requires.4.name = org.pushingpixels.trident
-requires.4.greedy = false
-requires.4.optional = true
-
-requires.5.namespace = osgi.bundle
-requires.5.name = org.eclipse.rap.ui.forms
-requires.5.optional = true
-requires.5.greedy = false
-
-requires.6.namespace = osgi.bundle
-requires.6.name = org.eclipse.rap.ui
-requires.6.optional = true
-requires.6.greedy = false
-
-requires.7.namespace = osgi.bundle
-requires.7.name = org.eclipse.rap.ui.workbench
-requires.7.optional = true
-requires.7.greedy = false
diff --git a/org.eclipse.riena.example.client.optional/META-INF/MANIFEST.MF b/org.eclipse.riena.example.client.optional/META-INF/MANIFEST.MF
index b2bdbed54..0ae4448d5 100644
--- a/org.eclipse.riena.example.client.optional/META-INF/MANIFEST.MF
+++ b/org.eclipse.riena.example.client.optional/META-INF/MANIFEST.MF
@@ -5,8 +5,9 @@ Bundle-SymbolicName: org.eclipse.riena.example.client.optional;singleton:=true
 Bundle-Version: 6.2.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.nebula.widgets.compositetable,
+ org.eclipse.nebula.widgets.grid;bundle-version="1.0.0",
  org.eclipse.riena.client,
- org.eclipse.nebula.widgets.grid;bundle-version="1.0.0"
+ org.eclipse.riena.ui.ridgets.swt.optional
 Export-Package: org.eclipse.riena.example.client.optional.controllers,
  org.eclipse.riena.example.client.optional.views
 Bundle-Vendor: Eclipse.org - Riena
diff --git a/org.eclipse.riena.example.client.optional/pom.xml b/org.eclipse.riena.example.client.optional/pom.xml
deleted file mode 100644
index 184b5fc30..000000000
--- a/org.eclipse.riena.example.client.optional/pom.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-	<modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<groupId>org.eclipse.riena</groupId>
-		<artifactId>org.eclipse.riena.parent</artifactId>
-		<version>6.2.0-SNAPSHOT</version>
-	</parent>
-
-	<artifactId>org.eclipse.riena.example.client.optional</artifactId>
-	<packaging>eclipse-plugin</packaging>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>target-platform-configuration</artifactId>
-				<version>${tycho.version}</version>
-				<configuration>
-					<dependency-resolution>
-						<extraRequirements>
-							<requirement>
-								<type>eclipse-plugin</type>
-								<id>org.eclipse.jface</id>
-								<versionRange>0.0.0</versionRange>
-							</requirement>
-							<requirement>
-								<type>eclipse-plugin</type>
-								<id>org.eclipse.ui</id>
-								<versionRange>0.0.0</versionRange>
-							</requirement>
-							<requirement>
-								<type>eclipse-plugin</type>
-								<id>org.eclipse.riena.ui.ridgets.swt.optional</id>
-								<versionRange>0.0.0</versionRange>
-							</requirement>
-						</extraRequirements>
-					</dependency-resolution>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-</project>
diff --git a/org.eclipse.riena.example.client/pom.xml b/org.eclipse.riena.example.client/pom.xml
deleted file mode 100644
index 0c5f21335..000000000
--- a/org.eclipse.riena.example.client/pom.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-	<modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<groupId>org.eclipse.riena</groupId>
-		<artifactId>org.eclipse.riena.parent</artifactId>
-		<version>6.2.0-SNAPSHOT</version>
-	</parent>
-
-	<artifactId>org.eclipse.riena.example.client</artifactId>
-	<packaging>eclipse-plugin</packaging>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>target-platform-configuration</artifactId>
-				<version>${tycho.version}</version>
-				<configuration>
-					<dependency-resolution>
-						<extraRequirements>
-							<requirement>
-								<type>eclipse-plugin</type>
-								<id>org.eclipse.ui</id>
-								<versionRange>0.0.0</versionRange>
-							</requirement>
-							<requirement>
-								<type>eclipse-plugin</type>
-								<id>org.eclipse.riena.ui.ridgets.swt.optional</id>
-								<versionRange>0.0.0</versionRange>
-							</requirement>
-						</extraRequirements>
-					</dependency-resolution>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-</project>
diff --git a/org.eclipse.riena.navigation.ui.swt.presentation/META-INF/MANIFEST.MF b/org.eclipse.riena.navigation.ui.swt.presentation/META-INF/MANIFEST.MF
index 35ef342cc..0583d92ac 100644
--- a/org.eclipse.riena.navigation.ui.swt.presentation/META-INF/MANIFEST.MF
+++ b/org.eclipse.riena.navigation.ui.swt.presentation/META-INF/MANIFEST.MF
@@ -3,8 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Riena Navigation Model UI Plug-in (Presentation)
 Bundle-SymbolicName: org.eclipse.riena.navigation.ui.swt.presentation
 Bundle-Version: 6.2.0.qualifier
-Require-Bundle: org.eclipse.ui;resolution:=optional,
- org.eclipse.rap.ui;resolution:=optional,
+Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.riena.navigation.ui,
  org.eclipse.riena.navigation.ui.swt,
diff --git a/org.eclipse.riena.navigation.ui.swt/META-INF/MANIFEST.MF b/org.eclipse.riena.navigation.ui.swt/META-INF/MANIFEST.MF
index e762970ad..c7f85a34d 100644
--- a/org.eclipse.riena.navigation.ui.swt/META-INF/MANIFEST.MF
+++ b/org.eclipse.riena.navigation.ui.swt/META-INF/MANIFEST.MF
@@ -10,8 +10,8 @@ Require-Bundle: org.eclipse.osgi.services,
  org.eclipse.riena.navigation.ui;visibility:=reexport,
  org.eclipse.riena.ui.ridgets.swt,
  org.eclipse.riena.ui.workarea,
- org.eclipse.ui;resolution:=optional,
- org.eclipse.rap.ui;resolution:=optional
+ org.eclipse.ui,
+ org.easymock;resolution:=optional
 Bundle-ActivationPolicy: lazy 
 Export-Package: org.eclipse.riena.internal.navigation.ui.swt;x-friends:="org.eclipse.riena.tests",
  org.eclipse.riena.internal.navigation.ui.swt.handlers;x-friends:="org.eclipse.riena.tests",
diff --git a/org.eclipse.riena.navigation.ui.swt/META-INF/p2.inf b/org.eclipse.riena.navigation.ui.swt/META-INF/p2.inf
deleted file mode 100644
index 3eff59c0e..000000000
--- a/org.eclipse.riena.navigation.ui.swt/META-INF/p2.inf
+++ /dev/null
@@ -1,39 +0,0 @@
-requires.0.namespace = osgi.bundle
-requires.0.name = org.eclipse.rap.jface.databinding
-requires.0.greedy = false
-requires.0.optional = true
-
-requires.1.namespace = osgi.bundle
-requires.1.name = org.eclipse.rap.jface
-requires.1.greedy = false
-requires.1.optional = true
-
-requires.2.namespace = osgi.bundle
-requires.2.name = org.eclipse.rap.rwt
-requires.2.greedy = false
-requires.2.optional = true
-
-requires.3.namespace = osgi.bundle
-requires.3.name = org.eclipse.rap.ui.workbench
-requires.3.greedy = false
-requires.3.optional = true
-
-requires.4.namespace = osgi.bundle
-requires.4.name = org.pushingpixels.trident
-requires.4.greedy = false
-requires.4.optional = true
-
-requires.5.namespace = osgi.bundle
-requires.5.name = org.eclipse.rap.ui.forms
-requires.5.optional = true
-requires.5.greedy = false
-
-requires.6.namespace = osgi.bundle
-requires.6.name = org.eclipse.rap.ui
-requires.6.optional = true
-requires.6.greedy = false
-
-requires.7.namespace = osgi.bundle
-requires.7.name = org.eclipse.rap.ui.workbench
-requires.7.optional = true
-requires.7.greedy = false
diff --git a/org.eclipse.riena.navigation.ui/META-INF/MANIFEST.MF b/org.eclipse.riena.navigation.ui/META-INF/MANIFEST.MF
index 4a6d064c5..06c885929 100644
--- a/org.eclipse.riena.navigation.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.riena.navigation.ui/META-INF/MANIFEST.MF
@@ -10,8 +10,7 @@ Require-Bundle: org.eclipse.core.databinding,
  org.eclipse.riena.ui.core,
  org.eclipse.riena.ui.ridgets,
  org.eclipse.riena.ui.workarea;bundle-version="6.1.0",
- org.eclipse.ui;bundle-version="3.6.0";resolution:=optional,
- org.eclipse.rap.ui;bundle-version="1.4.0";resolution:=optional
+ org.eclipse.ui;bundle-version="3.6.0"
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.riena.internal.navigation.ui;x-friends:="org.eclipse.riena.tests",
  org.eclipse.riena.internal.navigation.ui.filter;x-friends:="org.eclipse.riena.tests",
diff --git a/org.eclipse.riena.navigation.ui/META-INF/p2.inf b/org.eclipse.riena.navigation.ui/META-INF/p2.inf
deleted file mode 100644
index 3eff59c0e..000000000
--- a/org.eclipse.riena.navigation.ui/META-INF/p2.inf
+++ /dev/null
@@ -1,39 +0,0 @@
-requires.0.namespace = osgi.bundle
-requires.0.name = org.eclipse.rap.jface.databinding
-requires.0.greedy = false
-requires.0.optional = true
-
-requires.1.namespace = osgi.bundle
-requires.1.name = org.eclipse.rap.jface
-requires.1.greedy = false
-requires.1.optional = true
-
-requires.2.namespace = osgi.bundle
-requires.2.name = org.eclipse.rap.rwt
-requires.2.greedy = false
-requires.2.optional = true
-
-requires.3.namespace = osgi.bundle
-requires.3.name = org.eclipse.rap.ui.workbench
-requires.3.greedy = false
-requires.3.optional = true
-
-requires.4.namespace = osgi.bundle
-requires.4.name = org.pushingpixels.trident
-requires.4.greedy = false
-requires.4.optional = true
-
-requires.5.namespace = osgi.bundle
-requires.5.name = org.eclipse.rap.ui.forms
-requires.5.optional = true
-requires.5.greedy = false
-
-requires.6.namespace = osgi.bundle
-requires.6.name = org.eclipse.rap.ui
-requires.6.optional = true
-requires.6.greedy = false
-
-requires.7.namespace = osgi.bundle
-requires.7.name = org.eclipse.rap.ui.workbench
-requires.7.optional = true
-requires.7.greedy = false
diff --git a/org.eclipse.riena.tests/pom.xml b/org.eclipse.riena.tests/pom.xml
index 5c39bf1d2..d1b63af8f 100644
--- a/org.eclipse.riena.tests/pom.xml
+++ b/org.eclipse.riena.tests/pom.xml
@@ -25,57 +25,6 @@
 					<runOrder>alphabetical</runOrder>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>target-platform-configuration</artifactId>
-				<version>${tycho.version}</version>
-				<configuration>
-					<dependency-resolution>
-						<extraRequirements>
-							<requirement>
-								<type>eclipse-plugin</type>
-								<id>org.apache.log4j</id>
-								<versionRange>0.0.0</versionRange>
-							</requirement>
-							<requirement>
-								<type>eclipse-plugin</type>
-								<id>org.eclipse.ui</id>
-								<versionRange>0.0.0</versionRange>
-							</requirement>
-							<requirement>
-								<type>eclipse-plugin</type>
-								<id>org.eclipse.swt</id>
-								<versionRange>0.0.0</versionRange>
-							</requirement>
-							<requirement>
-								<type>eclipse-plugin</type>
-								<id>org.eclipse.jface</id>
-								<versionRange>0.0.0</versionRange>
-							</requirement>
-							<requirement>
-								<type>eclipse-plugin</type>
-								<id>org.eclipse.riena.ui.swt</id>
-								<versionRange>0.0.0</versionRange>
-							</requirement>
-							<requirement>
-								<type>eclipse-plugin</type>
-								<id>org.eclipse.riena.ui.swt.rcp</id>
-								<versionRange>0.0.0</versionRange>
-							</requirement>
-							<requirement>
-								<type>eclipse-plugin</type>
-								<id>org.eclipse.riena.ui.swt.3x</id>
-								<versionRange>0.0.0</versionRange>
-							</requirement>
-							<requirement>
-								<type>eclipse-plugin</type>
-								<id>org.eclipse.riena.navigation.ui.swt.3x</id>
-								<versionRange>0.0.0</versionRange>
-							</requirement>
-						</extraRequirements>
-					</dependency-resolution>
-				</configuration>
-			</plugin>
 		</plugins>
 	</build>
 </project>
diff --git a/org.eclipse.riena.ui.ridgets.swt/META-INF/MANIFEST.MF b/org.eclipse.riena.ui.ridgets.swt/META-INF/MANIFEST.MF
index 9531cf56a..1eaaa01e2 100644
--- a/org.eclipse.riena.ui.ridgets.swt/META-INF/MANIFEST.MF
+++ b/org.eclipse.riena.ui.ridgets.swt/META-INF/MANIFEST.MF
@@ -7,8 +7,7 @@ Bundle-Activator: org.eclipse.riena.internal.ui.ridgets.swt.Activator
 Require-Bundle: org.eclipse.core.databinding;visibility:=reexport,
  org.eclipse.core.databinding.beans;visibility:=reexport,
  org.eclipse.core.databinding.property;visibility:=reexport,
- org.eclipse.jface.databinding;resolution:=optional;visibility:=reexport,
- org.eclipse.rap.jface.databinding;resolution:=optional;visibility:=reexport,
+ org.eclipse.jface.databinding;visibility:=reexport,
  org.eclipse.riena.beans.common,
  org.eclipse.riena.core,
  org.eclipse.riena.ui.core;visibility:=reexport,
diff --git a/org.eclipse.riena.ui.ridgets.swt/META-INF/p2.inf b/org.eclipse.riena.ui.ridgets.swt/META-INF/p2.inf
deleted file mode 100644
index 3eff59c0e..000000000
--- a/org.eclipse.riena.ui.ridgets.swt/META-INF/p2.inf
+++ /dev/null
@@ -1,39 +0,0 @@
-requires.0.namespace = osgi.bundle
-requires.0.name = org.eclipse.rap.jface.databinding
-requires.0.greedy = false
-requires.0.optional = true
-
-requires.1.namespace = osgi.bundle
-requires.1.name = org.eclipse.rap.jface
-requires.1.greedy = false
-requires.1.optional = true
-
-requires.2.namespace = osgi.bundle
-requires.2.name = org.eclipse.rap.rwt
-requires.2.greedy = false
-requires.2.optional = true
-
-requires.3.namespace = osgi.bundle
-requires.3.name = org.eclipse.rap.ui.workbench
-requires.3.greedy = false
-requires.3.optional = true
-
-requires.4.namespace = osgi.bundle
-requires.4.name = org.pushingpixels.trident
-requires.4.greedy = false
-requires.4.optional = true
-
-requires.5.namespace = osgi.bundle
-requires.5.name = org.eclipse.rap.ui.forms
-requires.5.optional = true
-requires.5.greedy = false
-
-requires.6.namespace = osgi.bundle
-requires.6.name = org.eclipse.rap.ui
-requires.6.optional = true
-requires.6.greedy = false
-
-requires.7.namespace = osgi.bundle
-requires.7.name = org.eclipse.rap.ui.workbench
-requires.7.optional = true
-requires.7.greedy = false
diff --git a/org.eclipse.riena.ui.swt/META-INF/MANIFEST.MF b/org.eclipse.riena.ui.swt/META-INF/MANIFEST.MF
index b06e03313..cf576db57 100644
--- a/org.eclipse.riena.ui.swt/META-INF/MANIFEST.MF
+++ b/org.eclipse.riena.ui.swt/META-INF/MANIFEST.MF
@@ -4,16 +4,13 @@ Bundle-Name: Riena UI SWT Plug-in
 Bundle-SymbolicName: org.eclipse.riena.ui.swt;singleton:=true
 Bundle-Version: 6.2.0.qualifier
 Bundle-Activator: org.eclipse.riena.internal.ui.swt.Activator
-Require-Bundle: org.eclipse.jface;resolution:=optional;visibility:=reexport,
- org.eclipse.rap.jface;resolution:=optional;visibility:=reexport,
+Require-Bundle: org.eclipse.jface;visibility:=reexport,
  org.eclipse.riena.core,
  org.eclipse.riena.ui.core,
  org.eclipse.riena.ui.common,
  org.eclipse.riena.ui.ridgets,
- org.eclipse.swt;resolution:=optional;visibility:=reexport,
- org.eclipse.rap.rwt;resolution:=optional;visibility:=reexport,
- org.eclipse.ui.workbench;resolution:=optional;visibility:=reexport,
- org.eclipse.rap.ui.workbench;resolution:=optional;visibility:=reexport,
+ org.eclipse.swt;visibility:=reexport,
+ org.eclipse.ui.workbench;visibility:=reexport,
  com.caucho.hessian;bundle-version="3.2.0",
  org.apache.batik.dom.svg;bundle-version="1.7.0",
  org.apache.batik.transcoder;bundle-version="1.7.0",
diff --git a/org.eclipse.riena.ui.swt/META-INF/p2.inf b/org.eclipse.riena.ui.swt/META-INF/p2.inf
deleted file mode 100644
index 3eff59c0e..000000000
--- a/org.eclipse.riena.ui.swt/META-INF/p2.inf
+++ /dev/null
@@ -1,39 +0,0 @@
-requires.0.namespace = osgi.bundle
-requires.0.name = org.eclipse.rap.jface.databinding
-requires.0.greedy = false
-requires.0.optional = true
-
-requires.1.namespace = osgi.bundle
-requires.1.name = org.eclipse.rap.jface
-requires.1.greedy = false
-requires.1.optional = true
-
-requires.2.namespace = osgi.bundle
-requires.2.name = org.eclipse.rap.rwt
-requires.2.greedy = false
-requires.2.optional = true
-
-requires.3.namespace = osgi.bundle
-requires.3.name = org.eclipse.rap.ui.workbench
-requires.3.greedy = false
-requires.3.optional = true
-
-requires.4.namespace = osgi.bundle
-requires.4.name = org.pushingpixels.trident
-requires.4.greedy = false
-requires.4.optional = true
-
-requires.5.namespace = osgi.bundle
-requires.5.name = org.eclipse.rap.ui.forms
-requires.5.optional = true
-requires.5.greedy = false
-
-requires.6.namespace = osgi.bundle
-requires.6.name = org.eclipse.rap.ui
-requires.6.optional = true
-requires.6.greedy = false
-
-requires.7.namespace = osgi.bundle
-requires.7.name = org.eclipse.rap.ui.workbench
-requires.7.optional = true
-requires.7.greedy = false
diff --git a/pom.xml b/pom.xml
index 8aa907078..f3e359300 100644
--- a/pom.xml
+++ b/pom.xml
@@ -158,46 +158,6 @@
 							</restrictTo>
 						</filter>
 					</filters>
-					<dependency-resolution>
-						<optionalDependencies>ignore</optionalDependencies>
-						<extraRequirements>
-							<requirement>
-								<type>eclipse-plugin</type>
-								<id>org.junit</id>
-								<versionRange>0.0.0</versionRange>
-							</requirement>
-							<requirement>
-								<type>eclipse-plugin</type>
-								<id>org.apache.log4j</id>
-								<versionRange>0.0.0</versionRange>
-							</requirement>
-							<requirement>
-								<type>eclipse-plugin</type>
-								<id>org.eclipse.core.net</id>
-								<versionRange>0.0.0</versionRange>
-							</requirement>
-							<requirement>
-								<type>eclipse-plugin</type>
-								<id>org.eclipse.swt</id>
-								<versionRange>0.0.0</versionRange>
-							</requirement>
-							<requirement>
-								<type>eclipse-plugin</type>
-								<id>org.eclipse.jface</id>
-								<versionRange>0.0.0</versionRange>
-							</requirement>
-							<requirement>
-								<type>eclipse-plugin</type>
-								<id>org.eclipse.ui</id>
-								<versionRange>0.0.0</versionRange>
-							</requirement>
-							<requirement>
-								<type>eclipse-plugin</type>
-								<id>org.easymock</id>
-								<versionRange>0.0.0</versionRange>
-							</requirement>
-						</extraRequirements>
-					</dependency-resolution>
 				</configuration>
 			</plugin>
 		</plugins>