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 2018/11/10 22:02:17 UTC
[tika] branch master updated: TIKA-2775 - bulk upgrade dependencies
-- backoff minimum maven dependency to 3.1;
clean up whitespace in tika-eval's pom
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tika.git
The following commit(s) were added to refs/heads/master by this push:
new 57562aa TIKA-2775 - bulk upgrade dependencies -- backoff minimum maven dependency to 3.1; clean up whitespace in tika-eval's pom
57562aa is described below
commit 57562aa2ec90636cff1ebee76b649a5ddc598d6d
Author: TALLISON <ta...@apache.org>
AuthorDate: Sat Nov 10 16:34:20 2018 -0500
TIKA-2775 - bulk upgrade dependencies -- backoff minimum maven dependency to 3.1; clean up whitespace in tika-eval's pom
---
tika-eval/pom.xml | 177 ++++++++++++++++++++++++++-------------------------
tika-example/pom.xml | 2 +-
tika-parent/pom.xml | 10 +--
tika-server/pom.xml | 4 +-
4 files changed, 98 insertions(+), 95 deletions(-)
diff --git a/tika-eval/pom.xml b/tika-eval/pom.xml
index c2c595c..c5db36a 100644
--- a/tika-eval/pom.xml
+++ b/tika-eval/pom.xml
@@ -19,7 +19,8 @@
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -34,8 +35,6 @@
<url>http://tika.apache.org/</url>
<properties>
- <cli.version>1.4</cli.version> <!--sync version with tika-server or move to parent? -->
- <lucene.version>7.4.0</lucene.version>
<poi.version>4.0.0</poi.version>
</properties>
@@ -65,7 +64,7 @@
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
- <version>1.4.196</version>
+ <version>1.4.197</version>
</dependency>
<dependency>
<groupId>com.optimaize.languagedetector</groupId>
@@ -169,98 +168,100 @@
</createDependencyReducedPom>
<!-- <filters> -->
<transformers>
- <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+ <transformer
+ implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>org.apache.tika.eval.TikaEvalCLI</mainClass>
</transformer>
- <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
+ <transformer
+ implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
</transformers>
</configuration>
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <version>1.5</version>
- <executions>
- <execution>
- <goals>
- <goal>bundle</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <includes>
- <include>**/*.xml</include>
- </includes>
- </configuration>
- </plugin>
+ <plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <version>1.5</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>bundle</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <includes>
+ <include>**/*.xml</include>
+ </includes>
+ </configuration>
+ </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>${maven.bundle.version}</version>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-DocURL>${project.url}</Bundle-DocURL>
- <Bundle-Activator>
- org.apache.tika.config.TikaActivator
- </Bundle-Activator>
- <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <version>${rat.version}</version>
- <configuration>
- <excludes>
- <exclude>src/main/resources/common_tokens/*</exclude>
- <exclude>src/main/resources/*.json</exclude>
- <exclude>src/test/resources/common_tokens/*</exclude>
- <exclude>src/test/resources/test-dirs/**</exclude>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestEntries>
- <Automatic-Module-Name>org.apache.tika.eval</Automatic-Module-Name>
- </manifestEntries>
- </archive>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-failsafe-plugin</artifactId>
- <version>${maven.failsafe.version}</version>
- <configuration>
- <additionalClasspathElements>
- <additionalClasspathElement>
- ${project.build.directory}/${project.build.finalName}.jar
- </additionalClasspathElement>
- </additionalClasspathElements>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>${maven.bundle.version}</version>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-DocURL>${project.url}</Bundle-DocURL>
+ <Bundle-Activator>
+ org.apache.tika.config.TikaActivator
+ </Bundle-Activator>
+ <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
+ </instructions>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>${rat.version}</version>
+ <configuration>
+ <excludes>
+ <exclude>src/main/resources/common_tokens/*</exclude>
+ <exclude>src/main/resources/*.json</exclude>
+ <exclude>src/test/resources/common_tokens/*</exclude>
+ <exclude>src/test/resources/test-dirs/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <Automatic-Module-Name>org.apache.tika.eval</Automatic-Module-Name>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>${maven.failsafe.version}</version>
+ <configuration>
+ <additionalClasspathElements>
+ <additionalClasspathElement>
+ ${project.build.directory}/${project.build.finalName}.jar
+ </additionalClasspathElement>
+ </additionalClasspathElements>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
</project>
diff --git a/tika-example/pom.xml b/tika-example/pom.xml
index 4a1ebc5..bfd3892 100644
--- a/tika-example/pom.xml
+++ b/tika-example/pom.xml
@@ -127,7 +127,7 @@
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-core</artifactId>
- <version>7.4.0</version>
+ <version>${lucene.version}</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
diff --git a/tika-parent/pom.xml b/tika-parent/pom.xml
index f1f4026..43270fb 100644
--- a/tika-parent/pom.xml
+++ b/tika-parent/pom.xml
@@ -307,13 +307,13 @@
<project.reporting.outputEncoding>${project.build.sourceEncoding}</project.reporting.outputEncoding>
<!-- plugin versions -->
<forbiddenapis.version>2.6</forbiddenapis.version>
- <groovy.maven.version>2.1</groovy.maven.version>
+ <groovy.maven.version>2.0</groovy.maven.version>
<maven.antrun.version>1.8</maven.antrun.version>
<maven.assembly.version>3.1.0</maven.assembly.version>
- <maven.bundle.version>4.1.0</maven.bundle.version>
+ <maven.bundle.version>4.0.0</maven.bundle.version>
<maven.failsafe.version>2.22.1</maven.failsafe.version>
<maven.javadoc.version>3.0.1</maven.javadoc.version>
- <maven.scr.version>1.26.0</maven.scr.version>
+ <maven.scr.version>1.7.4</maven.scr.version>
<maven.surefire.version>2.22.1</maven.surefire.version>
<maven.shade.version>3.2.0</maven.shade.version>
<rat.version>0.12</rat.version>
@@ -327,6 +327,8 @@
<slf4j.version>1.7.25</slf4j.version>
<jackson.version>2.9.7</jackson.version>
<jaxb.version>2.3.0.1</jaxb.version>
+ <cli.version>1.4</cli.version>
+ <lucene.version>7.5.0</lucene.version>
<mockito.version>2.23.0</mockito.version>
</properties>
@@ -419,7 +421,7 @@
<rules>
<dependencyConvergence/>
<requireMavenVersion>
- <version>3.5</version>
+ <version>3.1</version>
</requireMavenVersion>
</rules>
</configuration>
diff --git a/tika-server/pom.xml b/tika-server/pom.xml
index ed4ed24..451b22b 100644
--- a/tika-server/pom.xml
+++ b/tika-server/pom.xml
@@ -74,7 +74,7 @@
<dependency>
<groupId>net.sf.opencsv</groupId>
<artifactId>opencsv</artifactId>
- <version>2.0</version>
+ <version>2.3</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
@@ -101,7 +101,7 @@
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
- <version>1.2</version>
+ <version>${cli.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>