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
commit 3433a82e57faa6313a5b1c2bf26832a1f7d2404e Author: Pasquale Congiusti <[email protected]> AuthorDate: Fri Sep 1 11:21:01 2023 +0200 feat(dependencies): bump to 3.2.0 --- README.adoc | 4 ++-- pom.xml | 10 +++++----- scripts/sync_cq.sh | 15 ++++++++++----- support/camel-k-runtime-bom/pom.xml | 4 ++-- 4 files changed, 19 insertions(+), 14 deletions(-) diff --git a/README.adoc b/README.adoc index 14c9bbdd..e41bfaac 100644 --- a/README.adoc +++ b/README.adoc @@ -10,9 +10,9 @@ This repository contains the Apache Camel-K Runtime bits used by the https://git == How to bump the main dependencies -In order to simplify the maintenance, you can use a script in `/script/` directory which take care of bumping the versions for the project, aligning it with Camel Quarkus version: `./script/bump.sh --camel-quarkus 2.16.0` +In order to simplify the maintenance, you can use a script in `/script/` directory which take care of bumping the versions for the project, aligning it with Camel Quarkus version: `./scripts/bump.sh --camel-quarkus 2.16.0`. When starting a new major or minor release, you'll also need to align the dependencies expected by Camel Quarkus running `./scripts/sync_cq.sh --skip-version-check`. -The project has an automatic action (`./script/sync_cq.sh`) running every night by Github Actions which is in charge to align the set of dependencies required by Camel Quarkus, according to the release. +The project has an automatic action (`./scripts/sync_cq.sh`) running every night by Github Actions which is in charge to align the set of dependencies required by Camel Quarkus, according to the release. This is useful to keep up to date each patch release. == Instructions for local debugging diff --git a/pom.xml b/pom.xml index a66c4134..54cf2f29 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.camel</groupId> <artifactId>camel-dependencies</artifactId> - <version>4.0.0-RC2</version> + <version>4.0.0</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -40,13 +40,13 @@ <maven.compiler.target>17</maven.compiler.target> <maven-version>3.8.6</maven-version> - <camel-version>4.0.0-RC2</camel-version> + <camel-version>4.0.0</camel-version> <!-- quarkus --> - <camel-quarkus-version>3.0.0-RC2</camel-quarkus-version> - <quarkus-version>3.2.2.Final</quarkus-version> + <camel-quarkus-version>3.2.0</camel-quarkus-version> + <quarkus-version>3.2.5.Final</quarkus-version> <quarkus-platform-group>io.quarkus.platform</quarkus-platform-group> - <quarkus-platform-version>3.2.2.Final</quarkus-platform-version> + <quarkus-platform-version>3.2.5.Final</quarkus-platform-version> <quarkus-native-builder-image>quay.io/quarkus/ubi-quarkus-mandrel-builder-image:23.0-jdk-17</quarkus-native-builder-image> <!-- camel-k-runtime specific --> diff --git a/scripts/sync_cq.sh b/scripts/sync_cq.sh index 88505fcb..5540f551 100755 --- a/scripts/sync_cq.sh +++ b/scripts/sync_cq.sh @@ -2,20 +2,22 @@ set -e -SEMVER="^([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)(-RC[[:digit:]]+)(-SNAPSHOT)$" +SEMVER="^([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)(-RC[[:digit:]]+|-SNAPSHOT)$" DRY_RUN="false" +SKIP_VERSION_CHECK="false" display_usage() { cat <<EOF -Synch with the latest released version of Camel Quarkus +Synch with the latest released version of Camel Quarkus. Usage: ./script/sync_cq.sh --dry-run Show the changes without applying them to the project --help This help message +--skip-version-check Use this parameter when starting a new minor or major upgrade from a local machine. -Example: ./script/sync_cq.sh --dry-run +Example: ./script/sync_cq.sh --skip-version-check --dry-run EOF } @@ -25,7 +27,7 @@ main() { VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout) if ! [[ $VERSION =~ $SEMVER ]]; then - echo "❗ Version must match major.minor.patch(-RCX)(-SNAPSHOT) semantic version: $1" + echo "❗ Version must match major.minor.patch[-RC<X>|[-SNAPSHOT] semantic version: $VERSION" exit 1 fi VERSION_FULL="${BASH_REMATCH[1]}.${BASH_REMATCH[2]}.${BASH_REMATCH[3]}" @@ -35,7 +37,7 @@ main() { git clone https://github.com/apache/camel-quarkus.git pushd camel-quarkus CQ_VERSION=$(git tag | grep $VERSION_MM | sort | tail -n 1) - if [ "$CQ_VERSION" == "$VERSION_FULL" ]; then + if [ "$SKIP_VERSION_CHECK" == "false" ] && [ "$CQ_VERSION" == "$VERSION_FULL" ]; then echo "INFO: there is no new version released, bye!" exit 0 fi @@ -83,6 +85,9 @@ parse_args(){ --dry-run) DRY_RUN="true" ;; + --skip-version-check) + SKIP_VERSION_CHECK="true" + ;; *) echo "❗ unknown argument: $1" display_usage diff --git a/support/camel-k-runtime-bom/pom.xml b/support/camel-k-runtime-bom/pom.xml index 7d39f52f..a443ede3 100644 --- a/support/camel-k-runtime-bom/pom.xml +++ b/support/camel-k-runtime-bom/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache</groupId> <artifactId>apache</artifactId> - <version>29</version> + <version>4</version> <relativePath /> </parent> @@ -39,7 +39,7 @@ <maven-enforcer-plugin-version>3.3.0</maven-enforcer-plugin-version> <maven-version>3.8.6</maven-version> <quarkus-platform-group>io.quarkus.platform</quarkus-platform-group> - <quarkus-platform-version>3.2.2.Final</quarkus-platform-version> + <quarkus-platform-version>3.2.5.Final</quarkus-platform-version> </properties> <developers>
