diff options
Diffstat (limited to 'java/sca/itest')
37 files changed, 44 insertions, 620 deletions
diff --git a/java/sca/itest/bpel/helloworld-reference/pom.xml b/java/sca/itest/bpel/helloworld-reference/pom.xml index 3a61b820d1..6d922c709d 100644 --- a/java/sca/itest/bpel/helloworld-reference/pom.xml +++ b/java/sca/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/java/sca/itest/bpel/helloworld-ws/pom.xml b/java/sca/itest/bpel/helloworld-ws/pom.xml index eb11a6ad7e..8efa769357 100644 --- a/java/sca/itest/bpel/helloworld-ws/pom.xml +++ b/java/sca/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/java/sca/itest/bpel/helloworld/pom.xml b/java/sca/itest/bpel/helloworld/pom.xml index 9b7786c270..dbabb8a283 100644 --- a/java/sca/itest/bpel/helloworld/pom.xml +++ b/java/sca/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/java/sca/itest/builder/pom.xml b/java/sca/itest/builder/pom.xml index 4855b0cfe6..5eda64fdd8 100644 --- a/java/sca/itest/builder/pom.xml +++ b/java/sca/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/java/sca/itest/contribution-classloader/contribution-classes/pom.xml b/java/sca/itest/contribution-classloader/contribution-classes/pom.xml index 53416eb338..f74b493c8e 100644 --- a/java/sca/itest/contribution-classloader/contribution-classes/pom.xml +++ b/java/sca/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/java/sca/itest/contribution-classloader/contribution-test/pom.xml b/java/sca/itest/contribution-classloader/contribution-test/pom.xml index 5c22d215be..b417012edd 100644 --- a/java/sca/itest/contribution-classloader/contribution-test/pom.xml +++ b/java/sca/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/java/sca/itest/contribution-import-export/export-composite/pom.xml b/java/sca/itest/contribution-import-export/export-composite/pom.xml index 4aea1320f3..2e21138924 100644 --- a/java/sca/itest/contribution-import-export/export-composite/pom.xml +++ b/java/sca/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/java/sca/itest/contribution-import-export/export-java/pom.xml b/java/sca/itest/contribution-import-export/export-java/pom.xml index 24346c6d1c..f598a23b21 100644 --- a/java/sca/itest/contribution-import-export/export-java/pom.xml +++ b/java/sca/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/java/sca/itest/contribution-import-export/import-composite/pom.xml b/java/sca/itest/contribution-import-export/import-composite/pom.xml index 6decf86182..cc2cf4161e 100644 --- a/java/sca/itest/contribution-import-export/import-composite/pom.xml +++ b/java/sca/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/java/sca/itest/contribution-import-export/import-java/pom.xml b/java/sca/itest/contribution-import-export/import-java/pom.xml index ee11269c71..933b00491c 100644 --- a/java/sca/itest/contribution-import-export/import-java/pom.xml +++ b/java/sca/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/java/sca/itest/contribution-import-export/import-resource/pom.xml b/java/sca/itest/contribution-import-export/import-resource/pom.xml index d3ea4f42dd..993e0b368a 100644 --- a/java/sca/itest/contribution-import-export/import-resource/pom.xml +++ b/java/sca/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/java/sca/itest/contribution-import-export/import-wsdl/pom.xml b/java/sca/itest/contribution-import-export/import-wsdl/pom.xml index 38e69bd152..9badb50dc7 100644 --- a/java/sca/itest/contribution-import-export/import-wsdl/pom.xml +++ b/java/sca/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/java/sca/itest/corba/pom.xml b/java/sca/itest/corba/pom.xml index 9670e8059f..b7b7f26b22 100644 --- a/java/sca/itest/corba/pom.xml +++ b/java/sca/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/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioSixTestCase.java b/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioSixTestCase.java index 3c12bf1b8c..b7309d68a0 100644 --- a/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioSixTestCase.java +++ b/java/sca/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/java/sca/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java b/java/sca/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java index 4977baa84c..c71a5875f4 100644 --- a/java/sca/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java +++ b/java/sca/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/java/sca/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/DatabindingTestCase.java b/java/sca/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/DatabindingTestCase.java index 37a521b1bd..da2fc8b108 100644 --- a/java/sca/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/DatabindingTestCase.java +++ b/java/sca/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/java/sca/itest/domain/pom.xml b/java/sca/itest/domain/pom.xml index 930bcda79d..45ce8c1081 100644 --- a/java/sca/itest/domain/pom.xml +++ b/java/sca/itest/domain/pom.xml @@ -93,7 +93,7 @@ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/java/sca/itest/exceptions-cross-binding-ws/pom.xml b/java/sca/itest/exceptions-cross-binding-ws/pom.xml index bdb3784be3..e7ecb604dc 100644 --- a/java/sca/itest/exceptions-cross-binding-ws/pom.xml +++ b/java/sca/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/java/sca/itest/jms-args/pom.xml b/java/sca/itest/jms-args/pom.xml index 32ad3099c6..eae5792e70 100644 --- a/java/sca/itest/jms-args/pom.xml +++ b/java/sca/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/java/sca/itest/jms-callbacks/pom.xml b/java/sca/itest/jms-callbacks/pom.xml index 1dd26c7a41..a495a8309a 100644 --- a/java/sca/itest/jms-callbacks/pom.xml +++ b/java/sca/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/java/sca/itest/jms-definitions/pom.xml b/java/sca/itest/jms-definitions/pom.xml index a142978fde..78a7c64e8f 100644 --- a/java/sca/itest/jms-definitions/pom.xml +++ b/java/sca/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/java/sca/itest/jms-selectors/pom.xml b/java/sca/itest/jms-selectors/pom.xml index 2a39634927..fe28f449d1 100644 --- a/java/sca/itest/jms-selectors/pom.xml +++ b/java/sca/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/java/sca/itest/jms/pom.xml b/java/sca/itest/jms/pom.xml index 0630174ace..1bed1c9f3c 100644 --- a/java/sca/itest/jms/pom.xml +++ b/java/sca/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/java/sca/itest/large-sdo-ws/pom.xml b/java/sca/itest/large-sdo-ws/pom.xml index 64aba086cb..cd67a16b3a 100644 --- a/java/sca/itest/large-sdo-ws/pom.xml +++ b/java/sca/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/java/sca/itest/late-reference-resolution/pom.xml b/java/sca/itest/late-reference-resolution/pom.xml index f30931f309..4b798109e1 100644 --- a/java/sca/itest/late-reference-resolution/pom.xml +++ b/java/sca/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/java/sca/itest/osgi-contribution/contribution-classes-v2/pom.xml b/java/sca/itest/osgi-contribution/contribution-classes-v2/pom.xml index edbb66ab09..f2ec045a5c 100644 --- a/java/sca/itest/osgi-contribution/contribution-classes-v2/pom.xml +++ b/java/sca/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/java/sca/itest/osgi-contribution/contribution-classes/pom.xml b/java/sca/itest/osgi-contribution/contribution-classes/pom.xml index 0a95927b7f..f70760a5fe 100644 --- a/java/sca/itest/osgi-contribution/contribution-classes/pom.xml +++ b/java/sca/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/java/sca/itest/osgi-contribution/contribution-test/pom.xml b/java/sca/itest/osgi-contribution/contribution-test/pom.xml index 6853aba2d1..505452c4df 100644 --- a/java/sca/itest/osgi-contribution/contribution-test/pom.xml +++ b/java/sca/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/java/sca/itest/osgi-implementation/pom.xml b/java/sca/itest/osgi-implementation/pom.xml index d9249b6b9f..3ccab0fd8a 100644 --- a/java/sca/itest/osgi-implementation/pom.xml +++ b/java/sca/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/java/sca/itest/osgi-tuscany/osgi-tuscany-test/pom.xml b/java/sca/itest/osgi-tuscany/osgi-tuscany-test/pom.xml index fa1ace68ac..d879d9c200 100644 --- a/java/sca/itest/osgi-tuscany/osgi-tuscany-test/pom.xml +++ b/java/sca/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/java/sca/itest/osgi-tuscany/tuscany-versioned/pom.xml b/java/sca/itest/osgi-tuscany/tuscany-versioned/pom.xml index 88c5fae221..928ef52291 100644 --- a/java/sca/itest/osgi-tuscany/tuscany-versioned/pom.xml +++ b/java/sca/itest/osgi-tuscany/tuscany-versioned/pom.xml @@ -36,590 +36,10 @@ <dependencies> <dependency> <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-monitor-logging</artifactId> + <artifactId>tuscany-distribution-all</artifactId> <version>${pom.version}</version> </dependency> - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-assembly</artifactId> - <version>${pom.version}</version> - </dependency> - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-assembly-xml</artifactId> - <version>${pom.version}</version> - </dependency> - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-assembly-xsd</artifactId> - <version>${pom.version}</version> - </dependency> - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-binding-dwr</artifactId> - <version>${pom.version}</version> - </dependency> - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-binding-ejb-runtime</artifactId> - <version>${pom.version}</version> - </dependency> - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-binding-atom</artifactId> - <version>${pom.version}</version> - </dependency> -<!-- - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-binding-atom-abdera</artifactId> - <version>${pom.version}</version> - </dependency> ---> - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-binding-feed</artifactId> - <version>${pom.version}</version> - </dependency> - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-binding-rss</artifactId> - <version>${pom.version}</version> - </dependency> - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-binding-rss-rome</artifactId> - <version>${pom.version}</version> - </dependency> - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-binding-http-runtime</artifactId> - <version>${pom.version}</version> - </dependency> - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-binding-jms-runtime</artifactId> - <version>${pom.version}</version> - </dependency> - <dependency> - <groupId>org.apache.activemq</groupId> - <artifactId>apache-activemq</artifactId> - <version>4.1.1</version> - <exclusions> - <exclusion> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - </exclusion> - <exclusion> - <groupId>commons-fileupload</groupId> - <artifactId>commons-fileupload</artifactId> - </exclusion> - <exclusion> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.activemq</groupId> - <artifactId>activemq-console</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.activemq</groupId> - <artifactId>activemq-core</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.activemq</groupId> - <artifactId>activemq-optional</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.activemq</groupId> - <artifactId>activemq-web</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.activemq</groupId> - <artifactId>activemq-web-demo</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.activemq</groupId> - <artifactId>activemq-jaas</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jms_1.1_spec</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jsp_2.0_spec</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-j2ee-management_1.0_spec</artifactId> - </exclusion> - <exclusion> - <groupId>org.mortbay.jetty</groupId> - <artifactId>servlet-api-2.5</artifactId> - </exclusion> - <exclusion> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty</artifactId> - </exclusion> - <exclusion> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty-util</artifactId> - </exclusion> - <exclusion> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - </exclusion> - <exclusion> - <groupId>backport-util-concurrent</groupId> - <artifactId>backport-util-concurrent</artifactId> - </exclusion> - <exclusion> - <groupId>activesoap</groupId> - <artifactId>jaxp-api</artifactId> - </exclusion> - <exclusion> - <groupId>activemq</groupId> - <artifactId>jmdns</artifactId> - </exclusion> - <exclusion> - <groupId>jrms</groupId> - <artifactId>jrms</artifactId> - </exclusion> - <exclusion> - <groupId>xerces</groupId> - <artifactId>xmlParserAPIs</artifactId> - </exclusion> - <exclusion> - <groupId>xstream</groupId> - <artifactId>xstream</artifactId> - </exclusion> - <exclusion> - <groupId>xmlpull</groupId> - <artifactId>xmlpull</artifactId> - </exclusion> - <exclusion> - <groupId>mx4j</groupId> - <artifactId>mx4j</artifactId> - </exclusion> - <exclusion> - <groupId>mx4j</groupId> - <artifactId>mx4j-remote</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-binding-jsonrpc-runtime</artifactId> - <version>${pom.version}</version> - </dependency> - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-binding-notification</artifactId> - <version>${pom.version}</version> - </dependency> - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-binding-rmi</artifactId> - <version>${pom.version}</version> - </dependency> - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-binding-sca</artifactId> - <version>${pom.version}</version> - </dependency> - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-binding-sca-axis2</artifactId> - <version>${pom.version}</version> - </dependency> - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-binding-sca-xml</artifactId> - <version>${pom.version}</version> - </dependency> - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-binding-ws</artifactId> - <version>${pom.version}</version> - </dependency> - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-binding-ws-axis2</artifactId> - <version>${pom.version}</version> - </dependency> - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-binding-ws-xml</artifactId> - <version>${pom.version}</version> - </dependency> - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-contribution</artifactId> - <version>${pom.version}</version> - </dependency> - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-contribution-groovy</artifactId> - <version>${pom.version}</version> - </dependency> - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-contribution-impl</artifactId> - <version>${pom.version}</version> - </dependency> - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-contribution-java</artifactId> - <version>${pom.version}</version> - </dependency> - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-contribution-namespace</artifactId> - <version>${pom.version}</version> - </dependency> - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-core</artifactId> - <version>${pom.version}</version> - </dependency> - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-core-databinding</artifactId> - <version>${pom.version}</version> - </dependency> - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-core-spi</artifactId> - <version>${pom.version}</version> - </dependency> - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-databinding</artifactId> - <version>${pom.version}</version> - </dependency> - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-databinding-axiom</artifactId> - <version>${pom.version}</version> - </dependency> - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-databinding-fastinfoset</artifactId> - <version>${pom.version}</version> - </dependency> - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-databinding-jaxb</artifactId> - <version>${pom.version}</version> - </dependency> - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-databinding-sdo</artifactId> - <version>${pom.version}</version> - </dependency> - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-databinding-sdo-axiom</artifactId> - <version>${pom.version}</version> - </dependency> - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-databinding-xmlbeans</artifactId> - <version>${pom.version}</version> - </dependency> - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-databinding-xstream</artifactId> - <version>${pom.version}</version> - </dependency> - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-host-embedded</artifactId> - <version>${pom.version}</version> - </dependency> - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-host-http</artifactId> - <version>${pom.version}</version> - </dependency> - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-host-rmi</artifactId> - <version>${pom.version}</version> - </dependency> - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-host-webapp</artifactId> - <version>${pom.version}</version> - </dependency> - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-host-jetty</artifactId> - <version>${pom.version}</version> - </dependency> - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-interface</artifactId> - <version>${pom.version}</version> - </dependency> - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-interface-java</artifactId> - <version>${pom.version}</version> - </dependency> - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-interface-java-xml</artifactId> - <version>${pom.version}</version> - </dependency> - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-interface-wsdl</artifactId> - <version>${pom.version}</version> - </dependency> - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-interface-wsdl-xml</artifactId> - <version>${pom.version}</version> - </dependency> -<!-- - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-implementation-bpel</artifactId> - <version>${pom.version}</version> - <exclusions> - <exclusion> - <groupId>ant</groupId> - <artifactId>ant</artifactId> - </exclusion> - </exclusions> - </dependency> ---> - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-implementation-das</artifactId> - <version>${pom.version}</version> - </dependency> - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-implementation-ejb</artifactId> - <version>${pom.version}</version> - </dependency> - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-implementation-ejb</artifactId> - <version>${pom.version}</version> - </dependency> - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-implementation-java</artifactId> - <version>${pom.version}</version> - </dependency> - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-implementation-java-xml</artifactId> - <version>${pom.version}</version> - </dependency> - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>${pom.version}</version> - </dependency> - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-implementation-node</artifactId> - <version>${pom.version}</version> - </dependency> - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-implementation-node-runtime</artifactId> - <version>${pom.version}</version> - <exclusions> - <exclusion> - <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-host-tomcat</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-implementation-osgi</artifactId> - <version>${pom.version}</version> - </dependency> - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-implementation-resource-runtime</artifactId> - <version>${pom.version}</version> - </dependency> - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-implementation-script</artifactId> - <version>${pom.version}</version> - <exclusions> - <exclusion> - <groupId>groovy</groupId> - <artifactId>groovy-all-minimal</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-implementation-spring</artifactId> - <version>${pom.version}</version> - </dependency> - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-implementation-xquery</artifactId> - <version>${pom.version}</version> - </dependency> - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-implementation-widget-runtime</artifactId> - <version>${pom.version}</version> - </dependency> - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-node-api</artifactId> - <version>${pom.version}</version> - </dependency> - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-node-impl</artifactId> - <version>${pom.version}</version> - </dependency> - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-node-launcher</artifactId> - <version>${pom.version}</version> - </dependency> - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-policy</artifactId> - <version>${pom.version}</version> - </dependency> - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-policy-logging</artifactId> - <version>${pom.version}</version> - </dependency> - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-policy-security</artifactId> - <version>${pom.version}</version> - </dependency> - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-policy-xml</artifactId> - <version>${pom.version}</version> - </dependency> - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-definitions</artifactId> - <version>${pom.version}</version> - </dependency> - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-workspace</artifactId> - <version>${pom.version}</version> - </dependency> - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-domain-manager</artifactId> - <version>${pom.version}</version> - <exclusions> - <exclusion> - <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-host-tomcat</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-workspace-impl</artifactId> - <version>${pom.version}</version> - </dependency> - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-workspace-xml</artifactId> - <version>${pom.version}</version> - </dependency> -<!-- - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-java2wsdl</artifactId> - <version>${pom.version}</version> - </dependency> - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-wsdl2java</artifactId> - <version>${pom.version}</version> - </dependency> ---> - <dependency> - <groupId>${pom.groupId}</groupId> - <artifactId>tuscany-sca-api</artifactId> - <version>${pom.version}</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sdo</groupId> - <artifactId>tuscany-sdo-impl</artifactId> - <version>1.1-incubating</version> - <exclusions> - <exclusion> - <groupId>org.codehaus.woodstox</groupId> - <artifactId>wstx-asl</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sdo</groupId> - <artifactId>tuscany-sdo-tools</artifactId> - <version>1.1-incubating</version> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> - <version>2.1.6</version> - <exclusions> - <exclusion> - <groupId>javax.xml.stream</groupId> - <artifactId>stax-api</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.1</version> - </dependency> - <dependency> - <groupId>commons-cli</groupId> - <artifactId>commons-cli</artifactId> - <version>1.0</version> - <exclusions> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.easymock</groupId> - <artifactId>easymock</artifactId> - <version>2.2</version> - </dependency> - </dependencies> - <build> <plugins> diff --git a/java/sca/itest/policy-security-basicauth/pom.xml b/java/sca/itest/policy-security-basicauth/pom.xml index ca9257b827..03002e6cf2 100644 --- a/java/sca/itest/policy-security-basicauth/pom.xml +++ b/java/sca/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/java/sca/itest/policy-security-jsr250/pom.xml b/java/sca/itest/policy-security-jsr250/pom.xml index 2bb8001486..2e1ed65eae 100644 --- a/java/sca/itest/policy-security-jsr250/pom.xml +++ b/java/sca/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/java/sca/itest/policy-security/pom.xml b/java/sca/itest/policy-security/pom.xml index e8100e9fa0..3011c2ff99 100644 --- a/java/sca/itest/policy-security/pom.xml +++ b/java/sca/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/java/sca/itest/policy/pom.xml b/java/sca/itest/policy/pom.xml index 68d03d72b6..8f7b692cff 100644 --- a/java/sca/itest/policy/pom.xml +++ b/java/sca/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/java/sca/itest/pom.xml b/java/sca/itest/pom.xml index 1c32e2489c..d59557d2e3 100644 --- a/java/sca/itest/pom.xml +++ b/java/sca/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/java/sca/itest/validation/pom.xml b/java/sca/itest/validation/pom.xml index 3d1d0c04f5..a5ee99675d 100644 --- a/java/sca/itest/validation/pom.xml +++ b/java/sca/itest/validation/pom.xml @@ -155,7 +155,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> </dependencies> |