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.git
commit 7448c0a0dfdfbbe2b2748cbc3e1e34fa12d89f73
Author: Pasquale Congiusti <pasquale.congiu...@gmail.com>
AuthorDate: Fri Dec 15 11:13:34 2023 +0100
chore(ci): bump default runtime to 3.6.0
---
.../bases/camel-k.clusterserviceversion.yaml | 2 +-
e2e/builder/build_test.go | 2 +-
pkg/util/defaults/defaults.go | 2 +-
...catalog-3.2.0.yaml => camel-catalog-3.6.0.yaml} | 27 +++++++++++++++-------
script/Makefile | 5 ++--
5 files changed, 25 insertions(+), 13 deletions(-)
diff --git a/config/manifests/bases/camel-k.clusterserviceversion.yaml
b/config/manifests/bases/camel-k.clusterserviceversion.yaml
index db02c16a4..9a63dfe93 100644
--- a/config/manifests/bases/camel-k.clusterserviceversion.yaml
+++ b/config/manifests/bases/camel-k.clusterserviceversion.yaml
@@ -23,7 +23,7 @@ metadata:
categories: Integration & Delivery
certified: "false"
containerImage: docker.io/apache/camel-k:2.2.0-SNAPSHOT
- createdAt: 2023-10-24T07:48:33Z
+ createdAt: 2023-12-15T10:08:46Z
description: Apache Camel K is a lightweight integration platform, born on
Kubernetes,
with serverless superpowers.
operators.operatorframework.io/builder: operator-sdk-v1.16.0
diff --git a/e2e/builder/build_test.go b/e2e/builder/build_test.go
index f449f0ef2..0dbc54d81 100644
--- a/e2e/builder/build_test.go
+++ b/e2e/builder/build_test.go
@@ -305,7 +305,7 @@ func TestKitKnativeFullBuild(t *testing.T) {
}
func TestKitTimerToLogFullNativeBuild(t *testing.T) {
- doKitFullBuild(t, "timer-to-log", "15m0s", TestTimeoutLong*3,
kitOptions{
+ doKitFullBuild(t, "timer-to-log", "30m0s", TestTimeoutLong*3,
kitOptions{
dependencies: []string{
"camel:timer", "camel:log",
},
diff --git a/pkg/util/defaults/defaults.go b/pkg/util/defaults/defaults.go
index 7adfd5e57..cbc823e01 100644
--- a/pkg/util/defaults/defaults.go
+++ b/pkg/util/defaults/defaults.go
@@ -26,7 +26,7 @@ const (
Version = "2.2.0-SNAPSHOT"
// DefaultRuntimeVersion --
- DefaultRuntimeVersion = "3.2.0"
+ DefaultRuntimeVersion = "3.6.0"
// BuildahVersion --
BuildahVersion = "1.30.0"
diff --git a/resources/camel-catalog-3.2.0.yaml
b/resources/camel-catalog-3.6.0.yaml
similarity index 99%
rename from resources/camel-catalog-3.2.0.yaml
rename to resources/camel-catalog-3.6.0.yaml
index 6841a342e..6f6b5ce5b 100644
--- a/resources/camel-catalog-3.2.0.yaml
+++ b/resources/camel-catalog-3.6.0.yaml
@@ -18,22 +18,24 @@
apiVersion: camel.apache.org/v1
kind: CamelCatalog
metadata:
- name: camel-catalog-3.2.0
+ name: camel-catalog-3.6.0
labels:
app: camel-k
- camel.apache.org/catalog.loader.version: 4.0.0
- camel.apache.org/catalog.version: 4.0.0
- camel.apache.org/runtime.version: 3.2.0
+ camel.apache.org/catalog.loader.version: 4.2.0
+ camel.apache.org/catalog.version: 4.2.0
+ camel.apache.org/runtime.version: 3.6.0
spec:
runtime:
- version: 3.2.0
+ version: 3.6.0
provider: quarkus
applicationClass: io.quarkus.bootstrap.runner.QuarkusEntryPoint
metadata:
- camel-quarkus.version: 3.2.0
- camel.version: 4.0.0
+ camel-quarkus.version: 3.6.0
+ camel.version: 4.2.0
+ jib.layer-filter-extension-maven.version: 0.3.0
+ jib.maven-plugin.version: 3.4.0
quarkus.native-builder-image:
quay.io/quarkus/ubi-quarkus-mandrel-builder-image:23.0-jdk-17
- quarkus.version: 3.2.6.Final
+ quarkus.version: 3.6.0
dependencies:
- groupId: org.apache.camel.k
artifactId: camel-k-runtime
@@ -2402,6 +2404,15 @@ spec:
passive: false
javaTypes:
- org.apache.camel.component.springrabbit.SpringRabbitMQComponent
+ camel-quarkus-spring-redis:
+ groupId: org.apache.camel.quarkus
+ artifactId: camel-quarkus-spring-redis
+ schemes:
+ - id: spring-redis
+ http: false
+ passive: false
+ javaTypes:
+ - org.apache.camel.component.redis.RedisComponent
camel-quarkus-sql:
groupId: org.apache.camel.quarkus
artifactId: camel-quarkus-sql
diff --git a/script/Makefile b/script/Makefile
index 62b6292c6..c0a25a37f 100644
--- a/script/Makefile
+++ b/script/Makefile
@@ -23,7 +23,7 @@ VERSIONFILE := pkg/util/defaults/defaults.go
VERSION ?= 2.2.0-SNAPSHOT
LAST_RELEASED_IMAGE_NAME := camel-k-operator
LAST_RELEASED_VERSION ?= 2.1.0
-DEFAULT_RUNTIME_VERSION := 3.2.0
+DEFAULT_RUNTIME_VERSION := 3.6.0
BUILDAH_VERSION := 1.30.0
KANIKO_VERSION := 1.9.1
CONTROLLER_GEN_VERSION := v0.6.1
@@ -153,7 +153,8 @@ update-default-camel:
bump-replace:
@# Bump version and replace with the variables provided by the user
@sed -i 's/^VERSION ?= .*$//VERSION ?= $(VERSION)/' ./script/Makefile
- @mvn -f java/pom.xml versions:set -DgenerateBackupPoms=false
-DnewVersion=$(VERSION)
+ @mvn -f java/crds/pom.xml versions:set -DgenerateBackupPoms=false
-DnewVersion=$(VERSION)
+ @mvn -f java/maven-logging/pom.xml versions:set
-DgenerateBackupPoms=false -DnewVersion=$(VERSION)
@sed -i 's/^LAST_RELEASED_VERSION ?= .*$//LAST_RELEASED_VERSION ?=
$(LAST_RELEASED_VERSION)/' ./script/Makefile
@sed -i 's/^STAGING_RUNTIME_REPO :=.*$//STAGING_RUNTIME_REPO :=/'
./script/Makefile
