Merge pull request #894 from fcrepo4/ogg-uploads

Adding IT to demonstrate FCREPO-1712
fcrepo · Aug 28, 2015 · b53c841 · b53c841
2 parents 731e92c + 71c2af3
commit b53c841
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 21 deletions.
diff --git a/fcrepo-boms/fcrepo-jcr-bom/pom.xml b/fcrepo-boms/fcrepo-jcr-bom/pom.xml
@@ -20,10 +20,6 @@
         <version>${modeshape.version}</version>
         <scope>provided</scope>
         <exclusions>
-          <exclusion>
-            <groupId>org.gagravarr</groupId>
-            <artifactId>vorbis-java-tika</artifactId>
-          </exclusion>
           <!-- tika-parsers transitively depends on commons-codec-1.5 but httpclient is pulling in 1.6, so we explicitly 
             exclude commons-codec here and add commons-codec-1.6 as a dependency below -->
           <exclusion>
@@ -44,19 +40,6 @@
           </exclusion>
         </exclusions>
       </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>
       <!-- only explicitly adding 1.6 below because we're excluding the older 1.5 dep from modeshape-jcr above -->
       <dependency>
         <groupId>commons-codec</groupId>

diff --git a/fcrepo-http-api/src/test/java/org/fcrepo/integration/http/api/FedoraLdpIT.java b/fcrepo-http-api/src/test/java/org/fcrepo/integration/http/api/FedoraLdpIT.java
@@ -1925,6 +1925,7 @@ public void testPutMalformedHeader() throws IOException {
         }
     }
 
+    @Test
     public void testPutEmptyBody() throws IOException {
         final HttpPut httpPut = putObjMethod(getRandomUniqueId());
         httpPut.addHeader("Content-Type", "application/ld+json");
@@ -1934,4 +1935,10 @@ public void testPutEmptyBody() throws IOException {
         }
     }
 
+    @Test
+    public void testPutOgg() throws IOException {
+        final String id = getRandomUniqueId();
+        createDatastream(id, "x", "OggS");
+    }
+
 }
diff --git a/fcrepo-http-commons/pom.xml b/fcrepo-http-commons/pom.xml
@@ -79,10 +79,6 @@
       <groupId>org.glassfish.jersey.core</groupId>
       <artifactId>jersey-server</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.gagravarr</groupId>
-      <artifactId>vorbis-java-tika</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.fcrepo</groupId>
       <artifactId>fcrepo-kernel-modeshape</artifactId>