mahout-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ssla...@apache.org
Subject svn commit: r1561578 - in /mahout/trunk: CHANGELOG core/src/main/assembly/job.xml examples/pom.xml pom.xml
Date Mon, 27 Jan 2014 01:10:16 GMT
Author: sslavic
Date: Mon Jan 27 01:10:15 2014
New Revision: 1561578

URL: http://svn.apache.org/r1561578
Log:
MAHOUT-1399: Fixed multiple slf4j bindings when running Mahout examples issue

Modified:
    mahout/trunk/CHANGELOG
    mahout/trunk/core/src/main/assembly/job.xml
    mahout/trunk/examples/pom.xml
    mahout/trunk/pom.xml

Modified: mahout/trunk/CHANGELOG
URL: http://svn.apache.org/viewvc/mahout/trunk/CHANGELOG?rev=1561578&r1=1561577&r2=1561578&view=diff
==============================================================================
--- mahout/trunk/CHANGELOG (original)
+++ mahout/trunk/CHANGELOG Mon Jan 27 01:10:15 2014
@@ -2,6 +2,8 @@ Mahout Change Log
 
 Release 0.9 - unreleased
 
+  MAHOUT-1399: Fixed multiple slf4j bindings when running Mahout examples issue (sslavic)
+
   MAHOUT-1410: clusteredPoints do not contain a vector id (smarthi, Andrew Musselman)
 
   MAHOUT-1409: MatrixVectorView has index check error (tdunning)

Modified: mahout/trunk/core/src/main/assembly/job.xml
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/assembly/job.xml?rev=1561578&r1=1561577&r2=1561578&view=diff
==============================================================================
--- mahout/trunk/core/src/main/assembly/job.xml (original)
+++ mahout/trunk/core/src/main/assembly/job.xml Mon Jan 27 01:10:15 2014
@@ -36,6 +36,7 @@
       </unpackOptions>
       <scope>runtime</scope>
       <outputDirectory>/</outputDirectory>
+      <useTransitiveFiltering>true</useTransitiveFiltering>
       <excludes>
         <exclude>org.apache.hadoop:hadoop-core</exclude>
       </excludes>

Modified: mahout/trunk/examples/pom.xml
URL: http://svn.apache.org/viewvc/mahout/trunk/examples/pom.xml?rev=1561578&r1=1561577&r2=1561578&view=diff
==============================================================================
--- mahout/trunk/examples/pom.xml (original)
+++ mahout/trunk/examples/pom.xml Mon Jan 27 01:10:15 2014
@@ -158,12 +158,26 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <scope>provided</scope>
     </dependency>
-
     <dependency>
       <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-jcl</artifactId>
-      <scope>runtime</scope>
+      <artifactId>jcl-over-slf4j</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <scope>provided</scope>
     </dependency>
 
   </dependencies>

Modified: mahout/trunk/pom.xml
URL: http://svn.apache.org/viewvc/mahout/trunk/pom.xml?rev=1561578&r1=1561577&r2=1561578&view=diff
==============================================================================
--- mahout/trunk/pom.xml (original)
+++ mahout/trunk/pom.xml Mon Jan 27 01:10:15 2014
@@ -106,6 +106,7 @@
     <mjavadoc.version>2.9.1</mjavadoc.version>
     <hadoop.version>1.2.1</hadoop.version>
     <lucene.version>4.6.0</lucene.version>
+    <slf4j.version>1.7.5</slf4j.version>
   </properties>
   <issueManagement>
     <system>Jira</system>
@@ -395,14 +396,37 @@
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-api</artifactId>
-        <version>1.7.5</version>
+        <version>${slf4j.version}</version>
       </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-jcl</artifactId>
-        <version>1.7.5</version>
+        <version>${slf4j.version}</version>
         <scope>test</scope>
       </dependency>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>jcl-over-slf4j</artifactId>
+        <version>${slf4j.version}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-log4j12</artifactId>
+        <version>${slf4j.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>commons-logging</groupId>
+        <artifactId>commons-logging</artifactId>
+        <version>1.1.3</version>
+      </dependency>
+
+      <dependency>
+        <groupId>log4j</groupId>
+        <artifactId>log4j</artifactId>
+        <version>1.2.17</version>
+      </dependency>
 
       <dependency>
         <groupId>org.apache.commons</groupId>



Mime
View raw message