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 25ff699b6e4 camel-jbang - Upgrade to quarkus 3.2.7
25ff699b6e4 is described below
commit 25ff699b6e4d596636ebfcc950a977794f62d01c
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Mon Oct 23 16:38:10 2023 +0200
camel-jbang - Upgrade to quarkus 3.2.7
---
.../dsl/jbang/core/commands/ExportBaseCommand.java | 2 +-
.../core/commands/catalog/CatalogBaseCommand.java | 2 +-
.../main/resources/quarkus-docker/Dockerfile.jvm | 2 +
.../resources/quarkus-docker/Dockerfile.legacy-jar | 2 +
.../resources/quarkus-docker/Dockerfile.native | 6 +--
.../quarkus-docker/Dockerfile.native-micro | 4 +-
.../src/main/resources/templates/quarkus-pom.tmpl | 49 ++++++++++------------
7 files changed, 33 insertions(+), 34 deletions(-)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
index a473a91f8d9..7516e7f7050 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
@@ -145,7 +145,7 @@ abstract class ExportBaseCommand extends CamelCommand {
protected String quarkusArtifactId;
@CommandLine.Option(names = { "--quarkus-version" }, description =
"Quarkus Platform version",
- defaultValue = "3.2.6.Final")
+ defaultValue = "3.2.7.Final")
protected String quarkusVersion;
@CommandLine.Option(names = { "--maven-wrapper" }, defaultValue = "true",
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogBaseCommand.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogBaseCommand.java
index e3767042d5e..5a75ed9b708 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogBaseCommand.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogBaseCommand.java
@@ -49,7 +49,7 @@ public abstract class CatalogBaseCommand extends CamelCommand
{
String runtime;
@CommandLine.Option(names = { "--quarkus-version" }, description =
"Quarkus Platform version",
- defaultValue = "3.2.6.Final")
+ defaultValue = "3.2.7.Final")
String quarkusVersion;
@CommandLine.Option(names = { "--repos" },
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/resources/quarkus-docker/Dockerfile.jvm
b/dsl/camel-jbang/camel-jbang-core/src/main/resources/quarkus-docker/Dockerfile.jvm
index b69bc1b8e28..45324243d22 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/resources/quarkus-docker/Dockerfile.jvm
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/resources/quarkus-docker/Dockerfile.jvm
@@ -110,3 +110,5 @@ USER 185
ENV JAVA_OPTS="-Dquarkus.http.host=0.0.0.0
-Djava.util.logging.manager=org.jboss.logmanager.LogManager"
ENV JAVA_APP_JAR="/deployments/quarkus-run.jar"
+ENTRYPOINT [ "/opt/jboss/container/java/run/run-java.sh" ]
+
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/resources/quarkus-docker/Dockerfile.legacy-jar
b/dsl/camel-jbang/camel-jbang-core/src/main/resources/quarkus-docker/Dockerfile.legacy-jar
index fed0377889b..3dc54e22384 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/resources/quarkus-docker/Dockerfile.legacy-jar
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/resources/quarkus-docker/Dockerfile.legacy-jar
@@ -106,3 +106,5 @@ EXPOSE 8080
USER 185
ENV JAVA_OPTS="-Dquarkus.http.host=0.0.0.0
-Djava.util.logging.manager=org.jboss.logmanager.LogManager"
ENV JAVA_APP_JAR="/deployments/quarkus-run.jar"
+
+ENTRYPOINT [ "/opt/jboss/container/java/run/run-java.sh" ]
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/resources/quarkus-docker/Dockerfile.native
b/dsl/camel-jbang/camel-jbang-core/src/main/resources/quarkus-docker/Dockerfile.native
index ae9abab940c..d5c985f5980 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/resources/quarkus-docker/Dockerfile.native
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/resources/quarkus-docker/Dockerfile.native
@@ -20,7 +20,7 @@
#
# Before building the container image run:
#
-# ./mvnw package -Pnative
+# ./mvnw package -Dnative
#
# Then, build the image with:
#
@@ -31,7 +31,7 @@
# docker run -i --rm -p 8080:8080 quarkus/code-with-quarkus
#
###
-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.6
+FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8
WORKDIR /work/
RUN chown 1001 /work \
&& chmod "g+rwX" /work \
@@ -41,4 +41,4 @@ COPY --chown=1001:root target/*-runner /work/application
EXPOSE 8080
USER 1001
-CMD ["./application", "-Dquarkus.http.host=0.0.0.0"]
+ENTRYPOINT ["./application", "-Dquarkus.http.host=0.0.0.0"]
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/resources/quarkus-docker/Dockerfile.native-micro
b/dsl/camel-jbang/camel-jbang-core/src/main/resources/quarkus-docker/Dockerfile.native-micro
index 4660a37c506..ea5c4c969b4 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/resources/quarkus-docker/Dockerfile.native-micro
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/resources/quarkus-docker/Dockerfile.native-micro
@@ -23,7 +23,7 @@
#
# Before building the container image run:
#
-# ./mvnw package -Pnative
+# ./mvnw package -Dnative
#
# Then, build the image with:
#
@@ -44,4 +44,4 @@ COPY --chown=1001:root target/*-runner /work/application
EXPOSE 8080
USER 1001
-CMD ["./application", "-Dquarkus.http.host=0.0.0.0"]
+ENTRYPOINT ["./application", "-Dquarkus.http.host=0.0.0.0"]
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/quarkus-pom.tmpl
b/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/quarkus-pom.tmpl
index 7e984215b4d..737fe071e5a 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/quarkus-pom.tmpl
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/quarkus-pom.tmpl
@@ -17,7 +17,8 @@
<quarkus.platform.group-id>{{ .QuarkusGroupId
}}</quarkus.platform.group-id>
<quarkus.platform.artifact-id>{{ .QuarkusArtifactId
}}</quarkus.platform.artifact-id>
<quarkus.platform.version>{{ .QuarkusVersion
}}</quarkus.platform.version>
- <surefire-plugin.version>3.0.0</surefire-plugin.version>
+ <skipITs>true</skipITs>
+ <surefire-plugin.version>3.1.2</surefire-plugin.version>
</properties>
<dependencyManagement>
@@ -99,6 +100,25 @@
</systemPropertyVariables>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>${surefire-plugin.version}</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ <configuration>
+ <systemPropertyVariables>
+
<native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
+
<java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
+ <maven.home>${maven.home}</maven.home>
+ </systemPropertyVariables>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
@@ -110,33 +130,8 @@
<name>native</name>
</property>
</activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-failsafe-plugin</artifactId>
- <version>${surefire-plugin.version}</version>
- <executions>
- <execution>
- <goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- <configuration>
- <systemPropertyVariables>
- <native.image.path>
-
${project.build.directory}/${project.build.finalName}-runner
- </native.image.path>
-
<java.util.logging.manager>org.jboss.logmanager.LogManager
- </java.util.logging.manager>
- <maven.home>${maven.home}</maven.home>
- </systemPropertyVariables>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
<properties>
+ <skipITs>false</skipITs>
<quarkus.package.type>native</quarkus.package.type>
</properties>
</profile>
