Repository: tika Updated Branches: refs/heads/master 6950dcf85 -> 8580fc292
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/8580fc29 Tree: http://git-wip-us.apache.org/repos/asf/tika/tree/8580fc29 Diff: http://git-wip-us.apache.org/repos/asf/tika/diff/8580fc29 Branch: refs/heads/master Commit: 8580fc29291bb27c96208d55263277a859d706f0 Parents: 6950dcf Author: tballison <[email protected]> Authored: Thu Mar 31 20:10:15 2016 -0400 Committer: tballison <[email protected]> Committed: Thu Mar 31 20:10:15 2016 -0400 ---------------------------------------------------------------------- tika-parsers/pom.xml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tika/blob/8580fc29/tika-parsers/pom.xml ---------------------------------------------------------------------- diff --git a/tika-parsers/pom.xml b/tika-parsers/pom.xml index ac5fcee..b710c1d 100644 --- a/tika-parsers/pom.xml +++ b/tika-parsers/pom.xml @@ -47,6 +47,8 @@ <netcdf-java.version>4.5.5</netcdf-java.version> <cxf.version>3.0.3</cxf.version> <sis.version>0.6</sis.version> + <!-- used by POI, PDFBox and Jackcess ...try to sync --> + <bouncycastle.version>1.54</bouncycastle.version> </properties> <dependencies> @@ -88,6 +90,12 @@ <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> <!-- Optional OSGi dependencies, used only when running within OSGi --> @@ -150,12 +158,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>org.apache.poi</groupId>
