Author: tallison
Date: Thu Oct 8 23:33:47 2015
New Revision: 1707635
URL: http://svn.apache.org/viewvc?rev=1707635&view=rev
Log:
TIKA-1736 upgrade jackcess-encrypt
Modified:
tika/trunk/CHANGES.txt
tika/trunk/tika-parsers/pom.xml
Modified: tika/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/tika/trunk/CHANGES.txt?rev=1707635&r1=1707634&r2=1707635&view=diff
==============================================================================
--- tika/trunk/CHANGES.txt (original)
+++ tika/trunk/CHANGES.txt Thu Oct 8 23:33:47 2015
@@ -1,4 +1,7 @@
Release 1.11 - Current Development
+
+ * Upgrade to Jackcess Encrypt 2.1.1 to avoid binary incompatibility
+ with Bouncy Castle (TIKA-1736).
* Make div and other markup more consistent between PPT and
PPTX (TIKA-1755).
Modified: tika/trunk/tika-parsers/pom.xml
URL:
http://svn.apache.org/viewvc/tika/trunk/tika-parsers/pom.xml?rev=1707635&r1=1707634&r2=1707635&view=diff
==============================================================================
--- tika/trunk/tika-parsers/pom.xml (original)
+++ tika/trunk/tika-parsers/pom.xml Thu Oct 8 23:33:47 2015
@@ -85,13 +85,7 @@
<dependency>
<groupId>com.healthmarketscience.jackcess</groupId>
<artifactId>jackcess-encrypt</artifactId>
- <version>2.1.0</version>
- <exclusions>
- <exclusion>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15</artifactId>
- </exclusion>
- </exclusions>
+ <version>2.1.1</version>
</dependency>
<!-- Optional OSGi dependencies, used only when running within OSGi -->
