You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@gora.apache.org by le...@apache.org on 2015/10/05 22:57:04 UTC
[2/3] gora git commit: GORA-240 Tests for MemStore
GORA-240 Tests for MemStore
Project: http://git-wip-us.apache.org/repos/asf/gora/repo
Commit: http://git-wip-us.apache.org/repos/asf/gora/commit/209d6632
Tree: http://git-wip-us.apache.org/repos/asf/gora/tree/209d6632
Diff: http://git-wip-us.apache.org/repos/asf/gora/diff/209d6632
Branch: refs/heads/master
Commit: 209d6632cb98a6c76a3c634f94222cb8b0d135ed
Parents: 11b1d7a
Author: Lewis John McGibbney <le...@jpl.nasa.gov>
Authored: Sun Oct 4 21:35:11 2015 -0700
Committer: Lewis John McGibbney <le...@jpl.nasa.gov>
Committed: Sun Oct 4 21:35:11 2015 -0700
----------------------------------------------------------------------
gora-accumulo/pom.xml | 12 +++++-------
gora-cassandra/pom.xml | 12 ++++++------
gora-compiler-cli/pom.xml | 10 ++++++----
gora-compiler/pom.xml | 10 ++++++----
gora-goraci/pom.xml | 4 ----
gora-hbase/pom.xml | 11 +----------
gora-mongodb/pom.xml | 11 +----------
gora-solr/pom.xml | 9 ++++-----
gora-tutorial/pom.xml | 11 +----------
9 files changed, 30 insertions(+), 60 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/gora/blob/209d6632/gora-accumulo/pom.xml
----------------------------------------------------------------------
diff --git a/gora-accumulo/pom.xml b/gora-accumulo/pom.xml
index 143ecd2..8ab5143 100644
--- a/gora-accumulo/pom.xml
+++ b/gora-accumulo/pom.xml
@@ -132,12 +132,16 @@
<scope>test</scope>
</dependency>
- <!-- Hadoop Dependencies -->
<dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
</dependency>
+ <!-- Logging Dependencies -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
@@ -160,12 +164,6 @@
<artifactId>hadoop-minicluster</artifactId>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <scope>test</scope>
- </dependency>
-
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/gora/blob/209d6632/gora-cassandra/pom.xml
----------------------------------------------------------------------
diff --git a/gora-cassandra/pom.xml b/gora-cassandra/pom.xml
index cb42f4f..5dffd28 100644
--- a/gora-cassandra/pom.xml
+++ b/gora-cassandra/pom.xml
@@ -163,17 +163,17 @@
<!-- Logging Dependencies -->
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</dependency>
-
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.jms</groupId>
+ <artifactId>jms</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- Testing Dependencies -->
http://git-wip-us.apache.org/repos/asf/gora/blob/209d6632/gora-compiler-cli/pom.xml
----------------------------------------------------------------------
diff --git a/gora-compiler-cli/pom.xml b/gora-compiler-cli/pom.xml
index 8dada7f..6212a1e 100644
--- a/gora-compiler-cli/pom.xml
+++ b/gora-compiler-cli/pom.xml
@@ -60,15 +60,17 @@
<!-- Logging Dependencies -->
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.jms</groupId>
+ <artifactId>jms</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/gora/blob/209d6632/gora-compiler/pom.xml
----------------------------------------------------------------------
diff --git a/gora-compiler/pom.xml b/gora-compiler/pom.xml
index e697531..4c0f490 100644
--- a/gora-compiler/pom.xml
+++ b/gora-compiler/pom.xml
@@ -101,15 +101,17 @@
<!-- Logging Dependencies -->
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.jms</groupId>
+ <artifactId>jms</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/gora/blob/209d6632/gora-goraci/pom.xml
----------------------------------------------------------------------
diff --git a/gora-goraci/pom.xml b/gora-goraci/pom.xml
index 1c6b312..9ad2a2b 100644
--- a/gora-goraci/pom.xml
+++ b/gora-goraci/pom.xml
@@ -385,10 +385,6 @@
<!-- Logging Dependencies -->
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/gora/blob/209d6632/gora-hbase/pom.xml
----------------------------------------------------------------------
diff --git a/gora-hbase/pom.xml b/gora-hbase/pom.xml
index 9e276ec..98a7b2e 100644
--- a/gora-hbase/pom.xml
+++ b/gora-hbase/pom.xml
@@ -148,20 +148,11 @@
<!-- Logging Dependencies -->
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <scope>compile</scope>
+ <artifactId>slf4j-log4j12</artifactId>
</dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <scope>compile</scope>
- </dependency>
-
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <scope>runtime</scope>
<exclusions>
<exclusion>
<groupId>javax.jms</groupId>
http://git-wip-us.apache.org/repos/asf/gora/blob/209d6632/gora-mongodb/pom.xml
----------------------------------------------------------------------
diff --git a/gora-mongodb/pom.xml b/gora-mongodb/pom.xml
index 9c93b2b..15dbfdc 100644
--- a/gora-mongodb/pom.xml
+++ b/gora-mongodb/pom.xml
@@ -147,20 +147,11 @@
<!-- Logging Dependencies -->
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <scope>compile</scope>
+ <artifactId>slf4j-log4j12</artifactId>
</dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <scope>test</scope>
- </dependency>
-
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <scope>runtime</scope>
<exclusions>
<exclusion>
<groupId>javax.jms</groupId>
http://git-wip-us.apache.org/repos/asf/gora/blob/209d6632/gora-solr/pom.xml
----------------------------------------------------------------------
diff --git a/gora-solr/pom.xml b/gora-solr/pom.xml
index 59497d8..80250dc 100644
--- a/gora-solr/pom.xml
+++ b/gora-solr/pom.xml
@@ -129,6 +129,10 @@
<!-- Logging Dependencies -->
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </dependency>
+ <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<exclusions>
@@ -138,11 +142,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <scope>test</scope>
- </dependency>
<!-- Solr Dependencies -->
<dependency>
http://git-wip-us.apache.org/repos/asf/gora/blob/209d6632/gora-tutorial/pom.xml
----------------------------------------------------------------------
diff --git a/gora-tutorial/pom.xml b/gora-tutorial/pom.xml
index d538e4d..8474901 100644
--- a/gora-tutorial/pom.xml
+++ b/gora-tutorial/pom.xml
@@ -137,14 +137,8 @@
<!-- Logging Dependencies -->
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
+ <artifactId>slf4j-log4j12</artifactId>
</dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- </dependency>
-
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
@@ -156,9 +150,6 @@
</exclusions>
</dependency>
- <!--dependency> <groupId>org.hsqldb</groupId> <artifactId>hsqldb</artifactId>
- </dependency> <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId>
- </dependency -->
</dependencies>
</project>