This is an automated email from the ASF dual-hosted git repository. nferraro 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 1019b9d chore(release): prepare 1.5.0 release 1019b9d is described below commit 1019b9dc2904f85c69f39a8fd5157e3cca32c0aa Author: nicolaferraro <ni.ferr...@gmail.com> AuthorDate: Fri Jul 2 12:15:57 2021 +0200 chore(release): prepare 1.5.0 release --- ....8.0-SNAPSHOT.yaml => camel-catalog-1.8.0.yaml} | 25 +++++++--------------- pkg/resources/resources.go | 10 ++++----- pkg/util/defaults/defaults.go | 2 +- script/Makefile | 6 +++--- 4 files changed, 17 insertions(+), 26 deletions(-) diff --git a/deploy/camel-catalog-1.8.0-SNAPSHOT.yaml b/deploy/camel-catalog-1.8.0.yaml similarity index 99% rename from deploy/camel-catalog-1.8.0-SNAPSHOT.yaml rename to deploy/camel-catalog-1.8.0.yaml index a023156..060a572 100644 --- a/deploy/camel-catalog-1.8.0-SNAPSHOT.yaml +++ b/deploy/camel-catalog-1.8.0.yaml @@ -18,21 +18,21 @@ apiVersion: camel.apache.org/v1 kind: CamelCatalog metadata: - name: camel-catalog-1.8.0-snapshot + name: camel-catalog-1.8.0 labels: app: camel-k - camel.apache.org/catalog.loader.version: 3.10.0 - camel.apache.org/catalog.version: 3.10.0 - camel.apache.org/runtime.version: 1.8.0-SNAPSHOT + camel.apache.org/catalog.loader.version: 3.11.0 + camel.apache.org/catalog.version: 3.11.0 + camel.apache.org/runtime.version: 1.8.0 spec: runtime: - version: 1.8.0-SNAPSHOT + version: 1.8.0 provider: quarkus applicationClass: io.quarkus.bootstrap.runner.QuarkusEntryPoint metadata: - camel-quarkus.version: 2.0.0-M2 - camel.version: 3.10.0 - quarkus.version: 2.0.0.CR3 + camel-quarkus.version: 2.0.0 + camel.version: 3.11.0 + quarkus.version: 2.0.0.Final dependencies: - groupId: org.apache.camel.k artifactId: camel-k-runtime @@ -131,15 +131,6 @@ spec: passive: false javaTypes: - org.apache.camel.component.amqp.AMQPComponent - camel-quarkus-apns: - groupId: org.apache.camel.quarkus - artifactId: camel-quarkus-apns - schemes: - - id: apns - http: false - passive: false - javaTypes: - - org.apache.camel.component.apns.ApnsComponent camel-quarkus-arangodb: groupId: org.apache.camel.quarkus artifactId: camel-quarkus-arangodb diff --git a/pkg/resources/resources.go b/pkg/resources/resources.go index eb6a2b6..9786e33 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.8.0-SNAPSHOT.yaml": &vfsgen۰CompressedFileInfo{ - name: "camel-catalog-1.8.0-SNAPSHOT.yaml", + "/camel-catalog-1.8.0.yaml": &vfsgen۰CompressedFileInfo{ + name: "camel-catalog-1.8.0.yaml", modTime: time.Time{}, - uncompressedSize: 89975, + uncompressedSize: 89700, - 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\x16\xba\x2a\xd5\xf7\xd4\x59\x75\x47\x8e\x1c\x27\x76\x2c\xc7\x89\xdc\x49\xba\x27\xb5\x20\x12\x92\x60\x91\x04\x0d\x80\xb2\x9c\x5f\x7f\x17\x40\xf0\x29\x65\xf3\xe1\x0d\xb7\x06\xe2\x03\x1b\xdf\xc6\xfe\xf0\x20\xde\x78\x1d\xcc\xf0\x7e\xaf\x5e\x07\xd7\x3c\x64\xa9\x62\x51\xa0\x45\xa0\xb7\x2c\x38\xcb\x68\xb8\x65\xc1\x52\xac\xf5\x23\x95\x2c\xb8\x10\x79\x1a\x51\xcd\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\x16\xba\x2a\xd5\xf7\xd4\x59\x75\x47\x8e\x1c\x27\x76\x2c\xc7\x89\xdc\x49\xba\x27\xb5\x20\x12\x92\x60\x91\x04\x0d\x80\xb2\x9c\x5f\x7f\x17\x40\xf0\x29\x65\xf3\xe1\x0d\xb7\x06\xe2\x03\x1b\xdf\xc6\xfe\xf0\x20\xde\x78\x1d\xcc\xf0\x7e\xaf\x5e\x07\xd7\x3c\x64\xa9\x62\x51\xa0\x45\xa0\xb7\x2c\x38\xcb\x68\xb8\x65\xc1\x52\xac\xf5\x23\x95\x2c\xb8\x10\x79\x1a\x51\xcd\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.8.0-SNAPSHOT.yaml"].(os.FileInfo), + fs["/camel-catalog-1.8.0.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 af50ab3..c959f58 100644 --- a/pkg/util/defaults/defaults.go +++ b/pkg/util/defaults/defaults.go @@ -26,7 +26,7 @@ const ( Version = "1.5.0-SNAPSHOT" // DefaultRuntimeVersion -- - DefaultRuntimeVersion = "1.8.0-SNAPSHOT" + DefaultRuntimeVersion = "1.8.0" // BuildahVersion -- BuildahVersion = "1.14.0" diff --git a/script/Makefile b/script/Makefile index 5206396..7f283bc 100644 --- a/script/Makefile +++ b/script/Makefile @@ -17,7 +17,7 @@ VERSIONFILE := pkg/util/defaults/defaults.go VERSION := 1.5.0-SNAPSHOT OPERATOR_VERSION := $(subst -SNAPSHOT,,$(VERSION)) LAST_RELEASED_VERSION := 1.4.0 -RUNTIME_VERSION := 1.8.0-SNAPSHOT +RUNTIME_VERSION := 1.8.0 BUILDAH_VERSION := 1.14.0 KANIKO_VERSION := 0.17.1 INSTALL_DEFAULT_KAMELETS := true @@ -33,12 +33,12 @@ LINT_DEADLINE := 10m # Used to push pre-release artifacts STAGING_IMAGE_NAME := docker.io/camelk/camel-k -STAGING_RUNTIME_REPO := +STAGING_RUNTIME_REPO := https://repository.apache.org/content/repositories/orgapachecamel-1342 # Define here the repo containing the default Kamelet catalog (if any) KAMELET_CATALOG_REPO := https://github.com/apache/camel-kamelets.git # Optional branch for the default Kamelet catalog (change this to a tag before release) -KAMELET_CATALOG_REPO_BRANCH := main +KAMELET_CATALOG_REPO_BRANCH := v0.3.0 # When packaging artifacts into the docker image, you can "copy" them from local maven # or "download" them from Apache Snapshots and Maven Central