diff options
| -rw-r--r-- | java/sca/distribution/all/src/main/release/bin/LICENSE | 12 | ||||
| -rw-r--r-- | java/sca/distribution/tomcat/tomcat-war/src/main/webapp/LICENSE | 6 | ||||
| -rw-r--r-- | java/sca/modules/binding-ws-axis2/pom.xml | 24 | ||||
| -rw-r--r-- | java/sca/modules/contribution/pom.xml | 8 | ||||
| -rw-r--r-- | java/sca/modules/implementation-bpel-runtime/pom.xml | 25 | ||||
| -rw-r--r-- | java/sca/modules/node-launcher/pom.xml | 2 | ||||
| -rw-r--r-- | java/sca/samples/helloworld-bpel/pom.xml | 15 |
7 files changed, 78 insertions, 14 deletions
diff --git a/java/sca/distribution/all/src/main/release/bin/LICENSE b/java/sca/distribution/all/src/main/release/bin/LICENSE index 8bf0e2481a..ff6ba9e0cf 100644 --- a/java/sca/distribution/all/src/main/release/bin/LICENSE +++ b/java/sca/distribution/all/src/main/release/bin/LICENSE @@ -228,11 +228,11 @@ The following components come under Apache Software License 2.0 axis-ant-1.4.jar
cglib-2.2.jar
commons-beanutils-1.7.0.jar
- commons-cli-1.1.jar
- commons-collections-3.1.jar
+ commons-cli-1.2.jar
+ commons-collections-3.2.jar
commons-codec-1.3.jar
commons-digester-1.8.jar
- commons-discovery-0.2.jar
+ commons-discovery-0.4.jar
commons-fileupload-1.2.jar
commons-httpclient-3.1.jar
commons-io-1.4.jar
@@ -254,14 +254,14 @@ The following components come under Apache Software License 2.0 geronimo-stax-api_1.0_spec-1.0.1.jar
geronimo-transaction-2.0.1.jar
httpclient-4.0.jar
- httpcore-4.0-beta1.jar
- httpcore-nio-4.0-beta1.jar
+ httpcore-4.0.1.jar
+ httpcore-nio-4.0.1.jar
jackson-core-asl-1.0.1.jar
jackson-mapper-asl-1.0.1.jar
jetty-6.1.19.jar
jetty-util-6.1.19.jar
juli-6.0.18.jar
- log4j-1.2.13.jar
+ log4j-1.2.15.jar
mex-1.41-impl.jar
myfaces-api-1.2.2.jar
myfaces-impl-1.2.2.jar
diff --git a/java/sca/distribution/tomcat/tomcat-war/src/main/webapp/LICENSE b/java/sca/distribution/tomcat/tomcat-war/src/main/webapp/LICENSE index 8874bffcc2..8bc5786069 100644 --- a/java/sca/distribution/tomcat/tomcat-war/src/main/webapp/LICENSE +++ b/java/sca/distribution/tomcat/tomcat-war/src/main/webapp/LICENSE @@ -226,9 +226,9 @@ The following components come under Apache Software License 2.0 axis2-mtompolicy-1.4.1.jar
axis-ant-1.4.jar
cglib-2.2.jar
- commons-collections-3.1.jar
+ commons-collections-3.2.jar
commons-codec-1.3.jar,
- commons-discovery-0.2.jar
+ commons-discovery-0.4.jar
commons-fileupload-1.2.jar
commons-httpclient-3.1.jar
commons-io-1.4.jar
@@ -239,7 +239,7 @@ The following components come under Apache Software License 2.0 geronimo-stax-api_1.0_spec-1.0.1.jar
httpclient-4.0.jar,
httpcore-4.0.1.jar
- httpcore-nio-4.0-beta1.jar
+ httpcore-nio-4.0.1.jar
jackson-core-asl-1.0.1.jar
jackson-mapper-asl-1.0.1.jar
log4j-1.2.15.jar
diff --git a/java/sca/modules/binding-ws-axis2/pom.xml b/java/sca/modules/binding-ws-axis2/pom.xml index 1c5da1a481..841270bed9 100644 --- a/java/sca/modules/binding-ws-axis2/pom.xml +++ b/java/sca/modules/binding-ws-axis2/pom.xml @@ -206,12 +206,36 @@ <artifactId>commons-httpclient</artifactId> <version>3.1</version> </dependency> + + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore</artifactId> + <version>4.0.1</version> + </dependency> + + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore-nio</artifactId> + <version>4.0.1</version> + </dependency> <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> <version>1.1.1</version> </dependency> + + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.2</version> + </dependency> + + <dependency> + <groupId>commons-discovery</groupId> + <artifactId>commons-discovery</artifactId> + <version>0.4</version> + </dependency> <dependency> <groupId>org.apache.axis2</groupId> diff --git a/java/sca/modules/contribution/pom.xml b/java/sca/modules/contribution/pom.xml index 617b4559f8..56d8f1af3a 100644 --- a/java/sca/modules/contribution/pom.xml +++ b/java/sca/modules/contribution/pom.xml @@ -34,7 +34,13 @@ <artifactId>tuscany-assembly</artifactId> <version>2.0-SNAPSHOT</version> </dependency> - + + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-assembly-xsd</artifactId> + <version>2.0-SNAPSHOT</version> + </dependency> + <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-extensibility</artifactId> diff --git a/java/sca/modules/implementation-bpel-runtime/pom.xml b/java/sca/modules/implementation-bpel-runtime/pom.xml index db293bf91e..67c6cdcd30 100644 --- a/java/sca/modules/implementation-bpel-runtime/pom.xml +++ b/java/sca/modules/implementation-bpel-runtime/pom.xml @@ -184,7 +184,7 @@ <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> - <version>3.1</version> + <version>3.2</version> </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId> @@ -362,7 +362,7 @@ <dependency> <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> - <version>2.9.0</version> + <version>2.8.1</version> <exclusions> <exclusion> <groupId>xml-apis</groupId> @@ -412,10 +412,29 @@ </exclusion> </exclusions> </dependency> + <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>1.2.13</version> + <version>1.2.15</version> + <exclusions> + <exclusion> + <groupId>com.sun.jdmk</groupId> + <artifactId>jmxtools</artifactId> + </exclusion> + <exclusion> + <groupId>com.sun.jmx</groupId> + <artifactId>jmxri</artifactId> + </exclusion> + <exclusion> + <groupId>javax.jms</groupId> + <artifactId>jms</artifactId> + </exclusion> + <exclusion> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + </exclusion> + </exclusions> </dependency> </dependencies> diff --git a/java/sca/modules/node-launcher/pom.xml b/java/sca/modules/node-launcher/pom.xml index fd2d0c2afe..4ae3dac803 100644 --- a/java/sca/modules/node-launcher/pom.xml +++ b/java/sca/modules/node-launcher/pom.xml @@ -40,7 +40,7 @@ <dependency> <groupId>commons-cli</groupId> <artifactId>commons-cli</artifactId> - <version>1.1</version> + <version>1.2</version> </dependency> </dependencies> diff --git a/java/sca/samples/helloworld-bpel/pom.xml b/java/sca/samples/helloworld-bpel/pom.xml index 0eb1658f85..73f310cbef 100644 --- a/java/sca/samples/helloworld-bpel/pom.xml +++ b/java/sca/samples/helloworld-bpel/pom.xml @@ -85,6 +85,21 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.tuscany.maven.plugins</groupId> + <artifactId>maven-osgi-junit-plugin</artifactId> + <version>1.0-SNAPSHOT</version> + <executions> + <execution> + <id>osgi-test</id> + <phase>test</phase> + <goals> + <goal>test</goal> + </goals> + <configuration></configuration> + </execution> + </executions> + </plugin> </plugins> </build> |