Permalink
Browse files

resolving merge conflicts

  • Loading branch information...
2 parents c9d4c98 + 1bc8741 commit 7e2ea8a5404e4512d8a53b203d7a85663f694f97 @EricWittmann EricWittmann committed Apr 2, 2013
View
@@ -108,6 +108,7 @@
<commons.codec.version>1.5</commons.codec.version>
<jline.version>2.9</jline.version>
<joda-time.version>2.1</joda-time.version>
+ <tika-core.version>1.2</tika-core.version> <!-- inline with version used by modeshape -->
</properties>
<build>
@@ -288,6 +289,11 @@
<version>${xmlunit.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.tika</groupId>
+ <artifactId>tika-core</artifactId>
+ <version>${tika-core.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
Oops, something went wrong.

0 comments on commit 7e2ea8a

Please sign in to comment.