You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ta...@apache.org on 2022/05/26 13:40:55 UTC
[tika] 01/01: TIKA-3751 -- fix build after dramatic changes in ossindex
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a commit to branch TIKA-3751-ossindex
in repository https://gitbox.apache.org/repos/asf/tika.git
commit fe43f14e8cf13dcaf1db594b85a8804e7260a0a6
Author: tallison <ta...@apache.org>
AuthorDate: Thu May 26 09:40:41 2022 -0400
TIKA-3751 -- fix build after dramatic changes in ossindex
---
tika-example/pom.xml | 25 ++++++++++
tika-parent/pom.xml | 53 +++++++++++++++++++++-
.../tika-parser-scientific-module/pom.xml | 19 ++++++++
tika-parsers/tika-parsers-ml/tika-dl/pom.xml | 5 ++
.../tika-parsers-ml/tika-parser-nlp-module/pom.xml | 16 ++++++-
5 files changed, 116 insertions(+), 2 deletions(-)
diff --git a/tika-example/pom.xml b/tika-example/pom.xml
index 9bc9a42ff..37d52316c 100644
--- a/tika-example/pom.xml
+++ b/tika-example/pom.xml
@@ -155,6 +155,31 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.sonatype.ossindex.maven</groupId>
+ <artifactId>ossindex-maven-plugin</artifactId>
+ <version>3.2.0</version>
+ <configuration>
+ <excludeCoordinates>
+ <exclude>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>31.1-jre</version>
+ </exclude>
+ <exclude>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.12.2</version>
+ </exclude>
+ <exclude>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ <version>1.4</version>
+ </exclude>
+ </excludeCoordinates>
+ <fail>true</fail>
+ </configuration>
+ </plugin>
</plugins>
</build>
diff --git a/tika-parent/pom.xml b/tika-parent/pom.xml
index 9ef97b943..794f2c7f6 100644
--- a/tika-parent/pom.xml
+++ b/tika-parent/pom.xml
@@ -312,7 +312,6 @@
<fakeload.version>0.4.0</fakeload.version>
<geoapi.version>3.0.1</geoapi.version>
<google.cloud.version>2.7.1</google.cloud.version>
- <gson.version>2.9.0</gson.version>
<guava.version>31.1-jre</guava.version>
<h2.version>2.1.212</h2.version>
<httpcomponents.version>4.5.13</httpcomponents.version>
@@ -402,6 +401,11 @@
<artifactId>c3p0</artifactId>
<version>0.9.1.2</version>
</dependency>
+ <dependency>
+ <groupId>com.beust</groupId>
+ <artifactId>jcommander</artifactId>
+ <version>1.82</version>
+ </dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
@@ -442,11 +446,26 @@
<artifactId>jsr305</artifactId>
<version>3.0.2</version>
</dependency>
+ <dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ <version>2.9.0</version>
+ </dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ <version>3.20.1</version>
+ </dependency>
+ <dependency>
+ <groupId>com.ibm.icu</groupId>
+ <artifactId>icu4j</artifactId>
+ <version>71.1</version>
+ </dependency>
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
@@ -467,6 +486,16 @@
<artifactId>commons-logging</artifactId>
<version>${commons.logging.version}</version>
</dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-common</artifactId>
+ <version>4.1.77.Final</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-handler</artifactId>
+ <version>4.1.77.Final</version>
+ </dependency>
<dependency>
<groupId>it.unimi.dsi</groupId>
<artifactId>fastutil</artifactId>
@@ -723,6 +752,28 @@
<artifactId>ossindex-maven-plugin</artifactId>
<version>3.2.0</version>
<configuration>
+ <excludeCoordinates>
+ <exclude>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>31.1-jre</version>
+ </exclude>
+ <exclude>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ <version>2.1.212</version>
+ </exclude>
+ <exclude>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-handler</artifactId>
+ <version>4.1.77.Final</version>
+ </exclude>
+ <exclude>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.12.2</version>
+ </exclude>
+ </excludeCoordinates>
<fail>true</fail>
</configuration>
<executions>
diff --git a/tika-parsers/tika-parsers-extended/tika-parser-scientific-module/pom.xml b/tika-parsers/tika-parsers-extended/tika-parser-scientific-module/pom.xml
index 8605d523d..e989900a8 100644
--- a/tika-parsers/tika-parsers-extended/tika-parser-scientific-module/pom.xml
+++ b/tika-parsers/tika-parsers-extended/tika-parser-scientific-module/pom.xml
@@ -132,6 +132,25 @@ May the gods of dependency management fix this in the future.
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.sonatype.ossindex.maven</groupId>
+ <artifactId>ossindex-maven-plugin</artifactId>
+ <configuration>
+ <excludeCoordinates>
+ <exclude>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>31.1-jre</version>
+ </exclude>
+ <exclude>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.12.2</version>
+ </exclude>
+ </excludeCoordinates>
+ </configuration>
+ </plugin>
+
</plugins>
</build>
diff --git a/tika-parsers/tika-parsers-ml/tika-dl/pom.xml b/tika-parsers/tika-parsers-ml/tika-dl/pom.xml
index af505dace..c553a6d11 100644
--- a/tika-parsers/tika-parsers-ml/tika-dl/pom.xml
+++ b/tika-parsers/tika-parsers-ml/tika-dl/pom.xml
@@ -58,6 +58,11 @@
<artifactId>imageio-tiff</artifactId>
<version>${twelvemonkeys.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.freemarker</groupId>
+ <artifactId>freemarker</artifactId>
+ <version>2.3.31</version>
+ </dependency>
</dependencies>
</dependencyManagement>
<dependencies>
diff --git a/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/pom.xml b/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/pom.xml
index befda7729..3f76b5786 100644
--- a/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/pom.xml
+++ b/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/pom.xml
@@ -119,7 +119,6 @@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
- <version>${gson.version}</version>
</dependency>
<!-- sentiment parser -->
<dependency>
@@ -225,6 +224,21 @@
<artifactId>log4j</artifactId>
<version>1.2.17</version>
</exclude>
+ <exclude>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>31.1-jre</version>
+ </exclude>
+ <exclude>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.12.2</version>
+ </exclude>
+ <exclude>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-queryparser</artifactId>
+ <version>4.0.0</version>
+ </exclude>
</excludeCoordinates>
</configuration>
<executions>