This is an automated email from the ASF dual-hosted git repository. tallison pushed a commit to branch branch_1x in repository https://gitbox.apache.org/repos/asf/tika.git
commit 809d6bbcd64164a28568d4782775e4ed6fcf5c77 Author: tallison <[email protected]> AuthorDate: Tue Nov 3 13:39:31 2020 -0500 bump maven bundle to 5.1.1 for compatibility with Java 15 # Conflicts: # tika-parent/pom.xml --- tika-parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tika-parent/pom.xml b/tika-parent/pom.xml index 975ece9..cb8fd75 100644 --- a/tika-parent/pom.xml +++ b/tika-parent/pom.xml @@ -326,7 +326,7 @@ <groovy.maven.version>2.1</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>5.1.1</maven.bundle.version> <maven.failsafe.version>2.22.1</maven.failsafe.version> <maven.javadoc.version>3.1.1</maven.javadoc.version> <maven.scr.version>1.26.0</maven.scr.version> @@ -487,7 +487,7 @@ <id>enforce</id> <configuration> <rules> - <dependencyConvergence /> + <dependencyConvergence/> <requireMavenVersion> <version>3.3</version> </requireMavenVersion>
