bug 405846: Update JUnit dependencies to 4.9

https://bugs.eclipse.org/bugs/show_bug.cgi?id=405846

Change-Id: I44b5058e06d1ea6b77f2f6ebff9305885f29fc64

33 files changed, 95 insertions, 90 deletions

diff --git a/org.eclipse.scout.commons.test/META-INF/MANIFEST.MF b/org.eclipse.scout.commons.test/META-INF/MANIFEST.MF
index ca9d99550d..5755ea5a92 100644
--- a/org.eclipse.scout.commons.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.scout.commons.test/META-INF/MANIFEST.MF
@@ -6,7 +6,6 @@ Bundle-Version: 3.9.0.qualifier
 Bundle-Vendor: Eclipse Scout Project
 Fragment-Host: org.eclipse.scout.commons;bundle-version="3.9.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.hamcrest.core;version="[1.1.0,2.0.0)",
- org.junit;version="[4.3.0,5.0.0)",
- org.junit.runner;version="[4.3.0,5.0.0)"
+Import-Package: org.junit;version="[4.9.0,5.0.0)",
+ org.junit.runner;version="[4.9.0,5.0.0)"
 Require-Bundle: org.eclipse.scout.rt.testing.commons;bundle-version="[3.9.0,4.0.0)"
diff --git a/org.eclipse.scout.jaxws216.test/META-INF/MANIFEST.MF b/org.eclipse.scout.jaxws216.test/META-INF/MANIFEST.MF
index 1e777db353..df63c3e425 100644
--- a/org.eclipse.scout.jaxws216.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.scout.jaxws216.test/META-INF/MANIFEST.MF
@@ -6,7 +6,5 @@ Bundle-Version: 3.9.0.qualifier
 Bundle-Vendor: Eclipse Scout Project
 Fragment-Host: org.eclipse.scout.jaxws216;bundle-version="2.1.6"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.hamcrest;version="[1.1.0,2.0.0)";core=split;mandatory:=core,
- org.hamcrest.core;version="[1.1.0,2.0.0)",
- org.junit;version="[4.3.0,5.0.0)",
- org.junit.runner;version="[4.3.0,5.0.0)"
+Import-Package: org.junit;version="[4.9.0,5.0.0)",
+ org.junit.runner;version="[4.9.0,5.0.0)"
diff --git a/org.eclipse.scout.rt.client.test/META-INF/MANIFEST.MF b/org.eclipse.scout.rt.client.test/META-INF/MANIFEST.MF
index 18093f00d0..3229dea80c 100644
--- a/org.eclipse.scout.rt.client.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.scout.rt.client.test/META-INF/MANIFEST.MF
@@ -6,11 +6,10 @@ Bundle-Version: 3.9.0.qualifier
 Bundle-Vendor: Eclipse Scout Project
 Fragment-Host: org.eclipse.scout.rt.client;bundle-version="3.9.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.hamcrest.core;version="[1.1.0,2.0.0)",
- org.junit;version="[4.3.0,5.0.0)",
- org.junit.runner;version="[4.3.0,5.0.0)"
-Require-Bundle: org.easymock,
- org.eclipse.scout.rt.testing.shared,
- org.eclipse.scout.rt.testing.client,
+Import-Package: org.easymock;version="[2.4.0,3.0.0)",
+ org.junit;version="[4.9.0,5.0.0)",
+ org.junit.runner;version="[4.9.0,5.0.0)"
+Require-Bundle: org.eclipse.scout.rt.testing.shared;bundle-version="[3.9.0,4.0.0)",
+ org.eclipse.scout.rt.testing.client;bundle-version="[3.9.0,4.0.0)",
  org.eclipse.scout.rt.client.testenvironment;bundle-version="[3.9.0,4.0.0)",
  org.eclipse.scout.rt.testing.commons;bundle-version="[3.9.0,4.0.0)"
diff --git a/org.eclipse.scout.rt.client.testenvironment/META-INF/MANIFEST.MF b/org.eclipse.scout.rt.client.testenvironment/META-INF/MANIFEST.MF
index a5decfcf70..613004150b 100644
--- a/org.eclipse.scout.rt.client.testenvironment/META-INF/MANIFEST.MF
+++ b/org.eclipse.scout.rt.client.testenvironment/META-INF/MANIFEST.MF
@@ -5,13 +5,9 @@ Bundle-SymbolicName: org.eclipse.scout.rt.client.testenvironment;singleton:=true
 Bundle-Version: 3.9.0.qualifier
 Bundle-Activator: org.eclipse.scout.rt.client.testenvironment.Activator
 Bundle-Vendor: Eclipse Scout Project
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.scout.rt.testing.client;bundle-version="[3.9.0,4.0.0)",
- org.eclipse.scout.commons;bundle-version="[3.9.0,4.0.0)",
- org.eclipse.scout.rt.client;bundle-version="[3.9.0,4.0.0)"
+Require-Bundle: org.eclipse.scout.rt.client;bundle-version="[3.9.0,4.0.0)",
+ org.eclipse.scout.rt.testing.client;bundle-version="[3.9.0,3.10.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.hamcrest.core;version="[1.1.0,2.0.0)",
- org.junit;version="[4.3.0,5.0.0)",
- org.junit.runner;version="[4.3.0,5.0.0)"
 Export-Package: org.eclipse.scout.rt.client.testenvironment
+Import-Package: org.junit.runners;version="[4.9.0,5.0.0)"
diff --git a/org.eclipse.scout.rt.extension.client.test/META-INF/MANIFEST.MF b/org.eclipse.scout.rt.extension.client.test/META-INF/MANIFEST.MF
index 3049dc3725..1b80c5fed5 100644
--- a/org.eclipse.scout.rt.extension.client.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.scout.rt.extension.client.test/META-INF/MANIFEST.MF
@@ -6,9 +6,8 @@ Bundle-Version: 3.9.0.qualifier
 Bundle-Vendor: Eclipse Scout Project
 Fragment-Host: org.eclipse.scout.rt.extension.client;bundle-version="[3.9.0,3.10.0)"
 Require-Bundle: org.eclipse.scout.rt.testing.client;bundle-version="[3.9.0,4.0.0)",
- org.eclipse.scout.rt.testing.shared;bundle-version="[3.9.0,4.0.0)",
  org.eclipse.scout.rt.client.testenvironment;bundle-version="[3.9.0,4.0.0)"
 Import-Package: org.easymock;version="[2.0.0,3.0.0)",
- org.junit;version="[4.3.0,5.0.0)",
- org.junit.runner;version="[4.3.0,5.0.0)"
+ org.junit;version="[4.9.0,5.0.0)",
+ org.junit.runner;version="[4.9.0,5.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/org.eclipse.scout.rt.server.test/META-INF/MANIFEST.MF b/org.eclipse.scout.rt.server.test/META-INF/MANIFEST.MF
index 2d58236c2d..c5f9a06c18 100644
--- a/org.eclipse.scout.rt.server.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.scout.rt.server.test/META-INF/MANIFEST.MF
@@ -6,11 +6,8 @@ Bundle-Version: 3.9.0.qualifier
 Bundle-Vendor: Eclipse Scout Project
 Fragment-Host: org.eclipse.scout.rt.server;bundle-version="3.9.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.hamcrest.core;version="[1.1.0,2.0.0)",
- org.junit;version="[4.3.0,5.0.0)",
- org.junit.runner;version="[4.3.0,5.0.0)"
-Require-Bundle: org.easymock,
- org.eclipse.scout.rt.testing.shared;bundle-version="[3.9.0,4.0.0)",
- org.eclipse.scout.rt.testing.server;bundle-version="[3.9.0,4.0.0)",
- org.eclipse.scout.rt.server.testenvironment;bundle-version="[3.9.0,4.0.0)",
- org.eclipse.scout.rt.testing.commons;bundle-version="[3.9.0,4.0.0)"
+Import-Package: org.easymock;version="[2.4.0,3.0.0)",
+ org.junit;version="[4.9.0,5.0.0)",
+ org.junit.runner;version="[4.9.0,5.0.0)"
+Require-Bundle: org.eclipse.scout.rt.testing.server;bundle-version="[3.9.0,4.0.0)",
+ org.eclipse.scout.rt.server.testenvironment;bundle-version="[3.9.0,4.0.0)"
diff --git a/org.eclipse.scout.rt.server.testenvironment/META-INF/MANIFEST.MF b/org.eclipse.scout.rt.server.testenvironment/META-INF/MANIFEST.MF
index 11ec83393a..157a84f71b 100644
--- a/org.eclipse.scout.rt.server.testenvironment/META-INF/MANIFEST.MF
+++ b/org.eclipse.scout.rt.server.testenvironment/META-INF/MANIFEST.MF
@@ -7,9 +7,8 @@ Bundle-Activator: org.eclipse.scout.rt.server.testenvironment.Activator
 Bundle-Vendor: Eclipse Scout Project
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.scout.rt.testing.server;bundle-version="[3.9.0,4.0.0)",
- org.eclipse.scout.commons;bundle-version="[3.9.0,4.0.0)",
  org.eclipse.scout.rt.server;bundle-version="[3.9.0,4.0.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.junit.runner;version="[4.8.1,5.0.0)"
 Export-Package: org.eclipse.scout.rt.server.testenvironment
+Import-Package: org.junit.runner;version="[4.9.0,5.0.0)"
diff --git a/org.eclipse.scout.rt.shared.test/META-INF/MANIFEST.MF b/org.eclipse.scout.rt.shared.test/META-INF/MANIFEST.MF
index f68cd12a91..548c09b4d4 100644
--- a/org.eclipse.scout.rt.shared.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.scout.rt.shared.test/META-INF/MANIFEST.MF
@@ -6,7 +6,6 @@ Bundle-Version: 3.9.0.qualifier
 Bundle-Vendor: Eclipse Scout Project
 Fragment-Host: org.eclipse.scout.rt.shared;bundle-version="3.9.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.hamcrest.core;version="[1.1.0,2.0.0)",
- org.junit;version="[4.3.0,5.0.0)",
- org.junit.runner;version="[4.3.0,5.0.0)"
+Import-Package: org.junit;version="[4.9.0,5.0.0)",
+ org.junit.runner;version="[4.9.0,5.0.0)"
 Require-Bundle: org.eclipse.scout.rt.testing.shared;bundle-version="3.9.0"
diff --git a/org.eclipse.scout.rt.testing-feature/feature.xml b/org.eclipse.scout.rt.testing-feature/feature.xml
index 6330c32c1d..0797cb43af 100644
--- a/org.eclipse.scout.rt.testing-feature/feature.xml
+++ b/org.eclipse.scout.rt.testing-feature/feature.xml
@@ -28,7 +28,7 @@
 
    <requires>
       <import plugin="org.apache.ant" version="1.7.1" match="compatible"/>
-      <import plugin="org.junit" version="4.5.0" match="compatible"/>
+      <import plugin="org.junit" version="4.9.0" match="compatible"/>
    </requires>
 
    <plugin
diff --git a/org.eclipse.scout.rt.testing.client.test/META-INF/MANIFEST.MF b/org.eclipse.scout.rt.testing.client.test/META-INF/MANIFEST.MF
index 56bd0a936e..c3de5a8ba9 100644
--- a/org.eclipse.scout.rt.testing.client.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.scout.rt.testing.client.test/META-INF/MANIFEST.MF
@@ -6,8 +6,6 @@ Bundle-Version: 3.9.0.qualifier
 Bundle-Vendor: Eclipse Scout Project
 Fragment-Host: org.eclipse.scout.rt.testing.client;bundle-version="3.9.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.hamcrest;version="[1.1.0,2.0.0)";core=split;mandatory:=core,
- org.hamcrest.core;version="[1.1.0,2.0.0)",
- org.junit;version="[4.3.0,5.0.0)",
- org.junit.runner;version="[4.3.0,5.0.0)"
+Import-Package: org.junit;version="[4.9.0,5.0.0)",
+ org.junit.runner;version="[4.9.0,5.0.0)"
 Require-Bundle: org.eclipse.scout.rt.client.testenvironment;bundle-version="[3.9.0,3.10.0)"
diff --git a/org.eclipse.scout.rt.testing.client.test/src/org/eclipse/scout/testing/client/runner/ScoutClientTestRunnerTest.java b/org.eclipse.scout.rt.testing.client.test/src/org/eclipse/scout/testing/client/runner/ScoutClientTestRunnerTest.java
index 74940c2974..0e036bd7b0 100644
--- a/org.eclipse.scout.rt.testing.client.test/src/org/eclipse/scout/testing/client/runner/ScoutClientTestRunnerTest.java
+++ b/org.eclipse.scout.rt.testing.client.test/src/org/eclipse/scout/testing/client/runner/ScoutClientTestRunnerTest.java
@@ -23,7 +23,9 @@ import org.eclipse.scout.testing.client.DefaultTestClientSessionProvider;
 import org.eclipse.scout.testing.client.ITestClientSessionProvider;
 import org.eclipse.scout.testing.client.runner.ScoutClientTestRunner.ClientTest;
 import org.eclipse.scout.testing.client.runner.ScoutClientTestRunner.NullTestClientSessionProvider;
+import org.junit.AfterClass;
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runners.model.InitializationError;
 
@@ -36,6 +38,16 @@ public class ScoutClientTestRunnerTest {
   private ClientTest m_allValuesClientTest;
   private ClientTest m_defaultValuesClientTest;
 
+  @BeforeClass
+  public static void beforeClassCheck() {
+    assertTrue("This check ensures the before class runner from scout testing works. @See bug405846", true);
+  }
+
+  @AfterClass
+  public static void afterClassCheck() {
+    assertTrue("This check ensures the after class runner from scout testing works. @See bug405846", true);
+  }
+
   @Before
   public void setUp() throws Exception {
     m_runner = new ScoutClientTestRunnerEx(TestCase.class);
diff --git a/org.eclipse.scout.rt.testing.client/META-INF/MANIFEST.MF b/org.eclipse.scout.rt.testing.client/META-INF/MANIFEST.MF
index c8224fae25..19b286bbe5 100644
--- a/org.eclipse.scout.rt.testing.client/META-INF/MANIFEST.MF
+++ b/org.eclipse.scout.rt.testing.client/META-INF/MANIFEST.MF
@@ -5,8 +5,7 @@ Bundle-SymbolicName: org.eclipse.scout.rt.testing.client
 Bundle-Version: 3.9.0.qualifier
 Bundle-Activator: org.eclipse.scout.testing.client.Activator
 Bundle-Vendor: Eclipse Scout Project
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
- org.eclipse.scout.rt.testing.shared;bundle-version="[3.7.0,4.0.0)",
+Require-Bundle: org.eclipse.scout.rt.testing.shared;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.scout.rt.client;bundle-version="[3.9.0,3.10.0)",
  org.eclipse.scout.rt.testing.commons;bundle-version="[3.9.0,3.10.0)"
 Export-Package: org.eclipse.scout.testing.client,
@@ -17,8 +16,8 @@ Export-Package: org.eclipse.scout.testing.client,
  org.eclipse.scout.testing.client.servicetunnel.http
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
-Import-Package: org.junit;version="[4.3.0,5.0.0)",
- org.junit.runner;version="[4.3.0,5.0.0)",
- org.junit.runner.notification;version="[4.3.0,5.0.0)",
- org.junit.runners;version="[4.3.0,5.0.0)",
- org.junit.runners.model;version="[4.3.0,5.0.0)"
+Import-Package: org.junit;version="[4.9.0,5.0.0)",
+ org.junit.runner;version="[4.9.0,5.0.0)",
+ org.junit.runner.notification;version="[4.9.0,5.0.0)",
+ org.junit.runners;version="[4.9.0,5.0.0)",
+ org.junit.runners.model;version="[4.9.0,5.0.0)"
diff --git a/org.eclipse.scout.rt.testing.common.ant.optional.junit.fragment/META-INF/MANIFEST.MF b/org.eclipse.scout.rt.testing.common.ant.optional.junit.fragment/META-INF/MANIFEST.MF
index 1b2cf55d88..d4830edd8d 100644
--- a/org.eclipse.scout.rt.testing.common.ant.optional.junit.fragment/META-INF/MANIFEST.MF
+++ b/org.eclipse.scout.rt.testing.common.ant.optional.junit.fragment/META-INF/MANIFEST.MF
@@ -7,4 +7,4 @@ Bundle-Vendor: Eclipse Scout Project
 Fragment-Host: org.apache.ant
 Require-Bundle: org.eclipse.core.runtime.compatibility;bundle-version="[3.2.100,4.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: junit.framework;version="[4.8.1,5.0.0)"
+Import-Package: junit.framework;version="[4.9.0,5.0.0)"
diff --git a/org.eclipse.scout.rt.testing.commons/META-INF/MANIFEST.MF b/org.eclipse.scout.rt.testing.commons/META-INF/MANIFEST.MF
index 68bc0fc93e..d6a3927881 100644
--- a/org.eclipse.scout.rt.testing.commons/META-INF/MANIFEST.MF
+++ b/org.eclipse.scout.rt.testing.commons/META-INF/MANIFEST.MF
@@ -10,5 +10,4 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
 Export-Package: org.eclipse.scout.rt.testing.commons
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
-Import-Package: junit.framework;version="[4.3.0,5.0.0)",
- org.junit;version="[4.3.0,5.0.0)"
+Import-Package: org.junit;version="[4.9.0,5.0.0)"
diff --git a/org.eclipse.scout.rt.testing.commons/build.properties b/org.eclipse.scout.rt.testing.commons/build.properties
index e9a8b38d3d..f9bb1695ab 100644
--- a/org.eclipse.scout.rt.testing.commons/build.properties
+++ b/org.eclipse.scout.rt.testing.commons/build.properties
@@ -8,6 +8,5 @@
 source.. = src/
 bin.includes = META-INF/,\
                .,\
-               plugin.xml,\
                about.html
 src.includes = about.html
diff --git a/org.eclipse.scout.rt.testing.commons/src/org/eclipse/scout/rt/testing/commons/Activator.java b/org.eclipse.scout.rt.testing.commons/src/org/eclipse/scout/rt/testing/commons/Activator.java
index 4b040d1290..f45cf30ce6 100644
--- a/org.eclipse.scout.rt.testing.commons/src/org/eclipse/scout/rt/testing/commons/Activator.java
+++ b/org.eclipse.scout.rt.testing.commons/src/org/eclipse/scout/rt/testing/commons/Activator.java
@@ -30,7 +30,7 @@ public class Activator implements BundleActivator {
    */
   @Override
   public void start(BundleContext bundleContext) throws Exception {
-    Activator.context = bundleContext;
+    context = bundleContext;
   }
 
   /*
@@ -41,7 +41,6 @@ public class Activator implements BundleActivator {
    */
   @Override
   public void stop(BundleContext bundleContext) throws Exception {
-    Activator.context = null;
+    context = null;
   }
-
 }
diff --git a/org.eclipse.scout.rt.testing.dependency-feature/feature.xml b/org.eclipse.scout.rt.testing.dependency-feature/feature.xml
index 1c2e5c86e1..0d39ca41de 100644
--- a/org.eclipse.scout.rt.testing.dependency-feature/feature.xml
+++ b/org.eclipse.scout.rt.testing.dependency-feature/feature.xml
@@ -31,8 +31,8 @@ BSI Business Systems Integration AG - initial API and implementation
    </url>
 
    <requires>
-      <import feature="org.eclipse.scout.rt.feature" version="3.8.0.qualifier"/>
-      <import plugin="org.junit4"/>
+      <import feature="org.eclipse.scout.rt" version="3.9.0" match="compatible"/>
+      <import plugin="org.junit" version="4.9.0" match="compatible"/>
    </requires>
 
    <plugin
@@ -43,12 +43,6 @@ BSI Business Systems Integration AG - initial API and implementation
          unpack="false"/>
 
    <plugin
-         id="org.junit"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
          id="org.apache.ant"
          download-size="0"
          install-size="0"
diff --git a/org.eclipse.scout.rt.testing.server.test/META-INF/MANIFEST.MF b/org.eclipse.scout.rt.testing.server.test/META-INF/MANIFEST.MF
index e46e6f7734..027d8d4314 100644
--- a/org.eclipse.scout.rt.testing.server.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.scout.rt.testing.server.test/META-INF/MANIFEST.MF
@@ -6,8 +6,6 @@ Bundle-Version: 3.9.0.qualifier
 Bundle-Vendor: Eclipse Scout Project
 Fragment-Host: org.eclipse.scout.rt.testing.server;bundle-version="3.9.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.hamcrest;version="[1.1.0,2.0.0)";core=split;mandatory:=core,
- org.hamcrest.core;version="[1.1.0,2.0.0)",
- org.junit;version="[4.3.0,5.0.0)",
- org.junit.runner;version="[4.3.0,5.0.0)"
+Import-Package: org.junit;version="[4.9.0,5.0.0)",
+ org.junit.runner;version="[4.9.0,5.0.0)"
 Require-Bundle: org.eclipse.scout.rt.server.testenvironment;bundle-version="[3.9.0,3.10.0)"
diff --git a/org.eclipse.scout.rt.testing.server.test/src/org/eclipse/scout/rt/testing/server/runner/ScoutServerTransactionTest.java b/org.eclipse.scout.rt.testing.server.test/src/org/eclipse/scout/rt/testing/server/runner/ScoutServerTransactionTest.java
index 1253b3a90b..a597247f02 100644
--- a/org.eclipse.scout.rt.testing.server.test/src/org/eclipse/scout/rt/testing/server/runner/ScoutServerTransactionTest.java
+++ b/org.eclipse.scout.rt.testing.server.test/src/org/eclipse/scout/rt/testing/server/runner/ScoutServerTransactionTest.java
@@ -11,6 +11,7 @@
 package org.eclipse.scout.rt.testing.server.runner;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
@@ -21,6 +22,8 @@ import org.eclipse.scout.rt.server.ServerJob;
 import org.eclipse.scout.rt.server.ThreadContext;
 import org.eclipse.scout.rt.server.transaction.ITransaction;
 import org.eclipse.scout.rt.testing.server.runner.fixture.TestTransactionMember;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -30,6 +33,16 @@ import org.junit.runner.RunWith;
 @RunWith(ScoutServerTestRunner.class)
 public class ScoutServerTransactionTest {
 
+  @BeforeClass
+  public static void beforeClassCheck() {
+    assertTrue("This check ensures the before class runner from scout testing works. @See bug405846", true);
+  }
+
+  @AfterClass
+  public static void afterClassCheck() {
+    assertTrue("This check ensures the after class runner from scout testing works. @See bug405846", true);
+  }
+
   @Test
   public void testValidTransactionMember() {
     final TestTransactionMember transactionMember = new TestTransactionMember("01");
diff --git a/org.eclipse.scout.rt.testing.server/META-INF/MANIFEST.MF b/org.eclipse.scout.rt.testing.server/META-INF/MANIFEST.MF
index 2bdea366e1..fc82a51df0 100644
--- a/org.eclipse.scout.rt.testing.server/META-INF/MANIFEST.MF
+++ b/org.eclipse.scout.rt.testing.server/META-INF/MANIFEST.MF
@@ -13,7 +13,6 @@ Export-Package: org.eclipse.scout.rt.testing.server,
  org.eclipse.scout.rt.testing.server.runner
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
-Import-Package: org.junit;version="[4.3.0,5.0.0)",
- org.junit.runner;version="[4.3.0,5.0.0)",
- org.junit.runners;version="[4.3.0,5.0.0)",
- org.junit.runners.model;version="[4.3.0,5.0.0)"
+Import-Package: org.junit;version="[4.9.0,5.0.0)",
+ org.junit.runners;version="[4.9.0,5.0.0)",
+ org.junit.runners.model;version="[4.9.0,5.0.0)"
diff --git a/org.eclipse.scout.rt.testing.shared/META-INF/MANIFEST.MF b/org.eclipse.scout.rt.testing.shared/META-INF/MANIFEST.MF
index b6c822016b..0f4f7a7217 100644
--- a/org.eclipse.scout.rt.testing.shared/META-INF/MANIFEST.MF
+++ b/org.eclipse.scout.rt.testing.shared/META-INF/MANIFEST.MF
@@ -15,8 +15,8 @@ Export-Package: org.eclipse.scout.rt.testing.shared,
  org.eclipse.scout.rt.testing.shared.services.lookup
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
-Import-Package: junit.framework;version="[4.3.0,5.0.0)",
+Import-Package: junit.framework;version="[4.9.0,5.0.0)",
  org.apache.tools.ant.taskdefs.optional.junit;version="[0.0.0,2.0.0)",
- org.junit;version="[4.3.0,5.0.0)",
- org.junit.runner;version="[4.3.0,5.0.0)",
- org.junit.runners.model;version="[4.3.0,5.0.0)"
+ org.junit;version="[4.9.0,5.0.0)",
+ org.junit.runner;version="[4.9.0,5.0.0)",
+ org.junit.runners.model;version="[4.9.0,5.0.0)"
diff --git a/org.eclipse.scout.rt.testing.shared/src/org/eclipse/scout/rt/testing/shared/runner/AbstractRunAftersInSeparateScoutSession.java b/org.eclipse.scout.rt.testing.shared/src/org/eclipse/scout/rt/testing/shared/runner/AbstractRunAftersInSeparateScoutSession.java
index 55c665b27c..0b2907e0f5 100644
--- a/org.eclipse.scout.rt.testing.shared/src/org/eclipse/scout/rt/testing/shared/runner/AbstractRunAftersInSeparateScoutSession.java
+++ b/org.eclipse.scout.rt.testing.shared/src/org/eclipse/scout/rt/testing/shared/runner/AbstractRunAftersInSeparateScoutSession.java
@@ -13,15 +13,14 @@ package org.eclipse.scout.rt.testing.shared.runner;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.junit.internal.runners.model.MultipleFailureException;
 import org.junit.runners.model.FrameworkMethod;
+import org.junit.runners.model.MultipleFailureException;
 import org.junit.runners.model.Statement;
 
 /**
  * Invokes all methods of a test class annotated with {@link org.junit.AfterClass} in a separate Scout session and
  * therefore in a separate Scout transaction.
  */
-@SuppressWarnings("restriction")
 public abstract class AbstractRunAftersInSeparateScoutSession extends Statement {
   private final Statement m_statement;
   private final Object m_target;
diff --git a/org.eclipse.scout.rt.testing.ui.swt/META-INF/MANIFEST.MF b/org.eclipse.scout.rt.testing.ui.swt/META-INF/MANIFEST.MF
index b7a299ad45..cfa4dd99cc 100644
--- a/org.eclipse.scout.rt.testing.ui.swt/META-INF/MANIFEST.MF
+++ b/org.eclipse.scout.rt.testing.ui.swt/META-INF/MANIFEST.MF
@@ -5,10 +5,10 @@ Bundle-SymbolicName: org.eclipse.scout.rt.testing.ui.swt;singleton:=true
 Bundle-Version: 3.9.0.qualifier
 Bundle-Activator: org.eclipse.scout.rt.testing.ui.swt.Activator
 Bundle-Vendor: Eclipse Scout Project
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
- org.eclipse.scout.rt.testing.shared;bundle-version="[3.7.0,4.0.0)",
+Require-Bundle: org.eclipse.scout.rt.testing.shared;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.scout.rt.client;bundle-version="[3.9.0,3.10.0)",
  org.eclipse.scout.rt.ui.swt;bundle-version="[3.9.0,3.10.0)",
+ org.eclipse.scout.rt.testing.commons;bundle-version="[3.9.0,3.10.0)",
  org.eclipse.scout.rt.testing.client;bundle-version="[3.9.0,3.10.0)"
 Export-Package: org.eclipse.scout.rt.testing.ui.swt
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/org.eclipse.scout.rt.testing.ui.swt/src/org/eclipse/scout/rt/testing/ui/swt/SwtMock.java b/org.eclipse.scout.rt.testing.ui.swt/src/org/eclipse/scout/rt/testing/ui/swt/SwtMock.java
index 3b36f66d13..7597833d56 100644
--- a/org.eclipse.scout.rt.testing.ui.swt/src/org/eclipse/scout/rt/testing/ui/swt/SwtMock.java
+++ b/org.eclipse.scout.rt.testing.ui.swt/src/org/eclipse/scout/rt/testing/ui/swt/SwtMock.java
@@ -30,7 +30,7 @@ import org.eclipse.scout.commons.logger.ScoutLogManager;
 import org.eclipse.scout.rt.client.ClientSyncJob;
 import org.eclipse.scout.rt.client.IClientSession;
 import org.eclipse.scout.rt.client.ui.basic.table.ITableRow;
-import org.eclipse.scout.rt.testing.shared.OsUtility;
+import org.eclipse.scout.rt.testing.commons.OsUtility;
 import org.eclipse.scout.rt.testing.shared.TestingUtility;
 import org.eclipse.scout.rt.testing.shared.WaitCondition;
 import org.eclipse.scout.rt.ui.swt.basic.ISwtScoutComposite;
diff --git a/org.eclipse.scout.rt.ui.rap.test/META-INF/MANIFEST.MF b/org.eclipse.scout.rt.ui.rap.test/META-INF/MANIFEST.MF
index 5ae7269d5d..f81a777136 100644
--- a/org.eclipse.scout.rt.ui.rap.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.scout.rt.ui.rap.test/META-INF/MANIFEST.MF
@@ -6,6 +6,5 @@ Bundle-Version: 3.9.0.qualifier
 Bundle-Vendor: Eclipse Scout Project
 Fragment-Host: org.eclipse.scout.rt.ui.rap;bundle-version="3.9.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.hamcrest.core;version="[1.1.0,2.0.0)",
- org.junit;version="[4.3.0,5.0.0)",
- org.junit.runner;version="[4.3.0,5.0.0)"
+Import-Package: org.junit;version="[4.9.0,5.0.0)",
+ org.junit.runner;version="[4.9.0,5.0.0)"
diff --git a/org.eclipse.scout.rt.ui.swing.test/META-INF/MANIFEST.MF b/org.eclipse.scout.rt.ui.swing.test/META-INF/MANIFEST.MF
index 2761ad5a9e..0a295edc99 100644
--- a/org.eclipse.scout.rt.ui.swing.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.scout.rt.ui.swing.test/META-INF/MANIFEST.MF
@@ -7,6 +7,5 @@ Bundle-Vendor: Eclipse Scout Project
 Fragment-Host: org.eclipse.scout.rt.ui.swing
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.easymock;version="[2.0.0,3.0.0)",
- org.hamcrest.core;version="[1.1.0,2.0.0)",
- org.junit;version="[4.3.0,5.0.0)",
- org.junit.runner;version="[4.3.0,5.0.0)"
+ org.junit;version="[4.9.0,5.0.0)",
+ org.junit.runner;version="[4.9.0,5.0.0)"
diff --git a/org.eclipse.scout.service.test/META-INF/MANIFEST.MF b/org.eclipse.scout.service.test/META-INF/MANIFEST.MF
index 589efd28f1..c20d550a5e 100644
--- a/org.eclipse.scout.service.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.scout.service.test/META-INF/MANIFEST.MF
@@ -6,8 +6,6 @@ Bundle-Version: 3.9.0.qualifier
 Bundle-Vendor: Eclipse Scout Project
 Fragment-Host: org.eclipse.scout.service
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.easymock;version="[2.0.0,3.0.0)",
- org.hamcrest.core;version="[1.1.0,2.0.0)",
- org.junit;version="[4.3.0,5.0.0)",
- org.junit.runner;version="[4.3.0,5.0.0)"
+Import-Package: org.junit;version="[4.9.0,5.0.0)",
+ org.junit.runner;version="[4.9.0,5.0.0)"
 Export-Package: org.eclipse.scout.service
diff --git a/org.eclipse.scout.target/eclipse-3.6.target b/org.eclipse.scout.target/eclipse-3.6.target
index d2ad1479ae..8b70208975 100644
--- a/org.eclipse.scout.target/eclipse-3.6.target
+++ b/org.eclipse.scout.target/eclipse-3.6.target
@@ -62,6 +62,10 @@
       <unit id="org.easymock" version="2.4.0.v20090202-0900"/>
       <unit id="org.easymock.source" version="2.4.0.v20090202-0900"/>
       <unit id="org.json" version="1.0.0.v201011060100"/>
+      <unit id="org.junit" version="4.11.0.v201303080030"/>
+      <unit id="org.junit.source" version="4.11.0.v201303080030"/>
+      <unit id="org.hamcrest.core" version="1.3.0.v201303031735"/>
+      <unit id="org.hamcrest.core.source" version="1.3.0.v201303031735"/>
       <unit id="org.w3c.css.sac" version="1.3.1.v200903091627"/>
       <unit id="org.w3c.css.sac.source" version="1.3.1.v200903091627"/>
       <unit id="org.w3c.dom.smil" version="1.0.0.v200806040011"/>
diff --git a/org.eclipse.scout.target/eclipse-3.7.target b/org.eclipse.scout.target/eclipse-3.7.target
index b0d73c9341..9aa8a6d334 100644
--- a/org.eclipse.scout.target/eclipse-3.7.target
+++ b/org.eclipse.scout.target/eclipse-3.7.target
@@ -62,6 +62,8 @@
       <unit id="org.easymock" version="2.4.0.v20090202-0900"/>
       <unit id="org.easymock.source" version="2.4.0.v20090202-0900"/>
       <unit id="org.json" version="1.0.0.v201011060100"/>
+      <unit id="org.junit" version="4.11.0.v201303080030"/>
+      <unit id="org.junit.source" version="4.11.0.v201303080030"/>
       <unit id="org.w3c.css.sac" version="1.3.1.v200903091627"/>
       <unit id="org.w3c.css.sac.source" version="1.3.1.v200903091627"/>
       <unit id="org.w3c.dom.smil" version="1.0.0.v200806040011"/>
diff --git a/org.eclipse.scout.target/eclipse-3.8.target b/org.eclipse.scout.target/eclipse-3.8.target
index d021c6c270..685b18be02 100644
--- a/org.eclipse.scout.target/eclipse-3.8.target
+++ b/org.eclipse.scout.target/eclipse-3.8.target
@@ -64,6 +64,8 @@
       <unit id="org.easymock" version="2.4.0.v20090202-0900"/>
       <unit id="org.easymock.source" version="2.4.0.v20090202-0900"/>
       <unit id="org.json" version="1.0.0.v201011060100"/>
+      <unit id="org.junit" version="4.11.0.v201303080030"/>
+      <unit id="org.junit.source" version="4.11.0.v201303080030"/>
       <unit id="org.w3c.css.sac" version="1.3.1.v200903091627"/>
       <unit id="org.w3c.css.sac.source" version="1.3.1.v200903091627"/>
       <unit id="org.w3c.dom.smil" version="1.0.0.v200806040011"/>
diff --git a/org.eclipse.scout.target/eclipse-3.9.target b/org.eclipse.scout.target/eclipse-3.9.target
index dc3ff5129b..ae259fc826 100644
--- a/org.eclipse.scout.target/eclipse-3.9.target
+++ b/org.eclipse.scout.target/eclipse-3.9.target
@@ -64,6 +64,8 @@
       <unit id="org.easymock" version="2.4.0.v20090202-0900"/>
       <unit id="org.easymock.source" version="2.4.0.v20090202-0900"/>
       <unit id="org.json" version="1.0.0.v201011060100"/>
+      <unit id="org.junit" version="4.11.0.v201303080030"/>
+      <unit id="org.junit.source" version="4.11.0.v201303080030"/>
       <unit id="org.w3c.css.sac" version="1.3.1.v200903091627"/>
       <unit id="org.w3c.css.sac.source" version="1.3.1.v200903091627"/>
       <unit id="org.w3c.dom.smil" version="1.0.0.v200806040011"/>
diff --git a/org.eclipse.scout.target/eclipse-3.9I.target b/org.eclipse.scout.target/eclipse-3.9I.target
index 96750c605e..1c51d00375 100644
--- a/org.eclipse.scout.target/eclipse-3.9I.target
+++ b/org.eclipse.scout.target/eclipse-3.9I.target
@@ -64,6 +64,8 @@
       <unit id="org.easymock" version="2.4.0.v20090202-0900"/>
       <unit id="org.easymock.source" version="2.4.0.v20090202-0900"/>
       <unit id="org.json" version="1.0.0.v201011060100"/>
+      <unit id="org.junit" version="4.11.0.v201303080030"/>
+      <unit id="org.junit.source" version="4.11.0.v201303080030"/>
       <unit id="org.w3c.css.sac" version="1.3.1.v200903091627"/>
       <unit id="org.w3c.css.sac.source" version="1.3.1.v200903091627"/>
       <unit id="org.w3c.dom.smil" version="1.0.0.v200806040011"/>
diff --git a/org.eclipse.scout.target/eclipse-staging.target b/org.eclipse.scout.target/eclipse-staging.target
index bca83c41a5..9db930c1ff 100644
--- a/org.eclipse.scout.target/eclipse-staging.target
+++ b/org.eclipse.scout.target/eclipse-staging.target
@@ -64,6 +64,8 @@
       <unit id="org.easymock" version="2.4.0.v20090202-0900"/>
       <unit id="org.easymock.source" version="2.4.0.v20090202-0900"/>
       <unit id="org.json" version="1.0.0.v201011060100"/>
+      <unit id="org.junit" version="4.11.0.v201303080030"/>
+      <unit id="org.junit.source" version="4.11.0.v201303080030"/>
       <unit id="org.w3c.css.sac" version="1.3.1.v200903091627"/>
       <unit id="org.w3c.css.sac.source" version="1.3.1.v200903091627"/>
       <unit id="org.w3c.dom.smil" version="1.0.0.v200806040011"/>