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/08/07 12:21:37 UTC
[camel-k] 07/07: Fix #1548: switch runtime to 1.5.1-SNAPSHOT
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 8aa809e869629531578a18859a6edb7c025affdf
Author: nicolaferraro <ni...@gmail.com>
AuthorDate: Fri Aug 7 11:30:51 2020 +0200
Fix #1548: switch runtime to 1.5.1-SNAPSHOT
---
...n.yaml => camel-catalog-1.5.1-SNAPSHOT-main.yaml} | 6 +++---
...aml => camel-catalog-1.5.1-SNAPSHOT-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.5.0-main.yaml b/deploy/camel-catalog-1.5.1-SNAPSHOT-main.yaml
similarity index 99%
rename from deploy/camel-catalog-1.5.0-main.yaml
rename to deploy/camel-catalog-1.5.1-SNAPSHOT-main.yaml
index a63de4c..966d5e7 100644
--- a/deploy/camel-catalog-1.5.0-main.yaml
+++ b/deploy/camel-catalog-1.5.1-SNAPSHOT-main.yaml
@@ -18,16 +18,16 @@
apiVersion: camel.apache.org/v1
kind: CamelCatalog
metadata:
- name: camel-catalog-1.5.0-main
+ name: camel-catalog-1.5.1-snapshot-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.5.0
+ camel.apache.org/runtime.version: 1.5.1-SNAPSHOT
camel.apache.org/runtime.provider: main
spec:
runtime:
- version: 1.5.0
+ version: 1.5.1-SNAPSHOT
provider: main
applicationClass: org.apache.camel.k.main.Application
metadata:
diff --git a/deploy/camel-catalog-1.5.0-quarkus.yaml b/deploy/camel-catalog-1.5.1-SNAPSHOT-quarkus.yaml
similarity index 99%
rename from deploy/camel-catalog-1.5.0-quarkus.yaml
rename to deploy/camel-catalog-1.5.1-SNAPSHOT-quarkus.yaml
index dc862bb..7e18efe 100644
--- a/deploy/camel-catalog-1.5.0-quarkus.yaml
+++ b/deploy/camel-catalog-1.5.1-SNAPSHOT-quarkus.yaml
@@ -18,16 +18,16 @@
apiVersion: camel.apache.org/v1
kind: CamelCatalog
metadata:
- name: camel-catalog-1.5.0-quarkus
+ name: camel-catalog-1.5.1-snapshot-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.5.0
+ camel.apache.org/runtime.version: 1.5.1-SNAPSHOT
camel.apache.org/runtime.provider: quarkus
spec:
runtime:
- version: 1.5.0
+ version: 1.5.1-SNAPSHOT
provider: quarkus
applicationClass: io.quarkus.runner.GeneratedMain
metadata:
diff --git a/deploy/resources.go b/deploy/resources.go
index 5dc0525..0741e84 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.5.0-main.yaml": &vfsgen۰CompressedFileInfo{
- name: "camel-catalog-1.5.0-main.yaml",
+ "/camel-catalog-1.5.1-SNAPSHOT-main.yaml": &vfsgen۰CompressedFileInfo{
+ name: "camel-catalog-1.5.1-SNAPSHOT-main.yaml",
modTime: time.Time{},
- uncompressedSize: 89151,
+ uncompressedSize: 89178,
- 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\x3d\xce\xcc\xf4\xd9\x7d\x9e\x6c\x39\x4e\xec\xd8\x8e\x3b\xf2\x24\x99\x7e\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\x7d\x5b\x77\xdb\x38\xb2\xee\x7b\x7e\x05\xd7\xe4\x65\xef\x75\x86\x35\xdd\xce\xcc\xf4\xd9\x7d\x9e\x6c\x39\x4e\xec\xd8\x8e\x3b\xf2\x24\x99\x79\xe9\x05\x91\x90\x04\x8b\x24\x68\x00\x92\x65\xff\xfa\xb3\x70\xe1\x55\x10\x24\x12\x86\xd7\xf6\x83\x49\x11\x55\x5f\xb1\x08\x12\x97\x42\xa1\xea\x7d\x14\xbf\xde\xdf\xbb\xf7\xd1\x35\x49\x70\xc1\x71\x1a\x09\x1a\x89\x25\x8e\x4e\x4b\x94\x2c\x71\x34\xa5\x73\xf1\x84\x18\x8e\x2e\xe8\xba\x [...]
},
- "/camel-catalog-1.5.0-quarkus.yaml": &vfsgen۰CompressedFileInfo{
- name: "camel-catalog-1.5.0-quarkus.yaml",
+ "/camel-catalog-1.5.1-SNAPSHOT-quarkus.yaml": &vfsgen۰CompressedFileInfo{
+ name: "camel-catalog-1.5.1-SNAPSHOT-quarkus.yaml",
modTime: time.Time{},
- uncompressedSize: 49007,
+ uncompressedSize: 49034,
- compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\x7d\x5d\x77\xdb\xaa\xf2\xf7\x7d\x3e\x85\x56\x73\x73\xce\x5a\x5b\xec\x9e\xf4\xec\x7d\xd1\xe7\x2a\x49\x9b\xee\xa4\x4d\x9a\xc6\x39\x6d\xf7\xbe\xe9\xc2\x12\xb6\x89\x25\x50\x00\xd9\x4e\x3e\xfd\xb3\x40\xc8\x92\x6c\x65\xf4\x12\xf0\x3f\x17\x91\x2c\x86\xdf\xc0\x80\x60\x34\xcc\xc0\x71\x10\xba\xfb\x3b\x3a\x0e\xbe\xd0\x88\x30\x49\xe2\x40\xf1\x40\x2d\x48\x70\x9a\xe1\x68\x41\x82\x09\x9f\xa9\x35\x16\x24\xb8\xe0\x39\x8b\xb1\xa2\x [...]
+ compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\x7d\x5d\x77\xdb\xaa\xf2\xf7\x7d\x3e\x85\x56\x73\x73\xce\x5a\x5b\xec\x7d\xd2\xb3\xf7\x45\x9f\xab\x24\x6d\xda\xa4\x4d\x9a\xc6\x39\x6d\xf7\xbe\xe9\xc2\x12\xb6\x89\x25\x50\x00\xd9\x4e\x3e\xfd\xb3\x40\xc8\x92\x6c\x65\xf4\x12\xf0\x3f\x17\x91\x2c\x86\xdf\xc0\x80\x60\x34\xcc\xc0\x71\x10\xba\xfb\x3b\x3a\x0e\xbe\xd0\x88\x30\x49\xe2\x40\xf1\x40\x2d\x48\x70\x9a\xe1\x68\x41\x82\x09\x9f\xa9\x35\x16\x24\xb8\xe0\x39\x8b\xb1\xa2\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.5.0-main.yaml"].(os.FileInfo),
- fs["/camel-catalog-1.5.0-quarkus.yaml"].(os.FileInfo),
+ fs["/camel-catalog-1.5.1-SNAPSHOT-main.yaml"].(os.FileInfo),
+ fs["/camel-catalog-1.5.1-SNAPSHOT-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 9a52d8b..8b8532d 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.5.0"
+ DefaultRuntimeVersion = "1.5.1-SNAPSHOT"
// BuildahVersion --
BuildahVersion = "1.14.0"
diff --git a/script/Makefile b/script/Makefile
index 52ce382..7d9f999 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.1
-RUNTIME_VERSION := 1.5.0
+RUNTIME_VERSION := 1.5.1-SNAPSHOT
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-1237
+STAGING_RUNTIME_REPO :=
# When packaging artifacts into the docker image, you can "copy" them from local maven
# or "download" them from Apache Snapshots and Maven Central