This is an automated email from the ASF dual-hosted git repository. marat pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
commit f86b7c64c9420987ea1e474f76373d67b0f887f0 Author: Marat Gubaidullin <[email protected]> AuthorDate: Mon Sep 16 15:27:18 2024 -0400 Quarkus 3.14.4 #1415 --- karavan-app/pom.xml | 9 +++------ .../org/apache/camel/karavan/kubernetes/KubernetesService.java | 5 +++-- .../apache/camel/karavan/kubernetes/KubernetesStatusService.java | 4 ++-- karavan-app/src/main/webui/package-lock.json | 2 +- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/karavan-app/pom.xml b/karavan-app/pom.xml index dd82b6e9..7e422482 100644 --- a/karavan-app/pom.xml +++ b/karavan-app/pom.xml @@ -33,11 +33,11 @@ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id> <quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id> - <quarkus.platform.version>3.12.3</quarkus.platform.version> + <quarkus.platform.version>3.14.4</quarkus.platform.version> <camel-kamelet.version>4.7.0</camel-kamelet.version> <surefire-plugin.version>3.1.0</surefire-plugin.version> - <jgit.version>3.1.2</jgit.version> - <quinoa.version>2.4.3</quinoa.version> + <jgit.version>3.1.3</jgit.version> + <quinoa.version>2.4.7</quinoa.version> <commons-text.version>1.12.0</commons-text.version> <resources-plugin.version>3.3.0</resources-plugin.version> <docker-java.version>3.3.6</docker-java.version> @@ -116,19 +116,16 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-text</artifactId> - <version>${commons-text.version}</version> </dependency> <!-- Docker --> <dependency> <groupId>com.github.docker-java</groupId> <artifactId>docker-java-core</artifactId> - <version>${docker-java.version}</version> <optional>false</optional> </dependency> <dependency> <groupId>com.github.docker-java</groupId> <artifactId>docker-java-transport-zerodep</artifactId> - <version>${docker-java.version}</version> <optional>false</optional> </dependency> <dependency> diff --git a/karavan-app/src/main/java/org/apache/camel/karavan/kubernetes/KubernetesService.java b/karavan-app/src/main/java/org/apache/camel/karavan/kubernetes/KubernetesService.java index 5dc18c87..6cdba772 100644 --- a/karavan-app/src/main/java/org/apache/camel/karavan/kubernetes/KubernetesService.java +++ b/karavan-app/src/main/java/org/apache/camel/karavan/kubernetes/KubernetesService.java @@ -22,7 +22,8 @@ import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.KubernetesClientBuilder; import io.fabric8.kubernetes.client.dsl.LogWatch; import io.fabric8.kubernetes.client.utils.Serialization; -import io.quarkus.runtime.configuration.ProfileManager; +import io.quarkus.runtime.LaunchMode; +import io.quarkus.runtime.configuration.ConfigUtils; import io.smallrye.mutiny.tuples.Tuple2; import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.inject.Default; @@ -534,7 +535,7 @@ public class KubernetesService { public String getNamespace() { if (namespace == null) { try (KubernetesClient client = kubernetesClient()) { - namespace = ProfileManager.getLaunchMode().isDevOrTest() ? "karavan" : client.getNamespace(); + namespace = LaunchMode.current().getProfileKey().equalsIgnoreCase("dev") ? "karavan" : client.getNamespace(); } } return namespace; diff --git a/karavan-app/src/main/java/org/apache/camel/karavan/kubernetes/KubernetesStatusService.java b/karavan-app/src/main/java/org/apache/camel/karavan/kubernetes/KubernetesStatusService.java index 166acae4..35716a87 100644 --- a/karavan-app/src/main/java/org/apache/camel/karavan/kubernetes/KubernetesStatusService.java +++ b/karavan-app/src/main/java/org/apache/camel/karavan/kubernetes/KubernetesStatusService.java @@ -21,9 +21,9 @@ import io.fabric8.kubernetes.api.model.apps.Deployment; import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.KubernetesClientBuilder; import io.fabric8.kubernetes.client.informers.SharedIndexInformer; +import io.quarkus.runtime.LaunchMode; import io.quarkus.runtime.ShutdownEvent; import io.quarkus.runtime.StartupEvent; -import io.quarkus.runtime.configuration.ProfileManager; import io.vertx.mutiny.core.eventbus.EventBus; import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.event.Observes; @@ -139,7 +139,7 @@ public class KubernetesStatusService implements HealthCheck { public String getNamespace() { if (namespace == null) { try (KubernetesClient client = kubernetesClient()) { - namespace = ProfileManager.getLaunchMode().isDevOrTest() ? "karavan" : client.getNamespace(); + namespace = LaunchMode.current().getProfileKey().equalsIgnoreCase("dev") ? "karavan" : client.getNamespace(); } } return namespace; diff --git a/karavan-app/src/main/webui/package-lock.json b/karavan-app/src/main/webui/package-lock.json index fac4c9a7..dae8c5d4 100644 --- a/karavan-app/src/main/webui/package-lock.json +++ b/karavan-app/src/main/webui/package-lock.json @@ -51,7 +51,7 @@ } }, "../../../../karavan-core": { - "version": "4.7.1", + "version": "4.8.0", "license": "Apache-2.0", "dependencies": { "@types/js-yaml": "^4.0.9",
