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 c0ca1fb1 feat(deps): split quarkus-camel-bom
c0ca1fb1 is described below
commit c0ca1fb1e8f077d6464d87d72396e1d95e680a57
Author: Pasquale Congiusti <pasquale.congiu...@gmail.com>
AuthorDate: Thu Dec 22 10:47:21 2022 +0100
feat(deps): split quarkus-camel-bom
Have a separate property to control quarkus-camel-bom in case of CVE or any
other fix to apply
---
pom.xml | 18 ++++++++++--------
scripts/bump.sh | 15 +++++++++++++--
support/camel-k-runtime-bom/pom.xml | 8 +++++---
3 files changed, 28 insertions(+), 13 deletions(-)
diff --git a/pom.xml b/pom.xml
index 1a76e724..b17ba4d7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,6 +44,8 @@
<camel-quarkus-version>2.14.0</camel-quarkus-version>
<quarkus-version>2.14.0.Final</quarkus-version>
<quarkus-platform-version>2.14.0.Final</quarkus-platform-version>
+ <!-- The quarkus camel bom may differ from quarkus platfom -->
+ <quarkus-camel-bom-version>2.14.0.Final</quarkus-camel-bom-version>
<quarkus-native-builder-image>quay.io/quarkus/ubi-quarkus-native-image:22.3.0-java11</quarkus-native-builder-image>
<!-- camel-k-runtime specific -->
@@ -135,7 +137,7 @@
<rules>
<requireMavenVersion>
<version>${maven-version}</version>
- </requireMavenVersion>
+ </requireMavenVersion>
</rules>
</configuration>
</execution>
@@ -313,7 +315,7 @@
<property>camel-version</property>
<regex>${project.parent.version}</regex>
<regexMessage>Camel version must be equals to
camel-dependency parent pom version (${project.parent.version})!</regexMessage>
- </requireProperty>
+ </requireProperty>
</rules>
<fail>true</fail>
</configuration>
@@ -392,7 +394,7 @@
</modules>
<dependencyManagement>
- <dependencies>
+ <dependencies>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-bom</artifactId>
@@ -402,14 +404,14 @@
</dependency>
<dependency>
<groupId>io.quarkus.platform</groupId>
- <artifactId>quarkus-bom</artifactId>
- <version>${quarkus-platform-version}</version>
+ <artifactId>quarkus-camel-bom</artifactId>
+ <version>${quarkus-camel-bom-version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>io.quarkus.platform</groupId>
- <artifactId>quarkus-camel-bom</artifactId>
+ <artifactId>quarkus-bom</artifactId>
<version>${quarkus-platform-version}</version>
<type>pom</type>
<scope>import</scope>
@@ -468,13 +470,13 @@
<artifactId>camel-k-master-deployment</artifactId>
<version>${project.version}</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.camel.k</groupId>
<artifactId>camel-k-knative-impl</artifactId>
<version>${project.version}</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.camel.k</groupId>
<artifactId>camel-k-cron-impl</artifactId>
diff --git a/scripts/bump.sh b/scripts/bump.sh
index 30610c9b..6ad8e822 100755
--- a/scripts/bump.sh
+++ b/scripts/bump.sh
@@ -13,6 +13,7 @@ Usage: ./script/bump.sh [options]
--camel-quarkus Bump Camel-Quarkus version
--quarkus Bump Quarkus version
--quarkus-platform Bump Quarkus platform version (could differ from
quarkus core)
+--quarkus-camel-bom Bump Quarkus Camel BOM version (could differ from
quarkus platform)
--help This help message
Example: ./script/bump.sh --version 1.14.0-SNAPSHOT --camel 3.16.0
@@ -25,6 +26,7 @@ CAMEL=""
CAMELQUARKUS=""
QUARKUS=""
QUARKUSPLATFORM=""
+QUARKUSCAMELBOM=""
main() {
parse_args $@
@@ -51,10 +53,15 @@ main() {
echo "Quarkus version set to $QUARKUS"
fi
- if [[ ! -z "$QUARKUSPLATFORM" ]]; then
+ if [[ ! -z "$QUARKUSPLATFORM" ]]; then
mvn versions:set-property -Dproperty="quarkus-platform-version"
-DnewVersion="$QUARKUSPLATFORM" -DgenerateBackupPoms=false
echo "Quarkus platform version set to $QUARKUSPLATFORM"
fi
+
+ if [[ ! -z "$QUARKUSCAMELBOM" ]]; then
+ mvn versions:set-property -Dproperty="quarkus-camel-bom-version"
-DnewVersion="$QUARKUSCAMELBOM" -DgenerateBackupPoms=false
+ echo "Quarkus Camel BOM version set to $QUARKUSCAMELBOM"
+ fi
}
parse_args(){
@@ -85,7 +92,11 @@ parse_args(){
--quarkus-platform)
shift
QUARKUSPLATFORM="$1"
- ;;
+ ;;
+ --quarkus-camel-bom)
+ shift
+ QUARKUSCAMELBOM="$1"
+ ;;
*)
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 61e847a2..3a411cb5 100644
--- a/support/camel-k-runtime-bom/pom.xml
+++ b/support/camel-k-runtime-bom/pom.xml
@@ -39,6 +39,8 @@
<maven-enforcer-plugin-version>3.1.0</maven-enforcer-plugin-version>
<maven-version>3.6.3</maven-version>
<quarkus-platform-version>2.14.0.Final</quarkus-platform-version>
+ <!-- The quarkus camel bom may differ from quarkus platfom -->
+ <quarkus-camel-bom-version>2.14.0.Final</quarkus-camel-bom-version>
</properties>
<developers>
@@ -97,14 +99,14 @@
<dependencies>
<dependency>
<groupId>io.quarkus.platform</groupId>
- <artifactId>quarkus-bom</artifactId>
- <version>${quarkus-platform-version}</version>
+ <artifactId>quarkus-camel-bom</artifactId>
+ <version>${quarkus-camel-bom-version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>io.quarkus.platform</groupId>
- <artifactId>quarkus-camel-bom</artifactId>
+ <artifactId>quarkus-bom</artifactId>
<version>${quarkus-platform-version}</version>
<type>pom</type>
<scope>import</scope>
