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 2021/04/16 08:59:54 UTC
[camel-k] branch master updated: chore(release): switch back to
1.7.0-SNAPSHOT runtime
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
The following commit(s) were added to refs/heads/master by this push:
new a961247 chore(release): switch back to 1.7.0-SNAPSHOT runtime
a961247 is described below
commit a961247f2c81f8b659f03f759f177b2b9e43e75d
Author: nicolaferraro <ni...@gmail.com>
AuthorDate: Thu Apr 15 17:27:38 2021 +0200
chore(release): switch back to 1.7.0-SNAPSHOT runtime
---
...el-catalog-1.7.0.yaml => camel-catalog-1.7.0-SNAPSHOT.yaml} | 6 +++---
pkg/resources/resources.go | 10 +++++-----
pkg/util/defaults/defaults.go | 2 +-
script/Makefile | 6 +++---
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/deploy/camel-catalog-1.7.0.yaml b/deploy/camel-catalog-1.7.0-SNAPSHOT.yaml
similarity index 99%
rename from deploy/camel-catalog-1.7.0.yaml
rename to deploy/camel-catalog-1.7.0-SNAPSHOT.yaml
index a0a291e..8918b60 100644
--- a/deploy/camel-catalog-1.7.0.yaml
+++ b/deploy/camel-catalog-1.7.0-SNAPSHOT.yaml
@@ -18,15 +18,15 @@
apiVersion: camel.apache.org/v1
kind: CamelCatalog
metadata:
- name: camel-catalog-1.7.0
+ name: camel-catalog-1.7.0-snapshot
labels:
app: camel-k
camel.apache.org/catalog.loader.version: 3.9.0
camel.apache.org/catalog.version: 3.9.0
- camel.apache.org/runtime.version: 1.7.0
+ camel.apache.org/runtime.version: 1.7.0-SNAPSHOT
spec:
runtime:
- version: 1.7.0
+ version: 1.7.0-SNAPSHOT
provider: quarkus
applicationClass: io.quarkus.bootstrap.runner.QuarkusEntryPoint
metadata:
diff --git a/pkg/resources/resources.go b/pkg/resources/resources.go
index 94a6ac4..3ea0b18 100644
--- a/pkg/resources/resources.go
+++ b/pkg/resources/resources.go
@@ -457,12 +457,12 @@ var assets = func() http.FileSystem {
compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x44\x8e\x31\x4e\x04\x31\x0c\x45\xfb\x9c\xe2\x2b\xdb\x32\xd2\xd0\x5a\xa2\xa2\x41\xe2\x00\xd4\x66\xd7\x33\x44\x24\x71\xe4\x38\x12\x73\x7b\x94\x1d\xc1\xba\xfc\x7e\xf6\x7f\x17\x5c\xb9\x48\x5e\xbe\x09\x99\xeb\x3e\x78\x97\x97\x83\x4b\x0e\xe1\x82\x0f\x4b\x2e\x38\x74\x18\x4c\x87\x4b\xc7\x97\x98\x3c\x61\x53\x83\xfc\x70\x69\x59\x28\x2c\xd8\x4c\x0b\x05\x00\x18\x96\x08\xd1\x53\x11\xa3\xf9\x24\xde\xd3\xc6\xc6\x45\x5c\xac\x9f\x14\x [...]
},
- "/camel-catalog-1.7.0.yaml": &vfsgen۰CompressedFileInfo{
- name: "camel-catalog-1.7.0.yaml",
+ "/camel-catalog-1.7.0-SNAPSHOT.yaml": &vfsgen۰CompressedFileInfo{
+ name: "camel-catalog-1.7.0-SNAPSHOT.yaml",
modTime: time.Time{},
- uncompressedSize: 87648,
+ uncompressedSize: 87675,
- compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\x7d\x4b\x77\xdb\x3a\x96\xee\x3c\xbf\x82\xeb\x64\xd2\xbd\x6e\x09\x75\x4e\x52\xb7\x4f\xdf\xdc\x91\x2d\xc7\x89\x1d\xcb\x71\x22\x57\x92\xaa\xc9\x59\x10\x09\x51\xb0\x48\x82\x06\x40\x59\xce\xaf\xef\x85\x07\x9f\x52\x36\x1f\x06\xd4\x1a\x88\x20\xb1\xf1\x6d\xec\x0f\x0f\x12\xef\xd7\xc1\xcc\xdd\xef\xd5\xeb\xe0\x86\x86\x24\x13\x24\x0a\x24\x0b\xe4\x86\x04\x67\x39\x0e\x37\x24\x58\xb2\xb5\x7c\xc2\x9c\x04\x97\xac\xc8\x22\x2c\x29\x [...]
+ compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\x7d\x4b\x77\xdb\x3a\x96\xee\xdc\xbf\x82\xeb\x64\xd2\xbd\x6e\x09\x75\x4e\x52\xb7\x4f\xdf\xdc\x91\x2d\xc7\x89\x1d\xcb\x76\x22\x57\x92\xaa\xc9\x59\x10\x09\x49\xb0\x48\x82\x06\x40\x59\xce\xaf\xef\x85\x07\x9f\x52\x36\x1f\x02\xd4\x1a\x88\x20\xb1\xf1\x6d\xec\x0f\x0f\x12\xef\x37\xc1\xc4\xdd\xef\xec\x4d\x70\x4b\x43\x92\x0a\x12\x05\x92\x05\x72\x4d\x82\xf3\x0c\x87\x6b\x12\xcc\xd9\x52\xbe\x60\x4e\x82\x2b\x96\xa7\x11\x96\x94\x [...]
},
"/traits.yaml": &vfsgen۰CompressedFileInfo{
name: "traits.yaml",
@@ -474,7 +474,7 @@ var assets = func() http.FileSystem {
}
fs["/"].(*vfsgen۰DirInfo).entries = []os.FileInfo{
fs["/addons"].(os.FileInfo),
- fs["/camel-catalog-1.7.0.yaml"].(os.FileInfo),
+ fs["/camel-catalog-1.7.0-SNAPSHOT.yaml"].(os.FileInfo),
fs["/crd"].(os.FileInfo),
fs["/default"].(os.FileInfo),
fs["/manager"].(os.FileInfo),
diff --git a/pkg/util/defaults/defaults.go b/pkg/util/defaults/defaults.go
index 063cdb8..809f00b 100644
--- a/pkg/util/defaults/defaults.go
+++ b/pkg/util/defaults/defaults.go
@@ -26,7 +26,7 @@ const (
Version = "1.4.0-SNAPSHOT"
// DefaultRuntimeVersion --
- DefaultRuntimeVersion = "1.7.0"
+ DefaultRuntimeVersion = "1.7.0-SNAPSHOT"
// BuildahVersion --
BuildahVersion = "1.14.0"
diff --git a/script/Makefile b/script/Makefile
index 325c5c9..feb40ac 100644
--- a/script/Makefile
+++ b/script/Makefile
@@ -16,8 +16,8 @@
VERSIONFILE := pkg/util/defaults/defaults.go
VERSION := 1.4.0-SNAPSHOT
OPERATOR_VERSION := $(subst -SNAPSHOT,,$(VERSION))
-LAST_RELEASED_VERSION := 1.3.0
-RUNTIME_VERSION := 1.7.0
+LAST_RELEASED_VERSION := 1.3.2
+RUNTIME_VERSION := 1.7.0-SNAPSHOT
BUILDAH_VERSION := 1.14.0
KANIKO_VERSION := 0.17.1
BASE_IMAGE := adoptopenjdk/openjdk11:slim
@@ -32,7 +32,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-1309
+STAGING_RUNTIME_REPO :=
# Define here the repo containing the default Kamelet catalog (if any)
KAMELET_CATALOG_REPO := https://github.com/apache/camel-kamelets.git