You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ji...@apache.org on 2024/01/23 08:14:22 UTC
(camel-quarkus) 05/15: Disabled consul because of #5635
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 a231d3bd9cf865478a97d09e222289531ce5e502
Author: JiriOndrusek <on...@gmail.com>
AuthorDate: Thu Jan 4 14:01:11 2024 +0100
Disabled consul because of #5635
---
.../deployment/ConsulClientSupportProcessor.java | 6 ++---
extensions-support/consul-client/runtime/pom.xml | 2 +-
integration-tests/consul/pom.xml | 2 ++
.../component/consul/it/ConsulResource.java | 2 +-
.../quarkus/component/consul/it/ConsulTest.java | 2 ++
.../component/consul/it/ConsulTestResource.java | 2 +-
poms/bom/pom.xml | 30 +++++++++++-----------
poms/bom/src/main/generated/flattened-full-pom.xml | 30 +++++++++++-----------
.../src/main/generated/flattened-reduced-pom.xml | 30 +++++++++++-----------
.../generated/flattened-reduced-verbose-pom.xml | 30 +++++++++++-----------
10 files changed, 70 insertions(+), 66 deletions(-)
diff --git a/extensions-support/consul-client/deployment/src/main/java/org/apache/camel/quarkus/support/consul/client/deployment/ConsulClientSupportProcessor.java b/extensions-support/consul-client/deployment/src/main/java/org/apache/camel/quarkus/support/consul/client/deployment/ConsulClientSupportProcessor.java
index 4952f3fb2b..2548279528 100644
--- a/extensions-support/consul-client/deployment/src/main/java/org/apache/camel/quarkus/support/consul/client/deployment/ConsulClientSupportProcessor.java
+++ b/extensions-support/consul-client/deployment/src/main/java/org/apache/camel/quarkus/support/consul/client/deployment/ConsulClientSupportProcessor.java
@@ -41,11 +41,11 @@ class ConsulClientSupportProcessor {
private static final DotName DOT_NAME_IMMUTABLE_MAP = DotName.createSimple(
"com.google.common.collect.ImmutableMap");
- private static final Pattern CLIENT_API_PATTERN = Pattern.compile("com\\.orbitz\\.consul\\..*Client\\$Api");
+ private static final Pattern CLIENT_API_PATTERN = Pattern.compile("org\\.kiwiproject\\.consul\\..*Client\\$Api");
@BuildStep
AdditionalApplicationArchiveMarkerBuildItem applicationArchiveMarkers() {
- return new AdditionalApplicationArchiveMarkerBuildItem("com/orbitz/consul");
+ return new AdditionalApplicationArchiveMarkerBuildItem("org/kiwiproject/consul");
}
@BuildStep
@@ -63,7 +63,7 @@ class ConsulClientSupportProcessor {
.map(AnnotationInstance::target)
.filter(item -> item.kind() == AnnotationTarget.Kind.CLASS)
.map(AnnotationTarget::asClass)
- .filter(item -> item.name().prefix().toString().startsWith("com.orbitz.consul.model"))
+ .filter(item -> item.name().prefix().toString().startsWith("org.kiwiproject.consul.model"))
.flatMap(item -> index.getIndex().getAllKnownSubclasses(item.name()).stream())
.map(item -> ReflectiveClassBuildItem.builder(item.name().toString()).methods().build())
.forEach(reflectiveClasses::produce);
diff --git a/extensions-support/consul-client/runtime/pom.xml b/extensions-support/consul-client/runtime/pom.xml
index 64e7eb2c57..ed2e7a43df 100644
--- a/extensions-support/consul-client/runtime/pom.xml
+++ b/extensions-support/consul-client/runtime/pom.xml
@@ -34,7 +34,7 @@
<artifactId>quarkus-core</artifactId>
</dependency>
<dependency>
- <groupId>com.orbitz.consul</groupId>
+ <groupId>org.kiwiproject</groupId>
<artifactId>consul-client</artifactId>
</dependency>
<dependency>
diff --git a/integration-tests/consul/pom.xml b/integration-tests/consul/pom.xml
index 1850fb7d38..3cf9368a6a 100644
--- a/integration-tests/consul/pom.xml
+++ b/integration-tests/consul/pom.xml
@@ -75,6 +75,7 @@
<profiles>
+ <!-- https://github.com/apache/camel-quarkus/issues/5635
<profile>
<id>native</id>
<activation>
@@ -102,6 +103,7 @@
</plugins>
</build>
</profile>
+ -->
<profile>
<id>virtualDependencies</id>
<activation>
diff --git a/integration-tests/consul/src/main/java/org/apache/camel/quarkus/component/consul/it/ConsulResource.java b/integration-tests/consul/src/main/java/org/apache/camel/quarkus/component/consul/it/ConsulResource.java
index 180cfd52dc..5d0bf5daff 100644
--- a/integration-tests/consul/src/main/java/org/apache/camel/quarkus/component/consul/it/ConsulResource.java
+++ b/integration-tests/consul/src/main/java/org/apache/camel/quarkus/component/consul/it/ConsulResource.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.quarkus.component.consul.it;
-import com.orbitz.consul.model.kv.ImmutableValue;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
import jakarta.ws.rs.Consumes;
@@ -29,6 +28,7 @@ import jakarta.ws.rs.core.MediaType;
import org.apache.camel.FluentProducerTemplate;
import org.apache.camel.component.consul.ConsulConstants;
import org.apache.camel.component.consul.endpoint.ConsulKeyValueActions;
+import org.kiwiproject.consul.model.kv.ImmutableValue;
@Path("/test/kv")
@ApplicationScoped
diff --git a/integration-tests/consul/src/test/java/org/apache/camel/quarkus/component/consul/it/ConsulTest.java b/integration-tests/consul/src/test/java/org/apache/camel/quarkus/component/consul/it/ConsulTest.java
index 4e52a1ebbb..b494b68d7f 100644
--- a/integration-tests/consul/src/test/java/org/apache/camel/quarkus/component/consul/it/ConsulTest.java
+++ b/integration-tests/consul/src/test/java/org/apache/camel/quarkus/component/consul/it/ConsulTest.java
@@ -21,12 +21,14 @@ import java.util.UUID;
import io.quarkus.test.common.QuarkusTestResource;
import io.quarkus.test.junit.QuarkusTest;
import io.restassured.RestAssured;
+import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import static org.hamcrest.core.Is.is;
@QuarkusTest
@QuarkusTestResource(ConsulTestResource.class)
+@Disabled //https://github.com/apache/camel-quarkus/issues/5635
class ConsulTest {
@Test
public void basic() {
diff --git a/integration-tests/consul/src/test/java/org/apache/camel/quarkus/component/consul/it/ConsulTestResource.java b/integration-tests/consul/src/test/java/org/apache/camel/quarkus/component/consul/it/ConsulTestResource.java
index 91209c1d10..4bfa6abd22 100644
--- a/integration-tests/consul/src/test/java/org/apache/camel/quarkus/component/consul/it/ConsulTestResource.java
+++ b/integration-tests/consul/src/test/java/org/apache/camel/quarkus/component/consul/it/ConsulTestResource.java
@@ -18,10 +18,10 @@ package org.apache.camel.quarkus.component.consul.it;
import java.util.Map;
-import com.orbitz.consul.Consul;
import io.quarkus.test.common.QuarkusTestResourceLifecycleManager;
import org.apache.camel.util.CollectionHelper;
import org.eclipse.microprofile.config.ConfigProvider;
+import org.kiwiproject.consul.Consul;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testcontainers.containers.GenericContainer;
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index d11c154a39..85c3fb79b0 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -6217,21 +6217,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>com.orbitz.consul</groupId>
- <artifactId>consul-client</artifactId>
- <version>${consul-client.version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.checkerframework</groupId>
- <artifactId>checker-qual</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>com.squareup.okio</groupId>
<artifactId>okio</artifactId>
@@ -6717,6 +6702,21 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.kiwiproject</groupId>
+ <artifactId>consul-client</artifactId>
+ <version>${consul-client.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.checkerframework</groupId>
+ <artifactId>checker-qual</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct-processor</artifactId>
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml
index 26eb0c65e2..77f1f893bd 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -6150,21 +6150,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>com.orbitz.consul</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <artifactId>consul-client</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>1.2.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <exclusions>
- <exclusion>
- <groupId>com.google.code.findbugs</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <artifactId>jsr305</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- </exclusion>
- <exclusion>
- <groupId>org.checkerframework</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <artifactId>checker-qual</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>com.squareup.okio</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>okio</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -6650,6 +6635,21 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.kiwiproject</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>consul-client</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>1.2.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>jsr305</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </exclusion>
+ <exclusion>
+ <groupId>org.checkerframework</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>checker-qual</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.mapstruct</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>mapstruct-processor</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 65a2e5ef24..d57ee25a76 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -6140,21 +6140,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>com.orbitz.consul</groupId>
- <artifactId>consul-client</artifactId>
- <version>1.2.0</version>
- <exclusions>
- <exclusion>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.checkerframework</groupId>
- <artifactId>checker-qual</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>com.squareup.okio</groupId>
<artifactId>okio</artifactId>
@@ -6555,6 +6540,21 @@
<artifactId>kotlin-scripting-jvm-host</artifactId>
<version>1.9.22</version>
</dependency>
+ <dependency>
+ <groupId>org.kiwiproject</groupId>
+ <artifactId>consul-client</artifactId>
+ <version>1.2.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.checkerframework</groupId>
+ <artifactId>checker-qual</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct-processor</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 715c06aeba..3f7f2b3174 100644
--- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
@@ -6155,21 +6155,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>com.orbitz.consul</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <artifactId>consul-client</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>1.2.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <exclusions>
- <exclusion>
- <groupId>com.google.code.findbugs</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <artifactId>jsr305</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- </exclusion>
- <exclusion>
- <groupId>org.checkerframework</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <artifactId>checker-qual</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>com.squareup.okio</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>okio</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -6570,6 +6555,21 @@
<artifactId>kotlin-scripting-jvm-host</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>1.9.22</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
+ <dependency>
+ <groupId>org.kiwiproject</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>consul-client</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>1.2.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>jsr305</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </exclusion>
+ <exclusion>
+ <groupId>org.checkerframework</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>checker-qual</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.mapstruct</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>mapstruct-processor</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->