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 41e97f2b106a8c5b71a3868769286ab71b92b8d5
Author: JiriOndrusek <ondrusek.j...@gmail.com>
AuthorDate: Thu Jan 4 16:31:17 2024 +0100
Quick workaround to make micrometer-deployment pass.
---
.../deployment/MicrometerMetricsConfigDefaultsTest.java | 2 +-
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 +++++
6 files changed, 22 insertions(+), 7 deletions(-)
diff --git
a/extensions/micrometer/deployment/src/test/java/org/apache/camel/quarkus/component/micrometer/deployment/MicrometerMetricsConfigDefaultsTest.java
b/extensions/micrometer/deployment/src/test/java/org/apache/camel/quarkus/component/micrometer/deployment/MicrometerMetricsConfigDefaultsTest.java
index cf0612ee43..f1e55cf781 100644
---
a/extensions/micrometer/deployment/src/test/java/org/apache/camel/quarkus/component/micrometer/deployment/MicrometerMetricsConfigDefaultsTest.java
+++
b/extensions/micrometer/deployment/src/test/java/org/apache/camel/quarkus/component/micrometer/deployment/MicrometerMetricsConfigDefaultsTest.java
@@ -63,7 +63,7 @@ public class MicrometerMetricsConfigDefaultsTest {
.stream()
.filter(eventNotifier ->
!eventNotifier.getClass().getName().contains("BaseMainSupport"))
.collect(Collectors.toList());
- assertEquals(2, eventNotifiers.size());
+ assertEquals(3, eventNotifiers.size());
ThreadPoolFactory threadPoolFactory =
context.getExecutorServiceManager().getThreadPoolFactory();
assertNotNull(threadPoolFactory);
diff --git a/pom.xml b/pom.xml
index f4aa5b296c..bcc47297c8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -152,6 +152,7 @@
<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 2abea18b88..c0b345e338 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -6735,6 +6735,11 @@
<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 c0165d0833..e413524287 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -6658,6 +6658,11 @@
<artifactId>mybatis</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>3.5.13</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} -->
@@ -22616,12 +22621,6 @@
<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 f0e661cdd4..9c80507945 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -6573,6 +6573,11 @@
<artifactId>mybatis</artifactId>
<version>3.5.13</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 18d312377e..0898fc40f3 100644
--- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
@@ -6573,6 +6573,11 @@
<artifactId>mybatis</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>3.5.13</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} -->
