This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 9a692f96728cc53141a980fa8861675639067bda
Author: JiriOndrusek <ondrusek.j...@gmail.com>
AuthorDate: Tue Jul 18 16:21:15 2023 +0200
Proper fix of tika version conflict + generated poms
---
poms/bom/pom.xml | 15 +++++++++++----
poms/bom/src/main/generated/flattened-full-pom.xml | 15 +++++++++++----
poms/bom/src/main/generated/flattened-reduced-pom.xml | 15 +++++++++++----
.../src/main/generated/flattened-reduced-verbose-pom.xml | 15 +++++++++++----
4 files changed, 44 insertions(+), 16 deletions(-)
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index fdcae4dcae..a1b8d23ab1 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -6386,10 +6386,6 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
- <exclusion>
- <artifactId>fontbox</artifactId>
- <groupId>org.apache.pdfbox</groupId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -6515,6 +6511,17 @@
<artifactId>kudu-client</artifactId>
<version>${kudu.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.pdfbox</groupId>
+ <artifactId>fontbox</artifactId>
+ <version>${pdfbox.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>xmlgraphics-commons</artifactId>
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml
b/poms/bom/src/main/generated/flattened-full-pom.xml
index ecdfd44de6..0849da1c1c 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -6299,10 +6299,6 @@
<groupId>commons-logging</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>commons-logging</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</exclusion>
- <exclusion>
- <groupId>org.apache.pdfbox</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <artifactId>fontbox</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -6428,6 +6424,17 @@
<artifactId>kudu-client</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>1.16.0</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
+ <dependency>
+ <groupId>org.apache.pdfbox</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>fontbox</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>2.0.29</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>commons-logging</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.apache.xmlgraphics</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>xmlgraphics-commons</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml
b/poms/bom/src/main/generated/flattened-reduced-pom.xml
index 58aa26a8b8..52cf685193 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -6299,10 +6299,6 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
- <exclusion>
- <groupId>org.apache.pdfbox</groupId>
- <artifactId>fontbox</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -6418,6 +6414,17 @@
<artifactId>kudu-client</artifactId>
<version>1.16.0</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.pdfbox</groupId>
+ <artifactId>fontbox</artifactId>
+ <version>2.0.29</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>xmlgraphics-commons</artifactId>
diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
index 5be4fdd539..3e75c27e15 100644
--- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
@@ -6299,10 +6299,6 @@
<groupId>commons-logging</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>commons-logging</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</exclusion>
- <exclusion>
- <groupId>org.apache.pdfbox</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <artifactId>fontbox</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -6418,6 +6414,17 @@
<artifactId>kudu-client</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>1.16.0</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
+ <dependency>
+ <groupId>org.apache.pdfbox</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>fontbox</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>2.0.29</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>commons-logging</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.apache.xmlgraphics</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>xmlgraphics-commons</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
