gora-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lewi...@apache.org
Subject [1/2] git commit: GORA-381 Fix Guava dependency mismatch post GoraCI
Date Sun, 28 Sep 2014 17:47:00 GMT
Repository: gora
Updated Branches:
  refs/heads/master 95aae127e -> c3271e2b6


GORA-381 Fix Guava dependency mismatch post GoraCI


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

Branch: refs/heads/master
Commit: b90f5c88c4c91f6f3d1f9d2abd1bcb0dce128d03
Parents: 95aae12
Author: Lewis John McGibbney <lewis.j.mcgibbney@jpl.nasa.gov>
Authored: Sun Sep 28 10:42:16 2014 -0700
Committer: Lewis John McGibbney <lewis.j.mcgibbney@jpl.nasa.gov>
Committed: Sun Sep 28 10:42:16 2014 -0700

----------------------------------------------------------------------
 gora-cassandra/pom.xml                          |  2 +-
 .../gora/cassandra/store/CassandraClient.java   | 28 ++++++++++----------
 .../src/test/conf/gora-cassandra-mapping.xml    |  6 ++---
 gora-cassandra/src/test/conf/gora.properties    |  4 +--
 gora-goraci/pom.xml                             |  7 ++---
 pom.xml                                         |  4 +--
 6 files changed, 26 insertions(+), 25 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/gora/blob/b90f5c88/gora-cassandra/pom.xml
----------------------------------------------------------------------
diff --git a/gora-cassandra/pom.xml b/gora-cassandra/pom.xml
index 2e2e689..e5661c9 100644
--- a/gora-cassandra/pom.xml
+++ b/gora-cassandra/pom.xml
@@ -18,7 +18,7 @@
     -->
     <modelVersion>4.0.0</modelVersion>
 
-    <parent>
+    <parent>    
         <groupId>org.apache.gora</groupId>
         <artifactId>gora</artifactId>
         <version>0.6-SNAPSHOT</version>

http://git-wip-us.apache.org/repos/asf/gora/blob/b90f5c88/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraClient.java
----------------------------------------------------------------------
diff --git a/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraClient.java
b/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraClient.java
index ddceec3..59bf8bd 100644
--- a/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraClient.java
+++ b/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraClient.java
@@ -122,20 +122,20 @@ public class CassandraClient<K, T extends PersistentBase> {
     // get cassandra mapping with persistent class
     this.persistentClass = persistentClass;
     this.cassandraMapping = CassandraMappingManager.getManager().get(persistentClass);
-	Map<String, String> accessMap = null;
-	if (properties != null) {
-		String username = properties
-				.getProperty("gora.cassandrastore.username");
-		if (username != null) {
-			accessMap = new HashMap<String, String>();
-			accessMap.put("username", username);
-			String password = properties
-					.getProperty("gora.cassandrastore.password");
-			if (password != null) {
-				accessMap.put("password", password);
-			}
-		}
-	}
+    Map<String, String> accessMap = null;
+    if (properties != null) {
+      String username = properties
+          .getProperty("gora.cassandrastore.username");
+      if (username != null) {
+        accessMap = new HashMap<String, String>();
+        accessMap.put("username", username);
+        String password = properties
+            .getProperty("gora.cassandrastore.password");
+        if (password != null) {
+          accessMap.put("password", password);
+        }
+      }
+    }
 
     this.cluster = HFactory.getOrCreateCluster(this.cassandraMapping.getClusterName(), 
         new CassandraHostConfigurator(this.cassandraMapping.getHostName()), accessMap);

http://git-wip-us.apache.org/repos/asf/gora/blob/b90f5c88/gora-cassandra/src/test/conf/gora-cassandra-mapping.xml
----------------------------------------------------------------------
diff --git a/gora-cassandra/src/test/conf/gora-cassandra-mapping.xml b/gora-cassandra/src/test/conf/gora-cassandra-mapping.xml
index 7aec1ca..8d45768 100644
--- a/gora-cassandra/src/test/conf/gora-cassandra-mapping.xml
+++ b/gora-cassandra/src/test/conf/gora-cassandra-mapping.xml
@@ -50,19 +50,19 @@
 -->
 
 <gora-otd>
-  <keyspace name="Employee" host="localhost" placement_strategy="org.apache.cassandra.locator.SimpleStrategy"
+  <keyspace name="Employee" host="localhost:9160" placement_strategy="org.apache.cassandra.locator.SimpleStrategy"
       replication_factor="1" cluster="Gora Cassandra Test Cluster">
     <family name="p" gc_grace_seconds="5"/>
      <family name="sc" type="super" />
   </keyspace>
 
-  <keyspace name="WebPage" host="localhost" placement_strategy="org.apache.cassandra.locator.SimpleStrategy"
+  <keyspace name="WebPage" host="localhost:9160" placement_strategy="org.apache.cassandra.locator.SimpleStrategy"
       replication_factor="1" cluster="Gora Cassandra Test Cluster">
     <family name="p" gc_grace_seconds="5"/>
     <family name="sc" type="super"/>
   </keyspace>
 
-  <keyspace name="TokenDatum" host="localhost" placement_strategy="org.apache.cassandra.locator.SimpleStrategy"
+  <keyspace name="TokenDatum" host="localhost:9160" placement_strategy="org.apache.cassandra.locator.SimpleStrategy"
       replication_factor="1" cluster="Gora Cassandra Test Cluster">
     <family name="p" gc_grace_seconds="5"/>
     <family name="sc" type="super"/>

http://git-wip-us.apache.org/repos/asf/gora/blob/b90f5c88/gora-cassandra/src/test/conf/gora.properties
----------------------------------------------------------------------
diff --git a/gora-cassandra/src/test/conf/gora.properties b/gora-cassandra/src/test/conf/gora.properties
index 6c8b06a..2218bf5 100644
--- a/gora-cassandra/src/test/conf/gora.properties
+++ b/gora-cassandra/src/test/conf/gora.properties
@@ -14,8 +14,8 @@
 # limitations under the License.
 
 gora.datastore.default=org.apache.gora.cassandra.CassandraStore
-gora.cassandrastore.cluster=Test Cluster
-gora.cassandrastore.host=localhost
+gora.cassandrastore.cluster=Gora Cassandra Test Cluster
+gora.cassandrastore.host=localhost:9160
 # property is annotated in CassandraClient#checkKeyspace()
 # options are ANY, ONE, TWO, THREE, LOCAL_QUORUM, EACH_QUORUM, QUORUM and ALL. 
 gora.cassandrastore.cf.consistency.level=ONE

http://git-wip-us.apache.org/repos/asf/gora/blob/b90f5c88/gora-goraci/pom.xml
----------------------------------------------------------------------
diff --git a/gora-goraci/pom.xml b/gora-goraci/pom.xml
index 7011437..0922967 100644
--- a/gora-goraci/pom.xml
+++ b/gora-goraci/pom.xml
@@ -285,11 +285,12 @@
       <artifactId>commons-cli</artifactId>
     </dependency>
 
-    <!--  dependency>
+    <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <scope>runtime</scope>
-    </dependency-->
+      <version>17.0</version>
+      <scope>compile</scope>
+    </dependency>
 
     <!-- jclouds dependencies -->
     <dependency>

http://git-wip-us.apache.org/repos/asf/gora/blob/b90f5c88/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 88cd405..2f83b25 100644
--- a/pom.xml
+++ b/pom.xml
@@ -635,7 +635,7 @@
     <restlet.version>2.2.1</restlet.version>
 
     <!-- Misc Dependencies -->
-    <guava.version>17.0</guava.version>
+    <guava.version>13.0</guava.version>
     <commons-lang.version>2.6</commons-lang.version>
     <jdom.version>1.1.3</jdom.version>
     <hsqldb.version>2.2.8</hsqldb.version>
@@ -653,7 +653,7 @@
     <maven-resources-plugin.version>2.5</maven-resources-plugin.version>
     <!-- pegged at 2.3.2 for eclipse users, see https://github.com/sonatype/m2eclipse-extras/issues/10
-->
     <maven-jar-plugin.version>2.3.2</maven-jar-plugin.version>
-    <maven-dependency-plugin.version>2.4</maven-dependency-plugin.version>
+    <maven-dependency-plugin.version>2.9</maven-dependency-plugin.version>
     <build-helper-maven-plugin.version>1.7</build-helper-maven-plugin.version>
     <maven-surfire-plugin.version>2.12</maven-surfire-plugin.version>
     <maven-release-plugin.version>2.5</maven-release-plugin.version>


Mime
View raw message