This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 15e5d91b6513 CAMEL-22771: camel-jbang - Upgrade test infra to use
JBang 4.16.0 (#20340)
15e5d91b6513 is described below
commit 15e5d91b65138bc0b2835466a8e5f5d8249a2dbb
Author: Dekrate <[email protected]>
AuthorDate: Thu Dec 11 13:20:26 2025 +0100
CAMEL-22771: camel-jbang - Upgrade test infra to use JBang 4.16.0 (#20340)
* CAMEL-22771: camel-jbang - Upgrade test infra to use JBang 4.16.0
* CAMEL-22771: Update missed version 4.8.0 to 4.16.0 in CliConfigITCase
---
.../apache/camel/dsl/jbang/core/commands/ExportTest.java | 16 ++++++++--------
.../apache/camel/test/infra/cli/it/CliConfigITCase.java | 8 ++++----
.../org/apache/camel/test/infra/cli/it/RunITCase.java | 2 +-
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/ExportTest.java
b/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/ExportTest.java
index 074b0cb5a08b..4d7bbf9c4174 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/ExportTest.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/ExportTest.java
@@ -101,7 +101,7 @@ class ExportTest {
return;
}
Export command = createCommand(rt, new String[] {
"classpath:route.yaml" },
- "--gav=examples:route:1.0.0", "--camel-version=4.8.3",
"--dir=" + workingDir, "--quiet");
+ "--gav=examples:route:1.0.0", "--camel-version=4.16.0",
"--dir=" + workingDir, "--quiet");
int exit = command.doCall();
Assertions.assertEquals(0, exit);
@@ -114,19 +114,19 @@ class ExportTest {
if (rt == RuntimeType.main) {
assertThat(model.getDependencyManagement().getDependencies())
- .as("Expected to find dependencyManagement entry:
org.apache.camel:camel-bom:4.8.3")
+ .as("Expected to find dependencyManagement entry:
org.apache.camel:camel-bom:4.16.0")
.anySatisfy(dep -> {
assertThat(dep.getGroupId()).isEqualTo("org.apache.camel");
assertThat(dep.getArtifactId()).isEqualTo("camel-bom");
- assertThat(dep.getVersion()).isEqualTo("4.8.3");
+ assertThat(dep.getVersion()).isEqualTo("4.16.0");
});
} else if (rt == RuntimeType.springBoot) {
assertThat(model.getDependencyManagement().getDependencies())
- .as("Expected to find dependencyManagement entry:
org.apache.camel.springboot:camel-spring-boot-bom:4.8.3")
+ .as("Expected to find dependencyManagement entry:
org.apache.camel.springboot:camel-spring-boot-bom:4.16.0")
.anySatisfy(dep -> {
assertThat(dep.getGroupId()).isEqualTo("org.apache.camel.springboot");
assertThat(dep.getArtifactId()).isEqualTo("camel-spring-boot-bom");
- assertThat(dep.getVersion()).isEqualTo("4.8.3");
+ assertThat(dep.getVersion()).isEqualTo("4.16.0");
});
}
}
@@ -764,7 +764,7 @@ class ExportTest {
}
@Test
- @SetSystemProperty(key = CamelJBangConstants.CAMEL_SPRING_BOOT_VERSION,
value = "4.10.0")
+ @SetSystemProperty(key = CamelJBangConstants.CAMEL_SPRING_BOOT_VERSION,
value = "4.16.0")
public void shouldOverrideSpringBootVersionFromSystemProperty() throws
Exception {
LOG.info("shouldOverrideSpringBootVersionFromSystemProperty");
Export command = createCommand(RuntimeType.springBoot, new String[] {
"classpath:route.yaml" },
@@ -774,11 +774,11 @@ class ExportTest {
Assertions.assertEquals(0, exit);
Model model = readMavenModel();
assertThat(model.getDependencyManagement().getDependencies())
- .as("Expected to find dependencyManagement entry:
org.apache.camel.springboot:camel-spring-boot-bom:4.10.0")
+ .as("Expected to find dependencyManagement entry:
org.apache.camel.springboot:camel-spring-boot-bom:4.16.0")
.anySatisfy(dep -> {
assertThat(dep.getGroupId()).isEqualTo("org.apache.camel.springboot");
assertThat(dep.getArtifactId()).isEqualTo("camel-spring-boot-bom");
- assertThat(dep.getVersion()).isEqualTo("4.10.0");
+ assertThat(dep.getVersion()).isEqualTo("4.16.0");
});
}
diff --git
a/test-infra/camel-test-infra-cli/src/test/java/org/apache/camel/test/infra/cli/it/CliConfigITCase.java
b/test-infra/camel-test-infra-cli/src/test/java/org/apache/camel/test/infra/cli/it/CliConfigITCase.java
index 0bd26be6a2c2..d3c026fa41ed 100644
---
a/test-infra/camel-test-infra-cli/src/test/java/org/apache/camel/test/infra/cli/it/CliConfigITCase.java
+++
b/test-infra/camel-test-infra-cli/src/test/java/org/apache/camel/test/infra/cli/it/CliConfigITCase.java
@@ -31,11 +31,11 @@ import org.junitpioneer.jupiter.SetSystemProperty;
public class CliConfigITCase extends AbstractTestSupport {
@Test
- @SetSystemProperty(key = "cli.service.version", value = "4.8.3")
+ @SetSystemProperty(key = "cli.service.version", value = "4.16.0")
public void setJBangVersionTest() {
execute(cliService -> {
String version = cliService.version();
- Assertions.assertEquals("4.8.3", version, "Check specific Camel
JBang version");
+ Assertions.assertEquals("4.16.0", version, "Check specific Camel
JBang version");
});
}
@@ -49,8 +49,8 @@ public class CliConfigITCase extends AbstractTestSupport {
}
@Test
- @SetSystemProperty(key = "cli.service.version", value = "4.8.3")
- @SetSystemProperty(key = "cli.service.execute.version", value = "4.8.0")
+ @SetSystemProperty(key = "cli.service.version", value = "4.16.0")
+ @SetSystemProperty(key = "cli.service.execute.version", value = "4.16.0")
public void setJBangAndCamelVersionTest() {
execute(cliService -> {
String version = cliService.version();
diff --git
a/test-infra/camel-test-infra-cli/src/test/java/org/apache/camel/test/infra/cli/it/RunITCase.java
b/test-infra/camel-test-infra-cli/src/test/java/org/apache/camel/test/infra/cli/it/RunITCase.java
index 0ddafdaa82e4..de18342924ad 100644
---
a/test-infra/camel-test-infra-cli/src/test/java/org/apache/camel/test/infra/cli/it/RunITCase.java
+++
b/test-infra/camel-test-infra-cli/src/test/java/org/apache/camel/test/infra/cli/it/RunITCase.java
@@ -40,7 +40,7 @@ public class RunITCase extends AbstractTestSupport {
}
@Test
- @SetSystemProperty(key = "cli.service.version", value = "4.8.3")
+ @SetSystemProperty(key = "cli.service.version", value = "4.16.0")
public void readPidFromBackgroundExecutionInPreviousVersionTest() {
execute(this::checkPidFromBackgroundExec);
}
