You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2025/10/17 17:50:06 UTC
(camel-quarkus) branch 3.27.x updated (95c385ed01 -> 482fafa223)
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a change to branch 3.27.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
from 95c385ed01 Remove superfluous System.out.println calls
new 785e039317 Use AsciiDoc attribute for langchain4j BOM version in extension code snippets
new 422c144b3d Enlarge timeout for Master Openshift IT
new c699ef157d Fix Dev UI fetching of Camel console JSON data
new fd66d8e857 Upgrade Quarkus LangChain4j to 1.2.1
new 0b3edfd37c Fix path to qwc-camel-core.js in Micrometer & MicroProfile Fault Tolerance Dev UI pages
new 8a9eb4a675 Update Dev UI documentation with the correct path to qwc-camel-core.js
new 482fafa223 Refactor Splunk test container
The 7 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
docs/antora.yml | 1 +
.../contributor-guide/create-new-dev-ui-page.adoc | 2 +-
.../reference/extensions/langchain4j-agent.adoc | 4 +-
.../reference/extensions/langchain4j-chat.adoc | 4 +-
.../extensions/langchain4j-embeddings.adoc | 4 +-
.../extensions/langchain4j-tokenizer.adoc | 4 +-
.../reference/extensions/langchain4j-tools.adoc | 4 +-
.../extensions/langchain4j-web-search.adoc | 4 +-
extensions-core/core/deployment/pom.xml | 5 ++
.../src/main/resources/dev-ui/qwc-camel-core.js | 4 +-
.../devui/CamelQuarkusCoreDevUITest.java | 37 +++------
.../main/resources/dev-ui/qwc-camel-micrometer.js | 2 +-
.../qwc-camel-microprofile-fault-tolerance.js | 2 +-
.../test/support/splunk/SplunkTestResource.java | 88 ++++++----------------
.../component/master/it/MasterOpenShiftTest.java | 2 +-
.../splunk-hec/src/test/resources/default.yml | 75 ++++++++++++++++++
.../src/test/resources/local_inputs.conf | 6 --
.../src/test/resources/local_server.conf | 33 --------
.../splunk/src/test/resources/default.yml | 75 ++++++++++++++++++
.../splunk/src/test/resources/local_inputs.conf | 6 --
.../splunk/src/test/resources/local_server.conf | 33 --------
pom.xml | 2 +-
.../quarkus/maven/UpdateExtensionDocPageMojo.java | 1 -
.../doc-templates/extension-doc-page.adoc | 4 +-
24 files changed, 211 insertions(+), 191 deletions(-)
copy extensions/jasypt/deployment/src/test/java/org/apache/camel/quarkus/component/jasypt/JasyptDevUITest.java => extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/devui/CamelQuarkusCoreDevUITest.java (53%)
create mode 100644 integration-tests/splunk-hec/src/test/resources/default.yml
delete mode 100644 integration-tests/splunk-hec/src/test/resources/local_inputs.conf
delete mode 100644 integration-tests/splunk-hec/src/test/resources/local_server.conf
create mode 100644 integration-tests/splunk/src/test/resources/default.yml
delete mode 100644 integration-tests/splunk/src/test/resources/local_inputs.conf
delete mode 100644 integration-tests/splunk/src/test/resources/local_server.conf
(camel-quarkus) 01/07: Use AsciiDoc attribute for langchain4j BOM version in extension code snippets
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch 3.27.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 785e039317cebd219292fc6a2a1d690d74ad5cd2
Author: James Netherton <ja...@gmail.com>
AuthorDate: Tue Oct 14 11:03:02 2025 +0100
Use AsciiDoc attribute for langchain4j BOM version in extension code snippets
---
docs/antora.yml | 1 +
docs/modules/ROOT/pages/reference/extensions/langchain4j-agent.adoc | 4 ++--
docs/modules/ROOT/pages/reference/extensions/langchain4j-chat.adoc | 4 ++--
.../ROOT/pages/reference/extensions/langchain4j-embeddings.adoc | 4 ++--
.../ROOT/pages/reference/extensions/langchain4j-tokenizer.adoc | 4 ++--
docs/modules/ROOT/pages/reference/extensions/langchain4j-tools.adoc | 4 ++--
.../ROOT/pages/reference/extensions/langchain4j-web-search.adoc | 4 ++--
.../org/apache/camel/quarkus/maven/UpdateExtensionDocPageMojo.java | 1 -
.../src/main/resources/doc-templates/extension-doc-page.adoc | 4 ++--
9 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/docs/antora.yml b/docs/antora.yml
index 7cb0ccab4b..1e5b7a55c9 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -31,6 +31,7 @@ asciidoc:
quarkus-version: 3.27.0 # replace ${quarkus.version}
graalvm-version: 23.1.2 # replace ${graalvm.version}
graalvm-docs-version: jdk21 # replace ${graalvm-docs.version}
+ langchain4j-version: 1.5.0 # replace ${langchain4j.version}
mapstruct-version: 1.6.3 # replace ${mapstruct.version}
min-maven-version: 3.8.2 # replace ${min-maven-version}
target-maven-version: 3.9.9 # replace ${target-maven-version}
diff --git a/docs/modules/ROOT/pages/reference/extensions/langchain4j-agent.adoc b/docs/modules/ROOT/pages/reference/extensions/langchain4j-agent.adoc
index 678d7a9524..b3c250d1f3 100644
--- a/docs/modules/ROOT/pages/reference/extensions/langchain4j-agent.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/langchain4j-agent.adoc
@@ -48,14 +48,14 @@ endif::[]
== LangChain4j dependency management
In order to ensure alignment across all Quarkus and LangChain4j related dependencies, it is recommended to import the LangChain4j BOM as below:
-[source,xml]
+[source,xml,subs=attributes+]
----
<dependencyManagement>
<dependencies>
<dependency>
<groupId>dev.langchain4j</groupId>
<artifactId>langchain4j-bom</artifactId>
- <version>1.5.0</version>
+ <version>{langchain4j-version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git a/docs/modules/ROOT/pages/reference/extensions/langchain4j-chat.adoc b/docs/modules/ROOT/pages/reference/extensions/langchain4j-chat.adoc
index ce319bb0bd..74c11c0be8 100644
--- a/docs/modules/ROOT/pages/reference/extensions/langchain4j-chat.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/langchain4j-chat.adoc
@@ -48,14 +48,14 @@ endif::[]
== LangChain4j dependency management
In order to ensure alignment across all Quarkus and LangChain4j related dependencies, it is recommended to import the LangChain4j BOM as below:
-[source,xml]
+[source,xml,subs=attributes+]
----
<dependencyManagement>
<dependencies>
<dependency>
<groupId>dev.langchain4j</groupId>
<artifactId>langchain4j-bom</artifactId>
- <version>1.5.0</version>
+ <version>{langchain4j-version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git a/docs/modules/ROOT/pages/reference/extensions/langchain4j-embeddings.adoc b/docs/modules/ROOT/pages/reference/extensions/langchain4j-embeddings.adoc
index c1f030a018..b8ddb07baa 100644
--- a/docs/modules/ROOT/pages/reference/extensions/langchain4j-embeddings.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/langchain4j-embeddings.adoc
@@ -44,14 +44,14 @@ endif::[]
== LangChain4j dependency management
In order to ensure alignment across all Quarkus and LangChain4j related dependencies, it is recommended to import the LangChain4j BOM as below:
-[source,xml]
+[source,xml,subs=attributes+]
----
<dependencyManagement>
<dependencies>
<dependency>
<groupId>dev.langchain4j</groupId>
<artifactId>langchain4j-bom</artifactId>
- <version>1.5.0</version>
+ <version>{langchain4j-version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git a/docs/modules/ROOT/pages/reference/extensions/langchain4j-tokenizer.adoc b/docs/modules/ROOT/pages/reference/extensions/langchain4j-tokenizer.adoc
index 76f1e8e130..1127e0d87d 100644
--- a/docs/modules/ROOT/pages/reference/extensions/langchain4j-tokenizer.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/langchain4j-tokenizer.adoc
@@ -48,14 +48,14 @@ endif::[]
== LangChain4j dependency management
In order to ensure alignment across all Quarkus and LangChain4j related dependencies, it is recommended to import the LangChain4j BOM as below:
-[source,xml]
+[source,xml,subs=attributes+]
----
<dependencyManagement>
<dependencies>
<dependency>
<groupId>dev.langchain4j</groupId>
<artifactId>langchain4j-bom</artifactId>
- <version>1.5.0</version>
+ <version>{langchain4j-version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git a/docs/modules/ROOT/pages/reference/extensions/langchain4j-tools.adoc b/docs/modules/ROOT/pages/reference/extensions/langchain4j-tools.adoc
index 7b0dfcc843..21b87ca680 100644
--- a/docs/modules/ROOT/pages/reference/extensions/langchain4j-tools.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/langchain4j-tools.adoc
@@ -48,14 +48,14 @@ endif::[]
== LangChain4j dependency management
In order to ensure alignment across all Quarkus and LangChain4j related dependencies, it is recommended to import the LangChain4j BOM as below:
-[source,xml]
+[source,xml,subs=attributes+]
----
<dependencyManagement>
<dependencies>
<dependency>
<groupId>dev.langchain4j</groupId>
<artifactId>langchain4j-bom</artifactId>
- <version>1.5.0</version>
+ <version>{langchain4j-version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git a/docs/modules/ROOT/pages/reference/extensions/langchain4j-web-search.adoc b/docs/modules/ROOT/pages/reference/extensions/langchain4j-web-search.adoc
index 0b35fe5754..5633728f34 100644
--- a/docs/modules/ROOT/pages/reference/extensions/langchain4j-web-search.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/langchain4j-web-search.adoc
@@ -48,14 +48,14 @@ endif::[]
== LangChain4j dependency management
In order to ensure alignment across all Quarkus and LangChain4j related dependencies, it is recommended to import the LangChain4j BOM as below:
-[source,xml]
+[source,xml,subs=attributes+]
----
<dependencyManagement>
<dependencies>
<dependency>
<groupId>dev.langchain4j</groupId>
<artifactId>langchain4j-bom</artifactId>
- <version>1.5.0</version>
+ <version>{langchain4j-version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git a/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/UpdateExtensionDocPageMojo.java b/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/UpdateExtensionDocPageMojo.java
index ad669296af..f07ace5bff 100644
--- a/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/UpdateExtensionDocPageMojo.java
+++ b/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/UpdateExtensionDocPageMojo.java
@@ -202,7 +202,6 @@ public class UpdateExtensionDocPageMojo extends AbstractDocGeneratorMojo {
model.put("hasDurationOption", configOptions.stream().anyMatch(ConfigItem::isTypeDuration));
model.put("hasMemSizeOption", configOptions.stream().anyMatch(ConfigItem::isTypeMemSize));
model.put("configOptions", configOptions);
- model.put("langchain4jVersion", project.getProperties().get("langchain4j.version"));
model.put("humanReadableKind", new TemplateMethodModelEx() {
@Override
public Object exec(List arguments) throws TemplateModelException {
diff --git a/tooling/maven-plugin/src/main/resources/doc-templates/extension-doc-page.adoc b/tooling/maven-plugin/src/main/resources/doc-templates/extension-doc-page.adoc
index bfa74c789a..8d4e99b2b5 100644
--- a/tooling/maven-plugin/src/main/resources/doc-templates/extension-doc-page.adoc
+++ b/tooling/maven-plugin/src/main/resources/doc-templates/extension-doc-page.adoc
@@ -105,14 +105,14 @@ You will also need to enable serialization for the exception classes that you in
== LangChain4j dependency management
In order to ensure alignment across all Quarkus and LangChain4j related dependencies, it is recommended to import the LangChain4j BOM as below:
-[source,xml]
+[source,xml,subs=attributes+]
----
<dependencyManagement>
<dependencies>
<dependency>
<groupId>dev.langchain4j</groupId>
<artifactId>langchain4j-bom</artifactId>
- <version>[=langchain4jVersion]</version>
+ <version>{langchain4j-version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
(camel-quarkus) 03/07: Fix Dev UI fetching of Camel console JSON data
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch 3.27.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit c699ef157d2c2827deb98d6360e5c4ae55eeb1dc
Author: James Netherton <ja...@gmail.com>
AuthorDate: Tue Oct 14 13:30:49 2025 +0100
Fix Dev UI fetching of Camel console JSON data
Fixes #7830
---
extensions-core/core/deployment/pom.xml | 5 +++
.../src/main/resources/dev-ui/qwc-camel-core.js | 4 +-
.../devui/CamelQuarkusCoreDevUITest.java | 46 ++++++++++++++++++++++
3 files changed, 53 insertions(+), 2 deletions(-)
diff --git a/extensions-core/core/deployment/pom.xml b/extensions-core/core/deployment/pom.xml
index e36549d47e..ea5e039a21 100644
--- a/extensions-core/core/deployment/pom.xml
+++ b/extensions-core/core/deployment/pom.xml
@@ -85,6 +85,11 @@
<artifactId>quarkus-junit5-internal</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-devui-test-spi</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
diff --git a/extensions-core/core/deployment/src/main/resources/dev-ui/qwc-camel-core.js b/extensions-core/core/deployment/src/main/resources/dev-ui/qwc-camel-core.js
index 6cada58a56..e6f285855a 100644
--- a/extensions-core/core/deployment/src/main/resources/dev-ui/qwc-camel-core.js
+++ b/extensions-core/core/deployment/src/main/resources/dev-ui/qwc-camel-core.js
@@ -84,8 +84,8 @@ export class QwcCamelCore extends QwcHotReloadElement {
enableConsoleUpdates() {
// If we're being inherited from outside camel-quarkus-core this allows JsonRpc calls to work
- if (this.jsonRpc.getExtensionName() !== 'org.apache.camel.quarkus.camel-quarkus-core') {
- this.jsonRpc._setExtensionName('org.apache.camel.quarkus.camel-quarkus-core');
+ if (this.jsonRpc.getExtensionName() !== 'camel-quarkus-core') {
+ this.jsonRpc._setExtensionName('camel-quarkus-core');
}
// Fetch initial data
diff --git a/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/devui/CamelQuarkusCoreDevUITest.java b/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/devui/CamelQuarkusCoreDevUITest.java
new file mode 100644
index 0000000000..63708016f4
--- /dev/null
+++ b/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/devui/CamelQuarkusCoreDevUITest.java
@@ -0,0 +1,46 @@
+/*
+ * 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.quarkus.core.deployment.devui;
+
+import java.util.Map;
+
+import io.quarkus.devui.tests.DevUIJsonRPCTest;
+import io.quarkus.test.QuarkusDevModeTest;
+import io.vertx.core.json.Json;
+import io.vertx.core.json.JsonObject;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class CamelQuarkusCoreDevUITest extends DevUIJsonRPCTest {
+ @RegisterExtension
+ static final QuarkusDevModeTest CONFIG = new QuarkusDevModeTest().withEmptyApplication();
+
+ public CamelQuarkusCoreDevUITest() {
+ super("org.apache.camel.quarkus.camel-quarkus-core");
+ }
+
+ @Test
+ void getCamelContextDevConsoleJSON() throws Exception {
+ String result = super.executeJsonRPCMethod(String.class, "getConsoleJSON",
+ Map.of("id", "context", "options", Map.of()));
+ JsonObject json = (JsonObject) Json.decodeValue(result);
+ assertEquals("camel-1", json.getString("name"));
+ assertEquals("Started", json.getString("state"));
+ }
+}
(camel-quarkus) 07/07: Refactor Splunk test container
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch 3.27.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 482fafa22399b1085c79f1c896b4d9154f5bcc58
Author: Lukas Lowinger <ll...@redhat.com>
AuthorDate: Fri Oct 17 16:57:18 2025 +0200
Refactor Splunk test container
---
.../test/support/splunk/SplunkTestResource.java | 88 ++++++----------------
.../splunk-hec/src/test/resources/default.yml | 75 ++++++++++++++++++
.../src/test/resources/local_inputs.conf | 6 --
.../src/test/resources/local_server.conf | 33 --------
.../splunk/src/test/resources/default.yml | 75 ++++++++++++++++++
.../splunk/src/test/resources/local_inputs.conf | 6 --
.../splunk/src/test/resources/local_server.conf | 33 --------
7 files changed, 172 insertions(+), 144 deletions(-)
diff --git a/integration-tests-support/splunk/src/test/java/org/apache/camel/quarkus/test/support/splunk/SplunkTestResource.java b/integration-tests-support/splunk/src/test/java/org/apache/camel/quarkus/test/support/splunk/SplunkTestResource.java
index a40d45d7ee..769e203cc0 100644
--- a/integration-tests-support/splunk/src/test/java/org/apache/camel/quarkus/test/support/splunk/SplunkTestResource.java
+++ b/integration-tests-support/splunk/src/test/java/org/apache/camel/quarkus/test/support/splunk/SplunkTestResource.java
@@ -17,6 +17,7 @@
package org.apache.camel.quarkus.test.support.splunk;
import java.io.IOException;
+import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Paths;
@@ -32,11 +33,9 @@ import org.eclipse.microprofile.config.ConfigProvider;
import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.testcontainers.containers.Container;
import org.testcontainers.containers.GenericContainer;
import org.testcontainers.containers.wait.strategy.Wait;
import org.testcontainers.images.builder.Transferable;
-import org.testcontainers.utility.MountableFile;
public class SplunkTestResource implements QuarkusTestResourceLifecycleManager {
@@ -90,69 +89,24 @@ public class SplunkTestResource implements QuarkusTestResourceLifecycleManager {
//extraction of private key can not be done by keytool (only openssl), but it can be done programmatically
byte[] concatenate = concatenateKeyAndCertificates(banner);
- container.withCopyToContainer(Transferable.of(concatenate), "/opt/splunk/etc/auth/mycerts/myServerCert.pem")
- .withCopyToContainer(Transferable.of(Files.readAllBytes(Paths.get(caCertPath))),
- "/opt/splunk/etc/auth/mycerts/cacert.pem");
+ container.withCopyToContainer(Transferable.of(concatenate),
+ "/opt/splunk/etc/auth/servercerts/myServerCert.pem");
+ // note we are using different root path "/etc/..." because on Podman 5.4.0 it is unable to copy two files from the same root path for unknown reason
+ container.withCopyToContainer(Transferable.of(Files.readAllBytes(Paths.get(caCertPath))),
+ "/etc/cacert.pem");
} else {
LOG.debug("Internal certificates are used for Splunk server.");
}
+ // based on https://splunk.github.io/docker-splunk/ADVANCED.html#runtime-configuration
+ container.withCopyToContainer(Transferable.of(readResourceToBytes("default.yml")), "/tmp/defaults/default.yml");
container.start();
- container.copyFileToContainer(MountableFile.forClasspathResource("local_server.conf"),
- "/opt/splunk/etc/system/local/server.conf");
- container.copyFileToContainer(MountableFile.forClasspathResource("local_inputs.conf"),
- "/opt/splunk/etc/system/local/inputs.conf");
-
- container.copyFileToContainer(MountableFile.forClasspathResource("local_server.conf"),
- "/opt/splunk/etc/system/local/server.conf");
- container.copyFileToContainer(MountableFile.forClasspathResource("local_inputs.conf"),
- "/opt/splunk/etc/system/local/inputs.conf");
-
- container.execInContainer("sudo", "sed", "-i", "s/minFreeSpace = 5000/minFreeSpace = 100/",
- "/opt/splunk/etc/system/local/server.conf");
-
/* uncomment for troubleshooting purposes - copy configuration from container
container.copyFileFromContainer("/opt/splunk/etc/system/local/server.conf",
Path.of(getClass().getResource("/").getPath()).resolve("local_server_from_container.conf").toFile()
.getAbsolutePath());*/
- assertExecResult(container.execInContainer("sudo", "microdnf", "--nodocs", "update", "tzdata"), "tzdata install");//install tzdata package so we can specify tz other than UTC
-
- LOG.debug(banner);
- LOG.debug("Restarting splunk server.");
- LOG.debug(banner);
-
- assertExecResult(container.execInContainer("sudo", "./bin/splunk", "restart"), "splunk restart");
-
- container.execInContainer("sudo", "./bin/splunk", "add", "index", TEST_INDEX);
- container.execInContainer("sudo", "./bin/splunk", "add", "tcp", String.valueOf(SplunkConstants.TCP_PORT),
- "-sourcetype", "TCP");
-
- /*uncomment for troubleshooting purposes - copy from container conf and log files
- container.copyFileFromContainer("/opt/splunk/etc/system/local/server.conf",
- Path.of(getClass().getResource("/").getPath()).resolve("local-server-from-container.conf").toFile()
- .getAbsolutePath());
- container.copyFileFromContainer("/opt/splunk/etc/system/default/server.conf",
- Path.of(getClass().getResource("/").getPath()).resolve("default-server-from-container.log").toFile()
- .getAbsolutePath());
- if (localhostCertPath != null && localhostKeystorePath != null && caCertPath != null && keystorePassword != null) {
- container.copyFileFromContainer("/opt/splunk/etc/auth/mycerts/myServerCert.pem",
- Path.of(getClass().getResource("/").getPath()).resolve("myServerCert-from-container.pem").toFile()
- .getAbsolutePath());
- container.copyFileFromContainer("/opt/splunk/etc/auth/mycerts/cacert.pem",
- Path.of(getClass().getResource("/").getPath()).resolve("cacert-from-container.pem").toFile()
- .getAbsolutePath());
- } else {
- container.copyFileFromContainer("/opt/splunk/etc/auth/server.pem",
- Path.of(getClass().getResource("/").getPath()).resolve("myServerCert-from-container.pem").toFile()
- .getAbsolutePath());
- container.copyFileFromContainer("/opt/splunk/etc/auth/cacert.pem",
- Path.of(getClass().getResource("/").getPath()).resolve("cacert-from-container.pem").toFile()
- .getAbsolutePath());
- }
- */
-
String splunkHost = container.getHost();
Map<String, String> m = Map.of(
@@ -171,7 +125,6 @@ public class SplunkTestResource implements QuarkusTestResourceLifecycleManager {
LOG.debug(banner);
return m;
-
} catch (Exception e) {
throw new RuntimeException(e);
}
@@ -193,17 +146,6 @@ public class SplunkTestResource implements QuarkusTestResourceLifecycleManager {
return (severCert + ca + pemKey).getBytes(StandardCharsets.UTF_8);
}
- private static void assertExecResult(Container.ExecResult res, String cmd) {
- if (res.getExitCode() != 0) {
- LOG.error("Command: " + cmd);
- LOG.error("Stdout: " + res.getStdout());
- LOG.error("Stderr: " + res.getStderr());
- throw new RuntimeException("Command " + cmd + ") failed. " + res.getStdout());
- } else {
- LOG.debug("Command: " + cmd + " succeeded!");
- }
- }
-
@Override
public void stop() {
try {
@@ -214,4 +156,18 @@ public class SplunkTestResource implements QuarkusTestResourceLifecycleManager {
// Ignored
}
}
+
+ public byte[] readResourceToBytes(String resourcePath) throws IOException {
+ ClassLoader classLoader = getClass().getClassLoader();
+ try (InputStream inputStream = classLoader.getResourceAsStream(resourcePath)) {
+ if (inputStream == null) {
+ throw new IOException("Resource not found on classpath: " + resourcePath);
+ }
+
+ return inputStream.readAllBytes();
+
+ } catch (IOException e) {
+ throw new IOException("Failed to read resource '" + resourcePath + "' into byte array.", e);
+ }
+ }
}
diff --git a/integration-tests/splunk-hec/src/test/resources/default.yml b/integration-tests/splunk-hec/src/test/resources/default.yml
new file mode 100644
index 0000000000..8f2244f5e6
--- /dev/null
+++ b/integration-tests/splunk-hec/src/test/resources/default.yml
@@ -0,0 +1,75 @@
+#
+# 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.
+#
+
+---
+splunk:
+ conf:
+ - key: indexes
+ value:
+ directory: /opt/splunk/etc/system/local
+ content:
+ testindex:
+ homePath: "$SPLUNK_DB/testindex/db"
+ coldPath: "$SPLUNK_DB/testindex/colddb"
+ thawedPath: "$SPLUNK_DB/testindex/thaweddb"
+ - key: inputs
+ value:
+ directory: /opt/splunk/etc/system/local
+ content:
+ default:
+ host: "localhost"
+ tcp://9998:
+ connection_host: "ip"
+ sourcetype: "TCP"
+ index: "testindex"
+ disabled: "false"
+ splunktcp-ssl:9997:
+ disabled: "0"
+ - key: server
+ value:
+ directory: /opt/splunk/etc/system/local
+ content:
+ general:
+ serverName: "b66b768099db"
+ pass4SymmKey: "$7$oeVDSaCZOSOMIVB0Yv2lBqldGvLt0pXWuQdDV7YvZ0d6Kwf/f0RwhQ=="
+ allowRemoteLogin: "always"
+ sslConfig:
+ caTrustStore: "splunk"
+ serverCert: "/opt/splunk/etc/auth/servercerts/myServerCert.pem"
+ sslPassword: "password"
+ requireClientCert: "false"
+ cipherSuite: "ECDHE-RSA-AES256-GCM-SHA384"
+ sslRootCAPath: "/etc/cacert.pem"
+ lmpool:auto_generated_pool_download-trial:
+ description: "auto_generated_pool_download-trial"
+ peers: "*"
+ quota: "MAX"
+ stack_id: "download-trial"
+ lmpool:auto_generated_pool_forwarder:
+ description: "auto_generated_pool_forwarder"
+ peers: "*"
+ quota: "MAX"
+ stack_id: "forwarder"
+ lmpool:auto_generated_pool_free:
+ description: "auto_generated_pool_free"
+ peers: "*"
+ quota: "MAX"
+ stack_id: "free"
+ license:
+ active_group: "Free"
+ diskUsage:
+ minFreeSpace: 100
\ No newline at end of file
diff --git a/integration-tests/splunk-hec/src/test/resources/local_inputs.conf b/integration-tests/splunk-hec/src/test/resources/local_inputs.conf
deleted file mode 100644
index 03ce3b62fe..0000000000
--- a/integration-tests/splunk-hec/src/test/resources/local_inputs.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-[default]
-host = localhost
-
-[splunktcp-ssl:9997]
-
-disabled=0
\ No newline at end of file
diff --git a/integration-tests/splunk-hec/src/test/resources/local_server.conf b/integration-tests/splunk-hec/src/test/resources/local_server.conf
deleted file mode 100644
index 93a12d0e87..0000000000
--- a/integration-tests/splunk-hec/src/test/resources/local_server.conf
+++ /dev/null
@@ -1,33 +0,0 @@
-[general]
-serverName = b66b768099db
-pass4SymmKey = $7$oeVDSaCZOSOMIVB0Yv2lBqldGvLt0pXWuQdDV7YvZ0d6Kwf/f0RwhQ==
-allowRemoteLogin = always
-
-[sslConfig]
-caTrustStore = splunk
-serverCert = /opt/splunk/etc/auth/mycerts/myServerCert.pem
-sslPassword = password
-requireClientCert = false
-cipherSuite = ECDHE-RSA-AES256-GCM-SHA384
-sslRootCAPath = /opt/splunk/etc/auth/mycerts/cacert.pem
-
-[lmpool:auto_generated_pool_download-trial]
-description = auto_generated_pool_download-trial
-peers = *
-quota = MAX
-stack_id = download-trial
-
-[lmpool:auto_generated_pool_forwarder]
-description = auto_generated_pool_forwarder
-peers = *
-quota = MAX
-stack_id = forwarder
-
-[lmpool:auto_generated_pool_free]
-description = auto_generated_pool_free
-peers = *
-quota = MAX
-stack_id = free
-
-[license]
-active_group = Free
diff --git a/integration-tests/splunk/src/test/resources/default.yml b/integration-tests/splunk/src/test/resources/default.yml
new file mode 100644
index 0000000000..8f2244f5e6
--- /dev/null
+++ b/integration-tests/splunk/src/test/resources/default.yml
@@ -0,0 +1,75 @@
+#
+# 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.
+#
+
+---
+splunk:
+ conf:
+ - key: indexes
+ value:
+ directory: /opt/splunk/etc/system/local
+ content:
+ testindex:
+ homePath: "$SPLUNK_DB/testindex/db"
+ coldPath: "$SPLUNK_DB/testindex/colddb"
+ thawedPath: "$SPLUNK_DB/testindex/thaweddb"
+ - key: inputs
+ value:
+ directory: /opt/splunk/etc/system/local
+ content:
+ default:
+ host: "localhost"
+ tcp://9998:
+ connection_host: "ip"
+ sourcetype: "TCP"
+ index: "testindex"
+ disabled: "false"
+ splunktcp-ssl:9997:
+ disabled: "0"
+ - key: server
+ value:
+ directory: /opt/splunk/etc/system/local
+ content:
+ general:
+ serverName: "b66b768099db"
+ pass4SymmKey: "$7$oeVDSaCZOSOMIVB0Yv2lBqldGvLt0pXWuQdDV7YvZ0d6Kwf/f0RwhQ=="
+ allowRemoteLogin: "always"
+ sslConfig:
+ caTrustStore: "splunk"
+ serverCert: "/opt/splunk/etc/auth/servercerts/myServerCert.pem"
+ sslPassword: "password"
+ requireClientCert: "false"
+ cipherSuite: "ECDHE-RSA-AES256-GCM-SHA384"
+ sslRootCAPath: "/etc/cacert.pem"
+ lmpool:auto_generated_pool_download-trial:
+ description: "auto_generated_pool_download-trial"
+ peers: "*"
+ quota: "MAX"
+ stack_id: "download-trial"
+ lmpool:auto_generated_pool_forwarder:
+ description: "auto_generated_pool_forwarder"
+ peers: "*"
+ quota: "MAX"
+ stack_id: "forwarder"
+ lmpool:auto_generated_pool_free:
+ description: "auto_generated_pool_free"
+ peers: "*"
+ quota: "MAX"
+ stack_id: "free"
+ license:
+ active_group: "Free"
+ diskUsage:
+ minFreeSpace: 100
\ No newline at end of file
diff --git a/integration-tests/splunk/src/test/resources/local_inputs.conf b/integration-tests/splunk/src/test/resources/local_inputs.conf
deleted file mode 100644
index 03ce3b62fe..0000000000
--- a/integration-tests/splunk/src/test/resources/local_inputs.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-[default]
-host = localhost
-
-[splunktcp-ssl:9997]
-
-disabled=0
\ No newline at end of file
diff --git a/integration-tests/splunk/src/test/resources/local_server.conf b/integration-tests/splunk/src/test/resources/local_server.conf
deleted file mode 100644
index 93a12d0e87..0000000000
--- a/integration-tests/splunk/src/test/resources/local_server.conf
+++ /dev/null
@@ -1,33 +0,0 @@
-[general]
-serverName = b66b768099db
-pass4SymmKey = $7$oeVDSaCZOSOMIVB0Yv2lBqldGvLt0pXWuQdDV7YvZ0d6Kwf/f0RwhQ==
-allowRemoteLogin = always
-
-[sslConfig]
-caTrustStore = splunk
-serverCert = /opt/splunk/etc/auth/mycerts/myServerCert.pem
-sslPassword = password
-requireClientCert = false
-cipherSuite = ECDHE-RSA-AES256-GCM-SHA384
-sslRootCAPath = /opt/splunk/etc/auth/mycerts/cacert.pem
-
-[lmpool:auto_generated_pool_download-trial]
-description = auto_generated_pool_download-trial
-peers = *
-quota = MAX
-stack_id = download-trial
-
-[lmpool:auto_generated_pool_forwarder]
-description = auto_generated_pool_forwarder
-peers = *
-quota = MAX
-stack_id = forwarder
-
-[lmpool:auto_generated_pool_free]
-description = auto_generated_pool_free
-peers = *
-quota = MAX
-stack_id = free
-
-[license]
-active_group = Free
(camel-quarkus) 05/07: Fix path to qwc-camel-core.js in Micrometer & MicroProfile Fault Tolerance Dev UI pages
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch 3.27.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 0b3edfd37c9475db166013436416dd5bf4acd995
Author: James Netherton <ja...@gmail.com>
AuthorDate: Wed Oct 15 15:05:09 2025 +0100
Fix path to qwc-camel-core.js in Micrometer & MicroProfile Fault Tolerance Dev UI pages
---
.../deployment/src/main/resources/dev-ui/qwc-camel-micrometer.js | 2 +-
.../src/main/resources/dev-ui/qwc-camel-microprofile-fault-tolerance.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/extensions/micrometer/deployment/src/main/resources/dev-ui/qwc-camel-micrometer.js b/extensions/micrometer/deployment/src/main/resources/dev-ui/qwc-camel-micrometer.js
index 6cf8db062b..613eff49eb 100644
--- a/extensions/micrometer/deployment/src/main/resources/dev-ui/qwc-camel-micrometer.js
+++ b/extensions/micrometer/deployment/src/main/resources/dev-ui/qwc-camel-micrometer.js
@@ -15,7 +15,7 @@
* limitations under the License.
*/
import {html} from 'qwc-hot-reload-element';
-import {QwcCamelCore} from "../org.apache.camel.quarkus.camel-quarkus-core/qwc-camel-core.js";
+import {QwcCamelCore} from "../camel-quarkus-core/qwc-camel-core.js";
import {columnBodyRenderer} from '@vaadin/grid/lit.js';
import '@vaadin/grid';
import '@vaadin/grid/vaadin-grid-sort-column.js';
diff --git a/extensions/microprofile-fault-tolerance/deployment/src/main/resources/dev-ui/qwc-camel-microprofile-fault-tolerance.js b/extensions/microprofile-fault-tolerance/deployment/src/main/resources/dev-ui/qwc-camel-microprofile-fault-tolerance.js
index 7c6b2498e2..6d9751680d 100644
--- a/extensions/microprofile-fault-tolerance/deployment/src/main/resources/dev-ui/qwc-camel-microprofile-fault-tolerance.js
+++ b/extensions/microprofile-fault-tolerance/deployment/src/main/resources/dev-ui/qwc-camel-microprofile-fault-tolerance.js
@@ -15,7 +15,7 @@
* limitations under the License.
*/
import {html} from 'qwc-hot-reload-element';
-import {QwcCamelCore} from "../org.apache.camel.quarkus.camel-quarkus-core/qwc-camel-core.js";
+import {QwcCamelCore} from "../camel-quarkus-core/qwc-camel-core.js";
import {columnBodyRenderer} from '@vaadin/grid/lit.js';
import '@vaadin/grid';
import '@vaadin/grid/vaadin-grid-sort-column.js';
(camel-quarkus) 06/07: Update Dev UI documentation with the correct path to qwc-camel-core.js
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch 3.27.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 8a9eb4a675891d584a575e81951015bb128913e8
Author: James Netherton <ja...@gmail.com>
AuthorDate: Fri Oct 17 08:43:48 2025 +0100
Update Dev UI documentation with the correct path to qwc-camel-core.js
---
docs/modules/ROOT/pages/contributor-guide/create-new-dev-ui-page.adoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/modules/ROOT/pages/contributor-guide/create-new-dev-ui-page.adoc b/docs/modules/ROOT/pages/contributor-guide/create-new-dev-ui-page.adoc
index b1ed015ef6..0b5cdd58e9 100644
--- a/docs/modules/ROOT/pages/contributor-guide/create-new-dev-ui-page.adoc
+++ b/docs/modules/ROOT/pages/contributor-guide/create-new-dev-ui-page.adoc
@@ -25,7 +25,7 @@ For example, to create a simple table view:
----
import {html} from 'qwc-hot-reload-element';
// NOTE: if your Dev UI page lives outside of camel-quarkus-core then use the following instead of ./qwc-camel-core.js:
-// import ../org.apache.camel.quarkus.camel-quarkus-core/qwc-camel-core.js
+// import ../camel-quarkus-core/qwc-camel-core.js
import {QwcCamelCore} from "./qwc-camel-core.js";
import {columnBodyRenderer} from '@vaadin/grid/lit.js';
import '@vaadin/grid';
(camel-quarkus) 04/07: Upgrade Quarkus LangChain4j to 1.2.1
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch 3.27.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit fd66d8e857b4a355c986f4d049574c57436f1077
Author: James Netherton <ja...@gmail.com>
AuthorDate: Wed Oct 15 07:19:48 2025 +0100
Upgrade Quarkus LangChain4j to 1.2.1
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 0d0ac74a63..a04fc996d0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,7 +56,7 @@
<quarkiverse-jackson-jq.version>2.4.0</quarkiverse-jackson-jq.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/jackson-jq/quarkus-jackson-jq-parent/ -->
<quarkiverse-jgit.version>3.6.0</quarkiverse-jgit.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/jgit/quarkus-jgit/ -->
<quarkiverse-jsch.version>3.1.0</quarkiverse-jsch.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/jsch/quarkus-jsch/ -->
- <quarkiverse-langchain4j.version>1.2.0</quarkiverse-langchain4j.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/langchain4j/quarkus-langchain4j-parent -->
+ <quarkiverse-langchain4j.version>1.2.1</quarkiverse-langchain4j.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/langchain4j/quarkus-langchain4j-parent -->
<quarkiverse-micrometer.version>3.4.1</quarkiverse-micrometer.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/micrometer/registry/quarkus-micrometer-registry-jmx/ -->
<quarkiverse-minio.version>3.8.6</quarkiverse-minio.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/minio/quarkus-minio-parent/ -->
<quarkiverse-mybatis.version>2.4.1</quarkiverse-mybatis.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/mybatis/quarkus-mybatis-parent/ -->
(camel-quarkus) 02/07: Enlarge timeout for Master Openshift IT
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch 3.27.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 422c144b3d787dbb2ad9ef5b442e072260675b62
Author: Lukas Lowinger <ll...@redhat.com>
AuthorDate: Tue Oct 14 13:51:44 2025 +0200
Enlarge timeout for Master Openshift IT
---
.../apache/camel/quarkus/component/master/it/MasterOpenShiftTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/integration-tests/master-openshift/src/test/java/org/apache/camel/quarkus/component/master/it/MasterOpenShiftTest.java b/integration-tests/master-openshift/src/test/java/org/apache/camel/quarkus/component/master/it/MasterOpenShiftTest.java
index 321d04c96b..e764ac4f52 100644
--- a/integration-tests/master-openshift/src/test/java/org/apache/camel/quarkus/component/master/it/MasterOpenShiftTest.java
+++ b/integration-tests/master-openshift/src/test/java/org/apache/camel/quarkus/component/master/it/MasterOpenShiftTest.java
@@ -106,7 +106,7 @@ class MasterOpenShiftTest {
}
private void awaitStartup(QuarkusProcessExecutor quarkusProcessExecutor) {
- Awaitility.await().atMost(10, TimeUnit.SECONDS).pollDelay(1, TimeUnit.SECONDS).until(() -> {
+ Awaitility.await().atMost(40, TimeUnit.SECONDS).pollDelay(1, TimeUnit.SECONDS).until(() -> {
return isApplicationHealthy(quarkusProcessExecutor.getHttpPort());
});
}