This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 02deb606c38eab9104d6b4394445c4aa27437e47 Author: JiriOndrusek <ondrusek.j...@gmail.com> AuthorDate: Tue Jul 18 09:12:56 2023 +0200 Fixed tika version conflict + regen of poms --- poms/bom/pom.xml | 4 ++++ poms/bom/src/main/generated/flattened-full-pom.xml | 10 +++++++--- poms/bom/src/main/generated/flattened-reduced-pom.xml | 10 +++++++--- poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 10 +++++++--- 4 files changed, 25 insertions(+), 9 deletions(-) diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index 63bff236a7..fdcae4dcae 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -6386,6 +6386,10 @@ <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </exclusion> + <exclusion> + <artifactId>fontbox</artifactId> + <groupId>org.apache.pdfbox</groupId> + </exclusion> </exclusions> </dependency> <dependency> diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 9210ee5ba6..ecdfd44de6 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6032,7 +6032,7 @@ <dependency> <groupId>com.google.cloud</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>google-cloud-pubsub</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>1.121.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>1.123.17</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <exclusions> <exclusion> <groupId>com.google.android</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -6299,6 +6299,10 @@ <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> @@ -6509,7 +6513,7 @@ <dependency> <groupId>org.influxdb</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>influxdb-java</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>2.22</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>2.23</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>org.javassist</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -6534,7 +6538,7 @@ <dependency> <groupId>org.mvel</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>mvel2</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>2.4.15.Final</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>2.5.0.Final</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>org.mybatis</groupId><!-- 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 e63e957e0b..58aa26a8b8 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6032,7 +6032,7 @@ <dependency> <groupId>com.google.cloud</groupId> <artifactId>google-cloud-pubsub</artifactId> - <version>1.121.0</version> + <version>1.123.17</version> <exclusions> <exclusion> <groupId>com.google.android</groupId> @@ -6299,6 +6299,10 @@ <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </exclusion> + <exclusion> + <groupId>org.apache.pdfbox</groupId> + <artifactId>fontbox</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -6494,7 +6498,7 @@ <dependency> <groupId>org.influxdb</groupId> <artifactId>influxdb-java</artifactId> - <version>2.22</version> + <version>2.23</version> </dependency> <dependency> <groupId>org.javassist</groupId> @@ -6514,7 +6518,7 @@ <dependency> <groupId>org.mvel</groupId> <artifactId>mvel2</artifactId> - <version>2.4.15.Final</version> + <version>2.5.0.Final</version> </dependency> <dependency> <groupId>org.mybatis</groupId> 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 1e403ecbae..5be4fdd539 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -6032,7 +6032,7 @@ <dependency> <groupId>com.google.cloud</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>google-cloud-pubsub</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>1.121.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>1.123.17</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <exclusions> <exclusion> <groupId>com.google.android</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -6299,6 +6299,10 @@ <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> @@ -6494,7 +6498,7 @@ <dependency> <groupId>org.influxdb</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>influxdb-java</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>2.22</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>2.23</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>org.javassist</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -6514,7 +6518,7 @@ <dependency> <groupId>org.mvel</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>mvel2</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>2.4.15.Final</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>2.5.0.Final</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>org.mybatis</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->