You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pc...@apache.org on 2022/05/31 07:59:42 UTC
[camel-k-runtime] branch main updated: chore(deps): move Quarkus native image into a property
This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
The following commit(s) were added to refs/heads/main by this push:
new 05bd2381 chore(deps): move Quarkus native image into a property
05bd2381 is described below
commit 05bd2381b9dd2af6fe41ca6d489ab824d01c638c
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Mon May 30 15:34:22 2022 +0200
chore(deps): move Quarkus native image into a property
---
pom.xml | 6 +++---
scripts/bump.sh | 11 -----------
2 files changed, 3 insertions(+), 14 deletions(-)
diff --git a/pom.xml b/pom.xml
index 12c0d02e..c30d381e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,8 +42,8 @@
<!-- quarkus -->
<camel-quarkus-version>2.8.0</camel-quarkus-version>
- <graalvm-version>22.0.0</graalvm-version>
<quarkus-version>2.8.0.Final</quarkus-version>
+ <quarkus-native-builder-image>quay.io/quarkus/ubi-quarkus-native-image:22.0.0-java11</quarkus-native-builder-image>
<!-- camel-k -->
<groovy-version>3.0.10</groovy-version>
@@ -977,7 +977,7 @@
<properties>
<quarkus.native.container-build>true</quarkus.native.container-build>
<quarkus.native.container-runtime>docker</quarkus.native.container-runtime>
- <quarkus.native.builder-image>quay.io/quarkus/ubi-quarkus-native-image:${graalvm-version}-java11</quarkus.native.builder-image>
+ <quarkus.native.builder-image>${quarkus-native-builder-image}</quarkus.native.builder-image>
</properties>
</profile>
<profile>
@@ -990,7 +990,7 @@
<properties>
<quarkus.native.container-build>true</quarkus.native.container-build>
<quarkus.native.container-runtime>podman</quarkus.native.container-runtime>
- <quarkus.native.builder-image>quay.io/quarkus/ubi-quarkus-native-image:${graalvm-version}-java11</quarkus.native.builder-image>
+ <quarkus.native.builder-image>${quarkus-native-builder-image}</quarkus.native.builder-image>
</properties>
</profile>
</profiles>
diff --git a/scripts/bump.sh b/scripts/bump.sh
index ac0c4c83..57e1d170 100755
--- a/scripts/bump.sh
+++ b/scripts/bump.sh
@@ -12,7 +12,6 @@ Usage: ./script/bump.sh [options]
--camel Bump Camel version
--camel-quarkus Bump Camel-Quarkus version
--quarkus Bump Quarkus version
---graalvm Bump GraalVM version
--help This help message
Example: ./script/bump.sh --version 1.14.0-SNAPSHOT --camel 3.16.0
@@ -24,7 +23,6 @@ VERSION=""
CAMEL=""
CAMELQUARKUS=""
QUARKUS=""
-GRAALVM=""
main() {
parse_args $@
@@ -49,11 +47,6 @@ main() {
mvn versions:set-property -Dproperty="quarkus-version" -DnewVersion="$QUARKUS"
echo "Quarkus platform version set to $QUARKUS"
fi
-
- if [[ ! -z "$GRAALVM" ]]; then
- mvn versions:set-property -Dproperty="graalvm-version" -DnewVersion="$GRAALVM"
- echo "GraalVM version set to $GRAALVM"
- fi
}
parse_args(){
@@ -81,10 +74,6 @@ parse_args(){
shift
QUARKUS="$1"
;;
- --graalvm)
- shift
- GRAALVM="$1"
- ;;
*)
echo "❗ unknown argument: $1"
display_usage