diff options
8 files changed, 49 insertions, 187 deletions
diff --git a/sca-java-2.x/trunk/modules/binding-rmi-runtime/pom.xml b/sca-java-2.x/trunk/modules/binding-rmi-runtime/pom.xml index d6d89a24c7..c8fcfe2774 100644 --- a/sca-java-2.x/trunk/modules/binding-rmi-runtime/pom.xml +++ b/sca-java-2.x/trunk/modules/binding-rmi-runtime/pom.xml @@ -32,13 +32,15 @@ <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-rmi</artifactId> + <artifactId>tuscany-core-runtime</artifactId> <version>2.0-SNAPSHOT</version> + <type>pom</type> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-interface-java</artifactId> + <artifactId>tuscany-binding-rmi</artifactId> <version>2.0-SNAPSHOT</version> </dependency> @@ -47,30 +49,12 @@ <artifactId>tuscany-host-rmi</artifactId> <version>2.0-SNAPSHOT</version> </dependency> - - <dependency> - <groupId>cglib</groupId> - <artifactId>cglib</artifactId> - <version>2.2</version> - </dependency> - - <dependency> - <groupId>asm</groupId> - <artifactId>asm</artifactId> - <version>3.1</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - - <dependency> + + <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl</artifactId> + <artifactId>tuscany-base-runtime</artifactId> <version>2.0-SNAPSHOT</version> + <type>pom</type> <scope>test</scope> </dependency> diff --git a/sca-java-2.x/trunk/modules/binding-rmi/pom.xml b/sca-java-2.x/trunk/modules/binding-rmi/pom.xml index 205cf3ac04..5a44cb0eef 100644 --- a/sca-java-2.x/trunk/modules/binding-rmi/pom.xml +++ b/sca-java-2.x/trunk/modules/binding-rmi/pom.xml @@ -32,8 +32,10 @@ <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-assembly</artifactId> + <artifactId>tuscany-core-runtime</artifactId> <version>2.0-SNAPSHOT</version> + <type>pom</type> + <scope>provided</scope> </dependency> </dependencies> diff --git a/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/pom.xml b/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/pom.xml index c6a4253468..0a9d258335 100644 --- a/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/pom.xml +++ b/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/pom.xml @@ -29,92 +29,29 @@ <artifactId>tuscany-binding-ws-runtime-axis2</artifactId> <name>Apache Tuscany SCA Axis2-1.5-based WS Binding Runtime</name> - <repositories> - <repository> - <id>apache.ws</id> - <name>Apache WebServices Repository</name> - <url>http://ws.zones.apache.org/repository/</url> - <layout>legacy</layout> - </repository> - </repositories> <dependencies> <!-- Compile dependencies --> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-core</artifactId> + <artifactId>tuscany-core-runtime</artifactId> <version>2.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-interface-wsdl</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-assembly-xml</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ws</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> + <type>pom</type> + <scope>provided</scope> + </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-binding-ws-wsdlgen</artifactId> <version>2.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-core-databinding</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-databinding</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-databinding-axiom</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-databinding-jaxb-axiom</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-http</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-xsd</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - + </dependency> + <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-policy-security</artifactId> <version>2.0-SNAPSHOT</version> - </dependency> + </dependency> <dependency> <groupId>org.apache.axis2</groupId> @@ -400,36 +337,38 @@ </exclusion> </exclusions> </dependency> - - <!-- Test dependencies --> + <!-- Runtime dependencies --> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-jetty</artifactId> + <artifactId>tuscany-databinding-axiom</artifactId> <version>2.0-SNAPSHOT</version> - <scope>test</scope> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl</artifactId> + <artifactId>tuscany-databinding-jaxb-axiom</artifactId> <version>2.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> + <scope>runtime</scope> + </dependency> + <!-- Test dependencies --> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> + <artifactId>tuscany-base-runtime</artifactId> <version>2.0-SNAPSHOT</version> + <type>pom</type> <scope>test</scope> - </dependency> - + </dependency> +<!-- <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-jms_1.1_spec</artifactId> <version>1.1.1</version> <scope>provided</scope> - </dependency> + </dependency> +--> </dependencies> diff --git a/sca-java-2.x/trunk/modules/databinding-axiom/pom.xml b/sca-java-2.x/trunk/modules/databinding-axiom/pom.xml index 3df7204dae..45b06b9db2 100644 --- a/sca-java-2.x/trunk/modules/databinding-axiom/pom.xml +++ b/sca-java-2.x/trunk/modules/databinding-axiom/pom.xml @@ -31,28 +31,11 @@ <dependencies> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-core-spi</artifactId> + <artifactId>tuscany-core-runtime</artifactId> <version>2.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-databinding</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - - <!-- - <dependency> - <groupId>javax.xml.stream</groupId> - <artifactId>stax-api</artifactId> - <version>1.0-2</version> - </dependency> - --> - - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-stax-api_1.0_spec</artifactId> - <version>1.0.1</version> - </dependency> + <type>pom</type> + <scope>provided</scope> + </dependency> <dependency> <groupId>org.apache.ws.commons.axiom</groupId> @@ -86,26 +69,7 @@ </exclusion> </exclusions> </dependency> - - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.1.1</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.codehaus.woodstox</groupId> - <artifactId>wstx-asl</artifactId> - <version>3.2.6</version> - <scope>runtime</scope> - <exclusions> - <exclusion> - <groupId>stax</groupId> - <artifactId>stax-api</artifactId> - </exclusion> - </exclusions> - </dependency> + </dependencies> diff --git a/sca-java-2.x/trunk/modules/databinding-jaxb-axiom/pom.xml b/sca-java-2.x/trunk/modules/databinding-jaxb-axiom/pom.xml index 744fe474da..80f20fa903 100644 --- a/sca-java-2.x/trunk/modules/databinding-jaxb-axiom/pom.xml +++ b/sca-java-2.x/trunk/modules/databinding-jaxb-axiom/pom.xml @@ -31,14 +31,12 @@ <dependencies> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-core-spi</artifactId> + <artifactId>tuscany-core-runtime</artifactId> <version>2.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-databinding-jaxb</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> + <type>pom</type> + <scope>provided</scope> + </dependency> + <dependency> <groupId>org.apache.ws.commons.axiom</groupId> <artifactId>axiom-api</artifactId> @@ -71,26 +69,6 @@ </dependency> </dependencies> - <repositories> - <repository> - <snapshots> - <enabled>true</enabled> - </snapshots> - <id>java.net</id> - <name>java.net Maven 1.x Repository</name> - <url>http://download.java.net/maven/1</url> - <layout>legacy</layout> - </repository> - </repositories> - - <pluginRepositories> - <pluginRepository> - <id>java.net2</id> - <name>java.net Maven 2.x Repository</name> - <url>http://download.java.net/maven/2</url> - </pluginRepository> - </pluginRepositories> - <build> <plugins> <plugin> diff --git a/sca-java-2.x/trunk/modules/host-rmi/pom.xml b/sca-java-2.x/trunk/modules/host-rmi/pom.xml index b00e404696..1d7a696e49 100644 --- a/sca-java-2.x/trunk/modules/host-rmi/pom.xml +++ b/sca-java-2.x/trunk/modules/host-rmi/pom.xml @@ -31,8 +31,10 @@ <dependencies> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-core-spi</artifactId> + <artifactId>tuscany-core-runtime</artifactId> <version>2.0-SNAPSHOT</version> + <type>pom</type> + <scope>provided</scope> </dependency> </dependencies> diff --git a/sca-java-2.x/trunk/modules/node-impl-osgi/pom.xml b/sca-java-2.x/trunk/modules/node-impl-osgi/pom.xml index c5af2a491b..750ed73bc9 100644 --- a/sca-java-2.x/trunk/modules/node-impl-osgi/pom.xml +++ b/sca-java-2.x/trunk/modules/node-impl-osgi/pom.xml @@ -110,12 +110,14 @@ <scope>test</scope> </dependency> +<!-- <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-binding-rmi-runtime</artifactId> <version>2.0-SNAPSHOT</version> <scope>test</scope> </dependency> +--> </dependencies> </project> diff --git a/sca-java-2.x/trunk/modules/policy-security/pom.xml b/sca-java-2.x/trunk/modules/policy-security/pom.xml index 029f605a4d..0140272e09 100644 --- a/sca-java-2.x/trunk/modules/policy-security/pom.xml +++ b/sca-java-2.x/trunk/modules/policy-security/pom.xml @@ -29,22 +29,13 @@ <name>Apache Tuscany SCA Policy Security Model</name> <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-contribution</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-assembly-xml</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-core-spi</artifactId> + <artifactId>tuscany-core-runtime</artifactId> <version>2.0-SNAPSHOT</version> + <type>pom</type> + <scope>provided</scope> </dependency> </dependencies> |