diff options
Diffstat (limited to 'java/sca/modules')
| -rw-r--r-- | java/sca/modules/implementation-bpel-ode/META-INF/MANIFEST.MF | 2 | ||||
| -rw-r--r-- | java/sca/modules/implementation-bpel-ode/pom.xml | 8 | ||||
| -rw-r--r-- | java/sca/modules/implementation-spring-sca/pom.xml | 33 |
3 files changed, 22 insertions, 21 deletions
diff --git a/java/sca/modules/implementation-bpel-ode/META-INF/MANIFEST.MF b/java/sca/modules/implementation-bpel-ode/META-INF/MANIFEST.MF index eb2db6e5cb..5e8ef59631 100644 --- a/java/sca/modules/implementation-bpel-ode/META-INF/MANIFEST.MF +++ b/java/sca/modules/implementation-bpel-ode/META-INF/MANIFEST.MF @@ -14,7 +14,7 @@ Bundle-Description: Apache Tuscany SCA BPEL ODE Implementation Extensi on
Import-Package: javax.resource.spi,
javax.sql,
- javax.transaction;version="1.0.1",
+ javax.transaction;version="1.1.0",
javax.wsdl,
javax.xml.namespace,
org.apache.commons.logging,
diff --git a/java/sca/modules/implementation-bpel-ode/pom.xml b/java/sca/modules/implementation-bpel-ode/pom.xml index e0e3c5f36d..5e6e263f94 100644 --- a/java/sca/modules/implementation-bpel-ode/pom.xml +++ b/java/sca/modules/implementation-bpel-ode/pom.xml @@ -259,6 +259,10 @@ <version>1.1</version>
<exclusions>
<exclusion>
+ <groupId>geronimo-spec</groupId>
+ <artifactId>geronimo-spec-jta</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</exclusion>
@@ -326,7 +330,7 @@ <exclusion>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
- </exclusion>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -349,7 +353,7 @@ <groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
</exclusion>
- </exclusions>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.xmlbeans</groupId>
diff --git a/java/sca/modules/implementation-spring-sca/pom.xml b/java/sca/modules/implementation-spring-sca/pom.xml index 98aadb1dea..746b8cc2ac 100644 --- a/java/sca/modules/implementation-spring-sca/pom.xml +++ b/java/sca/modules/implementation-spring-sca/pom.xml @@ -7,15 +7,15 @@ * to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
- * under the License.
+ * under the License.
-->
<project>
<modelVersion>4.0.0</modelVersion>
@@ -25,21 +25,21 @@ <version>2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>tuscany-implementation-spring-runtime</artifactId>
+ <artifactId>tuscany-implementation-spring-sca</artifactId>
<name>Apache Tuscany SCA Spring Implementation Runtime Model</name>
<dependencies>
- <!-- **************************************** -->
- <!-- * * -->
- <!-- * DONT ADD ANY TUSCANY DEPENDENCIES!!! * -->
- <!-- * * -->
- <!-- * See the README for details why not * -->
- <!-- * * -->
- <!-- * * -->
- <!-- **************************************** -->
+ <!-- **************************************** -->
+ <!-- * * -->
+ <!-- * DONT ADD ANY TUSCANY DEPENDENCIES!!! * -->
+ <!-- * * -->
+ <!-- * See the README for details why not * -->
+ <!-- * * -->
+ <!-- * * -->
+ <!-- **************************************** -->
- <!-- SCA API dependency -->
+ <!-- SCA API dependency -->
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca-api</artifactId>
@@ -47,27 +47,24 @@ <scope>provided</scope>
</dependency>
- <!-- Spring dependencies... -->
+ <!-- Spring dependencies... -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>2.5.5</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>2.5.5</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>2.5.5</version>
- <scope>provided</scope>
</dependency>
-
+
</dependencies>
</project>
|