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/11/11 09:04:37 UTC
[camel-k] branch release-1.10.x updated: preparing for next release
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch release-1.10.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/release-1.10.x by this push:
new 815d493e1 preparing for next release
815d493e1 is described below
commit 815d493e1ddab742e1e70f24332dc8cd98e3d2f1
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Nov 11 10:04:18 2022 +0100
preparing for next release
Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
docs/modules/ROOT/partials/apis/camel-k-crds.adoc | 14 +++++++-------
pkg/apis/camel/v1/zz_generated.deepcopy.go | 10 +++++-----
pkg/util/defaults/defaults.go | 2 +-
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/docs/modules/ROOT/partials/apis/camel-k-crds.adoc b/docs/modules/ROOT/partials/apis/camel-k-crds.adoc
index 4b48625fd..5f4b857d2 100644
--- a/docs/modules/ROOT/partials/apis/camel-k-crds.adoc
+++ b/docs/modules/ROOT/partials/apis/camel-k-crds.adoc
@@ -1572,6 +1572,13 @@ IntegrationKitTraits defines traits assigned to an `IntegrationKit`
The builder trait is internally used to determine the best strategy to build and configure IntegrationKits.
+|`camel` +
+*xref:#_camel_apache_org_v1_trait_CamelTrait[CamelTrait]*
+|
+
+
+The Camel trait sets up Camel configuration.
+
|`quarkus` +
*xref:#_camel_apache_org_v1_trait_QuarkusTrait[QuarkusTrait]*
|
@@ -1588,13 +1595,6 @@ NOTE: Compiling to a native executable, i.e. when using `package-type=native`, i
The Registry trait sets up Maven to use the Image registry as a Maven repository.
-|`camel` +
-*xref:#_camel_apache_org_v1_trait_CamelTrait[CamelTrait]*
-|
-
-
-The Camel trait sets up Camel configuration.
-
|`addons` +
*xref:#_camel_apache_org_v1_AddonTrait[map[string\]github.com/apache/camel-k/pkg/apis/camel/v1.AddonTrait]*
|
diff --git a/pkg/apis/camel/v1/zz_generated.deepcopy.go b/pkg/apis/camel/v1/zz_generated.deepcopy.go
index d4d0b3e4b..8bf7b1d46 100644
--- a/pkg/apis/camel/v1/zz_generated.deepcopy.go
+++ b/pkg/apis/camel/v1/zz_generated.deepcopy.go
@@ -828,6 +828,11 @@ func (in *IntegrationKitTraits) DeepCopyInto(out *IntegrationKitTraits) {
*out = new(trait.BuilderTrait)
(*in).DeepCopyInto(*out)
}
+ if in.Camel != nil {
+ in, out := &in.Camel, &out.Camel
+ *out = new(trait.CamelTrait)
+ (*in).DeepCopyInto(*out)
+ }
if in.Quarkus != nil {
in, out := &in.Quarkus, &out.Quarkus
*out = new(trait.QuarkusTrait)
@@ -838,11 +843,6 @@ func (in *IntegrationKitTraits) DeepCopyInto(out *IntegrationKitTraits) {
*out = new(trait.RegistryTrait)
(*in).DeepCopyInto(*out)
}
- if in.Camel != nil {
- in, out := &in.Camel, &out.Camel
- *out = new(trait.CamelTrait)
- (*in).DeepCopyInto(*out)
- }
if in.Addons != nil {
in, out := &in.Addons, &out.Addons
*out = make(map[string]AddonTrait, len(*in))
diff --git a/pkg/util/defaults/defaults.go b/pkg/util/defaults/defaults.go
index 70f1a9fa5..d2d95c7a6 100644
--- a/pkg/util/defaults/defaults.go
+++ b/pkg/util/defaults/defaults.go
@@ -26,7 +26,7 @@ const (
Version = "1.10.3-SNAPSHOT"
// DefaultRuntimeVersion --
- DefaultRuntimeVersion = "1.15.1"
+ DefaultRuntimeVersion = "1.15.2"
// BuildahVersion --
BuildahVersion = "1.23.3"