Author: nick
Date: Wed Aug 20 14:16:06 2014
New Revision: 1619109
URL: http://svn.apache.org/r1619109
Log:
Merge r1619108 from Trunk to the 1.6 branch ready for release - Bump the POI
dependency to 3.11-beta2, and remove the Geronimo stax one which is no longer
required by anything now we are on Java 1.6 TIKA-1380
Modified:
tika/branches/1.6/ (props changed)
tika/branches/1.6/tika-bundle/pom.xml
tika/branches/1.6/tika-parsers/pom.xml
Propchange: tika/branches/1.6/
------------------------------------------------------------------------------
Merged /tika/trunk:r1619108
Modified: tika/branches/1.6/tika-bundle/pom.xml
URL:
http://svn.apache.org/viewvc/tika/branches/1.6/tika-bundle/pom.xml?rev=1619109&r1=1619108&r2=1619109&view=diff
==============================================================================
--- tika/branches/1.6/tika-bundle/pom.xml (original)
+++ tika/branches/1.6/tika-bundle/pom.xml Wed Aug 20 14:16:06 2014
@@ -118,7 +118,7 @@
commons-compress, xz, commons-codec,
pdfbox,fontbox,jempbox,bcmail-jdk15,bcprov-jdk15,
poi,poi-scratchpad,poi-ooxml,poi-ooxml-schemas,
- xmlbeans, dom4j,
+ xmlbeans,
tagsoup,
asm-debug-all,
juniversalchardet,
Modified: tika/branches/1.6/tika-parsers/pom.xml
URL:
http://svn.apache.org/viewvc/tika/branches/1.6/tika-parsers/pom.xml?rev=1619109&r1=1619108&r2=1619109&view=diff
==============================================================================
--- tika/branches/1.6/tika-parsers/pom.xml (original)
+++ tika/branches/1.6/tika-parsers/pom.xml Wed Aug 20 14:16:06 2014
@@ -35,7 +35,7 @@
<url>http://tika.apache.org/</url>
<properties>
- <poi.version>3.11-beta1</poi.version>
+ <poi.version>3.11-beta2</poi.version>
<codec.version>1.9</codec.version> <!-- NOTE: sync with POI -->
<compress.version>1.8.1</compress.version>
<tukaani.version>1.5</tukaani.version> <!-- NOTE: sync with
commons-compress -->
@@ -155,11 +155,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-stax-api_1.0_spec</artifactId>
- <version>1.0.1</version>
- </dependency>
- <dependency>
<groupId>org.ccil.cowan.tagsoup</groupId>
<artifactId>tagsoup</artifactId>
<version>1.2.1</version>
