Skip to content

Commit

Permalink
Removing obsolete vorbis-java-tika exclusions that were breaking Ogg …
Browse files Browse the repository at this point in the history
…Vorbis uploads
  • Loading branch information
escowles committed Aug 28, 2015
1 parent 4219082 commit 71c2af3
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 21 deletions.
17 changes: 0 additions & 17 deletions fcrepo-boms/fcrepo-jcr-bom/pom.xml
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
4 changes: 0 additions & 4 deletions fcrepo-http-commons/pom.xml
Expand Up @@ -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>
Expand Down

0 comments on commit 71c2af3

Please sign in to comment.