Author: lewismc
Date: Thu Aug 16 22:39:26 2012
New Revision: 1374094
URL: http://svn.apache.org/viewvc?rev=1374094&view=rev
Log:
GORA-125 Clean up logging libraries
Modified:
gora/trunk/CHANGES.txt
gora/trunk/gora-cassandra/pom.xml
gora/trunk/gora-core/pom.xml
gora/trunk/gora-hbase/pom.xml
gora/trunk/gora-sql/pom.xml
gora/trunk/gora-tutorial/pom.xml
gora/trunk/pom.xml
Modified: gora/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/gora/trunk/CHANGES.txt?rev=1374094&r1=1374093&r2=1374094&view=diff
==============================================================================
--- gora/trunk/CHANGES.txt (original)
+++ gora/trunk/CHANGES.txt Thu Aug 16 22:39:26 2012
@@ -6,6 +6,8 @@ Gora Change Log
trunk (current development)
+* GORA-125 Clean up logging libraries (lewismc)
+
* GORA-160 Gora Fails to Import Into Recent Versions of Eclipse (Ed Kohlwey
via lewismc)
* GORA-85 Implement "Usage" messages for SpecificCompiler and LogAnalytics
(lewismc)
Modified: gora/trunk/gora-cassandra/pom.xml
URL:
http://svn.apache.org/viewvc/gora/trunk/gora-cassandra/pom.xml?rev=1374094&r1=1374093&r2=1374094&view=diff
==============================================================================
--- gora/trunk/gora-cassandra/pom.xml (original)
+++ gora/trunk/gora-cassandra/pom.xml Thu Aug 16 22:39:26 2012
@@ -149,16 +149,12 @@
<artifactId>jdom</artifactId>
</dependency>
- <!-- Logging Dependencies -->
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>avro</artifactId>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
-
+
+ <!-- Logging Dependencies -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
Modified: gora/trunk/gora-core/pom.xml
URL:
http://svn.apache.org/viewvc/gora/trunk/gora-core/pom.xml?rev=1374094&r1=1374093&r2=1374094&view=diff
==============================================================================
--- gora/trunk/gora-core/pom.xml (original)
+++ gora/trunk/gora-core/pom.xml Thu Aug 16 22:39:26 2012
@@ -137,7 +137,8 @@
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
Modified: gora/trunk/gora-hbase/pom.xml
URL:
http://svn.apache.org/viewvc/gora/trunk/gora-hbase/pom.xml?rev=1374094&r1=1374093&r2=1374094&view=diff
==============================================================================
--- gora/trunk/gora-hbase/pom.xml (original)
+++ gora/trunk/gora-hbase/pom.xml Thu Aug 16 22:39:26 2012
@@ -136,12 +136,7 @@
<!-- Logging Dependencies -->
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
+ <artifactId>slf4j-log4j12</artifactId>
</dependency>
<dependency>
Modified: gora/trunk/gora-sql/pom.xml
URL:
http://svn.apache.org/viewvc/gora/trunk/gora-sql/pom.xml?rev=1374094&r1=1374093&r2=1374094&view=diff
==============================================================================
--- gora/trunk/gora-sql/pom.xml (original)
+++ gora/trunk/gora-sql/pom.xml Thu Aug 16 22:39:26 2012
@@ -148,12 +148,7 @@
<!-- Logging Dependencies -->
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
+ <artifactId>slf4j-log4j12</artifactId>
</dependency>
<dependency>
Modified: gora/trunk/gora-tutorial/pom.xml
URL:
http://svn.apache.org/viewvc/gora/trunk/gora-tutorial/pom.xml?rev=1374094&r1=1374093&r2=1374094&view=diff
==============================================================================
--- gora/trunk/gora-tutorial/pom.xml (original)
+++ gora/trunk/gora-tutorial/pom.xml Thu Aug 16 22:39:26 2012
@@ -136,12 +136,7 @@
<!-- Logging Dependencies -->
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
+ <artifactId>slf4j-log4j12</artifactId>
</dependency>
<dependency>
Modified: gora/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/gora/trunk/pom.xml?rev=1374094&r1=1374093&r2=1374094&view=diff
==============================================================================
--- gora/trunk/pom.xml (original)
+++ gora/trunk/pom.xml Thu Aug 16 22:39:26 2012
@@ -576,7 +576,7 @@
<mysql.version>5.1.18</mysql.version>
<xerces.version>2.9.1</xerces.version>
<!-- Logging Dependencies -->
- <slf4j.version>1.6.1</slf4j.version>
+ <slf4j.version>1.5.11</slf4j.version>
<log4j.version>1.2.16</log4j.version>
<!-- Testing Dependencies -->
@@ -823,23 +823,6 @@
</dependency>
<!-- Logging Dependencies -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
<dependency>
<groupId>org.slf4j</groupId>