You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@gora.apache.org by hs...@apache.org on 2014/09/19 20:59:33 UTC

[1/2] git commit: Resolved issue with slf4j-api version conflict described at: https://issues.apache.org/jira/browse/GORA-372

Repository: gora
Updated Branches:
  refs/heads/master a72c5d360 -> a5f048277


Resolved issue with slf4j-api version conflict described at:
https://issues.apache.org/jira/browse/GORA-372

By @dobromyslov

This closes #8


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

Branch: refs/heads/master
Commit: 685d73fd28b008c3a01e98a95c158ee5c0a24155
Parents: a72c5d3
Author: Henry Saputra <he...@gmail.com>
Authored: Fri Sep 19 11:52:37 2014 -0700
Committer: Henry Saputra <he...@gmail.com>
Committed: Fri Sep 19 11:58:28 2014 -0700

----------------------------------------------------------------------
 gora-hbase/pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/gora/blob/685d73fd/gora-hbase/pom.xml
----------------------------------------------------------------------
diff --git a/gora-hbase/pom.xml b/gora-hbase/pom.xml
index 77075fd..f1392e5 100644
--- a/gora-hbase/pom.xml
+++ b/gora-hbase/pom.xml
@@ -112,6 +112,12 @@
       <groupId>org.apache.hbase</groupId>
       <artifactId>hbase</artifactId>
       <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-log4j12</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <dependency>


[2/2] git commit: Update CHANGES.txt for GORA-372 patch.

Posted by hs...@apache.org.
Update CHANGES.txt for GORA-372 patch.


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

Branch: refs/heads/master
Commit: a5f04827720dc9cd9ddc65efa6986388181afc2c
Parents: 685d73f
Author: Henry Saputra <he...@gmail.com>
Authored: Fri Sep 19 11:55:04 2014 -0700
Committer: Henry Saputra <he...@gmail.com>
Committed: Fri Sep 19 11:59:05 2014 -0700

----------------------------------------------------------------------
 CHANGES.txt | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/gora/blob/a5f04827/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index cfa9b7f..23cf5cb 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,8 @@
  ==CHANGES.txt
  =======================================================================
 
+* GORA-372: Fixed runtime error with the slf4j-api version conflict. (Viacheslav Dobromyslov (dobromyslov) via hsaputra)
+
 Apache Gora 0.5 Release - 15/09/14
 Release Report - http://s.apache.org/0.5report