incubator-photark-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lrese...@apache.org
Subject svn commit: r939956 - in /incubator/photark/trunk: photark-appengine-webapp/pom.xml photark-filesystem/pom.xml photark-jcr/pom.xml photark-ui-admin/pom.xml photark-ui/pom.xml photark-webapp/pom.xml photark/pom.xml
Date Sat, 01 May 2010 09:09:00 GMT
Author: lresende
Date: Sat May  1 09:09:00 2010
New Revision: 939956

URL: http://svn.apache.org/viewvc?rev=939956&view=rev
Log:
Cleaning up dependencies...

Modified:
    incubator/photark/trunk/photark-appengine-webapp/pom.xml
    incubator/photark/trunk/photark-filesystem/pom.xml
    incubator/photark/trunk/photark-jcr/pom.xml
    incubator/photark/trunk/photark-ui-admin/pom.xml
    incubator/photark/trunk/photark-ui/pom.xml
    incubator/photark/trunk/photark-webapp/pom.xml
    incubator/photark/trunk/photark/pom.xml

Modified: incubator/photark/trunk/photark-appengine-webapp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-appengine-webapp/pom.xml?rev=939956&r1=939955&r2=939956&view=diff
==============================================================================
--- incubator/photark/trunk/photark-appengine-webapp/pom.xml (original)
+++ incubator/photark/trunk/photark-appengine-webapp/pom.xml Sat May  1 09:09:00 2010
@@ -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>

Modified: incubator/photark/trunk/photark-filesystem/pom.xml
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-filesystem/pom.xml?rev=939956&r1=939955&r2=939956&view=diff
==============================================================================
--- incubator/photark/trunk/photark-filesystem/pom.xml (original)
+++ incubator/photark/trunk/photark-filesystem/pom.xml Sat May  1 09:09:00 2010
@@ -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>

Modified: incubator/photark/trunk/photark-jcr/pom.xml
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-jcr/pom.xml?rev=939956&r1=939955&r2=939956&view=diff
==============================================================================
--- incubator/photark/trunk/photark-jcr/pom.xml (original)
+++ incubator/photark/trunk/photark-jcr/pom.xml Sat May  1 09:09:00 2010
@@ -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>

Modified: incubator/photark/trunk/photark-ui-admin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-ui-admin/pom.xml?rev=939956&r1=939955&r2=939956&view=diff
==============================================================================
--- incubator/photark/trunk/photark-ui-admin/pom.xml (original)
+++ incubator/photark/trunk/photark-ui-admin/pom.xml Sat May  1 09:09:00 2010
@@ -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>
 

Modified: incubator/photark/trunk/photark-ui/pom.xml
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-ui/pom.xml?rev=939956&r1=939955&r2=939956&view=diff
==============================================================================
--- incubator/photark/trunk/photark-ui/pom.xml (original)
+++ incubator/photark/trunk/photark-ui/pom.xml Sat May  1 09:09:00 2010
@@ -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>

Modified: incubator/photark/trunk/photark-webapp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-webapp/pom.xml?rev=939956&r1=939955&r2=939956&view=diff
==============================================================================
--- incubator/photark/trunk/photark-webapp/pom.xml (original)
+++ incubator/photark/trunk/photark-webapp/pom.xml Sat May  1 09:09:00 2010
@@ -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>
 

Modified: incubator/photark/trunk/photark/pom.xml
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark/pom.xml?rev=939956&r1=939955&r2=939956&view=diff
==============================================================================
--- incubator/photark/trunk/photark/pom.xml (original)
+++ incubator/photark/trunk/photark/pom.xml Sat May  1 09:09:00 2010
@@ -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>
 



Mime
View raw message