Cleaning up dependencies...
git-svn-id: https://svn.apache.org/repos/asf/incubator/photark/trunk@939956 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/photark-appengine-webapp/pom.xml b/photark-appengine-webapp/pom.xml
index 1dea59f..ff4f717 100644
--- a/photark-appengine-webapp/pom.xml
+++ b/photark-appengine-webapp/pom.xml
@@ -61,7 +61,6 @@
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-java-runtime</artifactId>
<version>${tuscany.version}</version>
-
<scope>runtime</scope>
</dependency>
@@ -69,8 +68,17 @@
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
<version>${tuscany.version}</version>
-
<scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-impl</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -91,7 +99,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.5</version>
+ <version>4.8.1</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/photark-filesystem/pom.xml b/photark-filesystem/pom.xml
index 549d9b1..f83def5 100644
--- a/photark-filesystem/pom.xml
+++ b/photark-filesystem/pom.xml
@@ -33,7 +33,6 @@
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca-api</artifactId>
<version>${tuscany.version}</version>
-
</dependency>
<dependency>
@@ -42,10 +41,18 @@
<version>1.0-incubating-SNAPSHOT</version>
</dependency>
+ <!-- marking dependency as provided to exclude from war file -->
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.5</version>
+ <version>4.8.1</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/photark-jcr/pom.xml b/photark-jcr/pom.xml
index f4a7def..a4b055c 100644
--- a/photark-jcr/pom.xml
+++ b/photark-jcr/pom.xml
@@ -40,14 +40,12 @@
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca-api</artifactId>
<version>${tuscany.version}</version>
-
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-data-api</artifactId>
<version>${tuscany.version}</version>
-
</dependency>
<!-- JackRabbit Dependencies -->
@@ -97,6 +95,14 @@
<version>2.4</version>
</dependency>
+ <!-- marking dependency as provided to exclude from war file -->
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
diff --git a/photark-ui-admin/pom.xml b/photark-ui-admin/pom.xml
index 46998e1..fde0c50 100644
--- a/photark-ui-admin/pom.xml
+++ b/photark-ui-admin/pom.xml
@@ -40,14 +40,12 @@
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-data-api</artifactId>
<version>${tuscany.version}</version>
-
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-java-runtime</artifactId>
<version>${tuscany.version}</version>
-
<scope>runtime</scope>
</dependency>
@@ -55,17 +53,18 @@
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
<version>${tuscany.version}</version>
-
<scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-impl</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
-
- <!--
- <dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- <version>1.2.1</version>
- </dependency>
- -->
<dependency>
<groupId>javax.servlet</groupId>
@@ -74,11 +73,10 @@
<scope>provided</scope>
</dependency>
-
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.5</version>
+ <version>4.8.1</version>
<scope>test</scope>
</dependency>
diff --git a/photark-ui/pom.xml b/photark-ui/pom.xml
index 5de8e92..06bf039 100644
--- a/photark-ui/pom.xml
+++ b/photark-ui/pom.xml
@@ -33,7 +33,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.5</version>
+ <version>4.8.1</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/photark-webapp/pom.xml b/photark-webapp/pom.xml
index d576383..5cd138d 100644
--- a/photark-webapp/pom.xml
+++ b/photark-webapp/pom.xml
@@ -60,37 +60,52 @@
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-host-webapp</artifactId>
<version>${tuscany.version}</version>
-
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-data-api</artifactId>
<version>${tuscany.version}</version>
-
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-java-runtime</artifactId>
<version>${tuscany.version}</version>
-
<scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
-
+
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
<version>${tuscany.version}</version>
-
<scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-impl</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-binding-http-runtime</artifactId>
<version>${tuscany.version}</version>
-
<scope>runtime</scope>
</dependency>
@@ -117,7 +132,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.3</version>
+ <version>2.5</version>
<scope>provided</scope>
</dependency>
diff --git a/photark/pom.xml b/photark/pom.xml
index 7123e89..054855b 100644
--- a/photark/pom.xml
+++ b/photark/pom.xml
@@ -33,41 +33,39 @@
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca-api</artifactId>
<version>${tuscany.version}</version>
-
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-data-api</artifactId>
<version>${tuscany.version}</version>
-
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-java-runtime</artifactId>
<version>${tuscany.version}</version>
-
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-atom-runtime</artifactId>
- <version>${tuscany.version}</version>
-
- </dependency>
-
- <dependency>
<groupId>org.apache.sanselan</groupId>
<artifactId>sanselan</artifactId>
<version>0.97-incubator</version>
</dependency>
+
+ <!-- marking dependency as provided to exclude from war file -->
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.5</version>
+ <version>4.8.1</version>
<scope>test</scope>
</dependency>
