You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ts...@apache.org on 2021/10/14 11:31:45 UTC
[camel-k] branch main updated: chore(runtime): update to Camel K
Runtime 1.10.0-SNAPSHOT
This is an automated email from the ASF dual-hosted git repository.
tsato 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 94ee10d chore(runtime): update to Camel K Runtime 1.10.0-SNAPSHOT
94ee10d is described below
commit 94ee10dc93aa63e2be05485fdd406f55f0e6fe70
Author: Tadayoshi Sato <sa...@gmail.com>
AuthorDate: Thu Oct 14 14:28:42 2021 +0900
chore(runtime): update to Camel K Runtime 1.10.0-SNAPSHOT
---
pkg/resources/resources.go | 10 ++++-----
pkg/util/defaults/defaults.go | 2 +-
...9.0.yaml => camel-catalog-1.10.0-SNAPSHOT.yaml} | 24 ++++++++++++++--------
script/Makefile | 2 +-
4 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/pkg/resources/resources.go b/pkg/resources/resources.go
index d851ff8..bf3e684 100644
--- a/pkg/resources/resources.go
+++ b/pkg/resources/resources.go
@@ -529,12 +529,12 @@ var assets = func() http.FileSystem {
compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x53\x4d\x8f\xdb\x36\x14\xbc\xf3\x57\x0c\xac\x4b\x02\xac\xe5\xb6\xa7\xc2\x3d\xb9\x9b\xdd\x56\x68\x60\x03\x2b\xa7\x41\x8e\xcf\xd4\xb3\xf4\x60\x8a\x4f\x25\xa9\x55\xb6\xbf\xbe\xa0\x2c\x67\x37\xe8\x35\xbc\xf8\x43\xa3\x79\x33\x6f\x86\x05\xd6\x3f\xee\x98\x02\x1f\xc5\xb2\x8f\xdc\x20\x29\x52\xc7\xd8\x0d\x64\x3b\x46\xad\xe7\x34\x51\x60\x3c\xea\xe8\x1b\x4a\xa2\x1e\xef\x76\xf5\xe3\x7b\x8c\xbe\xe1\x00\xf5\x0c\x0d\xe8\x35\xb0\x [...]
},
- "/camel-catalog-1.9.0.yaml": &vfsgen۰CompressedFileInfo{
- name: "camel-catalog-1.9.0.yaml",
+ "/camel-catalog-1.10.0-SNAPSHOT.yaml": &vfsgen۰CompressedFileInfo{
+ name: "camel-catalog-1.10.0-SNAPSHOT.yaml",
modTime: time.Time{},
- uncompressedSize: 89676,
+ uncompressedSize: 89936,
- compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\x7d\x5b\x77\xdb\x38\xb6\xe6\x7b\x7e\x05\x57\xe5\xe5\x9c\x35\x2d\x74\x55\xaa\xe7\xd4\x4c\xcd\x93\x23\xc7\x89\x1d\xcb\x71\x22\x77\x92\xee\x97\x5a\x10\x09\x49\xb0\x48\x82\x06\x40\x59\xce\xaf\x9f\x05\x10\xbc\x4a\xd9\xbc\x78\xc3\xed\x07\x93\x22\x36\xbe\x8d\xef\x03\x08\x12\x17\x02\xaf\x83\x19\xde\xdf\xab\xd7\xc1\x35\x0f\x59\xaa\x58\x14\x68\x11\xe8\x2d\x0b\xce\x32\x1a\x6e\x59\xb0\x14\x6b\xfd\x48\x25\x0b\x2e\x44\x9e\x46\x [...]
+ compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\x7d\x4b\x77\xdb\x38\xb6\xee\x3c\xbf\x82\xab\x32\x39\x67\xdd\x26\xba\x2a\xd5\xf7\xd4\x5d\x75\x47\x8e\x12\x27\x76\x62\xc7\x89\xdc\x49\xba\x27\xb5\x20\x12\x92\x60\x91\x04\x0d\x80\xb2\x9c\x5f\x7f\x16\x40\xf0\x29\x65\xf3\xe1\x0d\xb7\x07\x26\x45\x6c\x7c\x1b\xdf\x07\x10\x24\x1e\x04\x5e\x06\x21\xde\xdf\x8b\x97\xc1\x47\x1e\xb1\x4c\xb1\x38\xd0\x22\xd0\x5b\x16\x9c\xe5\x34\xda\xb2\x60\x29\xd6\xfa\x81\x4a\x16\x9c\x8b\x22\x8b\x [...]
},
"/traits.yaml": &vfsgen۰CompressedFileInfo{
name: "traits.yaml",
@@ -547,7 +547,7 @@ var assets = func() http.FileSystem {
fs["/"].(*vfsgen۰DirInfo).entries = []os.FileInfo{
fs["/addons"].(os.FileInfo),
fs["/builder"].(os.FileInfo),
- fs["/camel-catalog-1.9.0.yaml"].(os.FileInfo),
+ fs["/camel-catalog-1.10.0-SNAPSHOT.yaml"].(os.FileInfo),
fs["/crd"].(os.FileInfo),
fs["/manager"].(os.FileInfo),
fs["/prometheus"].(os.FileInfo),
diff --git a/pkg/util/defaults/defaults.go b/pkg/util/defaults/defaults.go
index 5467852..afe478f 100644
--- a/pkg/util/defaults/defaults.go
+++ b/pkg/util/defaults/defaults.go
@@ -26,7 +26,7 @@ const (
Version = "1.7.0-SNAPSHOT"
// DefaultRuntimeVersion --
- DefaultRuntimeVersion = "1.9.0"
+ DefaultRuntimeVersion = "1.10.0-SNAPSHOT"
// BuildahVersion --
BuildahVersion = "1.14.0"
diff --git a/resources/camel-catalog-1.9.0.yaml b/resources/camel-catalog-1.10.0-SNAPSHOT.yaml
similarity index 99%
rename from resources/camel-catalog-1.9.0.yaml
rename to resources/camel-catalog-1.10.0-SNAPSHOT.yaml
index 29b24ee..343c535 100644
--- a/resources/camel-catalog-1.9.0.yaml
+++ b/resources/camel-catalog-1.10.0-SNAPSHOT.yaml
@@ -18,21 +18,21 @@
apiVersion: camel.apache.org/v1
kind: CamelCatalog
metadata:
- name: camel-catalog-1.9.0
+ name: camel-catalog-1.10.0-snapshot
labels:
app: camel-k
- camel.apache.org/catalog.loader.version: 3.11.1
- camel.apache.org/catalog.version: 3.11.1
- camel.apache.org/runtime.version: 1.9.0
+ camel.apache.org/catalog.loader.version: 3.11.2
+ camel.apache.org/catalog.version: 3.11.2
+ camel.apache.org/runtime.version: 1.10.0-SNAPSHOT
spec:
runtime:
- version: 1.9.0
+ version: 1.10.0-SNAPSHOT
provider: quarkus
applicationClass: io.quarkus.bootstrap.runner.QuarkusEntryPoint
metadata:
- camel-quarkus.version: 2.2.0
- camel.version: 3.11.1
- quarkus.version: 2.2.0.Final
+ camel-quarkus.version: 2.3.0
+ camel.version: 3.11.2
+ quarkus.version: 2.3.0.Final
dependencies:
- groupId: io.quarkus
artifactId: quarkus-logging-json
@@ -2907,6 +2907,14 @@ spec:
passive: false
javaTypes:
- org.apache.camel.component.zookeepermaster.MasterComponent
+ jolokia-jvm:
+ groupId: org.jolokia
+ artifactId: jolokia-jvm
+ exclusions:
+ - groupId: com.googlecode.json-simple
+ artifactId: json-simple
+ - groupId: org.jolokia
+ artifactId: jolokia-core
loaders:
groovy:
groupId: org.apache.camel.quarkus
diff --git a/script/Makefile b/script/Makefile
index ab86c22..47ac339 100644
--- a/script/Makefile
+++ b/script/Makefile
@@ -17,7 +17,7 @@ VERSIONFILE := pkg/util/defaults/defaults.go
VERSION ?= 1.7.0-SNAPSHOT
OPERATOR_VERSION := $(subst -SNAPSHOT,,$(VERSION))
LAST_RELEASED_VERSION := 1.6.0
-RUNTIME_VERSION := 1.9.0
+RUNTIME_VERSION := 1.10.0-SNAPSHOT
BUILDAH_VERSION := 1.14.0
KANIKO_VERSION := 0.17.1
INSTALL_DEFAULT_KAMELETS := true