This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a commit to branch camel-4.18.x in repository https://gitbox.apache.org/repos/asf/camel.git
commit b7480829458d1da2c228cfa6abe70701e4dd1f37 Author: Peter Palaga <[email protected]> AuthorDate: Thu Mar 26 13:01:30 2026 +0100 Allow building with an alternative Quarkus Extension registry URL --- .../camel/catalog/jbang/camel-jbang-configuration-metadata.json | 4 +++- .../org/apache/camel/dsl/jbang/core/common/RuntimeType.java | 1 + .../java/org/apache/camel/dsl/jbang/core/common/QuarkusHelper.java | 5 ++++- parent/pom.xml | 1 + 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/jbang/camel-jbang-configuration-metadata.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/jbang/camel-jbang-configuration-metadata.json index 7249ffadeb29..22ca438bb84d 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/jbang/camel-jbang-configuration-metadata.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/jbang/camel-jbang-configuration-metadata.json @@ -3,6 +3,7 @@ { "name": "camel.jbang", "description": "Camel JBang configurations" } ], "properties": [ + { "name": "camel.jbang.buildTool", "required": false, "description": "Build tool to use (Maven or Gradle)", "type": "string", "javaType": "String", "defaultValue": "Maven", "secret": false }, { "name": "camel.jbang.camel-version", "required": false, "description": "The version of Apache Camel to use", "type": "string", "javaType": "String", "secret": false }, { "name": "camel.jbang.camelSpringBootVersion", "required": false, "description": "To use a custom Camel version when running or export to Spring Boot", "label": "spring-boot", "type": "string", "javaType": "String", "secret": false }, { "name": "camel.jbang.classpathFiles", "required": false, "description": "Additional files to add to classpath (Use commas to separate multiple files).", "type": "string", "javaType": "String", "secret": false }, @@ -16,10 +17,11 @@ { "name": "camel.jbang.excludes", "required": false, "description": "Exclude files by name or pattern (Use commas to separate multiple files)", "type": "string", "javaType": "String", "secret": false }, { "name": "camel.jbang.exportDir", "required": false, "description": "Directory where the project will be exported", "type": "string", "javaType": "String", "defaultValue": ".", "secret": false }, { "name": "camel.jbang.gav", "required": false, "description": "Maven coordinate (groupId:artifactId:version)", "type": "string", "javaType": "String", "secret": false }, + { "name": "camel.jbang.gradleWrapper", "required": false, "description": "Include Gradle Wrapper files in the exported project", "type": "boolean", "javaType": "boolean", "defaultValue": true, "secret": false }, { "name": "camel.jbang.groovyFiles", "required": false, "description": "Additional groovy source files to export to src\/main\/resources\/camel-groovy directory (Use commas to separate multiple files)", "type": "string", "javaType": "String", "secret": false }, { "name": "camel.jbang.health", "required": false, "description": "Health check at \/observe\/health on local HTTP server (port 8080 by default)", "type": "boolean", "javaType": "boolean", "defaultValue": false, "secret": false, "deprecated": true }, { "name": "camel.jbang.ignoreLoadingError", "required": false, "description": "Whether to ignore route loading and compilation errors (use this with care!)", "label": "advanced", "type": "boolean", "javaType": "boolean", "defaultValue": false, "secret": false }, - { "name": "camel.jbang.javaVersion", "required": false, "description": "Java version", "type": "enum", "javaType": "String", "defaultValue": "21", "secret": false, "enum": [ "21" ] }, + { "name": "camel.jbang.javaVersion", "required": false, "description": "Java version (17 or 21)", "type": "enum", "javaType": "String", "defaultValue": "21", "secret": false, "enum": [ "17", "21" ] }, { "name": "camel.jbang.jfr", "required": false, "description": "Enables Java Flight Recorder saving recording to disk on exit", "type": "boolean", "javaType": "boolean", "defaultValue": false, "secret": false }, { "name": "camel.jbang.jfr-profile", "required": false, "description": "Java Flight Recorder profile to use (such as default or profile)", "type": "string", "javaType": "String", "defaultValue": "default", "secret": false }, { "name": "camel.jbang.jib-maven-plugin-version", "required": false, "description": "Version to use for jib-maven-plugin if exporting to camel-main and have Kubernetes enabled (jkube.xxx options)", "label": "kubernetes", "type": "string", "javaType": "String", "defaultValue": "3.4.5", "secret": false }, diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java-templates/org/apache/camel/dsl/jbang/core/common/RuntimeType.java b/dsl/camel-jbang/camel-jbang-core/src/main/java-templates/org/apache/camel/dsl/jbang/core/common/RuntimeType.java index e30ed9954495..6088eea14f1d 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java-templates/org/apache/camel/dsl/jbang/core/common/RuntimeType.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java-templates/org/apache/camel/dsl/jbang/core/common/RuntimeType.java @@ -27,6 +27,7 @@ public enum RuntimeType { main; public static final String QUARKUS_VERSION = "${quarkus-version}"; + public static final String QUARKUS_EXTENSION_REGISTRY_BASE_URL = "${quarkus-extension-registry-base-url}"; public static final String SPRING_BOOT_VERSION = "${spring-boot-version}"; public static final String KAMELETS_VERSION = "${camel-kamelets-catalog-version}"; diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/QuarkusHelper.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/QuarkusHelper.java index 8831774ffeb6..2221c7c63516 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/QuarkusHelper.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/QuarkusHelper.java @@ -39,7 +39,10 @@ import org.apache.camel.util.json.Jsoner; public final class QuarkusHelper { public static final String QUARKUS_PLATFORM_URL_PROPERTY = "camel.jbang.quarkus.platform.url"; - public static final String DEFAULT_QUARKUS_PLATFORM_URL = "https://registry.quarkus.io/client/platforms";; + public static final String DEFAULT_QUARKUS_PLATFORM_URL = RuntimeType.QUARKUS_EXTENSION_REGISTRY_BASE_URL + + (RuntimeType.QUARKUS_EXTENSION_REGISTRY_BASE_URL.endsWith("/") + ? "" : "/") + + "client/platforms"; private QuarkusHelper() { } diff --git a/parent/pom.xml b/parent/pom.xml index 626b1d712041..faf0db8116c0 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -470,6 +470,7 @@ <qpid-broker-version>10.0.1</qpid-broker-version> <qpid-proton-j-version>0.34.1</qpid-proton-j-version> <qpid-jms-client-version>2.10.0</qpid-jms-client-version> + <quarkus-extension-registry-base-url>https://registry.quarkus.io</quarkus-extension-registry-base-url> <quarkus-mcp-server-version>1.10.0</quarkus-mcp-server-version> <quarkus-version>3.31.3</quarkus-version> <quartz-version>2.5.2</quartz-version>
