Hi, I reverse committed the patch I applied to trunk for GORA-125 as it appeared to break trunk. I don't have quite enough time just now to look more deeply in to it but will get around ASAP. I thought it best to get trunk stable as a priority, hopefully this reverse commit achieves that. Apologies for the crap commit.
Lewis On Wed, Aug 22, 2012 at 12:25 PM, <[email protected]> wrote: > Author: lewismc > Date: Wed Aug 22 11:25:15 2012 > New Revision: 1375995 > > URL: http://svn.apache.org/viewvc?rev=1375995&view=rev > Log: > reverse commit to r1373630 as GORA-125 breaks trunk > > Modified: > gora/trunk/CHANGES.txt > gora/trunk/gora-accumulo/pom.xml > 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=1375995&r1=1375994&r2=1375995&view=diff > ============================================================================== > --- gora/trunk/CHANGES.txt (original) > +++ gora/trunk/CHANGES.txt Wed Aug 22 11:25:15 2012 > @@ -6,8 +6,6 @@ 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-accumulo/pom.xml > URL: > http://svn.apache.org/viewvc/gora/trunk/gora-accumulo/pom.xml?rev=1375995&r1=1375994&r2=1375995&view=diff > ============================================================================== > --- gora/trunk/gora-accumulo/pom.xml (original) > +++ gora/trunk/gora-accumulo/pom.xml Wed Aug 22 11:25:15 2012 > @@ -123,8 +123,6 @@ > <artifactId>avro</artifactId> > </dependency> > > - > - <!-- Logging Dependencies --> > <dependency> > <groupId>log4j</groupId> > <artifactId>log4j</artifactId> > @@ -135,16 +133,6 @@ > </exclusion> > </exclusions> > </dependency> > - > - <dependency> > - <groupId>org.slf4j</groupId> > - <artifactId>slf4j-log4j12</artifactId> > - </dependency> > - > - <dependency> > - <groupId>org.slf4j</groupId> > - <artifactId>slf4j-api</artifactId> > - </dependency> > > <!-- Testing Dependencies --> > <dependency> > > Modified: gora/trunk/gora-cassandra/pom.xml > URL: > http://svn.apache.org/viewvc/gora/trunk/gora-cassandra/pom.xml?rev=1375995&r1=1375994&r2=1375995&view=diff > ============================================================================== > --- gora/trunk/gora-cassandra/pom.xml (original) > +++ gora/trunk/gora-cassandra/pom.xml Wed Aug 22 11:25:15 2012 > @@ -149,20 +149,19 @@ > <artifactId>jdom</artifactId> > </dependency> > > + <!-- Logging Dependencies --> > <dependency> > <groupId>org.apache.hadoop</groupId> > <artifactId>avro</artifactId> > </dependency> > - > - <!-- Logging Dependencies --> > <dependency> > <groupId>org.slf4j</groupId> > - <artifactId>slf4j-log4j12</artifactId> > + <artifactId>slf4j-api</artifactId> > </dependency> > - > + > <dependency> > <groupId>org.slf4j</groupId> > - <artifactId>slf4j-api</artifactId> > + <artifactId>slf4j-log4j12</artifactId> > </dependency> > > <dependency> > > Modified: gora/trunk/gora-core/pom.xml > URL: > http://svn.apache.org/viewvc/gora/trunk/gora-core/pom.xml?rev=1375995&r1=1375994&r2=1375995&view=diff > ============================================================================== > --- gora/trunk/gora-core/pom.xml (original) > +++ gora/trunk/gora-core/pom.xml Wed Aug 22 11:25:15 2012 > @@ -127,11 +127,6 @@ > </exclusion> > </exclusions> > </dependency> > - > - <dependency> > - <groupId>org.slf4j</groupId> > - <artifactId>slf4j-api</artifactId> > - </dependency> > > <!-- Testing Dependencies --> > <dependency> > @@ -142,7 +137,7 @@ > > <dependency> > <groupId>org.slf4j</groupId> > - <artifactId>slf4j-log4j12</artifactId> > + <artifactId>slf4j-simple</artifactId> > <scope>test</scope> > </dependency> > > > Modified: gora/trunk/gora-hbase/pom.xml > URL: > http://svn.apache.org/viewvc/gora/trunk/gora-hbase/pom.xml?rev=1375995&r1=1375994&r2=1375995&view=diff > ============================================================================== > --- gora/trunk/gora-hbase/pom.xml (original) > +++ gora/trunk/gora-hbase/pom.xml Wed Aug 22 11:25:15 2012 > @@ -136,12 +136,12 @@ > <!-- Logging Dependencies --> > <dependency> > <groupId>org.slf4j</groupId> > - <artifactId>slf4j-log4j12</artifactId> > + <artifactId>slf4j-api</artifactId> > </dependency> > - > + > <dependency> > <groupId>org.slf4j</groupId> > - <artifactId>slf4j-api</artifactId> > + <artifactId>slf4j-simple</artifactId> > </dependency> > > <dependency> > > Modified: gora/trunk/gora-sql/pom.xml > URL: > http://svn.apache.org/viewvc/gora/trunk/gora-sql/pom.xml?rev=1375995&r1=1375994&r2=1375995&view=diff > ============================================================================== > --- gora/trunk/gora-sql/pom.xml (original) > +++ gora/trunk/gora-sql/pom.xml Wed Aug 22 11:25:15 2012 > @@ -148,12 +148,12 @@ > <!-- Logging Dependencies --> > <dependency> > <groupId>org.slf4j</groupId> > - <artifactId>slf4j-log4j12</artifactId> > + <artifactId>slf4j-api</artifactId> > </dependency> > - > + > <dependency> > <groupId>org.slf4j</groupId> > - <artifactId>slf4j-api</artifactId> > + <artifactId>slf4j-jdk14</artifactId> > </dependency> > > <dependency> > > Modified: gora/trunk/gora-tutorial/pom.xml > URL: > http://svn.apache.org/viewvc/gora/trunk/gora-tutorial/pom.xml?rev=1375995&r1=1375994&r2=1375995&view=diff > ============================================================================== > --- gora/trunk/gora-tutorial/pom.xml (original) > +++ gora/trunk/gora-tutorial/pom.xml Wed Aug 22 11:25:15 2012 > @@ -136,12 +136,12 @@ > <!-- Logging Dependencies --> > <dependency> > <groupId>org.slf4j</groupId> > - <artifactId>slf4j-log4j12</artifactId> > + <artifactId>slf4j-api</artifactId> > </dependency> > - > + > <dependency> > <groupId>org.slf4j</groupId> > - <artifactId>slf4j-api</artifactId> > + <artifactId>slf4j-simple</artifactId> > </dependency> > > <dependency> > > Modified: gora/trunk/pom.xml > URL: > http://svn.apache.org/viewvc/gora/trunk/pom.xml?rev=1375995&r1=1375994&r2=1375995&view=diff > ============================================================================== > --- gora/trunk/pom.xml (original) > +++ gora/trunk/pom.xml Wed Aug 22 11:25:15 2012 > @@ -576,7 +576,7 @@ > <mysql.version>5.1.18</mysql.version> > <xerces.version>2.9.1</xerces.version> > <!-- Logging Dependencies --> > - <slf4j.version>1.5.11</slf4j.version> > + <slf4j.version>1.6.1</slf4j.version> > <log4j.version>1.2.16</log4j.version> > > <!-- Testing Dependencies --> > @@ -823,16 +823,27 @@ > </dependency> > > <!-- Logging Dependencies --> > + <dependency> > + <groupId>org.slf4j</groupId> > + <artifactId>slf4j-api</artifactId> > + <version>${slf4j.version}</version> > + </dependency> > > <dependency> > <groupId>org.slf4j</groupId> > - <artifactId>slf4j-log4j12</artifactId> > + <artifactId>slf4j-simple</artifactId> > <version>${slf4j.version}</version> > </dependency> > - > + > <dependency> > <groupId>org.slf4j</groupId> > - <artifactId>slf4j-api</artifactId> > + <artifactId>slf4j-jdk14</artifactId> > + <version>${slf4j.version}</version> > + </dependency> > + > + <dependency> > + <groupId>org.slf4j</groupId> > + <artifactId>slf4j-log4j12</artifactId> > <version>${slf4j.version}</version> > </dependency> > > > -- Lewis
