airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ramin...@apache.org
Subject svn commit: r1536482 - in /airavata/trunk: modules/credential-store/pom.xml modules/rest/webapp/pom.xml tools/registry-tool/pom.xml
Date Mon, 28 Oct 2013 18:46:34 GMT
Author: raminder
Date: Mon Oct 28 18:46:34 2013
New Revision: 1536482

URL: http://svn.apache.org/r1536482
Log:
excluded mysql dependency

Modified:
    airavata/trunk/modules/credential-store/pom.xml
    airavata/trunk/modules/rest/webapp/pom.xml
    airavata/trunk/tools/registry-tool/pom.xml

Modified: airavata/trunk/modules/credential-store/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/credential-store/pom.xml?rev=1536482&r1=1536481&r2=1536482&view=diff
==============================================================================
--- airavata/trunk/modules/credential-store/pom.xml (original)
+++ airavata/trunk/modules/credential-store/pom.xml Mon Oct 28 18:46:34 2013
@@ -34,13 +34,21 @@
             <version>${oa4mp.version}</version>
             <exclusions>
         	<exclusion>
-          		<groupId>net.oauth.core</groupId> <!-- Exclude Project-D from
Project-B -->
+          		<groupId>net.oauth.core</groupId> 
           		<artifactId>oauth-httpclient4</artifactId>
         	</exclusion>
-                <exclusion>
-          		<groupId>net.oauth.core</groupId> <!-- Exclude Project-D from
Project-B -->
-          		<artifactId>oauth-consumer</artifactId>
-        	</exclusion>
+			<exclusion>
+				<groupId>net.oauth.core</groupId>
+				<artifactId>oauth-consumer</artifactId>
+			</exclusion>
+			<exclusion>
+				<groupId>mysql</groupId>
+				<artifactId>mysql-connector-java</artifactId>
+			</exclusion>
+			<exclusion>
+				<groupId>postgresql</groupId>
+				<artifactId>postgresql</artifactId>
+			</exclusion>
             </exclusions>
         </dependency>
         <dependency>

Modified: airavata/trunk/modules/rest/webapp/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/webapp/pom.xml?rev=1536482&r1=1536481&r2=1536482&view=diff
==============================================================================
--- airavata/trunk/modules/rest/webapp/pom.xml (original)
+++ airavata/trunk/modules/rest/webapp/pom.xml Mon Oct 28 18:46:34 2013
@@ -182,11 +182,29 @@
             <artifactId>airavata-credential-store</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>edu.uiuc.ncsa.myproxy</groupId>
-            <artifactId>oa4mp-client-oauth1</artifactId>
-            <version>${oa4mp.version}</version>
-        </dependency>
+		<dependency>
+			<groupId>edu.uiuc.ncsa.myproxy</groupId>
+			<artifactId>oa4mp-client-oauth1</artifactId>
+			<version>${oa4mp.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>net.oauth.core</groupId>
+					<artifactId>oauth-httpclient4</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>net.oauth.core</groupId>
+					<artifactId>oauth-consumer</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>mysql</groupId>
+					<artifactId>mysql-connector-java</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>postgresql</groupId>
+					<artifactId>postgresql</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
 		<dependency>
 			<groupId>org.apache.airavata</groupId>
 			<artifactId>airavata-rest-mappings</artifactId>

Modified: airavata/trunk/tools/registry-tool/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/tools/registry-tool/pom.xml?rev=1536482&r1=1536481&r2=1536482&view=diff
==============================================================================
--- airavata/trunk/tools/registry-tool/pom.xml (original)
+++ airavata/trunk/tools/registry-tool/pom.xml Mon Oct 28 18:46:34 2013
@@ -28,11 +28,6 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <version>5.1.6</version>
-        </dependency>
-        <dependency>
             <groupId>org.apache.derby</groupId>
             <artifactId>derby</artifactId>
             <version>10.9.1.0</version>



Mime
View raw message