Addresses dependency convergence, some minor cleanup

fcrepo4-archive · Jun 21, 2013 · c2a7f11 · c2a7f11
1 parent f93de6c
commit c2a7f11
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -14,6 +14,20 @@
       <groupId>org.modeshape</groupId>
       <artifactId>modeshape-jcr</artifactId>
     </dependency>
+    <!-- vorbis-java-tika is only added here because it declares a dependency on 
+      tika-core:1.0 which we want to exclude in favor of version 1.3 which is a dependency 
+      of tika-parsers:1.3 -->
+    <dependency>
+      <groupId>org.gagravarr</groupId>
+      <artifactId>vorbis-java-tika</artifactId>
+      <version>0.1</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.tika</groupId>
+          <artifactId>tika-core</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
@@ -22,7 +36,6 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>javax.servlet-api</artifactId>
-      <version>3.0.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -42,8 +55,8 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-    	<groupId>ch.qos.logback</groupId>
-    	<artifactId>logback-classic</artifactId>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
     </dependency>
   </dependencies>
   <build>

diff --git a/src/main/java/org/fcrepo/federation/bagit/BagItConnector.java b/src/main/java/org/fcrepo/federation/bagit/BagItConnector.java
@@ -148,7 +148,7 @@ public void initialize(final NamespaceRegistry registry,
         rootPath = Paths.get(directoryAbsolutePath);
 
         setExtraPropertiesStore(new BagItExtraPropertiesStore(this));
-        getLogger().trace("Initialized.");
+        getLogger().trace("Initialized. rootPath: {}", rootPath);
         final BlockingQueue<Runnable> workQueue =
                 new ArrayBlockingQueue<Runnable>(1);
         threadPool =