You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by tp...@apache.org on 2014/12/14 04:19:33 UTC

svn commit: r1645379 - in /tika/trunk: tika-bundle/pom.xml tika-parent/pom.xml tika-server/pom.xml

Author: tpalsulich
Date: Sun Dec 14 03:19:32 2014
New Revision: 1645379

URL: http://svn.apache.org/r1645379
Log:
Fix tika-bundle slf4j dependency issue.

Modified:
    tika/trunk/tika-bundle/pom.xml
    tika/trunk/tika-parent/pom.xml
    tika/trunk/tika-server/pom.xml

Modified: tika/trunk/tika-bundle/pom.xml
URL: http://svn.apache.org/viewvc/tika/trunk/tika-bundle/pom.xml?rev=1645379&r1=1645378&r2=1645379&view=diff
==============================================================================
--- tika/trunk/tika-bundle/pom.xml (original)
+++ tika/trunk/tika-bundle/pom.xml Sun Dec 14 03:19:32 2014
@@ -96,7 +96,6 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
-      <version>1.6.1</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -199,6 +198,7 @@
               org.osgi.framework;resolution:=optional,
               org.quartz;resolution:=optional,
               org.quartz.impl;resolution:=optional,
+              org.slf4j;resolution:=optional
               org.w3c.dom;resolution:=optional,
               org.relaxng.datatype;resolution:=optional,
               org.xml.sax;resolution:=optional,

Modified: tika/trunk/tika-parent/pom.xml
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parent/pom.xml?rev=1645379&r1=1645378&r2=1645379&view=diff
==============================================================================
--- tika/trunk/tika-parent/pom.xml (original)
+++ tika/trunk/tika-parent/pom.xml Sun Dec 14 03:19:32 2014
@@ -249,7 +249,12 @@
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-log4j12</artifactId>
-        <version>1.7.7</version>
+        <version>${slf4j.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-simple</artifactId>
+        <version>${slf4j.version}</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
@@ -258,6 +263,7 @@
     <maven.compiler.source>1.6</maven.compiler.source>
     <maven.compiler.target>1.6</maven.compiler.target>
     <project.reporting.outputEncoding>${project.build.sourceEncoding}</project.reporting.outputEncoding>
+    <slf4j.version>1.7.7</slf4j.version>
   </properties>
 
   <build>

Modified: tika/trunk/tika-server/pom.xml
URL: http://svn.apache.org/viewvc/tika/trunk/tika-server/pom.xml?rev=1645379&r1=1645378&r2=1645379&view=diff
==============================================================================
--- tika/trunk/tika-server/pom.xml (original)
+++ tika/trunk/tika-server/pom.xml Sun Dec 14 03:19:32 2014
@@ -28,6 +28,10 @@
   <artifactId>tika-server</artifactId>
   <name>Apache Tika server</name>
 
+  <properties>
+    <cxf.version>3.0.3</cxf.version>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
@@ -47,18 +51,18 @@
     <dependency>
       <groupId>org.apache.cxf</groupId>
       <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-      <version>3.0.2</version>
+      <version>${cxf.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cxf</groupId>
       <artifactId>cxf-rt-rs-service-description</artifactId>
-      <version>3.0.2</version>
+      <version>${cxf.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.cxf</groupId>
       <artifactId>cxf-rt-transports-http-jetty</artifactId>
-      <version>3.0.2</version>
+      <version>${cxf.version}</version>
     </dependency>
     <dependency>
       <groupId>javax.mail</groupId>
@@ -78,7 +82,7 @@
     <dependency>
       <groupId>org.apache.cxf</groupId>
       <artifactId>cxf-rt-rs-client</artifactId>
-      <version>3.0.2</version>
+      <version>${cxf.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>