diff options
Diffstat (limited to 'sca-java-2.x')
7 files changed, 17 insertions, 11 deletions
diff --git a/sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE b/sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE index 7bf827f5d4..ab661a1183 100644 --- a/sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE +++ b/sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE @@ -270,6 +270,7 @@ The following components come under Apache Software License 2.0 geronimo-transaction-2.1.4.jar
geronimo-ws-metadata_2.0_spec-1.1.2.jar
groovy-all-1.7.1.jar
+ gson-1.4.jar
hazelcast-1.8.3.jar
hazelcast-client-1.8.3.jar
httpclient-4.0.jar
@@ -691,15 +692,24 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. The jars;
activation-1.1.jar,
+atmosphere-annotations-0.6.1.jar,
+atmosphere-commons-0.6.1.jar,
+atmosphere-compat-jbossweb-0.6.1.jar,
+atmosphere-compat-tomcat-0.6.1.jar,
+atmosphere-compat-weblogic-0.6.1.jar,
+atmosphere-jersey-0.6.1.jar,
+atmosphere-runtime-0.6.1.jar,
jaxb-api-2.1.jar,
jaxb-impl-2.1.12.jar,
jaxws-api-2.1.jar,
+jersey-core-1.3.jar,
+jersey-server-1.3.jar,
jsr181-api-1.0-MR1.jar,
jsr250-api-1.0.jar,
jstl-1.1.2.jar,
mail-1.4.jar,
servlet-api-2.5.jar,
-jsr311-api-1.1.jar
+jsr311-api-1.1.1.jar
COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
diff --git a/sca-java-2.x/trunk/features/all/pom.xml b/sca-java-2.x/trunk/features/all/pom.xml index 8566b74fb0..bf168dc8b7 100644 --- a/sca-java-2.x/trunk/features/all/pom.xml +++ b/sca-java-2.x/trunk/features/all/pom.xml @@ -149,13 +149,11 @@ <version>2.0-SNAPSHOT</version> </dependency> -<!-- not in distro until build settles down <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-binding-comet-runtime</artifactId> <version>2.0-SNAPSHOT</version> </dependency> ---> <dependency> <groupId>org.apache.tuscany.sca</groupId> @@ -285,13 +283,11 @@ <!-- policy extensions --> -<!-- not in distro until build settles down <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-policy-logging</artifactId> <version>2.0-SNAPSHOT</version> </dependency> ---> <dependency> <groupId>org.apache.tuscany.sca</groupId> diff --git a/sca-java-2.x/trunk/modules/base-runtime-pom/pom.xml b/sca-java-2.x/trunk/modules/base-runtime-pom/pom.xml index 7e28d4681e..35bc47d1b3 100644 --- a/sca-java-2.x/trunk/modules/base-runtime-pom/pom.xml +++ b/sca-java-2.x/trunk/modules/base-runtime-pom/pom.xml @@ -180,11 +180,11 @@ <artifactId>tuscany-implementation-java</artifactId>
<version>${pom.version}</version>
</dependency>
- <!-- dependency>
+ <dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-jaxrs</artifactId>
<version>${pom.version}</version>
- </dependency -->
+ </dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-python</artifactId>
diff --git a/sca-java-2.x/trunk/modules/binding-rest-runtime/pom.xml b/sca-java-2.x/trunk/modules/binding-rest-runtime/pom.xml index 330188cafd..8b44a0c558 100644 --- a/sca-java-2.x/trunk/modules/binding-rest-runtime/pom.xml +++ b/sca-java-2.x/trunk/modules/binding-rest-runtime/pom.xml @@ -93,7 +93,7 @@ <dependency> <groupId>javax.ws.rs</groupId> <artifactId>jsr311-api</artifactId> - <version>1.1</version> + <version>1.1.1</version> </dependency> <dependency> diff --git a/sca-java-2.x/trunk/modules/implementation-jaxrs-runtime/pom.xml b/sca-java-2.x/trunk/modules/implementation-jaxrs-runtime/pom.xml index 66bf8b64c2..76572499a3 100644 --- a/sca-java-2.x/trunk/modules/implementation-jaxrs-runtime/pom.xml +++ b/sca-java-2.x/trunk/modules/implementation-jaxrs-runtime/pom.xml @@ -99,7 +99,7 @@ <dependency> <groupId>javax.ws.rs</groupId> <artifactId>jsr311-api</artifactId> - <version>1.1</version> + <version>1.1.1</version> </dependency> <dependency> diff --git a/sca-java-2.x/trunk/modules/implementation-jaxrs/pom.xml b/sca-java-2.x/trunk/modules/implementation-jaxrs/pom.xml index 23dce9ab5c..44fb9f8a7b 100644 --- a/sca-java-2.x/trunk/modules/implementation-jaxrs/pom.xml +++ b/sca-java-2.x/trunk/modules/implementation-jaxrs/pom.xml @@ -76,7 +76,7 @@ <dependency> <groupId>javax.ws.rs</groupId> <artifactId>jsr311-api</artifactId> - <version>1.1</version> + <version>1.1.1</version> </dependency> <dependency> diff --git a/sca-java-2.x/trunk/modules/interface-java-jaxrs/pom.xml b/sca-java-2.x/trunk/modules/interface-java-jaxrs/pom.xml index c6410c1c83..cb9d4dd5fb 100644 --- a/sca-java-2.x/trunk/modules/interface-java-jaxrs/pom.xml +++ b/sca-java-2.x/trunk/modules/interface-java-jaxrs/pom.xml @@ -32,7 +32,7 @@ <dependency> <groupId>javax.ws.rs</groupId> <artifactId>jsr311-api</artifactId> - <version>1.1</version> + <version>1.1.1</version> </dependency> <dependency> |