Put back the base jar pom.xml to include explicit dependencies instead of using the features/base as the shade plugin doesn't seem to work quite right with pom type dependencies. It ends up with the feature/base and its transitive dependencies still being included in the dependency reduced pom.xml which means all the individual modules still come in as transitive dependencies. There may be some way to fix this with shade plugin excludes but while i work that out put this back to the old way

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@997663 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 254 insertions, 2 deletions

diff --git a/sca-java-2.x/trunk/shades/base/pom.xml b/sca-java-2.x/trunk/shades/base/pom.xml
index 1c6d2e92c3..cddc75945c 100644
--- a/sca-java-2.x/trunk/shades/base/pom.xml
+++ b/sca-java-2.x/trunk/shades/base/pom.xml
@@ -34,9 +34,260 @@
 

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-feature-base</artifactId>

+            <artifactId>tuscany-domain-node</artifactId>

             <version>${pom.version}</version>

-            <type>pom</type>

+        </dependency>

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-implementation-web-runtime</artifactId>

+            <version>${pom.version}</version>

+        </dependency>

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-launcher</artifactId>

+            <version>${pom.version}</version>

+        </dependency>

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-endpoint-hazelcast</artifactId>

+            <version>${pom.version}</version>

+        </dependency>

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-endpoint-hazelcast-client</artifactId>

+            <version>${pom.version}</version>

+        </dependency>

+        <!-- dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-sca-client-javascript</artifactId>

+            <version>${pom.version}</version>

+        </dependency -->

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-sca-client-impl</artifactId>

+            <version>${pom.version}</version>

+        </dependency>

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-host-jetty</artifactId>

+            <version>${pom.version}</version>

+            <exclusions>

+                <exclusion>

+                    <groupId>org.apache.tuscany.sca</groupId>

+                    <artifactId>tuscany-core-spi</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>javax.servlet</groupId>

+                    <artifactId>servlet-api</artifactId>

+                </exclusion>

+            </exclusions>

+        </dependency>

+

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-binding-hazelcast-runtime</artifactId>

+            <version>${pom.version}</version>

+        </dependency>

+

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-shell</artifactId>

+            <version>${pom.version}</version>

+        </dependency>

+

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-stripes</artifactId>

+            <version>${pom.version}</version>

+            <exclusions>

+                <exclusion>

+                   <groupId>net.sourceforge.stripes</groupId>

+                   <artifactId>stripes</artifactId>

+                </exclusion>

+            </exclusions>

+        </dependency>

+

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-wink</artifactId>

+            <version>${pom.version}</version>

+        </dependency>

+

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-binding-ws-runtime-jaxws-ri</artifactId>

+            <version>${pom.version}</version>

+        </dependency>

+

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-data-api</artifactId>

+            <version>${pom.version}</version>

+        </dependency>

+

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-binding-rmi-runtime</artifactId>

+            <version>${pom.version}</version>

+        </dependency>

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-host-rmi</artifactId>

+            <version>${pom.version}</version>

+        </dependency>

+

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-contribution-osgi</artifactId>

+            <version>${pom.version}</version>

+            <exclusions>

+                <exclusion>

+                    <groupId>org.eclipse</groupId>

+                    <artifactId>osgi</artifactId>

+                </exclusion>

+            </exclusions>

+        </dependency>

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-implementation-osgi-runtime</artifactId>

+            <version>${pom.version}</version>

+            <exclusions>

+                <exclusion>

+                    <groupId>org.eclipse</groupId>

+                    <artifactId>osgi</artifactId>

+                </exclusion>

+            </exclusions>

+        </dependency>

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-node-impl-osgi</artifactId>

+            <version>${pom.version}</version>

+            <exclusions>

+                <exclusion>

+                    <groupId>org.eclipse</groupId>

+                    <artifactId>osgi</artifactId>

+                </exclusion>

+                <exclusion>

+                    <groupId>org.eclipse.osgi</groupId>

+                    <artifactId>services</artifactId>

+                </exclusion>

+            </exclusions>

+        </dependency>

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-extensibility-equinox</artifactId>

+            <version>${pom.version}</version>

+            <exclusions>

+                <exclusion>

+                    <groupId>org.eclipse</groupId>

+                    <artifactId>osgi</artifactId>

+                </exclusion>

+            </exclusions>

+        </dependency>

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-node-launcher-equinox</artifactId>

+            <version>${pom.version}</version>

+            <exclusions>

+                <exclusion>

+                    <groupId>org.eclipse</groupId>

+                    <artifactId>osgi</artifactId>

+                </exclusion>

+                <exclusion>

+                    <groupId>javax.servlet</groupId>

+                    <artifactId>servlet-api</artifactId>

+                </exclusion>

+                <exclusion>

+                    <groupId>commons-cli</groupId>

+                    <artifactId>commons-cli</artifactId>

+                </exclusion>

+            </exclusions>

+        </dependency>

+

+<!-- these remaining dependencies are not required when using JDK6, so use a scope of provided  -->

+

+        <dependency>

+            <groupId>org.apache.geronimo.specs</groupId>

+            <artifactId>geronimo-stax-api_1.0_spec</artifactId>

+            <version>1.0.1</version>

+            <scope>provided</scope>

+        </dependency>

+

+        <dependency>

+            <groupId>org.codehaus.woodstox</groupId>

+            <artifactId>wstx-asl</artifactId>

+            <version>3.2.4</version>

+            <scope>provided</scope>

+            <exclusions>

+                <exclusion>

+                    <groupId>stax</groupId>

+                    <artifactId>stax-api</artifactId>

+                </exclusion>

+            </exclusions>

+        </dependency>

+

+        <dependency>

+            <groupId>javax.xml.bind</groupId>

+            <artifactId>jaxb-api</artifactId>

+            <version>2.1</version>

+            <scope>provided</scope>

+        </dependency>

+

+        <dependency>

+            <groupId>javax.activation</groupId>

+            <artifactId>activation</artifactId>

+            <version>1.1</version>

+            <scope>provided</scope>

+        </dependency>

+

+        <dependency>

+            <groupId>com.sun.xml.bind</groupId>

+            <artifactId>jaxb-impl</artifactId>

+            <version>2.1.12</version>

+            <scope>provided</scope>

+        </dependency>

+

+

+        <dependency>

+            <groupId>javax.xml.ws</groupId>

+            <artifactId>jaxws-api</artifactId>

+            <version>2.1</version>

+            <scope>provided</scope>

+            <exclusions>

+                <exclusion>

+                    <groupId>javax.xml.soap</groupId>

+                    <artifactId>saaj-api</artifactId>

+                </exclusion>

+            </exclusions>

+        </dependency>

+

+        <dependency>

+            <groupId>javax.annotation</groupId>

+            <artifactId>jsr250-api</artifactId>

+            <version>1.0</version>

+            <scope>provided</scope>

+        </dependency>

+

+        <dependency>

+            <groupId>javax.jws</groupId>

+            <artifactId>jsr181-api</artifactId>

+            <version>1.0-MR1</version>

+            <scope>provided</scope>

+        </dependency>

+

+        <dependency>

+            <groupId>javax.xml.stream</groupId>

+            <artifactId>stax-api</artifactId>

+            <version>1.0-2</version>

+            <scope>provided</scope>

         </dependency>

 

     </dependencies>

@@ -77,3 +328,4 @@
         </plugins>

     </build>

 </project>

+