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 cf92576a72 Remove ssr-dom-shim dependency override
cf92576a72 is described below
commit cf92576a72831856be79bb2791a275f3f23f52de
Author: James Netherton <[email protected]>
AuthorDate: Mon Feb 19 07:26:17 2024 +0000
Remove ssr-dom-shim dependency override
---
pom.xml | 1 -
poms/bom/pom.xml | 5 -----
poms/bom/src/main/generated/flattened-full-pom.xml | 11 ++++++-----
poms/bom/src/main/generated/flattened-reduced-pom.xml | 5 -----
poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 5 -----
5 files changed, 6 insertions(+), 21 deletions(-)
diff --git a/pom.xml b/pom.xml
index df5e935f2e..ae1eea4a60 100644
--- a/pom.xml
+++ b/pom.xml
@@ -154,7 +154,6 @@
<snakeyaml-engine.version>${snakeyaml-engine-version}</snakeyaml-engine.version><!--
Resolve conflict between camel-snakeyaml & kubernetes-client -->
<spring.version>${spring-version}</spring.version>
<spring.data.redis.version>${spring-data-redis-version}</spring.data.redis.version>
- <ssr-dom-shim.version>1.1.2-pre.1</ssr-dom-shim.version><!-- Resolves
conflict brought by Quarkus-vertx-http-dev-ui-resources - quick solution -->
<tablesaw.version>0.43.1</tablesaw.version>
<threetenbp.version>1.6.0</threetenbp.version>
<xalan.version>2.7.2</xalan.version><!-- Xalan should be removed as is
in Camel, but it is not possible.
https://github.com/apache/camel-quarkus/issues/4065-->
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index 55b8cf4516..7285175cb0 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -6782,11 +6782,6 @@
<artifactId>mybatis</artifactId>
<version>${mybatis.version}</version>
</dependency>
- <dependency>
- <groupId>org.mvnpm.at.lit-labs</groupId>
- <artifactId>ssr-dom-shim</artifactId>
- <version>${ssr-dom-shim.version}</version>
- </dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-quarkus</artifactId>
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml
b/poms/bom/src/main/generated/flattened-full-pom.xml
index 4eab6a1d13..9f26895377 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -6705,11 +6705,6 @@
<artifactId>mybatis</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>3.5.15</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
- <dependency>
- <groupId>org.mvnpm.at.lit-labs</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <artifactId>ssr-dom-shim</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>1.1.2-pre.1</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- </dependency>
<dependency>
<groupId>org.optaplanner</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>optaplanner-quarkus</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -22719,6 +22714,12 @@
<artifactId>mockito-inline</artifactId><!--
io.quarkus:quarkus-bom:3.0.0.Final -->
<version>5.2.0</version><!-- io.quarkus:quarkus-bom:3.0.0.Final -->
</dependency>
+ <dependency>
+ <groupId>org.mvnpm.at.lit-labs</groupId><!--
io.quarkus:quarkus-bom:3.0.0.Final -->
+ <artifactId>ssr-dom-shim</artifactId><!--
io.quarkus:quarkus-bom:3.0.0.Final -->
+ <version>1.1.0</version><!-- io.quarkus:quarkus-bom:3.0.0.Final -->
+ <scope>runtime</scope><!-- io.quarkus:quarkus-bom:3.0.0.Final -->
+ </dependency>
<dependency>
<groupId>org.mvnpm.at.lit</groupId><!--
io.quarkus:quarkus-bom:3.0.0.Final -->
<artifactId>reactive-element</artifactId><!--
io.quarkus:quarkus-bom:3.0.0.Final -->
diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml
b/poms/bom/src/main/generated/flattened-reduced-pom.xml
index 7b11c632db..34791aa30c 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -6605,11 +6605,6 @@
<artifactId>mybatis</artifactId>
<version>3.5.15</version>
</dependency>
- <dependency>
- <groupId>org.mvnpm.at.lit-labs</groupId>
- <artifactId>ssr-dom-shim</artifactId>
- <version>1.1.2-pre.1</version>
- </dependency>
<dependency>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-quarkus</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 4e2d218752..1bf13e6d6a 100644
--- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
@@ -6605,11 +6605,6 @@
<artifactId>mybatis</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>3.5.15</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
- <dependency>
- <groupId>org.mvnpm.at.lit-labs</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <artifactId>ssr-dom-shim</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>1.1.2-pre.1</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- </dependency>
<dependency>
<groupId>org.optaplanner</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>optaplanner-quarkus</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
