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 2023/02/20 09:31:39 UTC
[camel-k] branch align-for-1.12.0 created (now 400422a40)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch align-for-1.12.0
in repository https://gitbox.apache.org/repos/asf/camel-k.git
at 400422a40 Regen
This branch includes the following new commits:
new edb9d82e3 Camel-K-runtime: Point to 1.17.0 staging
new 3ac5ae2d0 Point to camel-kamelets 3.20.1.1
new 400422a40 Regen
The 3 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.
[camel-k] 03/03: Regen
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch align-for-1.12.0
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 400422a40489b5988c9535181c43e39ee9a252bb
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Feb 20 10:31:17 2023 +0100
Regen
Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
pkg/resources/resources.go | 10 +++++-----
pkg/util/defaults/defaults.go | 2 +-
...-catalog-1.17.0-SNAPSHOT.yaml => camel-catalog-1.17.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 6a9d81f16..86b05c41f 100644
--- a/pkg/resources/resources.go
+++ b/pkg/resources/resources.go
@@ -601,12 +601,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.17.0-SNAPSHOT.yaml": &vfsgen۰CompressedFileInfo{
- name: "camel-catalog-1.17.0-SNAPSHOT.yaml",
+ "/camel-catalog-1.17.0.yaml": &vfsgen۰CompressedFileInfo{
+ name: "camel-catalog-1.17.0.yaml",
modTime: time.Time{},
- uncompressedSize: 86772,
+ uncompressedSize: 86745,
- compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\xbd\x4b\x77\xdb\xb8\xb2\x36\x3c\xcf\xaf\xe0\xea\x4c\xce\x59\xdf\x16\xba\xdb\x7d\xbe\xdd\xef\xca\x3b\xb2\xe5\x38\xb1\x63\x3b\x4e\xe4\x9d\xce\xde\x93\x5e\x10\x09\x49\xb0\x48\x82\x06\x40\x59\xce\xaf\x7f\x17\x40\xf0\x2a\xa5\x78\x71\xc1\xc7\x03\x93\x22\x0a\x4f\xa1\x1e\x80\xb8\xb3\xf0\x36\x98\xe1\xfd\xbd\x79\x1b\x5c\xf3\x90\xa5\x8a\x45\x81\x16\x81\xde\xb0\xe0\x34\xa3\xe1\x86\x05\x0b\xb1\xd2\x4f\x54\xb2\xe0\x42\xe4\x69\x [...]
+ compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\x7d\x4b\x77\xdb\xb8\xb2\xee\x3c\xbf\x82\xab\x33\x39\x67\xdd\x2d\x74\xb7\x7b\xdf\xdd\x77\xe5\x8e\x6c\x39\x4e\xec\xd8\x89\x13\x79\x27\xd9\x3d\xe9\x05\x91\x90\x04\x8b\x24\x68\x00\x94\xe5\xfc\xfa\xb3\x00\x82\x4f\x29\xc5\x87\x0b\x3e\x1e\x98\x14\x51\xf8\x0a\xf5\x01\xc4\x9b\x85\xd7\xc1\x0c\xef\xef\xd5\xeb\xe0\x9a\x87\x2c\x55\x2c\x0a\xb4\x08\xf4\x86\x05\xa7\x19\x0d\x37\x2c\x58\x88\x95\x7e\xa4\x92\x05\x17\x22\x4f\x23\xaa\x [...]
},
"/traits.yaml": &vfsgen۰CompressedFileInfo{
name: "traits.yaml",
@@ -619,7 +619,7 @@ var assets = func() http.FileSystem {
fs["/"].(*vfsgen۰DirInfo).entries = []os.FileInfo{
fs["/addons"].(os.FileInfo),
fs["/builder"].(os.FileInfo),
- fs["/camel-catalog-1.17.0-SNAPSHOT.yaml"].(os.FileInfo),
+ fs["/camel-catalog-1.17.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 b881b9a96..f0321821c 100644
--- a/pkg/util/defaults/defaults.go
+++ b/pkg/util/defaults/defaults.go
@@ -26,7 +26,7 @@ const (
Version = "1.12.0-SNAPSHOT"
// DefaultRuntimeVersion --
- DefaultRuntimeVersion = "1.17.0-SNAPSHOT"
+ DefaultRuntimeVersion = "1.17.0"
// BuildahVersion --
BuildahVersion = "1.23.3"
diff --git a/resources/camel-catalog-1.17.0-SNAPSHOT.yaml b/resources/camel-catalog-1.17.0.yaml
similarity index 99%
rename from resources/camel-catalog-1.17.0-SNAPSHOT.yaml
rename to resources/camel-catalog-1.17.0.yaml
index 1a6d4b5fe..ad1b9e910 100644
--- a/resources/camel-catalog-1.17.0-SNAPSHOT.yaml
+++ b/resources/camel-catalog-1.17.0.yaml
@@ -18,15 +18,15 @@
apiVersion: camel.apache.org/v1
kind: CamelCatalog
metadata:
- name: camel-catalog-1.17.0-snapshot
+ name: camel-catalog-1.17.0
labels:
app: camel-k
camel.apache.org/catalog.loader.version: 3.20.1
camel.apache.org/catalog.version: 3.20.1
- camel.apache.org/runtime.version: 1.17.0-SNAPSHOT
+ camel.apache.org/runtime.version: 1.17.0
spec:
runtime:
- version: 1.17.0-SNAPSHOT
+ version: 1.17.0
provider: quarkus
applicationClass: io.quarkus.bootstrap.runner.QuarkusEntryPoint
metadata:
diff --git a/script/maven-settings.xml b/script/maven-settings.xml
index 54dab3545..a392fc02e 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-1499</url>
+ <url>https://repository.apache.org/content/repositories/orgapachecamel-1528/</url>
<releases>
<enabled>true</enabled>
<updatePolicy>never</updatePolicy>
[camel-k] 02/03: Point to camel-kamelets 3.20.1.1
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch align-for-1.12.0
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 3ac5ae2d058cffaba6e164569aef909ed8f712cf
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Feb 20 10:28:44 2023 +0100
Point to camel-kamelets 3.20.1.1
Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
script/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/script/Makefile b/script/Makefile
index 9977846ca..c395f2000 100644
--- a/script/Makefile
+++ b/script/Makefile
@@ -85,7 +85,7 @@ STAGING_RUNTIME_REPO := https://repository.apache.org/content/repositories/orgap
INSTALL_DEFAULT_KAMELETS ?= true
KAMELET_CATALOG_REPO := https://github.com/apache/camel-kamelets.git
# Make sure to use a released tag or empty if you want to get the latest development bits
-KAMELET_CATALOG_REPO_TAG := v0.10.0
+KAMELET_CATALOG_REPO_TAG := v3.20.1.1
# 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.
[camel-k] 01/03: Camel-K-runtime: Point to 1.17.0 staging
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch align-for-1.12.0
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit edb9d82e38b832e50b1fc36a14ce15bd70c77b4e
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Feb 20 10:28:01 2023 +0100
Camel-K-runtime: Point to 1.17.0 staging
Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
script/Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/script/Makefile b/script/Makefile
index 3e0f88ac6..9977846ca 100644
--- a/script/Makefile
+++ b/script/Makefile
@@ -23,7 +23,7 @@ VERSIONFILE := pkg/util/defaults/defaults.go
VERSION ?= 1.12.0-SNAPSHOT
LAST_RELEASED_IMAGE_NAME := camel-k-operator
LAST_RELEASED_VERSION ?= 1.11.1
-RUNTIME_VERSION := 1.17.0-SNAPSHOT
+RUNTIME_VERSION := 1.17.0
BUILDAH_VERSION := 1.23.3
KANIKO_VERSION := 0.17.1
CONTROLLER_GEN_VERSION := v0.6.1
@@ -79,7 +79,7 @@ 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-1528/
# Kamelets options
INSTALL_DEFAULT_KAMELETS ?= true