You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by nf...@apache.org on 2020/07/21 12:28:51 UTC
[camel-k] 02/03: Upgrade to staged Camel K runtime 1.4.1 (Camel
3.4.0, Camel-Quarkus 1.0.0-CR3, Quarkus 1.6.0.Final)
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 7a72889bc4b5055722f10bbbf6dffe6a2395372b
Author: Nicola Ferraro <ni...@gmail.com>
AuthorDate: Tue Jul 21 11:45:34 2020 +0200
Upgrade to staged Camel K runtime 1.4.1 (Camel 3.4.0,Camel-Quarkus 1.0.0-CR3, Quarkus 1.6.0.Final)
---
...1.4.0-main.yaml => camel-catalog-1.4.1-main.yaml} | 6 +++---
...quarkus.yaml => camel-catalog-1.4.1-quarkus.yaml} | 6 +++---
deploy/resources.go | 20 ++++++++++----------
pkg/util/defaults/defaults.go | 2 +-
script/Makefile | 4 ++--
5 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/deploy/camel-catalog-1.4.0-main.yaml b/deploy/camel-catalog-1.4.1-main.yaml
similarity index 99%
rename from deploy/camel-catalog-1.4.0-main.yaml
rename to deploy/camel-catalog-1.4.1-main.yaml
index 3a45448..c7f9361 100644
--- a/deploy/camel-catalog-1.4.0-main.yaml
+++ b/deploy/camel-catalog-1.4.1-main.yaml
@@ -18,16 +18,16 @@
apiVersion: camel.apache.org/v1
kind: CamelCatalog
metadata:
- name: camel-catalog-1.4.0-main
+ name: camel-catalog-1.4.1-main
labels:
app: camel-k
camel.apache.org/catalog.version: 3.4.0
camel.apache.org/catalog.loader.version: 3.4.0
- camel.apache.org/runtime.version: 1.4.0
+ camel.apache.org/runtime.version: 1.4.1
camel.apache.org/runtime.provider: main
spec:
runtime:
- version: 1.4.0
+ version: 1.4.1
provider: main
applicationClass: org.apache.camel.k.main.Application
metadata:
diff --git a/deploy/camel-catalog-1.4.0-quarkus.yaml b/deploy/camel-catalog-1.4.1-quarkus.yaml
similarity index 99%
rename from deploy/camel-catalog-1.4.0-quarkus.yaml
rename to deploy/camel-catalog-1.4.1-quarkus.yaml
index 973c68c..e8cde54 100644
--- a/deploy/camel-catalog-1.4.0-quarkus.yaml
+++ b/deploy/camel-catalog-1.4.1-quarkus.yaml
@@ -18,16 +18,16 @@
apiVersion: camel.apache.org/v1
kind: CamelCatalog
metadata:
- name: camel-catalog-1.4.0-quarkus
+ name: camel-catalog-1.4.1-quarkus
labels:
app: camel-k
camel.apache.org/catalog.version: 3.4.0
camel.apache.org/catalog.loader.version: 3.4.0
- camel.apache.org/runtime.version: 1.4.0
+ camel.apache.org/runtime.version: 1.4.1
camel.apache.org/runtime.provider: quarkus
spec:
runtime:
- version: 1.4.0
+ version: 1.4.1
provider: quarkus
applicationClass: io.quarkus.runner.GeneratedMain
metadata:
diff --git a/deploy/resources.go b/deploy/resources.go
index fb0d9a2..c43e536 100644
--- a/deploy/resources.go
+++ b/deploy/resources.go
@@ -88,19 +88,19 @@ var assets = func() http.FileSystem {
compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x53\x3d\x6f\xdb\x30\x14\xdc\xf9\x2b\x0e\xd6\x92\x00\xfe\x68\x3b\xba\x93\x9a\xd8\xa8\xd0\xc0\x06\x22\xa7\x41\xc6\x67\xf1\x59\x7a\x08\x45\xaa\x24\x15\xc5\xff\xbe\xa0\x6c\x37\x09\xba\x86\x9b\xa0\xd3\x7d\xf0\x4e\x19\x66\x9f\x77\x54\x86\x3b\xa9\xd8\x06\xd6\x88\x0e\xb1\x61\xe4\x1d\x55\x0d\xa3\x74\x87\x38\x90\x67\xac\x5d\x6f\x35\x45\x71\x16\x57\x79\xb9\xbe\x46\x6f\x35\x7b\x38\xcb\x70\x1e\xad\xf3\xac\x32\x54\xce\x46\x2f\x [...]
},
- "/camel-catalog-1.3.0-main.yaml": &vfsgen۰CompressedFileInfo{
- name: "camel-catalog-1.3.0-main.yaml",
+ "/camel-catalog-1.4.1-main.yaml": &vfsgen۰CompressedFileInfo{
+ name: "camel-catalog-1.4.1-main.yaml",
modTime: time.Time{},
- uncompressedSize: 88654,
+ uncompressedSize: 89151,
- compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xcc\x7d\x5b\x77\xdb\x38\xb2\xee\x7b\x7e\x05\xd7\xe4\x65\xef\x75\x46\x35\xdd\xce\xcc\xf4\xd9\x7d\x9e\x6c\x39\x4e\xec\xd8\x8e\x3b\xf2\x24\x99\x79\xe9\x05\x91\x90\x04\x89\x24\x68\x00\xba\xd8\xbf\xfe\x2c\x5c\x78\x15\x04\x89\x84\xe1\xb5\xfd\x60\x52\x44\xd5\x57\x2c\x82\xc4\xa5\x50\xa8\x7a\x1f\x8d\x5e\xef\xef\xdd\xfb\xe8\x96\xc4\x38\xe7\x38\x89\x04\x8d\xc4\x02\x47\xe7\x05\x8a\x17\x38\x9a\xd0\x99\xd8\x22\x86\xa3\x2b\xba\xce\x [...]
+ compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xcc\xbd\x5b\x77\xdb\x38\xb2\x2f\xfe\x9e\x4f\xc1\x35\x79\xd9\x7b\xfd\x47\x35\xdd\xce\xec\xe9\xff\xee\xf3\x64\xcb\x71\x62\xc7\x76\xdc\x91\x27\xc9\xf4\x4b\x2f\x88\x84\x24\x48\x24\x41\x03\xd0\xc5\xfe\xf4\x67\xe1\xc2\xab\x20\x48\x24\x0c\xaf\xe3\x07\x93\x22\xaa\x7e\xc5\x22\x48\x5c\x0a\x85\xaa\xf7\xd1\xe8\xf5\xfe\xde\xbd\x8f\x6e\x49\x8c\x73\x8e\x93\x48\xd0\x48\x2c\x70\x74\x5e\xa0\x78\x81\xa3\x09\x9d\x89\x2d\x62\x38\xba\xa2\x [...]
},
- "/camel-catalog-1.3.0-quarkus.yaml": &vfsgen۰CompressedFileInfo{
- name: "camel-catalog-1.3.0-quarkus.yaml",
+ "/camel-catalog-1.4.1-quarkus.yaml": &vfsgen۰CompressedFileInfo{
+ name: "camel-catalog-1.4.1-quarkus.yaml",
modTime: time.Time{},
- uncompressedSize: 47442,
+ uncompressedSize: 49007,
- compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\x5d\x4f\x77\xdc\xa8\xb2\xdf\xfb\x53\x70\xe2\xcd\xbd\xe7\x8c\x98\xb9\xce\x9b\x59\xe4\xad\x6c\x27\xce\xd8\x89\x1d\x27\xed\x3b\xc9\xcc\x26\x87\x96\xe8\x6e\xdc\x12\xc8\x80\xba\xdb\xfe\xf4\xef\x80\xd0\xbf\xb6\x5c\xfa\x63\xd4\xcf\x0b\x4b\x2d\x8a\x5f\x41\x81\xa0\x54\x55\xc0\x31\x0a\xfc\xfd\x1d\x1d\xa3\xcf\x2c\xa4\x5c\xd1\x08\x69\x81\xf4\x8a\xa2\xd3\x94\x84\x2b\x8a\x66\x62\xa1\xb7\x44\x52\x74\x21\x32\x1e\x11\xcd\x04\x47\x [...]
+ compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\x5d\xdf\x77\xdb\xa8\xf2\x7f\xcf\x5f\xa1\xd3\xbc\xdc\x7b\xce\x8a\xdd\x4d\xf7\xee\x43\xbf\x4f\x49\xda\x74\x93\x36\x69\x1a\xe7\xb6\xdd\x7d\xe9\xc1\x12\xb6\x89\x25\x50\x00\xd9\x4e\xfe\xfa\xef\x01\x21\x4b\xb2\x95\xd1\x8f\x80\x6f\x1e\x22\x59\x0c\x9f\x81\x01\xc1\x68\x98\x81\xe3\x20\x74\xf7\x77\x74\x1c\x7c\xa6\x11\x61\x92\xc4\x81\xe2\x81\x5a\x90\xe0\x34\xc3\xd1\x82\x04\x13\x3e\x53\x6b\x2c\x48\x70\xc1\x73\x16\x63\x45\x39\x [...]
},
"/cr-example.yaml": &vfsgen۰CompressedFileInfo{
name: "cr-example.yaml",
@@ -372,8 +372,8 @@ var assets = func() http.FileSystem {
fs["/builder-role-kubernetes.yaml"].(os.FileInfo),
fs["/builder-role-openshift.yaml"].(os.FileInfo),
fs["/builder-service-account.yaml"].(os.FileInfo),
- fs["/camel-catalog-1.3.0-main.yaml"].(os.FileInfo),
- fs["/camel-catalog-1.3.0-quarkus.yaml"].(os.FileInfo),
+ fs["/camel-catalog-1.4.1-main.yaml"].(os.FileInfo),
+ fs["/camel-catalog-1.4.1-quarkus.yaml"].(os.FileInfo),
fs["/cr-example.yaml"].(os.FileInfo),
fs["/crd-build.yaml"].(os.FileInfo),
fs["/crd-camel-catalog.yaml"].(os.FileInfo),
diff --git a/pkg/util/defaults/defaults.go b/pkg/util/defaults/defaults.go
index e0135d9..a2b2a84 100644
--- a/pkg/util/defaults/defaults.go
+++ b/pkg/util/defaults/defaults.go
@@ -26,7 +26,7 @@ const (
Version = "1.1.0-SNAPSHOT"
// DefaultRuntimeVersion --
- DefaultRuntimeVersion = "1.4.0"
+ DefaultRuntimeVersion = "1.4.1"
// BuildahVersion --
BuildahVersion = "1.14.0"
diff --git a/script/Makefile b/script/Makefile
index 4352f09..7e42d29 100644
--- a/script/Makefile
+++ b/script/Makefile
@@ -16,7 +16,7 @@
VERSIONFILE := pkg/util/defaults/defaults.go
VERSION := 1.1.0-SNAPSHOT
LAST_RELEASED_VERSION := 1.0.0
-RUNTIME_VERSION := 1.4.0
+RUNTIME_VERSION := 1.4.1
BUILDAH_VERSION := 1.14.0
KANIKO_VERSION := 0.17.1
BASE_IMAGE := adoptopenjdk/openjdk11:slim
@@ -30,7 +30,7 @@ LINT_DEADLINE := 10m
# Used to push pre-release artifacts
STAGING_IMAGE_NAME := docker.io/camelk/camel-k
-STAGING_RUNTIME_REPO := https://repository.apache.org/content/repositories/orgapachecamel-1228
+STAGING_RUNTIME_REPO := https://repository.apache.org/content/repositories/orgapachecamel-1235
# When packaging artifacts into the docker image, you can "copy" them from local maven
# or "download" them from Apache Snapshots and Maven Central