This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch gradle in repository https://gitbox.apache.org/repos/asf/camel.git
commit ef9585c8a7e68b9e59ac47f77d35b3c561036321 Author: Claus Ibsen <[email protected]> AuthorDate: Sat Feb 28 09:44:47 2026 +0100 CAMEL-22801: camel-jbang - Remove deprecated export to gradle --- .../apache/camel/dsl/jbang/core/commands/Run.java | 2 +- .../apache/camel/dsl/jbang/it/ExportITCase.java | 11 ----- .../camel/dsl/jbang/it/MavenGradleITCase.java | 54 -------------------- .../dsl/jbang/it/support/JBangTestSupport.java | 1 - .../resources/jbang/it/maven-gradle/build.gradle | 57 ---------------------- .../core/commands/kubernetes/KubernetesExport.java | 10 +--- .../core/commands/kubernetes/KubernetesRun.java | 4 +- 7 files changed, 3 insertions(+), 136 deletions(-) diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java index 1e79fdc8e6d5..a042542637b4 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java @@ -754,7 +754,7 @@ public class Run extends CamelCommand { files.add(OPENAPI_GENERATED_FILE); } - // if we only run pom.xml then auto discover from the Maven/Gradle based project + // if we only run pom.xml then auto discover from the Maven based project if (files.size() == 1 && (files.get(0).endsWith("pom.xml"))) { Path projectDir = Path.of(files.get(0)).toAbsolutePath(); // use a better name when running diff --git a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/ExportITCase.java b/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/ExportITCase.java index 4d645fa55177..af6ce440f2f8 100644 --- a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/ExportITCase.java +++ b/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/ExportITCase.java @@ -70,17 +70,6 @@ public class ExportITCase extends JBangTestSupport { assertFileInDataFolderExists("src/main/resources/camel/server.yaml"); } - @Test - @Tag("spring-boot") - public void testExportGradle() { - execute(String.format( - "export --build-tool=gradle --runtime=spring-boot --gav=com.foo:acme:1.0-SNAPSHOT --directory=%s", - mountPoint())); - assertFileInDataFolderExists("gradlew"); - assertFileInDataFolderExists("build.gradle"); - assertFileInDataFolderExists("gradle/wrapper/gradle-wrapper.jar"); - } - @Test @Tag("quarkus") public void testExportProperties() throws IOException { diff --git a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/MavenGradleITCase.java b/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/MavenGradleITCase.java deleted file mode 100644 index a632e797b715..000000000000 --- a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/MavenGradleITCase.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * 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.dsl.jbang.it; - -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; - -import org.apache.camel.dsl.jbang.it.support.JBangTestSupport; -import org.junit.jupiter.api.Test; - -public class MavenGradleITCase extends JBangTestSupport { - - @Test - public void runFromMavenModuleTest() { - execInContainer(String.format("mkdir %s/mvn-app", mountPoint())); - execInContainer(String.format("cd %s/mvn-app && %s init cheese.xml", mountPoint(), getMainCommand())); - execInContainer(String.format( - "cd %s/mvn-app && %s export --runtime=camel-main --gav=org.jbang:maven-app:1.0-SNAPSHOT", mountPoint(), - getMainCommand())); - execInContainer(String.format("cd %s/mvn-app && %s run pom.xml --background", mountPoint(), getMainCommand())); - checkLogContains("Apache Camel " + version() + " (maven-app) started"); - checkLogContains("Hello Camel from route1"); - } - - @Test - public void runFromGradleTest() throws IOException { - execInContainer(String.format("mkdir %s/gradle-app", mountPoint())); - execInContainer(String.format("cd %s/gradle-app && %s init cheese.xml", mountPoint(), getMainCommand())); - execInContainer(String.format( - "cd %s/gradle-app && %s export --runtime=camel-main --gav=org.jbang:gradle-app:1.0-SNAPSHOT", mountPoint(), - getMainCommand())); - copyResourceInDataFolder(TestResources.BUILD_GRADLE); - Files.move(Path.of(String.format("%s/build.gradle", getDataFolder())), - Path.of(String.format("%s/gradle-app/build.gradle", getDataFolder()))); - execInContainer(String.format("cd %s/gradle-app && %s run pom.xml --background", mountPoint(), getMainCommand())); - checkLogContains("Apache Camel " + version() + " (gradle-app) started"); - checkLogContains("Hello Camel from route1"); - } -} diff --git a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/support/JBangTestSupport.java b/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/support/JBangTestSupport.java index 74d9e8da358f..690fd4286654 100644 --- a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/support/JBangTestSupport.java +++ b/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/support/JBangTestSupport.java @@ -100,7 +100,6 @@ public abstract class JBangTestSupport { HELLO_NAME("helloName.xml", "/jbang/it/helloName.xml"), JOKE("joke.yaml", "/jbang/it/joke.yaml"), MQQT_CONSUMER("mqttConsumer.yaml", "/jbang/it/mqttConsumer.yaml"), - BUILD_GRADLE("build.gradle", "/jbang/it/maven-gradle/build.gradle"), DIR_ROUTE("FromDirectoryRoute.java", "/jbang/it/from-source-dir/FromDirectoryRoute.java"), SERVER_ROUTE("server.yaml", "/jbang/it/server.yaml"), CIRCUIT_BREAKER("CircuitBreakerRoute.java", "/jbang/it/CircuitBreakerRoute.java"), diff --git a/dsl/camel-jbang/camel-jbang-it/src/test/resources/jbang/it/maven-gradle/build.gradle b/dsl/camel-jbang/camel-jbang-it/src/test/resources/jbang/it/maven-gradle/build.gradle deleted file mode 100644 index c3e003fd08c7..000000000000 --- a/dsl/camel-jbang/camel-jbang-it/src/test/resources/jbang/it/maven-gradle/build.gradle +++ /dev/null @@ -1,57 +0,0 @@ -/* - * 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. - */ -/* - * This file was generated by the Gradle 'init' task. - */ - -plugins { - id 'java-library' - id 'maven-publish' -} - -repositories { - mavenLocal() -} - -dependencies { - api libs.org.apache.camel.camel.core - api libs.org.apache.camel.camel.main - runtimeOnly libs.org.apache.logging.log4j.log4j.slf4j2.impl - runtimeOnly libs.org.apache.logging.log4j.log4j.core - testImplementation libs.org.apache.camel.camel.test.main.junit5 -} - -group = 'org.jbang' -version = '1.0-SNAPSHOT' -description = 'A Camel Route' -java.sourceCompatibility = JavaVersion.VERSION_17 - -publishing { - publications { - maven(MavenPublication) { - from(components.java) - } - } -} - -tasks.withType(JavaCompile) { - options.encoding = 'UTF-8' -} - -tasks.withType(Javadoc) { - options.encoding = 'UTF-8' -} diff --git a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesExport.java b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesExport.java index 20aa42601d9d..3782d7191412 100644 --- a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesExport.java +++ b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesExport.java @@ -54,7 +54,7 @@ import org.apache.camel.util.StringHelper; import picocli.CommandLine; import picocli.CommandLine.Command; -@Command(name = "export", description = "Export as Maven/Gradle project that contains a Kubernetes deployment manifest", +@Command(name = "export", description = "Export as Maven project that contains a Kubernetes deployment manifest", sortOptions = false) public class KubernetesExport extends Export { @@ -168,7 +168,6 @@ public class KubernetesExport extends Export { camelSpringBootVersion = configurer.camelSpringBootVersion; quarkusGroupId = configurer.quarkusGroupId; quarkusArtifactId = configurer.quarkusArtifactId; - buildTool = configurer.buildTool; openapi = configurer.openapi; exportDir = configurer.exportDir; packageName = configurer.packageName; @@ -177,7 +176,6 @@ public class KubernetesExport extends Export { javaLiveReload = configurer.javaLiveReload; ignoreLoadingError = configurer.ignoreLoadingError; mavenWrapper = configurer.mavenWrapper; - gradleWrapper = configurer.gradleWrapper; fresh = configurer.fresh; download = configurer.download; skipPlugins = configurer.skipPlugins; @@ -211,10 +209,6 @@ public class KubernetesExport extends Export { printer().println("Exporting application ..."); - if (!buildTool.equals("maven")) { - printer().printf("--build-tool=%s is not yet supported%n", buildTool); - } - // Resolve image group and registry String resolvedImageGroup = resolveImageGroup(); String resolvedImageRegistry = resolveImageRegistry(); @@ -641,7 +635,6 @@ public class KubernetesExport extends Export { String camelSpringBootVersion, String quarkusGroupId, String quarkusArtifactId, - String buildTool, String openapi, String exportDir, String packageName, @@ -650,7 +643,6 @@ public class KubernetesExport extends Export { boolean javaLiveReload, boolean ignoreLoadingError, boolean mavenWrapper, - boolean gradleWrapper, boolean fresh, boolean download, boolean packageScanJars, diff --git a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesRun.java b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesRun.java index e02ce08f1dbe..3da2ca43b9ae 100644 --- a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesRun.java +++ b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesRun.java @@ -275,7 +275,7 @@ public class KubernetesRun extends KubernetesBaseCommand { String packageName; @CommandLine.Option(names = { "--build-property" }, - description = "Maven/Gradle build properties, ex. --build-property=prop1=foo") + description = "Maven properties, ex. --build-property=prop1=foo") List<String> buildProperties = new ArrayList<>(); @CommandLine.Option(names = { "--disable-auto" }, @@ -457,7 +457,6 @@ public class KubernetesRun extends KubernetesBaseCommand { camelSpringBootVersion, quarkusGroupId, quarkusArtifactId, - "maven", openApi, workingDir, packageName, @@ -467,7 +466,6 @@ public class KubernetesRun extends KubernetesBaseCommand { true, true, false, - true, download, packageScanJars, (quiet || output != null),
