This is an automated email from the ASF dual-hosted git repository.
lewismc pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/any23.git
The following commit(s) were added to refs/heads/master by this push:
new 8bff6e4 ANY23-444 Update all dependencies and plugins (#142)
8bff6e4 is described below
commit 8bff6e435a81a6271203297bfdc7cecde3fc4227
Author: Lewis John McGibbney <[email protected]>
AuthorDate: Sun Sep 22 20:48:26 2019 -0700
ANY23-444 Update all dependencies and plugins (#142)
* ANY23-444 Update all dependencies and plugins
---
cli/src/main/assembly/bin.xml | 8 +--
plugins/basic-crawler/src/main/assembly/bin.xml | 8 +--
plugins/html-scraper/src/main/assembly/bin.xml | 8 +--
plugins/office-scraper/src/main/assembly/bin.xml | 8 +--
pom.xml | 85 ++++++++++++++----------
service/pom.xml | 2 +-
service/src/main/assembly/server-embedded.xml | 8 +--
7 files changed, 70 insertions(+), 57 deletions(-)
diff --git a/cli/src/main/assembly/bin.xml b/cli/src/main/assembly/bin.xml
index ce264a6..ae52c0d 100644
--- a/cli/src/main/assembly/bin.xml
+++ b/cli/src/main/assembly/bin.xml
@@ -34,24 +34,24 @@
<file>
<source>${basedir}/src/main/assembly/README.txt</source>
<filtered>true</filtered>
- <outputDirectory></outputDirectory>
+ <outputDirectory/>
<fileMode>0666</fileMode>
</file>
<file>
<source>${basedir}/src/main/assembly/LICENSE-with-deps.txt</source>
<destName>LICENSE.txt</destName>
- <outputDirectory></outputDirectory>
+ <outputDirectory/>
<fileMode>0666</fileMode>
</file>
<file>
<source>${basedir}/src/main/assembly/NOTICE-with-deps.txt</source>
<destName>NOTICE.txt</destName>
- <outputDirectory></outputDirectory>
+ <outputDirectory/>
<fileMode>0666</fileMode>
</file>
<file>
<source>${basedir}/../RELEASE-NOTES.txt</source>
- <outputDirectory></outputDirectory>
+ <outputDirectory/>
<fileMode>0666</fileMode>
</file>
</files>
diff --git a/plugins/basic-crawler/src/main/assembly/bin.xml
b/plugins/basic-crawler/src/main/assembly/bin.xml
index 57fa46f..85401a5 100644
--- a/plugins/basic-crawler/src/main/assembly/bin.xml
+++ b/plugins/basic-crawler/src/main/assembly/bin.xml
@@ -31,24 +31,24 @@
<file>
<source>${basedir}/src/main/assembly/LICENSE-with-deps.txt</source>
<destName>LICENSE.txt</destName>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory/>
<fileMode>666</fileMode>
</file>
<file>
<source>${basedir}/src/main/assembly/NOTICE-with-deps.txt</source>
<destName>NOTICE.txt</destName>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory/>
<fileMode>666</fileMode>
</file>
<file>
<source>${basedir}/src/main/assembly/README.txt</source>
<filtered>true</filtered>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory/>
<fileMode>666</fileMode>
</file>
<file>
<source>${basedir}/../../RELEASE-NOTES.txt</source>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory/>
<fileMode>666</fileMode>
</file>
</files>
diff --git a/plugins/html-scraper/src/main/assembly/bin.xml
b/plugins/html-scraper/src/main/assembly/bin.xml
index 09ef4a0..68570df 100644
--- a/plugins/html-scraper/src/main/assembly/bin.xml
+++ b/plugins/html-scraper/src/main/assembly/bin.xml
@@ -31,24 +31,24 @@
<file>
<source>${basedir}/src/main/assembly/LICENSE-with-deps.txt</source>
<destName>LICENSE.txt</destName>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory/>
<fileMode>666</fileMode>
</file>
<file>
<source>${basedir}/src/main/assembly/NOTICE-with-deps.txt</source>
<destName>NOTICE.txt</destName>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory/>
<fileMode>666</fileMode>
</file>
<file>
<source>${basedir}/src/main/assembly/README.txt</source>
<filtered>true</filtered>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory/>
<fileMode>666</fileMode>
</file>
<file>
<source>${basedir}/../../RELEASE-NOTES.txt</source>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory/>
<fileMode>666</fileMode>
</file>
</files>
diff --git a/plugins/office-scraper/src/main/assembly/bin.xml
b/plugins/office-scraper/src/main/assembly/bin.xml
index cf65292..06b91f1 100644
--- a/plugins/office-scraper/src/main/assembly/bin.xml
+++ b/plugins/office-scraper/src/main/assembly/bin.xml
@@ -31,24 +31,24 @@
<file>
<source>${basedir}/src/main/assembly/LICENSE-with-deps.txt</source>
<destName>LICENSE.txt</destName>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory/>
<fileMode>666</fileMode>
</file>
<file>
<source>${basedir}/src/main/assembly/NOTICE-with-deps.txt</source>
<destName>NOTICE.txt</destName>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory/>
<fileMode>666</fileMode>
</file>
<file>
<source>${basedir}/src/main/assembly/README.txt</source>
<filtered>true</filtered>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory/>
<fileMode>666</fileMode>
</file>
<file>
<source>${basedir}/../../RELEASE-NOTES.txt</source>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory/>
<fileMode>666</fileMode>
</file>
</files>
diff --git a/pom.xml b/pom.xml
index 7444f03..125c85b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -270,17 +270,17 @@
<implementation.build>${scmBranch}@r${buildNumber}</implementation.build>
<implementation.build.tstamp>${maven.build.timestamp}</implementation.build.tstamp>
- <httpclient.version>4.5.7</httpclient.version>
- <httpcore.version>4.4.11</httpcore.version>
+ <httpclient.version>4.5.10</httpclient.version>
+ <httpcore.version>4.4.12</httpcore.version>
<owlapi.version>5.1.11</owlapi.version>
- <poi.version>4.0.1</poi.version>
+ <poi.version>4.1.0</poi.version>
<rdf4j.version>2.4.4</rdf4j.version>
<semargl.version>0.7</semargl.version>
- <slf4j.logger.version>1.7.25</slf4j.logger.version>
- <tika.version>1.20</tika.version>
+ <slf4j.logger.version>1.7.28</slf4j.logger.version>
+ <tika.version>1.22</tika.version>
<openie_2.11.version>4.2.6</openie_2.11.version>
<openregex.version>1.1.1</openregex.version>
- <jackson.version>2.9.8</jackson.version>
+ <jackson.version>2.9.10</jackson.version>
<!-- Overridden in profiles to add JDK specific arguments to surefire -->
<surefire-extra-args />
@@ -293,29 +293,30 @@
<form.tracker.id>UA-59636188-1</form.tracker.id>
<!-- Maven Plugin Versions -->
- <maven-javadoc-plugin.version>3.0.1</maven-javadoc-plugin.version>
+ <maven-javadoc-plugin.version>3.1.1</maven-javadoc-plugin.version>
<maven-clean-plugin.version>3.1.0</maven-clean-plugin.version>
<maven-deploy-plugin.version>3.0.0-M1</maven-deploy-plugin.version>
<maven-install-plugin.version>3.0.0-M1</maven-install-plugin.version>
<maven-resources-plugin.version>3.1.0</maven-resources-plugin.version>
<maven-assembly-plugin.version>3.1.1</maven-assembly-plugin.version>
-
<appassembler-maven-plugin.version>2.0.0</appassembler-maven-plugin.version>
+
<appassembler-maven-plugin.version>2.1.0</appassembler-maven-plugin.version>
<maven-release-plugin.version>2.5.3</maven-release-plugin.version>
<buildnumber-maven-plugin.version>1.4</buildnumber-maven-plugin.version>
- <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
- <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
+ <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
+ <maven-jar-plugin.version>3.1.2</maven-jar-plugin.version>
<maven-surefire-plugin.version>3.0.0-M3</maven-surefire-plugin.version>
- <jacoco-maven-plugin.version>0.8.3</jacoco-maven-plugin.version>
+ <jacoco-maven-plugin.version>0.8.4</jacoco-maven-plugin.version>
<maven-site-plugin.version>3.7.1</maven-site-plugin.version>
<maven-changes-plugin.version>2.12.1</maven-changes-plugin.version>
<maven-project-info-reports-plugin.version>3.0.0</maven-project-info-reports-plugin.version>
<maven-jxr-plugin.version>3.0.0</maven-jxr-plugin.version>
- <maven-checkstyle-plugin.version>3.0.0</maven-checkstyle-plugin.version>
+ <maven-checkstyle-plugin.version>3.1.0</maven-checkstyle-plugin.version>
<apache-rat-plugin.version>0.13</apache-rat-plugin.version>
<maven-source-plugin.version>3.0.1</maven-source-plugin.version>
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
- <maven-war-plugin.version>3.2.2</maven-war-plugin.version>
- <maven-invoker-plugin.version>3.2.0</maven-invoker-plugin.version>
+ <maven-war-plugin.version>3.2.3</maven-war-plugin.version>
+ <maven-invoker-plugin.version>3.2.1</maven-invoker-plugin.version>
+ <maven-checkstyle-plugin.version>3.1.12.2</maven-checkstyle-plugin.version>
<!--
| Any23 website has to be stored in SVN
@@ -610,7 +611,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>2.24.0</version>
+ <version>3.0.0</version>
<scope>test</scope>
</dependency>
<!-- END: Test Dependencies -->
@@ -711,6 +712,28 @@
</dependency>
</dependencies>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>3.0.0-M2</version>
+ <executions>
+ <execution>
+ <id>enforce-maven</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireMavenVersion>
+ <version>3.5.0</version>
+ </requireMavenVersion>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
</plugins>
</pluginManagement>
@@ -816,8 +839,8 @@
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>${jacoco-maven-plugin.version}</version>
- <executions>
- <execution>
+ <executions>
+ <execution>
<id>prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
@@ -825,6 +848,12 @@
</execution>
</executions>
</plugin>
+
+ <plugin>
+ <groupId>com.github.spotbugs</groupId>
+ <artifactId>spotbugs-maven-plugin</artifactId>
+ <version>${maven-checkstyle-plugin.version}</version>
+ </plugin>
</plugins>
</build>
@@ -896,27 +925,11 @@
</reportSets>
</plugin>
- <!-- findBugs report. -->
- <!-- TODO: deactivated because not working with Maven 3. Tried with
2.3.2/2.3.1/2.3 with no result.
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>1.1.1</version>
- <configuration>
- <xmlOutput>true</xmlOutput>
- <xmlOutputDirectory>target/findbugs-reports</xmlOutputDirectory>
- <threshold>High</threshold>
- <effort>Max</effort>
- <visitors>FindDeadLocalStores</visitors>
- <omitVisitors>FindDeadLocalStores</omitVisitors>
- <onlyAnalyze>org.apache.any23.*</onlyAnalyze>
- <debug>true</debug>
- <relaxed>true</relaxed>
- <xmlOutputDirectory>target/findbugs-reports</xmlOutputDirectory>
- <findbugsXmlOutput>target/findbugs-reports</findbugsXmlOutput>
- </configuration>
+ <groupId>com.github.spotbugs</groupId>
+ <artifactId>spotbugs-maven-plugin</artifactId>
+ <version>${maven-checkstyle-plugin.version}</version>
</plugin>
- -->
<!-- Check style report. -->
<plugin>
diff --git a/service/pom.xml b/service/pom.xml
index d729a0b..2f12c2f 100644
--- a/service/pom.xml
+++ b/service/pom.xml
@@ -33,7 +33,7 @@
<properties>
<!-- the following property is used in the bash script as well, don't
remove it! -->
- <jetty.runner.version>9.4.14.v20181114</jetty.runner.version>
+ <jetty.runner.version>9.4.20.v20190813</jetty.runner.version>
<output.directory>${project.build.directory}/${project.artifactId}-${project.version}/WEB-INF/lib/apache-any23-openie</output.directory>
</properties>
diff --git a/service/src/main/assembly/server-embedded.xml
b/service/src/main/assembly/server-embedded.xml
index 6cd2b0c..3a0ecdf 100644
--- a/service/src/main/assembly/server-embedded.xml
+++ b/service/src/main/assembly/server-embedded.xml
@@ -30,24 +30,24 @@
<file>
<source>${basedir}/src/main/assembly/README.txt</source>
<filtered>true</filtered>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory/>
<fileMode>666</fileMode>
</file>
<file>
<source>${basedir}/src/main/assembly/LICENSE-server-embedded.txt</source>
<destName>LICENSE.txt</destName>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory/>
<fileMode>666</fileMode>
</file>
<file>
<source>${basedir}/src/main/assembly/NOTICE-server-embedded.txt</source>
<destName>NOTICE.txt</destName>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory/>
<fileMode>666</fileMode>
</file>
<file>
<source>${basedir}/../RELEASE-NOTES.txt</source>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory/>
<fileMode>666</fileMode>
</file>
</files>
