This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/main by this push:
new 2e2eca550 chore(runtime): default to latest LTS (#5009)
2e2eca550 is described below
commit 2e2eca550fe4a82c6a622b5d9bc72b403ba5a290
Author: Pasquale Congiusti <[email protected]>
AuthorDate: Fri Dec 22 15:57:16 2023 +0100
chore(runtime): default to latest LTS (#5009)
---
docs/antora.yml | 16 ++++++-------
pkg/util/defaults/defaults.go | 2 +-
...catalog-3.6.0.yaml => camel-catalog-3.2.3.yaml} | 27 +++++++---------------
script/Makefile | 4 ++--
4 files changed, 19 insertions(+), 30 deletions(-)
diff --git a/docs/antora.yml b/docs/antora.yml
index 8e368cf8e..03dfef953 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -30,15 +30,15 @@ asciidoc:
attributes:
requires: "'util=camel-website-util,ck=xref:js/ck.js'"
prerelease: true
- camel-kamelets-version: '4.2.0'
- camel-kamelets-docs-version: 4.2.x
- camel-k-runtime-version: 3.6.0
+ camel-kamelets-version: '4.0.1'
+ camel-kamelets-docs-version: 4.0.x
+ camel-k-runtime-version: 3.2.3
camel-api-versions: camel.apache.org/v1 camel.apache.org/v1alpha1 # from
Makefile BUNDLE_CAMEL_APIS
- camel-version: 4.2.0
- camel-docs-version: 4.2.x
- camel-quarkus-version: 3.6.0
- camel-quarkus-docs-version: 3.6.x
- quarkus-version: 3.6.0
+ camel-version: 4.0.3
+ camel-docs-version: 4.0.x
+ camel-quarkus-version: 3.2.3
+ camel-quarkus-docs-version: 3.2.x
+ quarkus-version: 3.2.9.Final
buildah-version: 1.30.0
kaniko-version: 1.9.1
kustomize-version: 4.5.4
diff --git a/pkg/util/defaults/defaults.go b/pkg/util/defaults/defaults.go
index cbc823e01..b5c6d2001 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.6.0"
+ DefaultRuntimeVersion = "3.2.3"
// BuildahVersion --
BuildahVersion = "1.30.0"
diff --git a/resources/camel-catalog-3.6.0.yaml
b/resources/camel-catalog-3.2.3.yaml
similarity index 99%
rename from resources/camel-catalog-3.6.0.yaml
rename to resources/camel-catalog-3.2.3.yaml
index 6f6b5ce5b..0c9bbb903 100644
--- a/resources/camel-catalog-3.6.0.yaml
+++ b/resources/camel-catalog-3.2.3.yaml
@@ -18,24 +18,22 @@
apiVersion: camel.apache.org/v1
kind: CamelCatalog
metadata:
- name: camel-catalog-3.6.0
+ name: camel-catalog-3.2.3
labels:
app: camel-k
- 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
+ camel.apache.org/catalog.loader.version: 4.0.3
+ camel.apache.org/catalog.version: 4.0.3
+ camel.apache.org/runtime.version: 3.2.3
spec:
runtime:
- version: 3.6.0
+ version: 3.2.3
provider: quarkus
applicationClass: io.quarkus.bootstrap.runner.QuarkusEntryPoint
metadata:
- 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
+ camel-quarkus.version: 3.2.3
+ camel.version: 4.0.3
quarkus.native-builder-image:
quay.io/quarkus/ubi-quarkus-mandrel-builder-image:23.0-jdk-17
- quarkus.version: 3.6.0
+ quarkus.version: 3.2.9.Final
dependencies:
- groupId: org.apache.camel.k
artifactId: camel-k-runtime
@@ -2404,15 +2402,6 @@ 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 634b03152..5e41283e2 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.6.0
+DEFAULT_RUNTIME_VERSION := 3.2.3
BUILDAH_VERSION := 1.30.0
KANIKO_VERSION := 1.9.1
CONTROLLER_GEN_VERSION := v0.6.1
@@ -86,7 +86,7 @@ STAGING_RUNTIME_REPO :=
INSTALL_DEFAULT_KAMELETS ?= true
KAMELET_CATALOG_REPO := https://github.com/apache/camel-kamelets.git
# Make sure to use a released tag or empty if you want to get the latest
development bits
-KAMELET_CATALOG_REPO_TAG := v4.2.0
+KAMELET_CATALOG_REPO_TAG := v4.0.1
# When performing integration tests, it is not necessary to always execute
build, especially
# in e2e tests when lots of tests are being executed sequentially & the build
has already taken place.