35 files changed, 42 insertions, 38 deletions
diff --git a/branches/sca-equinox/itest/bpel/helloworld-reference/pom.xml b/branches/sca-equinox/itest/bpel/helloworld-reference/pom.xml
index 946486b2e7..6af821f34f 100644
--- a/branches/sca-equinox/itest/bpel/helloworld-reference/pom.xml
+++ b/branches/sca-equinox/itest/bpel/helloworld-reference/pom.xml
@@ -92,7 +92,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.2</version>
+            <version>4.5</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/branches/sca-equinox/itest/bpel/helloworld-ws/pom.xml b/branches/sca-equinox/itest/bpel/helloworld-ws/pom.xml
index 40646822a6..b678b7bc65 100644
--- a/branches/sca-equinox/itest/bpel/helloworld-ws/pom.xml
+++ b/branches/sca-equinox/itest/bpel/helloworld-ws/pom.xml
@@ -85,7 +85,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.2</version>
+            <version>4.5</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/branches/sca-equinox/itest/bpel/helloworld/pom.xml b/branches/sca-equinox/itest/bpel/helloworld/pom.xml
index 9b7786c270..dbabb8a283 100644
--- a/branches/sca-equinox/itest/bpel/helloworld/pom.xml
+++ b/branches/sca-equinox/itest/bpel/helloworld/pom.xml
@@ -71,7 +71,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.2</version>
+            <version>4.5</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/branches/sca-equinox/itest/builder/pom.xml b/branches/sca-equinox/itest/builder/pom.xml
index 4855b0cfe6..5eda64fdd8 100644
--- a/branches/sca-equinox/itest/builder/pom.xml
+++ b/branches/sca-equinox/itest/builder/pom.xml
@@ -94,7 +94,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.2</version>
+            <version>4.5</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/branches/sca-equinox/itest/contribution-classloader/contribution-classes/pom.xml b/branches/sca-equinox/itest/contribution-classloader/contribution-classes/pom.xml
index 53416eb338..f74b493c8e 100644
--- a/branches/sca-equinox/itest/contribution-classloader/contribution-classes/pom.xml
+++ b/branches/sca-equinox/itest/contribution-classloader/contribution-classes/pom.xml
@@ -45,7 +45,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.2</version>
+            <version>4.5</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/branches/sca-equinox/itest/contribution-classloader/contribution-test/pom.xml b/branches/sca-equinox/itest/contribution-classloader/contribution-test/pom.xml
index 5c22d215be..b417012edd 100644
--- a/branches/sca-equinox/itest/contribution-classloader/contribution-test/pom.xml
+++ b/branches/sca-equinox/itest/contribution-classloader/contribution-test/pom.xml
@@ -52,7 +52,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.2</version>
+            <version>4.5</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/branches/sca-equinox/itest/contribution-import-export/export-composite/pom.xml b/branches/sca-equinox/itest/contribution-import-export/export-composite/pom.xml
index 60d1b3af0c..17b2866b4c 100644
--- a/branches/sca-equinox/itest/contribution-import-export/export-composite/pom.xml
+++ b/branches/sca-equinox/itest/contribution-import-export/export-composite/pom.xml
@@ -59,7 +59,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.2</version>
+            <version>4.5</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/branches/sca-equinox/itest/contribution-import-export/export-java/pom.xml b/branches/sca-equinox/itest/contribution-import-export/export-java/pom.xml
index 4a855334b8..1f4a062cdf 100644
--- a/branches/sca-equinox/itest/contribution-import-export/export-java/pom.xml
+++ b/branches/sca-equinox/itest/contribution-import-export/export-java/pom.xml
@@ -59,7 +59,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.2</version>
+            <version>4.5</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/branches/sca-equinox/itest/contribution-import-export/import-composite/pom.xml b/branches/sca-equinox/itest/contribution-import-export/import-composite/pom.xml
index 5f4e1bfd5e..860536cba2 100644
--- a/branches/sca-equinox/itest/contribution-import-export/import-composite/pom.xml
+++ b/branches/sca-equinox/itest/contribution-import-export/import-composite/pom.xml
@@ -65,7 +65,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.2</version>
+            <version>4.5</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/branches/sca-equinox/itest/contribution-import-export/import-java/pom.xml b/branches/sca-equinox/itest/contribution-import-export/import-java/pom.xml
index ca5edde5d0..fff4b6a894 100644
--- a/branches/sca-equinox/itest/contribution-import-export/import-java/pom.xml
+++ b/branches/sca-equinox/itest/contribution-import-export/import-java/pom.xml
@@ -65,7 +65,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.2</version>
+            <version>4.5</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/branches/sca-equinox/itest/contribution-import-export/import-resource/pom.xml b/branches/sca-equinox/itest/contribution-import-export/import-resource/pom.xml
index 428e3279ba..5ce827a5e7 100644
--- a/branches/sca-equinox/itest/contribution-import-export/import-resource/pom.xml
+++ b/branches/sca-equinox/itest/contribution-import-export/import-resource/pom.xml
@@ -94,7 +94,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.2</version>
+            <version>4.5</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/branches/sca-equinox/itest/contribution-import-export/import-wsdl/pom.xml b/branches/sca-equinox/itest/contribution-import-export/import-wsdl/pom.xml
index 22e3913dd8..711f9eac04 100644
--- a/branches/sca-equinox/itest/contribution-import-export/import-wsdl/pom.xml
+++ b/branches/sca-equinox/itest/contribution-import-export/import-wsdl/pom.xml
@@ -65,7 +65,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.2</version>
+            <version>4.5</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/branches/sca-equinox/itest/corba/pom.xml b/branches/sca-equinox/itest/corba/pom.xml
index 9670e8059f..b7b7f26b22 100644
--- a/branches/sca-equinox/itest/corba/pom.xml
+++ b/branches/sca-equinox/itest/corba/pom.xml
@@ -112,7 +112,7 @@
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.2</version>
+			<version>4.5</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioSixTestCase.java b/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioSixTestCase.java
index 3c12bf1b8c..b7309d68a0 100644
--- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioSixTestCase.java
+++ b/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioSixTestCase.java
@@ -180,7 +180,7 @@ public class ScenarioSixTestCase {
             inner.setY(10f);
             arg.setIu(inner);
             TRichUnion result = ref.passRichUnion(arg);
-            assertEquals(arg.getIu().getY(), result.getIu().getY());
+            assertEquals(arg.getIu().getY(), result.getIu().getY(), 0.0f);
         } catch (Exception e) {
             e.printStackTrace();
             fail();
@@ -190,7 +190,7 @@ public class ScenarioSixTestCase {
             TRichUnion arg = new TRichUnion();
             arg.setY(15f);
             TRichUnion result = ref.passRichUnion(arg);
-            assertEquals(arg.getY(), result.getY());
+            assertEquals(arg.getY(), result.getY(), 0.0f);
         } catch (Exception e) {
             e.printStackTrace();
             fail();
@@ -214,11 +214,11 @@ public class ScenarioSixTestCase {
             inner.y(20f);
             arg.iu(inner);
             RichUnion result = ref.passRichUnion(arg);
-            assertEquals(arg.iu().y(), result.iu().y());
+            assertEquals(arg.iu().y(), result.iu().y(), 0.0f);
             arg = new RichUnion();
             arg.y(15f);
             result = ref.passRichUnion(arg);
-            assertEquals(arg.y(), result.y());
+            assertEquals(arg.y(), result.y(), 0.0f);
         } catch (Exception e) {
             e.printStackTrace();
             fail();
diff --git a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java b/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java
index 4977baa84c..c71a5875f4 100644
--- a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java
+++ b/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java
@@ -622,7 +622,7 @@ public class StandardTypesDatabindingTestCase {
      * Service method invoked is getNewSource.
      */
     @Test
-    @Ignore("junit.framework.ComparisonFailure: null expected:<... encoding=\"UTF-8\"?><[a>A</a]>> but was:<... encoding=\"UTF-8\"?><[return xmlns=\"http://jaxb.databindings.itest.sca.tuscany.apache.org/\">A</return]>>")
+    // @Ignore("junit.framework.ComparisonFailure: null expected:<... encoding=\"UTF-8\"?><[a>A</a]>> but was:<... encoding=\"UTF-8\"?><[return xmlns=\"http://jaxb.databindings.itest.sca.tuscany.apache.org/\">A</return]>>")
     public void testWSNewSource() throws Exception {
         StandardTypesServiceClient serviceClient =
             domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent");
diff --git a/branches/sca-equinox/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/DatabindingTestCase.java b/branches/sca-equinox/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/DatabindingTestCase.java
index 37a521b1bd..da2fc8b108 100644
--- a/branches/sca-equinox/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/DatabindingTestCase.java
+++ b/branches/sca-equinox/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/DatabindingTestCase.java
@@ -47,10 +47,14 @@ public class DatabindingTestCase {
      */
     @BeforeClass
     public static void setUp() throws Exception {
+        try {
         SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
         node = nodeFactory.createSCANodeFromClassLoader("wsdl/wrapped/helloservice.composite", null);
         node.start();
         client = (SCAClient)node;
+        }catch(Throwable e) {
+            e.printStackTrace();
+        }
     }
 
     /**
diff --git a/branches/sca-equinox/itest/exceptions-cross-binding-ws/pom.xml b/branches/sca-equinox/itest/exceptions-cross-binding-ws/pom.xml
index bdb3784be3..e7ecb604dc 100644
--- a/branches/sca-equinox/itest/exceptions-cross-binding-ws/pom.xml
+++ b/branches/sca-equinox/itest/exceptions-cross-binding-ws/pom.xml
@@ -40,7 +40,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.2</version>
+            <version>4.5</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/branches/sca-equinox/itest/jms-args/pom.xml b/branches/sca-equinox/itest/jms-args/pom.xml
index 32ad3099c6..eae5792e70 100644
--- a/branches/sca-equinox/itest/jms-args/pom.xml
+++ b/branches/sca-equinox/itest/jms-args/pom.xml
@@ -65,7 +65,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.2</version>
+            <version>4.5</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/branches/sca-equinox/itest/jms-callbacks/pom.xml b/branches/sca-equinox/itest/jms-callbacks/pom.xml
index 1dd26c7a41..a495a8309a 100644
--- a/branches/sca-equinox/itest/jms-callbacks/pom.xml
+++ b/branches/sca-equinox/itest/jms-callbacks/pom.xml
@@ -66,7 +66,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.2</version>
+            <version>4.5</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/branches/sca-equinox/itest/jms-definitions/pom.xml b/branches/sca-equinox/itest/jms-definitions/pom.xml
index a142978fde..78a7c64e8f 100644
--- a/branches/sca-equinox/itest/jms-definitions/pom.xml
+++ b/branches/sca-equinox/itest/jms-definitions/pom.xml
@@ -66,7 +66,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.2</version>
+            <version>4.5</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/branches/sca-equinox/itest/jms-selectors/pom.xml b/branches/sca-equinox/itest/jms-selectors/pom.xml
index 2a39634927..fe28f449d1 100644
--- a/branches/sca-equinox/itest/jms-selectors/pom.xml
+++ b/branches/sca-equinox/itest/jms-selectors/pom.xml
@@ -66,7 +66,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.2</version>
+            <version>4.5</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/branches/sca-equinox/itest/jms/pom.xml b/branches/sca-equinox/itest/jms/pom.xml
index 0630174ace..1bed1c9f3c 100644
--- a/branches/sca-equinox/itest/jms/pom.xml
+++ b/branches/sca-equinox/itest/jms/pom.xml
@@ -66,7 +66,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.2</version>
+            <version>4.5</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/branches/sca-equinox/itest/large-sdo-ws/pom.xml b/branches/sca-equinox/itest/large-sdo-ws/pom.xml
index 23ee346ea9..0854d13098 100644
--- a/branches/sca-equinox/itest/large-sdo-ws/pom.xml
+++ b/branches/sca-equinox/itest/large-sdo-ws/pom.xml
@@ -67,7 +67,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.2</version>
+            <version>4.5</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/branches/sca-equinox/itest/late-reference-resolution/pom.xml b/branches/sca-equinox/itest/late-reference-resolution/pom.xml
index 3b3a41db41..83b67c4a72 100644
--- a/branches/sca-equinox/itest/late-reference-resolution/pom.xml
+++ b/branches/sca-equinox/itest/late-reference-resolution/pom.xml
@@ -114,7 +114,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.2</version>
+            <version>4.5</version>
             <scope>test</scope>
         </dependency>
                 
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/pom.xml b/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/pom.xml
index edbb66ab09..f2ec045a5c 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/pom.xml
+++ b/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/pom.xml
@@ -73,7 +73,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.2</version>
+            <version>4.5</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-classes/pom.xml b/branches/sca-equinox/itest/osgi-contribution/contribution-classes/pom.xml
index 0a95927b7f..f70760a5fe 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-classes/pom.xml
+++ b/branches/sca-equinox/itest/osgi-contribution/contribution-classes/pom.xml
@@ -72,7 +72,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.2</version>
+            <version>4.5</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-test/pom.xml b/branches/sca-equinox/itest/osgi-contribution/contribution-test/pom.xml
index 6853aba2d1..505452c4df 100644
--- a/branches/sca-equinox/itest/osgi-contribution/contribution-test/pom.xml
+++ b/branches/sca-equinox/itest/osgi-contribution/contribution-test/pom.xml
@@ -84,7 +84,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.2</version>
+            <version>4.5</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/branches/sca-equinox/itest/osgi-implementation/pom.xml b/branches/sca-equinox/itest/osgi-implementation/pom.xml
index d9249b6b9f..3ccab0fd8a 100644
--- a/branches/sca-equinox/itest/osgi-implementation/pom.xml
+++ b/branches/sca-equinox/itest/osgi-implementation/pom.xml
@@ -131,7 +131,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.2</version>
+            <version>4.5</version>
         </dependency>
     </dependencies>
 
diff --git a/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/pom.xml b/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/pom.xml
index fa1ace68ac..d879d9c200 100644
--- a/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/pom.xml
+++ b/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/pom.xml
@@ -68,7 +68,7 @@ End Felix dependencies -->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.2</version>
+            <version>4.5</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/branches/sca-equinox/itest/policy-security-basicauth/pom.xml b/branches/sca-equinox/itest/policy-security-basicauth/pom.xml
index 6550e2f1dc..728ad3b72f 100644
--- a/branches/sca-equinox/itest/policy-security-basicauth/pom.xml
+++ b/branches/sca-equinox/itest/policy-security-basicauth/pom.xml
@@ -99,7 +99,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.2</version>
+            <version>4.5</version>
         </dependency>
         
         <dependency>
diff --git a/branches/sca-equinox/itest/policy-security-jsr250/pom.xml b/branches/sca-equinox/itest/policy-security-jsr250/pom.xml
index da0e3a0fce..032fe9cdcb 100644
--- a/branches/sca-equinox/itest/policy-security-jsr250/pom.xml
+++ b/branches/sca-equinox/itest/policy-security-jsr250/pom.xml
@@ -67,7 +67,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.2</version>
+            <version>4.5</version>
         </dependency>
 
 
diff --git a/branches/sca-equinox/itest/policy-security/pom.xml b/branches/sca-equinox/itest/policy-security/pom.xml
index ba079444e1..5a8da9a702 100644
--- a/branches/sca-equinox/itest/policy-security/pom.xml
+++ b/branches/sca-equinox/itest/policy-security/pom.xml
@@ -60,7 +60,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.2</version>
+            <version>4.5</version>
         </dependency>
 
 
diff --git a/branches/sca-equinox/itest/policy/pom.xml b/branches/sca-equinox/itest/policy/pom.xml
index d889b904a3..32578331af 100644
--- a/branches/sca-equinox/itest/policy/pom.xml
+++ b/branches/sca-equinox/itest/policy/pom.xml
@@ -60,7 +60,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.2</version>
+            <version>4.5</version>
         </dependency>
 
 
diff --git a/branches/sca-equinox/itest/pom.xml b/branches/sca-equinox/itest/pom.xml
index 594a0a70e8..c137b9a2a6 100644
--- a/branches/sca-equinox/itest/pom.xml
+++ b/branches/sca-equinox/itest/pom.xml
@@ -33,14 +33,14 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.2</version>
+            <version>4.5</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>org.easymock</groupId>
             <artifactId>easymock</artifactId>
-            <version>2.2</version>
+            <version>2.4</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/branches/sca-equinox/itest/validation/pom.xml b/branches/sca-equinox/itest/validation/pom.xml
index deb8a90f23..77e6a18ce9 100644
--- a/branches/sca-equinox/itest/validation/pom.xml
+++ b/branches/sca-equinox/itest/validation/pom.xml
@@ -136,7 +136,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.2</version>
+            <version>4.5</version>
             <scope>test</scope>
         </dependency>
     </dependencies>