(camel-karavan) branch main updated: Fixes
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
The following commit(s) were added to refs/heads/main by this push:
new 9534b0a1 Fixes
9534b0a1 is described below
commit 9534b0a12a51d8663bb920b7fc923f58b466861a
Author: Marat Gubaidullin
AuthorDate: Mon Jul 22 09:51:49 2024 -0400
Fixes
---
.../org/apache/camel/karavan/KaravanConstants.java | 1 +
.../karavan/kubernetes/KubernetesService.java | 4 +-
.../apache/camel/karavan/service/CodeService.java | 2 +-
.../camel/karavan/service/ProjectService.java | 5 ++-
.../src/main/webui/src/api/NotificationService.ts | 4 +-
.../src/main/webui/src/api/ProjectService.ts | 3 +-
.../webui/src/designer/route/DslConnections.tsx| 44 +++---
.../src/knowledgebase/components/ComponentCard.tsx | 25 +++-
.../src/main/webui/src/project/DevModeToolbar.tsx | 18 +
.../src/main/webui/src/project/ProjectPage.tsx | 25 +++-
.../src/main/webui/src/project/ProjectPanel.tsx| 2 +-
.../webui/src/project/dashboard/DashboardTab.tsx | 7 ++--
.../src/main/webui/src/project/trace/TraceTab.tsx | 4 +-
.../src/main/webui/src/projects/ProjectsPage.tsx | 6 ++-
karavan-app/src/main/webui/src/util/CodeUtils.ts | 2 +-
15 files changed, 79 insertions(+), 73 deletions(-)
diff --git
a/karavan-app/src/main/java/org/apache/camel/karavan/KaravanConstants.java
b/karavan-app/src/main/java/org/apache/camel/karavan/KaravanConstants.java
index 68e6f031..756a558a 100644
--- a/karavan-app/src/main/java/org/apache/camel/karavan/KaravanConstants.java
+++ b/karavan-app/src/main/java/org/apache/camel/karavan/KaravanConstants.java
@@ -33,6 +33,7 @@ public class KaravanConstants {
public static final String CAMEL_PREFIX = "camel";
+public static final String BUILD_SCRIPT_VOLUME_NAME = "build-script";
public static final String BUILD_SCRIPT_CONFIG_MAP = "build.sh";
public static final String BUILD_DOCKER_CONFIG_SECRET = "dockerconfigjson";
public static final String PRIVATE_KEY_SECRET_KEY = "private-key";
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 25702ff5..75327b14 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
@@ -171,7 +171,7 @@ public class KubernetesService {
List volumeMounts = new ArrayList<>();
-volumeMounts.add(new
VolumeMountBuilder().withName(BUILD_SCRIPT_CONFIG_MAP).withMountPath("/karavan/builder").withReadOnly(true).build());
+volumeMounts.add(new
VolumeMountBuilder().withName(BUILD_SCRIPT_VOLUME_NAME).withMountPath("/karavan/builder").withReadOnly(true).build());
if (hasDockerConfigSecret) {
volumeMounts.add(new
VolumeMountBuilder().withName(BUILD_DOCKER_CONFIG_SECRET).withMountPath("/karavan/.docker").withReadOnly(true).build());
}
@@ -192,7 +192,7 @@ public class KubernetesService {
.build();
List volumes = new ArrayList<>();
-volumes.add(new VolumeBuilder().withName(BUILD_SCRIPT_CONFIG_MAP)
+volumes.add(new VolumeBuilder().withName(BUILD_SCRIPT_VOLUME_NAME)
.withConfigMap(new
ConfigMapVolumeSourceBuilder().withName(BUILD_SCRIPT_CONFIG_MAP).withItems(
new
KeyToPathBuilder().withKey(BUILD_SCRIPT_FILENAME).withPath(BUILD_SCRIPT_FILENAME).build()
).withDefaultMode(511).build()).build());
diff --git
a/karavan-app/src/main/java/org/apache/camel/karavan/service/CodeService.java
b/karavan-app/src/main/java/org/apache/camel/karavan/service/CodeService.java
index 9bd89a45..f4fd13f7 100644
---
a/karavan-app/src/main/java/org/apache/camel/karavan/service/CodeService.java
+++
b/karavan-app/src/main/java/org/apache/camel/karavan/service/CodeService.java
@@ -239,7 +239,7 @@ public class CodeService {
public String getResourceFile(String path) {
try (InputStream inputStream =
CodeService.class.getResourceAsStream(path);
BufferedReader reader = new BufferedReader(new
InputStreamReader(inputStream))) {
-return
reader.lines().collect(Collectors.joining(System.lineSeparator()));
+ return
reader.lines().collect(Collectors.joining(System.lineSeparator()));
} catch (Exception e) {
return null;
}
diff --git
a/karavan-app/src/main/java/org/apache/camel/karavan/service/ProjectService.java
b/karavan-app/src/main/java/org/apache/camel/karavan/service/ProjectService.java
index 18a6b2f2..bd2b3916 100644
---
a/karavan-app/src/main/java/org/apache/camel/karavan/service/ProjectService.java
+++
b/karavan-app/src/main/java/
(camel-karavan) branch main updated: Fixes for 4.7
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
The following commit(s) were added to refs/heads/main by this push:
new f0a01a48 Fixes for 4.7
f0a01a48 is described below
commit f0a01a48feb27a12a8c03e9cf6ea083839703f82
Author: Marat Gubaidullin
AuthorDate: Mon Jul 15 11:04:31 2024 -0400
Fixes for 4.7
---
.../org/apache/camel/karavan/KaravanCache.java | 4 +-
.../org/apache/camel/karavan/KaravanConstants.java | 8 ++
.../org/apache/camel/karavan/KaravanEvents.java| 8 +-
.../apache/camel/karavan/KaravanStartupLoader.java | 4 +-
.../camel/karavan/api/ConfigurationResource.java | 2 +-
.../camel/karavan/api/ContainerResource.java | 5 +-
.../apache/camel/karavan/api/DevModeResource.java | 6 +-
.../apache/camel/karavan/api/ImagesResource.java | 35 +--
.../karavan/docker/DockerComposeConverter.java | 2 +-
.../camel/karavan/docker/DockerEventHandler.java | 7 ++
.../apache/camel/karavan/docker/DockerService.java | 27 +-
.../camel/karavan/listener/CommitListener.java | 10 +-
.../camel/karavan/listener/ConfigListener.java | 6 +-
.../{ConfigListener.java => DockerListener.java} | 43 -
.../karavan/listener/NotificationListener.java | 16 +++-
.../apache/camel/karavan/model/Configuration.java | 14 ++-
.../apache/camel/karavan/model/ContainerImage.java | 68 ++
.../apache/camel/karavan/service/CodeService.java | 31 +-
.../camel/karavan/service/ConfigService.java | 30 +++---
.../apache/camel/karavan/service/GitService.java | 2 -
.../camel/karavan/service/ProjectService.java | 30 ++
karavan-app/src/main/webui/src/api/KaravanApi.tsx | 35 +--
.../src/main/webui/src/api/NotificationService.ts | 3 +
.../src/main/webui/src/api/ProjectModels.ts| 8 ++
.../src/main/webui/src/api/ProjectService.ts | 4 +-
karavan-app/src/main/webui/src/api/ProjectStore.ts | 8 +-
.../src/main/webui/src/log/ProjectLogPanel.tsx | 19 ++--
karavan-app/src/main/webui/src/main/Main.tsx | 13 +--
.../src/main/webui/src/project/DevModeToolbar.tsx | 1 -
.../main/webui/src/project/beans/BeanWizard.tsx| 2 +-
.../main/webui/src/project/builder/ImagesPanel.tsx | 104 +++--
.../src/project/container/ProjectContainerTab.tsx | 47 +-
.../src/main/webui/src/project/files/FilesTab.tsx | 20 ++--
.../main/webui/src/projects/CreateProjectModal.tsx | 7 +-
.../main/webui/src/projects/DeleteProjectModal.tsx | 3 +-
karavan-app/src/main/webui/src/util/StringUtils.ts | 4 +
36 files changed, 431 insertions(+), 205 deletions(-)
diff --git
a/karavan-app/src/main/java/org/apache/camel/karavan/KaravanCache.java
b/karavan-app/src/main/java/org/apache/camel/karavan/KaravanCache.java
index 6f05f72d..b1d29405 100644
--- a/karavan-app/src/main/java/org/apache/camel/karavan/KaravanCache.java
+++ b/karavan-app/src/main/java/org/apache/camel/karavan/KaravanCache.java
@@ -97,8 +97,8 @@ public class KaravanCache {
}
public Map getProjectFilesMap(String projectId) {
-return files.entrySet().stream().filter(es ->
!Objects.isNull(es.getValue()) && Objects.equals(es.getValue().getProjectId(),
projectId))
-.collect(Collectors.toMap(Map.Entry::getKey,
Map.Entry::getValue));
+return getCopyProjectFiles().stream().filter(pf -> !Objects.isNull(pf)
&& Objects.equals(pf.getProjectId(), projectId))
+.collect(Collectors.toMap(ProjectFile::getName,
ProjectFile::copy));
}
public ProjectFile getProjectFile(String projectId, String filename) {
diff --git
a/karavan-app/src/main/java/org/apache/camel/karavan/KaravanConstants.java
b/karavan-app/src/main/java/org/apache/camel/karavan/KaravanConstants.java
index 63c285df..68e6f031 100644
--- a/karavan-app/src/main/java/org/apache/camel/karavan/KaravanConstants.java
+++ b/karavan-app/src/main/java/org/apache/camel/karavan/KaravanConstants.java
@@ -41,6 +41,14 @@ public class KaravanConstants {
public static final String LABEL_KUBERNETES_RUNTIME =
"app.kubernetes.io/runtime";
public static final String ANNOTATION_COMMIT =
"jkube.eclipse.org/git-commit";
+public static final String PROPERTY_NAME_PROJECT_ID =
"camel.karavan.projectId";
+public static final String PROPERTY_NAME_PROJECT_NAME =
"camel.karavan.projectName";
+public static final String PROPERTY_NAME_GAV = "camel.jbang.gav";
+
+public static final String PROPERTY_FORMATTER_PROJECT_ID =
PROPERTY_NAME_PROJECT_ID + "=%s";
+public static final String PROPERTY_FORMATTER_PROJECT_NAME =
PROPERTY_NAME_PROJECT_NAME + "=%s";
+public static final String PROPERTY_FORMATTER_GAV = PROPERTY_NAME_GAV +
"=org.camel.karavan.demo:%s:1";
+
public enum CamelRuntime {
CAMEL_MAIN("camel-main"),
QUARKUS("quarkus"),
d
(camel-karavan) branch main updated: Fixes
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
The following commit(s) were added to refs/heads/main by this push:
new eaec5195 Fixes
eaec5195 is described below
commit eaec519571fa0c2e92b85ef29a5125a963118aa2
Author: Marat Gubaidullin
AuthorDate: Thu Jan 18 17:37:37 2024 -0500
Fixes
---
.../src/main/java/org/apache/camel/karavan/api/DevModeResource.java | 4
.../src/main/java/org/apache/camel/karavan/git/GitService.java| 3 ++-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/DevModeResource.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/DevModeResource.java
index 14bbc5a6..09fb6c49 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/DevModeResource.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/DevModeResource.java
@@ -31,12 +31,15 @@ import org.apache.camel.karavan.service.CamelService;
import org.apache.camel.karavan.service.ConfigService;
import org.apache.camel.karavan.service.ProjectService;
import org.eclipse.microprofile.config.inject.ConfigProperty;
+import org.jboss.logging.Logger;
import static
org.apache.camel.karavan.service.ContainerStatusService.CONTAINER_STATUS;
@Path("/api/devmode")
public class DevModeResource {
+private static final Logger LOGGER =
Logger.getLogger(DevModeResource.class.getName());
+
@ConfigProperty(name = "karavan.environment")
String environment;
@@ -71,6 +74,7 @@ public class DevModeResource {
return Response.notModified().build();
}
} catch (Exception e) {
+LOGGER.error(e);
return Response.serverError().entity(e).build();
}
}
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/git/GitService.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/git/GitService.java
index c07496b0..30b195e7 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/git/GitService.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/git/GitService.java
@@ -32,6 +32,7 @@ import org.apache.camel.karavan.kubernetes.KubernetesService;
import org.apache.camel.karavan.service.ConfigService;
import org.eclipse.jgit.api.*;
import org.eclipse.jgit.api.errors.GitAPIException;
+import org.eclipse.jgit.api.errors.InvalidRemoteException;
import org.eclipse.jgit.api.errors.RefNotFoundException;
import org.eclipse.jgit.api.errors.TransportException;
import org.eclipse.jgit.diff.DiffEntry;
@@ -147,7 +148,7 @@ public class GitService {
try {
git = clone(folder, gitConfig.getUri(), gitConfig.getBranch(),
cred);
checkout(git, false, null, null, gitConfig.getBranch());
-} catch (RefNotFoundException | TransportException e) {
+} catch (RefNotFoundException | InvalidRemoteException e) {
LOGGER.error("New repository");
git = init(folder, gitConfig.getUri(), gitConfig.getBranch());
} catch (Exception e) {
(camel-karavan) branch main updated: Fixes for demo
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
The following commit(s) were added to refs/heads/main by this push:
new 812f39bd Fixes for demo
812f39bd is described below
commit 812f39bd40acada7660749a2d5d6ffb6bb5b1bd4
Author: Marat Gubaidullin
AuthorDate: Wed Dec 13 20:32:29 2023 -0500
Fixes for demo
---
.../apache/camel/karavan/api/BuildResource.java| 56 +
.../camel/karavan/api/ContainerResource.java | 2 +-
.../apache/camel/karavan/api/DevModeResource.java | 2 +-
.../org/apache/camel/karavan/code/CodeService.java | 9 +-
.../org/apache/camel/karavan/git/GitService.java | 2 +
.../karavan/infinispan/InfinispanService.java | 6 +-
.../karavan/kubernetes/KubernetesService.java | 100 +++-
.../camel/karavan/kubernetes/PodEventHandler.java | 13 ++-
.../apache/camel/karavan/service/CamelService.java | 46 +---
.../karavan/service/ContainerStatusService.java| 1 +
.../camel/karavan/service/ProjectService.java | 17 +--
.../org/apache/camel/karavan/shared/Constants.java | 5 +
.../src/main/webui/src/api/KaravanApi.tsx | 11 ++
.../designer/route/element/DslElementHeader.tsx| 5 +-
.../route/property/ComponentParameterField.tsx | 5 +-
.../designer/route/property/DslPropertyField.tsx | 3 +-
.../src/designer/route/useRouteDesignerHook.tsx| 20 +++-
.../webui/src/project/{file => }/FileEditor.tsx| 21 ++--
.../src/main/webui/src/project/ProjectPage.tsx | 2 +-
.../webui/src/project/file/PropertiesPanel.tsx | 61 --
.../webui/src/project/file/PropertiesTable.tsx | 126 -
.../webui/src/project/file/PropertiesToolbar.tsx | 63 ---
.../main/webui/src/project/file/PropertyField.tsx | 73
.../main/webui/src/project/files/FilesToolbar.tsx | 26 -
24 files changed, 268 insertions(+), 407 deletions(-)
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/BuildResource.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/BuildResource.java
new file mode 100644
index ..ace9fa8c
--- /dev/null
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/BuildResource.java
@@ -0,0 +1,56 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.karavan.api;
+
+import jakarta.inject.Inject;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import org.apache.camel.karavan.code.CodeService;
+import org.apache.camel.karavan.infinispan.InfinispanService;
+import org.apache.camel.karavan.kubernetes.KubernetesService;
+
+@Path("/api/build")
+public class BuildResource {
+
+@Inject
+InfinispanService infinispanService;
+
+@Inject
+KubernetesService kubernetesService;
+
+@Inject
+CodeService codeService;
+
+@POST
+@Produces(MediaType.APPLICATION_JSON)
+@Consumes(MediaType.APPLICATION_JSON)
+@Path("/update-config-map")
+public Response updateConfigMaps() {
+if (infinispanService.isReady()) {
+String script = codeService.getBuilderScript();
+kubernetesService.createBuildScriptConfigmap(script, true);
+return Response.ok().build();
+} else {
+return Response.noContent().build();
+}
+}
+
+}
\ No newline at end of file
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/ContainerResource.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/ContainerResource.java
index 8effafe0..bfcae002 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/ContainerResource.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/ContainerResource.java
@@ -156,7 +156,7 @@ public class ContainerResource {
status = ContainerStatus.createByType(projectId, environment,
ContainerStatus.ContainerType.valueOf(type));
[camel-karavan] branch main updated: Fixes for #834
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 The following commit(s) were added to refs/heads/main by this push: new a5463198 Fixes for #834 a5463198 is described below commit a54631987138f4a6fe6a49dd27bb9edfa02f46c1 Author: Marat Gubaidullin AuthorDate: Mon Jul 31 18:53:14 2023 -0400 Fixes for #834 --- karavan-web/karavan-app/pom.xml | 10 -- 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/karavan-web/karavan-app/pom.xml b/karavan-web/karavan-app/pom.xml index 9c8e179b..96c8e5ff 100644 --- a/karavan-web/karavan-app/pom.xml +++ b/karavan-web/karavan-app/pom.xml @@ -167,13 +167,11 @@ src/main/resources true -**/application.properties -components/** -kamelets/** -snippets/** -META-INF/** -**/**.xml +**/** + +**/.gitignore +
[camel-karavan] branch main updated: Fixes for #834
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
The following commit(s) were added to refs/heads/main by this push:
new ce40cb2a Fixes for #834
ce40cb2a is described below
commit ce40cb2aca6dc97f163697378cf82f1fddb2a5db
Author: Marat Gubaidullin
AuthorDate: Mon Jul 31 17:15:26 2023 -0400
Fixes for #834
---
karavan-web/karavan-app/pom.xml| 6 +-
.../src/main/docker/Dockerfile.distroless | 2 +-
.../org/apache/camel/karavan/api/AuthResource.java | 12 ++--
.../camel/karavan/api/ComponentResources.java | 10 +--
.../camel/karavan/api/ConfigurationResource.java | 12 ++--
.../apache/camel/karavan/api/DevModeResource.java | 8 +--
.../camel/karavan/api/InfrastructureResource.java | 8 +--
.../apache/camel/karavan/api/KameletResources.java | 10 +--
.../apache/camel/karavan/api/LogWatchResource.java | 20 +++---
.../camel/karavan/api/ProjectFileResource.java | 20 +++---
.../camel/karavan/api/ProjectGitResource.java | 16 ++---
.../apache/camel/karavan/api/ProjectResource.java | 6 +-
.../org/apache/camel/karavan/api/SseResource.java | 71 --
.../apache/camel/karavan/api/StatusResource.java | 14 ++---
.../apache/camel/karavan/api/UsersResource.java| 10 +--
.../camel/karavan/docker/DockerEventListener.java | 4 +-
.../apache/camel/karavan/docker/DockerService.java | 8 +--
.../camel/karavan/docker/DockerServiceUtils.java | 2 +-
.../karavan/kubernetes/KubernetesService.java | 8 +--
.../apache/camel/karavan/service/AuthService.java | 2 +-
.../apache/camel/karavan/service/CamelService.java | 4 +-
.../apache/camel/karavan/service/CodeService.java | 11 ++--
.../apache/camel/karavan/service/EventService.java | 4 +-
.../apache/camel/karavan/service/GitService.java | 4 +-
.../camel/karavan/service/KaravanService.java | 6 +-
.../camel/karavan/service/ProjectService.java | 6 +-
.../camel/karavan/service/ScheduledService.java| 4 +-
.../apache/camel/karavan/shared/ConfigService.java | 4 +-
.../src/main/resources/application.properties | 4 +-
...arkus-org.apache.camel.AggregationStrategy.java | 4 +-
.../quarkus-org.apache.camel.Processor.java| 4 +-
karavan-web/karavan-headless/pom.xml | 2 +-
.../src/main/docker/Dockerfile.distroless | 2 +-
.../camel/karavan/headless/CamelService.java | 4 +-
.../camel/karavan/headless/EventService.java | 4 +-
.../camel/karavan/headless/HeadlessService.java| 7 +--
karavan-web/karavan-infinispan/pom.xml | 2 +-
.../karavan/infinispan/InfinispanService.java | 7 ++-
karavan-web/pom.xml| 8 +--
39 files changed, 136 insertions(+), 204 deletions(-)
diff --git a/karavan-web/karavan-app/pom.xml b/karavan-web/karavan-app/pom.xml
index 848d8da2..9c8e179b 100644
--- a/karavan-web/karavan-app/pom.xml
+++ b/karavan-web/karavan-app/pom.xml
@@ -21,7 +21,7 @@
org.apache.camel.karavan
karavan-web
-3.21.1-SNAPSHOT
+4.0.0-RC2
../pom.xml
@@ -114,11 +114,13 @@
com.github.docker-java
docker-java-core
${docker-java.version}
+false
com.github.docker-java
-docker-java-transport-httpclient5
+docker-java-transport-zerodep
${docker-java.version}
+false
diff --git a/karavan-web/karavan-app/src/main/docker/Dockerfile.distroless
b/karavan-web/karavan-app/src/main/docker/Dockerfile.distroless
index 2e9ab688..87155a0e 100644
--- a/karavan-web/karavan-app/src/main/docker/Dockerfile.distroless
+++ b/karavan-web/karavan-app/src/main/docker/Dockerfile.distroless
@@ -12,7 +12,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM gcr.io/distroless/java:11
+FROM gcr.io/distroless/java:17
COPY target/*-runner.jar /deployments/karavan.jar
WORKDIR /deployments
CMD ["karavan.jar"]
\ No newline at end of file
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/AuthResource.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/AuthResource.java
index d7ff2139..ad4b6416 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/AuthResource.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/AuthResource.java
@@ -18,12 +18,12 @@ package org.apache.camel.karavan.api;
import org.apache.camel.karavan.service.AuthService;
-import javax.inject.Inject;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Respon
