[tika] branch branch_1x updated: TIKA-3613 -- general dependency upgrades -- fix merge errors

[ta...@apache.org]

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


The following commit(s) were added to refs/heads/branch_1x by this push:
     new 9d79f41  TIKA-3613 -- general dependency upgrades -- fix merge errors
9d79f41 is described below

commit 9d79f4120fc2608fdb970178537420d0d25d95d6
Author: tallison <ta...@apache.org>
AuthorDate: Wed Dec 8 12:28:20 2021 -0500

    TIKA-3613 -- general dependency upgrades -- fix merge errors
---
 tika-parent/pom.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tika-parent/pom.xml b/tika-parent/pom.xml
index 8d0adea..2878ff9 100644
--- a/tika-parent/pom.xml
+++ b/tika-parent/pom.xml
@@ -259,6 +259,7 @@
     <maven.compiler.target>1.8</maven.compiler.target>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>${project.build.sourceEncoding}</project.reporting.outputEncoding>
+    <project.build.outputTimestamp>1</project.build.outputTimestamp>
     <!-- plugin versions -->
     <forbiddenapis.version>3.1</forbiddenapis.version>
     <groovy.maven.version>2.1.1</groovy.maven.version>
@@ -292,6 +293,7 @@
     <cli.version>1.5.0</cli.version>
     <lucene.version>8.9.0</lucene.version>
     <mockito.version>3.11.2</mockito.version>
+    <lombok.version>1.18.20</lombok.version>
     <opennlp.version>1.9.4</opennlp.version>
   </properties>
   <dependencyManagement>