Repository: tika Updated Branches: refs/heads/2.x 6f952a6b7 -> 682af60ae
TIKA-1923 - Upgrade bouncy castle to 1.54 Project: http://git-wip-us.apache.org/repos/asf/tika/repo Commit: http://git-wip-us.apache.org/repos/asf/tika/commit/682af60a Tree: http://git-wip-us.apache.org/repos/asf/tika/tree/682af60a Diff: http://git-wip-us.apache.org/repos/asf/tika/diff/682af60a Branch: refs/heads/2.x Commit: 682af60ae083a37a71c05970435071f3a0076bf1 Parents: 6f952a6 Author: tballison <[email protected]> Authored: Thu Mar 31 20:18:44 2016 -0400 Committer: tballison <[email protected]> Committed: Thu Mar 31 20:18:44 2016 -0400 ---------------------------------------------------------------------- tika-parser-modules/pom.xml | 2 ++ .../tika-parser-office-module/pom.xml | 16 ++++++++++++++++ tika-parser-modules/tika-parser-pdf-module/pom.xml | 4 ++-- 3 files changed, 20 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tika/blob/682af60a/tika-parser-modules/pom.xml ---------------------------------------------------------------------- diff --git a/tika-parser-modules/pom.xml b/tika-parser-modules/pom.xml index 44831e2..bb930d9 100644 --- a/tika-parser-modules/pom.xml +++ b/tika-parser-modules/pom.xml @@ -40,6 +40,8 @@ <codec.version>1.10</codec.version> <pdfbox.version>2.0.0</pdfbox.version> <jempbox.version>1.8.11</jempbox.version> + <!-- used by POI, PDFBox and Jackcess ...try to sync --> + <bouncycastle.version>1.54</bouncycastle.version> </properties> <modules> http://git-wip-us.apache.org/repos/asf/tika/blob/682af60a/tika-parser-modules/tika-parser-office-module/pom.xml ---------------------------------------------------------------------- diff --git a/tika-parser-modules/tika-parser-office-module/pom.xml b/tika-parser-modules/tika-parser-office-module/pom.xml index e9623dc..4756328 100644 --- a/tika-parser-modules/tika-parser-office-module/pom.xml +++ b/tika-parser-modules/tika-parser-office-module/pom.xml @@ -68,6 +68,22 @@ <groupId>com.healthmarketscience.jackcess</groupId> <artifactId>jackcess-encrypt</artifactId> <version>2.1.1</version> + <exclusions> + <exclusion> + <groupId>org.bouncycastle</groupId> + <artifactId>bcprov-jdk15on</artifactId> + </exclusion> + </exclusions> + </dependency> + <!-- PDFBox (in the tika-parser-pdf-module) and poi's ooxml + code relies on bouncy castle, as does jackcess-encrypt + Need to exclude the older library and include the newer one + if there is a conflict. + --> + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcprov-jdk15on</artifactId> + <version>${bouncycastle.version}</version> </dependency> <dependency> <groupId>com.pff</groupId> http://git-wip-us.apache.org/repos/asf/tika/blob/682af60a/tika-parser-modules/tika-parser-pdf-module/pom.xml ---------------------------------------------------------------------- diff --git a/tika-parser-modules/tika-parser-pdf-module/pom.xml b/tika-parser-modules/tika-parser-pdf-module/pom.xml index 6323d18..e1c6a3e 100644 --- a/tika-parser-modules/tika-parser-pdf-module/pom.xml +++ b/tika-parser-modules/tika-parser-pdf-module/pom.xml @@ -64,12 +64,12 @@ <dependency> <groupId>org.bouncycastle</groupId> <artifactId>bcmail-jdk15on</artifactId> - <version>1.52</version> + <version>${bouncycastle.version}</version> </dependency> <dependency> <groupId>org.bouncycastle</groupId> <artifactId>bcprov-jdk15on</artifactId> - <version>1.52</version> + <version>${bouncycastle.version}</version> </dependency> <dependency> <groupId>commons-logging</groupId>
