From ac13d5c533c295e4db2ddf922c90fdcb3ca83ade Mon Sep 17 00:00:00 2001 From: JiriOndrusek Date: Thu, 4 Jan 2024 14:01:11 +0100 Subject: [PATCH] Disabled consul because of #5635 --- .../ConsulClientSupportProcessor.java | 6 ++-- .../consul-client/runtime/pom.xml | 2 +- integration-tests/consul/pom.xml | 2 ++ .../component/consul/it/ConsulResource.java | 2 +- .../component/consul/it/ConsulTest.java | 2 ++ .../consul/it/ConsulTestResource.java | 2 +- poms/bom/pom.xml | 30 +++++++++---------- .../src/main/generated/flattened-full-pom.xml | 30 +++++++++---------- .../main/generated/flattened-reduced-pom.xml | 30 +++++++++---------- .../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 4952f3fb2b1d..25482795289f 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 @@ void reflectiveClasses(CombinedIndexBuildItem index, BuildProducer 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 64e7eb2c5792..ed2e7a43df16 100644 --- a/extensions-support/consul-client/runtime/pom.xml +++ b/extensions-support/consul-client/runtime/pom.xml @@ -34,7 +34,7 @@ quarkus-core - com.orbitz.consul + org.kiwiproject consul-client diff --git a/integration-tests/consul/pom.xml b/integration-tests/consul/pom.xml index 1850fb7d387b..3cf9368a6a47 100644 --- a/integration-tests/consul/pom.xml +++ b/integration-tests/consul/pom.xml @@ -75,6 +75,7 @@ + virtualDependencies 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 180cfd52dc02..5d0bf5daff88 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 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 4e52a1ebbbce..b494b68d7fcf 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 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 91209c1d1051..4bfa6abd228d 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 @@ 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 5c202afe3ed6..536333fd3b35 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -6199,21 +6199,6 @@ - - com.orbitz.consul - consul-client - ${consul-client.version} - - - com.google.code.findbugs - jsr305 - - - org.checkerframework - checker-qual - - - com.squareup.okio okio @@ -6699,6 +6684,21 @@ + + org.kiwiproject + consul-client + ${consul-client.version} + + + com.google.code.findbugs + jsr305 + + + org.checkerframework + checker-qual + + + org.mapstruct mapstruct-processor diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 363419614b86..a05757b497de 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6122,21 +6122,6 @@ - - com.orbitz.consul - consul-client - 1.2.0 - - - com.google.code.findbugs - jsr305 - - - org.checkerframework - checker-qual - - - com.squareup.okio okio @@ -6622,6 +6607,21 @@ + + org.kiwiproject + consul-client + 1.2.0 + + + com.google.code.findbugs + jsr305 + + + org.checkerframework + checker-qual + + + org.mapstruct mapstruct-processor diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 6c6ad63a6c2d..f5e0a5d2b66d 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6122,21 +6122,6 @@ - - com.orbitz.consul - consul-client - 1.2.0 - - - com.google.code.findbugs - jsr305 - - - org.checkerframework - checker-qual - - - com.squareup.okio okio @@ -6537,6 +6522,21 @@ kotlin-scripting-jvm-host 1.9.21 + + org.kiwiproject + consul-client + 1.2.0 + + + com.google.code.findbugs + jsr305 + + + org.checkerframework + checker-qual + + + org.mapstruct mapstruct-processor 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 58d95b684f91..caceb22d460b 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -6122,21 +6122,6 @@ - - com.orbitz.consul - consul-client - 1.2.0 - - - com.google.code.findbugs - jsr305 - - - org.checkerframework - checker-qual - - - com.squareup.okio okio @@ -6537,6 +6522,21 @@ kotlin-scripting-jvm-host 1.9.21 + + org.kiwiproject + consul-client + 1.2.0 + + + com.google.code.findbugs + jsr305 + + + org.checkerframework + checker-qual + + + org.mapstruct mapstruct-processor