You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2023/03/14 11:28:41 UTC
[camel-quarkus] branch main updated: Upgrade Quarkiverse Freemarker to 1.0.0.Alpha2
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/main by this push:
new 615c2f00ab Upgrade Quarkiverse Freemarker to 1.0.0.Alpha2
615c2f00ab is described below
commit 615c2f00aba8c9a6612e33b7c44c0046fa01d35f
Author: James Netherton <ja...@gmail.com>
AuthorDate: Tue Mar 14 07:46:57 2023 +0000
Upgrade Quarkiverse Freemarker to 1.0.0.Alpha2
---
extensions/freemarker/runtime/pom.xml | 5 +----
pom.xml | 4 ++--
poms/bom/pom.xml | 7 -------
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 ++--------
6 files changed, 9 insertions(+), 37 deletions(-)
diff --git a/extensions/freemarker/runtime/pom.xml b/extensions/freemarker/runtime/pom.xml
index 25f322817e..2d472f452b 100644
--- a/extensions/freemarker/runtime/pom.xml
+++ b/extensions/freemarker/runtime/pom.xml
@@ -47,15 +47,12 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-freemarker</artifactId>
- <!-- TODO: https://github.com/apache/camel-quarkus/issues/4634
- We prefer the version pulled via quarkus-freemarker
<exclusions>
- <exclusion>
+ <exclusion><!-- We prefer the version pulled via quarkus-freemarker -->
<groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId>
</exclusion>
</exclusions>
- -->
</dependency>
</dependencies>
diff --git a/pom.xml b/pom.xml
index f3bf2d1647..afe53248fd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,7 +51,7 @@
<quarkiverse-amazonservices.version>2.0.0.Alpha1</quarkiverse-amazonservices.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/amazonservices/quarkus-amazon-services-parent/ -->
<quarkiverse-artemis.version>3.0.0.Alpha7</quarkiverse-artemis.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/artemis/quarkus-artemis-parent/ -->
<quarkiverse-cxf.version>2.0.0.Alpha4</quarkiverse-cxf.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/cxf/quarkus-cxf-parent/ -->
- <quarkiverse-freemarker.version>1.0.0.Alpha1</quarkiverse-freemarker.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/freemarker/quarkus-freemarker-parent/ -->
+ <quarkiverse-freemarker.version>1.0.0.Alpha2</quarkiverse-freemarker.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/freemarker/quarkus-freemarker-parent/ -->
<quarkiverse-jackson-jq.version>2.0.0.Alpha</quarkiverse-jackson-jq.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/jackson-jq/quarkus-jackson-jq-parent/ -->
<quarkiverse-jgit.version>2.3.1</quarkiverse-jgit.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/jgit/quarkus-jgit-parent/ -->
<quarkiverse-jsch.version>2.0.3</quarkiverse-jsch.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/jsch/quarkus-jsch-parent/ -->
@@ -93,7 +93,7 @@
<curator.version>4.3.0</curator.version><!-- Mess in the transitive dependencies of Spark, Zookeeper and other hadoop related components -->
<cxf.version>4.0.0</cxf.version><!-- @sync io.quarkiverse.cxf:quarkus-cxf-parent:${quarkiverse-cxf.version} prop:cxf.version -->
<eddsa.version>${eddsa-version}</eddsa.version>
- <freemarker.version>2.3.31</freemarker.version><!-- @sync io.quarkiverse.freemarker:quarkus-freemarker-parent:${quarkiverse-freemarker.version} prop:freemarker.version -->
+ <freemarker.version>2.3.32</freemarker.version><!-- @sync io.quarkiverse.freemarker:quarkus-freemarker-parent:${quarkiverse-freemarker.version} prop:freemarker.version -->
<geny.version>0.6.2</geny.version>
<github-api.version>1.313</github-api.version><!-- Used in a Groovy script bellow -->
<google-auth-library-credentials.version>1.7.0</google-auth-library-credentials.version><!-- TODO: Revert back to using Camel's version when gRPC versions are in sync -->
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index 6555408320..476e7af763 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -6105,17 +6105,10 @@
<artifactId>reactor-netty</artifactId>
<version>${reactor-netty.version}</version>
</dependency>
- <!-- TODO: https://github.com/apache/camel-quarkus/issues/4634 -->
<dependency>
<groupId>io.quarkiverse.freemarker</groupId>
<artifactId>quarkus-freemarker</artifactId>
<version>${quarkiverse-freemarker.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.freemarker</groupId>
- <artifactId>freemarker</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>io.quarkiverse.freemarker</groupId>
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml
index 49bc8ed3e3..5e04a2626b 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -5976,18 +5976,12 @@
<dependency>
<groupId>io.quarkiverse.freemarker</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>quarkus-freemarker</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>1.0.0.Alpha1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <exclusions>
- <exclusion>
- <groupId>org.freemarker</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <artifactId>freemarker</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- </exclusion>
- </exclusions>
+ <version>1.0.0.Alpha2</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
<dependency>
<groupId>io.quarkiverse.freemarker</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>quarkus-freemarker-deployment</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>1.0.0.Alpha1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>1.0.0.Alpha2</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
<dependency>
<groupId>io.quarkiverse.jackson-jq</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 91396389a8..5356981abc 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -5971,18 +5971,12 @@
<dependency>
<groupId>io.quarkiverse.freemarker</groupId>
<artifactId>quarkus-freemarker</artifactId>
- <version>1.0.0.Alpha1</version>
- <exclusions>
- <exclusion>
- <groupId>org.freemarker</groupId>
- <artifactId>freemarker</artifactId>
- </exclusion>
- </exclusions>
+ <version>1.0.0.Alpha2</version>
</dependency>
<dependency>
<groupId>io.quarkiverse.freemarker</groupId>
<artifactId>quarkus-freemarker-deployment</artifactId>
- <version>1.0.0.Alpha1</version>
+ <version>1.0.0.Alpha2</version>
</dependency>
<dependency>
<groupId>io.quarkiverse.jackson-jq</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 5540221236..9d6f85e050 100644
--- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
@@ -5971,18 +5971,12 @@
<dependency>
<groupId>io.quarkiverse.freemarker</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>quarkus-freemarker</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>1.0.0.Alpha1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <exclusions>
- <exclusion>
- <groupId>org.freemarker</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <artifactId>freemarker</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- </exclusion>
- </exclusions>
+ <version>1.0.0.Alpha2</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
<dependency>
<groupId>io.quarkiverse.freemarker</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>quarkus-freemarker-deployment</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>1.0.0.Alpha1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>1.0.0.Alpha2</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
<dependency>
<groupId>io.quarkiverse.jackson-jq</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->