You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2022/12/06 14:52:16 UTC
[camel-k] branch main updated (c7393eaa6 -> 4b3c78e6f)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
from c7393eaa6 fix(#3800): Add proper kamel linux binary on MacOS
new 430d104e7 Prepare for release 1.11.0: Aligning to Camel Kamelets 0.10.0 and camel-k-runtime 1.16.0
new 4b3c78e6f Prepare for release 1.11.0: Aligning to Camel Kamelets 0.10.0 and camel-k-runtime 1.16.0
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pkg/resources/resources.go | 10 +++++-----
pkg/util/defaults/defaults.go | 2 +-
...-catalog-1.16.0-SNAPSHOT.yaml => camel-catalog-1.16.0.yaml} | 6 +++---
script/Makefile | 6 +++---
script/maven-settings.xml | 2 +-
5 files changed, 13 insertions(+), 13 deletions(-)
rename resources/{camel-catalog-1.16.0-SNAPSHOT.yaml => camel-catalog-1.16.0.yaml} (99%)
[camel-k] 02/02: Prepare for release 1.11.0: Aligning to Camel Kamelets 0.10.0 and camel-k-runtime 1.16.0
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 4b3c78e6f336ba72143da916bea44a58e1b9da8c
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Dec 6 09:51:05 2022 +0100
Prepare for release 1.11.0: Aligning to Camel Kamelets 0.10.0 and camel-k-runtime 1.16.0
Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
pkg/resources/resources.go | 10 +++++-----
pkg/util/defaults/defaults.go | 2 +-
...-catalog-1.16.0-SNAPSHOT.yaml => camel-catalog-1.16.0.yaml} | 6 +++---
script/maven-settings.xml | 2 +-
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/pkg/resources/resources.go b/pkg/resources/resources.go
index be62dbca9..2d415721a 100644
--- a/pkg/resources/resources.go
+++ b/pkg/resources/resources.go
@@ -594,12 +594,12 @@ var assets = func() http.FileSystem {
compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x53\xc1\x8e\xdb\x36\x14\xbc\xf3\x2b\x06\xd6\x25\x01\xd6\x72\xdb\x53\xe1\x9e\xdc\xcd\x6e\x2b\x34\xb0\x81\x95\xd3\x20\xc7\x67\xe9\x59\x7a\x58\x8a\x54\x1f\xa9\x55\xb6\x5f\x5f\x90\x96\xbb\x0e\xda\x63\x78\xb1\x05\x8d\xe6\xcd\xbc\x19\x16\x58\x7f\xbf\x63\x0a\x7c\x94\x86\x5d\xe0\x16\xd1\x23\xf6\x8c\xdd\x48\x4d\xcf\xa8\xfd\x39\xce\xa4\x8c\x47\x3f\xb9\x96\xa2\x78\x87\x77\xbb\xfa\xf1\x3d\x26\xd7\xb2\xc2\x3b\x86\x57\x0c\x5e\x [...]
},
- "/camel-catalog-1.16.0-SNAPSHOT.yaml": &vfsgen۰CompressedFileInfo{
- name: "camel-catalog-1.16.0-SNAPSHOT.yaml",
+ "/camel-catalog-1.16.0.yaml": &vfsgen۰CompressedFileInfo{
+ name: "camel-catalog-1.16.0.yaml",
modTime: time.Time{},
- uncompressedSize: 86027,
+ uncompressedSize: 86000,
- compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\x7d\x5d\x77\xdb\x38\xd2\xe6\xbd\x7f\x05\x4f\xe7\xe6\x7d\xcf\x8e\x30\xdd\xe9\xd9\xe9\xdd\xde\x2b\x5b\x8e\x13\x3b\xb6\xe3\x44\x9e\x24\x33\x37\x7d\x20\x12\x92\x60\x91\x04\x0d\x80\xb2\x9c\x5f\xbf\x07\x20\xf8\x29\xa5\xf8\xe1\x82\x5f\x5f\x98\x14\x51\x78\x0a\xf5\x00\xc4\x37\x0b\x6f\x82\x19\xde\xdf\xc9\x9b\xe0\x9a\x87\x2c\x55\x2c\x0a\xb4\x08\xf4\x86\x05\xa7\x19\x0d\x37\x2c\x58\x88\x95\x7e\xa2\x92\x05\x17\x22\x4f\x23\xaa\x [...]
+ compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\x7d\x5d\x77\xdb\x38\xd2\xe6\x7d\x7e\x05\x4f\xe7\xe6\x7d\xcf\x8e\x30\xdd\xe9\xd9\xe9\xdd\xde\x2b\x5b\x8e\x13\x3b\x76\xe2\x44\x9e\x24\x33\x37\x7d\x20\x12\x92\x60\x91\x04\x05\x80\xb2\x9c\x5f\xbf\x07\x20\xf8\x29\xa5\xf8\xe1\x82\x5f\x5f\x98\x14\x51\x78\x0a\xf5\x00\xc4\x37\x0b\xaf\x83\x19\xde\xdf\xab\xd7\xc1\x0d\x0f\x59\xaa\x58\x14\x68\x11\xe8\x0d\x0b\xce\x32\x1a\x6e\x58\xb0\x10\x2b\xfd\x48\x25\x0b\x2e\x45\x9e\x46\x54\x [...]
},
"/traits.yaml": &vfsgen۰CompressedFileInfo{
name: "traits.yaml",
@@ -612,7 +612,7 @@ var assets = func() http.FileSystem {
fs["/"].(*vfsgen۰DirInfo).entries = []os.FileInfo{
fs["/addons"].(os.FileInfo),
fs["/builder"].(os.FileInfo),
- fs["/camel-catalog-1.16.0-SNAPSHOT.yaml"].(os.FileInfo),
+ fs["/camel-catalog-1.16.0.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 a2141f4a5..29d2e61ec 100644
--- a/pkg/util/defaults/defaults.go
+++ b/pkg/util/defaults/defaults.go
@@ -26,7 +26,7 @@ const (
Version = "1.11.0-SNAPSHOT"
// DefaultRuntimeVersion --
- DefaultRuntimeVersion = "1.16.0-SNAPSHOT"
+ DefaultRuntimeVersion = "1.16.0"
// BuildahVersion --
BuildahVersion = "1.23.3"
diff --git a/resources/camel-catalog-1.16.0-SNAPSHOT.yaml b/resources/camel-catalog-1.16.0.yaml
similarity index 99%
rename from resources/camel-catalog-1.16.0-SNAPSHOT.yaml
rename to resources/camel-catalog-1.16.0.yaml
index b8ec4c06c..7d40c3152 100644
--- a/resources/camel-catalog-1.16.0-SNAPSHOT.yaml
+++ b/resources/camel-catalog-1.16.0.yaml
@@ -18,15 +18,15 @@
apiVersion: camel.apache.org/v1
kind: CamelCatalog
metadata:
- name: camel-catalog-1.16.0-snapshot
+ name: camel-catalog-1.16.0
labels:
app: camel-k
camel.apache.org/catalog.loader.version: 3.19.0
camel.apache.org/catalog.version: 3.19.0
- camel.apache.org/runtime.version: 1.16.0-SNAPSHOT
+ camel.apache.org/runtime.version: 1.16.0
spec:
runtime:
- version: 1.16.0-SNAPSHOT
+ version: 1.16.0
provider: quarkus
applicationClass: io.quarkus.bootstrap.runner.QuarkusEntryPoint
metadata:
diff --git a/script/maven-settings.xml b/script/maven-settings.xml
index 05878f1de..54dab3545 100644
--- a/script/maven-settings.xml
+++ b/script/maven-settings.xml
@@ -41,7 +41,7 @@ under the License.
<repository>
<id>apache-staging</id>
<name>Apache Staging Repository</name>
- <url>https://repository.apache.org/content/repositories/orgapachecamel-1484</url>
+ <url>https://repository.apache.org/content/repositories/orgapachecamel-1499</url>
<releases>
<enabled>true</enabled>
<updatePolicy>never</updatePolicy>
[camel-k] 01/02: Prepare for release 1.11.0: Aligning to Camel Kamelets 0.10.0 and camel-k-runtime 1.16.0
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 430d104e797fdaeb15f4adbede336bab929a81c4
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Dec 6 09:46:01 2022 +0100
Prepare for release 1.11.0: Aligning to Camel Kamelets 0.10.0 and camel-k-runtime 1.16.0
Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
script/Makefile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/script/Makefile b/script/Makefile
index bf761b97e..d7fabdbbb 100644
--- a/script/Makefile
+++ b/script/Makefile
@@ -17,7 +17,7 @@ VERSIONFILE := pkg/util/defaults/defaults.go
VERSION ?= 1.11.0-SNAPSHOT
LAST_RELEASED_IMAGE_NAME := camel-k-operator
LAST_RELEASED_VERSION ?= 1.10.3
-RUNTIME_VERSION := 1.16.0-SNAPSHOT
+RUNTIME_VERSION := 1.16.0
BUILDAH_VERSION := 1.23.3
KANIKO_VERSION := 0.17.1
INSTALL_DEFAULT_KAMELETS := true
@@ -75,12 +75,12 @@ OPM := opm
# 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-1499
# 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 := v0.9.0
+KAMELET_CATALOG_REPO_BRANCH := v0.10.0
# When performing integration tests, it is not necessary to always execute build, especially
# in e2e tests when lots of tests are being executed sequentially & the build has already taken place.