airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sma...@apache.org
Subject [1/8] git commit: Unifying multiple mysql-connector-java versions.
Date Sun, 29 Jun 2014 12:38:28 GMT
Repository: airavata
Updated Branches:
  refs/heads/master 3d5b9a67f -> eaf09bd90


Unifying multiple mysql-connector-java versions.


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/c97832e2
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/c97832e2
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/c97832e2

Branch: refs/heads/master
Commit: c97832e292407bf3a26e4fc5138c21181a4e7fff
Parents: 8ebb254
Author: Suresh Marru <smarru@apache.org>
Authored: Sat Jun 28 23:29:28 2014 -0400
Committer: Suresh Marru <smarru@apache.org>
Committed: Sat Jun 28 23:29:28 2014 -0400

----------------------------------------------------------------------
 .../airavata-client-sdks/java-client-samples/pom.xml      |  7 +------
 modules/gfac/gfac-gsissh/pom.xml                          | 10 +++++-----
 modules/registry/airavata-jpa-registry/pom.xml            |  2 +-
 modules/ws-messenger/pom.xml                              |  2 +-
 pom.xml                                                   |  1 +
 5 files changed, 9 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/c97832e2/airavata-api/airavata-client-sdks/java-client-samples/pom.xml
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/pom.xml b/airavata-api/airavata-client-sdks/java-client-samples/pom.xml
index 4c2e282..f678f3a 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/pom.xml
+++ b/airavata-api/airavata-client-sdks/java-client-samples/pom.xml
@@ -26,11 +26,6 @@
 
     <dependencies>
     
-		<dependency>
-			<groupId>mysql</groupId>
-			<artifactId>mysql-connector-java</artifactId>
-			<version>5.1.12</version>
-		</dependency>
         <dependency>
             <groupId>org.apache.airavata</groupId>
             <artifactId>airavata-data-models</artifactId>
@@ -79,7 +74,7 @@
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>5.1.17</version>
+            <version>${mysql.connector.version}</version>
         </dependency>
 	<dependency>
             <groupId>org.apache.airavata</groupId>

http://git-wip-us.apache.org/repos/asf/airavata/blob/c97832e2/modules/gfac/gfac-gsissh/pom.xml
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-gsissh/pom.xml b/modules/gfac/gfac-gsissh/pom.xml
index d129a5d..49b3ce4 100644
--- a/modules/gfac/gfac-gsissh/pom.xml
+++ b/modules/gfac/gfac-gsissh/pom.xml
@@ -107,10 +107,10 @@
             <artifactId>sshj</artifactId>
             <version>0.6.1</version>
         </dependency>
-	<dependency>
-			<groupId>mysql</groupId>
-				<artifactId>mysql-connector-java</artifactId>
-					<version>5.1.31</version>
-				</dependency>
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>${mysql.connector.version}</version>
+        </dependency>
     </dependencies>
 </project>

http://git-wip-us.apache.org/repos/asf/airavata/blob/c97832e2/modules/registry/airavata-jpa-registry/pom.xml
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/pom.xml b/modules/registry/airavata-jpa-registry/pom.xml
index 7f7d41a..18a860e 100644
--- a/modules/registry/airavata-jpa-registry/pom.xml
+++ b/modules/registry/airavata-jpa-registry/pom.xml
@@ -87,7 +87,7 @@
         <!--dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>5.1.6</version>
+            <version>${mysql.connector.version}</version>
         </dependency-->
         <dependency>
             <groupId>org.apache.derby</groupId>

http://git-wip-us.apache.org/repos/asf/airavata/blob/c97832e2/modules/ws-messenger/pom.xml
----------------------------------------------------------------------
diff --git a/modules/ws-messenger/pom.xml b/modules/ws-messenger/pom.xml
index 1865829..363b00d 100644
--- a/modules/ws-messenger/pom.xml
+++ b/modules/ws-messenger/pom.xml
@@ -67,7 +67,7 @@
             <dependency>
                 <groupId>mysql</groupId>
                 <artifactId>mysql-connector-java</artifactId>
-                <version>5.1.6</version>
+                <version>${mysql.connector.version}</version>
                 <scope>compile</scope>
             </dependency>
             <dependency>

http://git-wip-us.apache.org/repos/asf/airavata/blob/c97832e2/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6698962..046ffe7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -91,6 +91,7 @@
         <jglobus.version>2.0.6</jglobus.version>
         <ebay.cors.filter>1.0.0</ebay.cors.filter>
         <thrift.version>0.9.1</thrift.version>
+        <mysql.connector.version>5.1.31</mysql.connector.version>
         <skipTests>false</skipTests>
     </properties>
 


Mime
View raw message