This is an automated email from the ASF dual-hosted git repository. tilman pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tika.git
commit 75f191bf7890a61aa0d6828fac17502563ef01c6 Merge: 83a6f81c3 5832eb854 Author: Tilman Hausherr <[email protected]> AuthorDate: Sat Jul 16 06:41:54 2022 +0200 TIKA-3795: remove dependencyManagement because the conflicts no longer happen tika-core/src/main/java/org/apache/tika/config/TikaConfig.java | 10 ++++++++++ tika-parent/pom.xml | 2 +- tika-parsers/tika-parsers-ml/tika-age-recogniser/pom.xml | 10 ---------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --cc tika-parsers/tika-parsers-ml/tika-age-recogniser/pom.xml index 412cd8ca3,dc2645819..8f5ac3fee --- a/tika-parsers/tika-parsers-ml/tika-age-recogniser/pom.xml +++ b/tika-parsers/tika-parsers-ml/tika-age-recogniser/pom.xml @@@ -90,11 -105,11 +90,6 @@@ <artifactId>jackson-mapper-asl</artifactId> <version>1.9.13</version> </dependency> -- <dependency> -- <groupId>org.objenesis</groupId> -- <artifactId>objenesis</artifactId> -- <version>3.2</version> -- </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> @@@ -105,11 -120,11 +100,6 @@@ <artifactId>log4j</artifactId> <version>1.2.17</version> </dependency> -- <dependency> -- <groupId>xml-apis</groupId> -- <artifactId>xml-apis</artifactId> -- <version>2.0.2</version> -- </dependency> <!-- avoid conflicts because of age-predictor-api --> <dependency>
