You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gi...@apache.org on 2023/10/31 23:51:43 UTC
(camel-k) branch main updated (221571f5d -> b0caa04d7)
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
from 221571f5d chore(deps): bump sigs.k8s.io/structured-merge-diff/v4
new d43fcba99 chore: changelog automatic update
new b0caa04d7 chore: nightly SBOM update
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:
CHANGELOG.md | 2 ++
camel-k-sbom/camel-k-sbom.json | 74 +++++++++++++++++++++---------------------
2 files changed, 39 insertions(+), 37 deletions(-)
(camel-k) 01/02: chore: changelog automatic update
Posted by gi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit d43fcba99612197e655d30ee855965eba86d7751
Author: github-actions[bot] <41...@users.noreply.github.com>
AuthorDate: Tue Oct 31 23:43:56 2023 +0000
chore: changelog automatic update
---
CHANGELOG.md | 2 ++
1 file changed, 2 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 56d79bbeb..4591dff4e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,8 @@
**Merged pull requests:**
+- chore\(deps\): bump sigs.k8s.io/structured-merge-diff/v4 from 4.4.0 to 4.4.1 [\#4884](https://github.com/apache/camel-k/pull/4884) ([dependabot[bot]](https://github.com/apps/dependabot))
+- chore\(deps\): bump github.com/docker/docker from 24.0.0+incompatible to 24.0.7+incompatible [\#4879](https://github.com/apache/camel-k/pull/4879) ([dependabot[bot]](https://github.com/apps/dependabot))
- fix\(doc\): Runtime resources example fix [\#4878](https://github.com/apache/camel-k/pull/4878) ([gansheer](https://github.com/gansheer))
- fix\(doc\): Remove ambiguous local files usage on config/resources [\#4876](https://github.com/apache/camel-k/pull/4876) ([gansheer](https://github.com/gansheer))
- chore\(deps\): bump sigs.k8s.io/structured-merge-diff/v4 from 4.3.0 to 4.4.0 [\#4874](https://github.com/apache/camel-k/pull/4874) ([dependabot[bot]](https://github.com/apps/dependabot))
(camel-k) 02/02: chore: nightly SBOM update
Posted by gi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit b0caa04d74a7e63044528bc7d0ac6f1147290c17
Author: github-actions[bot] <41...@users.noreply.github.com>
AuthorDate: Tue Oct 31 23:48:48 2023 +0000
chore: nightly SBOM update
---
camel-k-sbom/camel-k-sbom.json | 74 +++++++++++++++++++++---------------------
1 file changed, 37 insertions(+), 37 deletions(-)
diff --git a/camel-k-sbom/camel-k-sbom.json b/camel-k-sbom/camel-k-sbom.json
index ad65b063b..1bd22e6ab 100644
--- a/camel-k-sbom/camel-k-sbom.json
+++ b/camel-k-sbom/camel-k-sbom.json
@@ -2,10 +2,10 @@
"$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json",
"bomFormat": "CycloneDX",
"specVersion": "1.4",
- "serialNumber": "urn:uuid:799df78f-fc4f-4799-970d-50fcfa32ac29",
+ "serialNumber": "urn:uuid:8cd46d63-913b-46df-8cbc-a1e1309bcede",
"version": 1,
"metadata": {
- "timestamp": "2023-10-30T23:48:00Z",
+ "timestamp": "2023-10-31T23:48:48Z",
"tools": [
{
"vendor": "CycloneDX",
@@ -46,11 +46,11 @@
}
],
"component": {
- "bom-ref": "pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231030234345-62b7a7e860ac?type=module",
+ "bom-ref": "pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231031234356-d43fcba99612?type=module",
"type": "application",
"name": "github.com/apache/camel-k/v2",
- "version": "v0.0.0-20231030234345-62b7a7e860ac",
- "purl": "pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231030234345-62b7a7e860ac?type=module\u0026goos=linux\u0026goarch=amd64",
+ "version": "v0.0.0-20231031234356-d43fcba99612",
+ "purl": "pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231031234356-d43fcba99612?type=module\u0026goos=linux\u0026goarch=amd64",
"externalReferences": [
{
"url": "https://github.com/apache/camel-k",
@@ -551,18 +551,18 @@
}
},
{
- "bom-ref": "pkg:golang/github.com/docker/docker@v24.0.0+incompatible?type=module",
+ "bom-ref": "pkg:golang/github.com/docker/docker@v24.0.7+incompatible?type=module",
"type": "library",
"name": "github.com/docker/docker",
- "version": "v24.0.0+incompatible",
+ "version": "v24.0.7+incompatible",
"scope": "required",
"hashes": [
{
"alg": "SHA-256",
- "content": "cf86dff07bce3575fd4dd7b994604c43bc8226035a86626e99dad2b5901b798e"
+ "content": "5a8ea5dfb02ec0fdc968c9d96b6dba973557180dc5f48835b1e41e9f470a6253"
}
],
- "purl": "pkg:golang/github.com/docker/docker@v24.0.0+incompatible?type=module\u0026goos=linux\u0026goarch=amd64",
+ "purl": "pkg:golang/github.com/docker/docker@v24.0.7+incompatible?type=module\u0026goos=linux\u0026goarch=amd64",
"externalReferences": [
{
"url": "https://github.com/docker/docker",
@@ -3814,18 +3814,18 @@
}
},
{
- "bom-ref": "pkg:golang/sigs.k8s.io/structured-merge-diff/v4@v4.4.0?type=module",
+ "bom-ref": "pkg:golang/sigs.k8s.io/structured-merge-diff/v4@v4.4.1?type=module",
"type": "library",
"name": "sigs.k8s.io/structured-merge-diff/v4",
- "version": "v4.4.0",
+ "version": "v4.4.1",
"scope": "required",
"hashes": [
{
"alg": "SHA-256",
- "content": "64d59c7bf83cb855b8d5c2bd5d80a3ed146debdd7d216ce73d9d95382b872e38"
+ "content": "d79d0bfb4becffc0c0efc875bb4da8a16d7f7c5abf2f0afeb068aa973bebb6ae"
}
],
- "purl": "pkg:golang/sigs.k8s.io/structured-merge-diff/v4@v4.4.0?type=module\u0026goos=linux\u0026goarch=amd64",
+ "purl": "pkg:golang/sigs.k8s.io/structured-merge-diff/v4@v4.4.1?type=module\u0026goos=linux\u0026goarch=amd64",
"evidence": {
"licenses": [
{
@@ -3853,7 +3853,7 @@
],
"dependencies": [
{
- "ref": "pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231030234345-62b7a7e860ac?type=module",
+ "ref": "pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231031234356-d43fcba99612?type=module",
"dependsOn": [
"pkg:golang/github.com/Masterminds/semver@v1.5.0?type=module",
"pkg:golang/github.com/container-tools/spectrum@v0.6.40?type=module",
@@ -3905,7 +3905,7 @@
"pkg:golang/knative.dev/pkg@v0.0.0-20231011193800-bd99f2f98be7?type=module",
"pkg:golang/knative.dev/serving@v0.38.2?type=module",
"pkg:golang/sigs.k8s.io/controller-runtime@v0.15.2?type=module",
- "pkg:golang/sigs.k8s.io/structured-merge-diff/v4@v4.4.0?type=module"
+ "pkg:golang/sigs.k8s.io/structured-merge-diff/v4@v4.4.1?type=module"
]
},
{
@@ -4029,7 +4029,7 @@
"pkg:golang/github.com/davecgh/go-spew@v1.1.2-0.20180830191138-d8f796af33cc?type=module",
"pkg:golang/github.com/docker/cli@v24.0.7+incompatible?type=module",
"pkg:golang/github.com/docker/distribution@v2.8.2+incompatible?type=module",
- "pkg:golang/github.com/docker/docker@v24.0.0+incompatible?type=module",
+ "pkg:golang/github.com/docker/docker@v24.0.7+incompatible?type=module",
"pkg:golang/github.com/docker/docker-credential-helpers@v0.7.0?type=module",
"pkg:golang/github.com/google/go-cmp@v0.6.0?type=module",
"pkg:golang/github.com/google/go-containerregistry@v0.16.1?type=module",
@@ -4072,7 +4072,7 @@
"ref": "pkg:golang/github.com/docker/distribution@v2.8.2+incompatible?type=module"
},
{
- "ref": "pkg:golang/github.com/docker/docker@v24.0.0+incompatible?type=module"
+ "ref": "pkg:golang/github.com/docker/docker@v24.0.7+incompatible?type=module"
},
{
"ref": "pkg:golang/github.com/docker/docker-credential-helpers@v0.7.0?type=module",
@@ -4183,7 +4183,7 @@
"pkg:golang/github.com/containerd/stargz-snapshotter/estargz@v0.14.3?type=module",
"pkg:golang/github.com/docker/cli@v24.0.7+incompatible?type=module",
"pkg:golang/github.com/docker/distribution@v2.8.2+incompatible?type=module",
- "pkg:golang/github.com/docker/docker@v24.0.0+incompatible?type=module",
+ "pkg:golang/github.com/docker/docker@v24.0.7+incompatible?type=module",
"pkg:golang/github.com/docker/docker-credential-helpers@v0.7.0?type=module",
"pkg:golang/github.com/gogo/protobuf@v1.3.2?type=module",
"pkg:golang/github.com/golang/protobuf@v1.5.3?type=module",
@@ -4390,7 +4390,7 @@
"pkg:golang/k8s.io/kube-openapi@v0.0.0-20230501164219-8b0f38b5fd1f?type=module",
"pkg:golang/k8s.io/utils@v0.0.0-20230505201702-9f6742963106?type=module",
"pkg:golang/sigs.k8s.io/json@v0.0.0-20221116044647-bc3834ca7abd?type=module",
- "pkg:golang/sigs.k8s.io/structured-merge-diff/v4@v4.4.0?type=module",
+ "pkg:golang/sigs.k8s.io/structured-merge-diff/v4@v4.4.1?type=module",
"pkg:golang/sigs.k8s.io/yaml@v1.3.0?type=module"
]
},
@@ -4456,7 +4456,7 @@
"pkg:golang/k8s.io/utils@v0.0.0-20230505201702-9f6742963106?type=module",
"pkg:golang/sigs.k8s.io/controller-runtime@v0.15.2?type=module",
"pkg:golang/sigs.k8s.io/json@v0.0.0-20221116044647-bc3834ca7abd?type=module",
- "pkg:golang/sigs.k8s.io/structured-merge-diff/v4@v4.4.0?type=module",
+ "pkg:golang/sigs.k8s.io/structured-merge-diff/v4@v4.4.1?type=module",
"pkg:golang/sigs.k8s.io/yaml@v1.3.0?type=module"
]
},
@@ -4492,7 +4492,7 @@
"pkg:golang/k8s.io/utils@v0.0.0-20230505201702-9f6742963106?type=module",
"pkg:golang/sigs.k8s.io/controller-runtime@v0.15.2?type=module",
"pkg:golang/sigs.k8s.io/json@v0.0.0-20221116044647-bc3834ca7abd?type=module",
- "pkg:golang/sigs.k8s.io/structured-merge-diff/v4@v4.4.0?type=module"
+ "pkg:golang/sigs.k8s.io/structured-merge-diff/v4@v4.4.1?type=module"
]
},
{
@@ -4597,7 +4597,7 @@
"pkg:golang/k8s.io/utils@v0.0.0-20230505201702-9f6742963106?type=module",
"pkg:golang/sigs.k8s.io/controller-runtime@v0.15.2?type=module",
"pkg:golang/sigs.k8s.io/json@v0.0.0-20221116044647-bc3834ca7abd?type=module",
- "pkg:golang/sigs.k8s.io/structured-merge-diff/v4@v4.4.0?type=module",
+ "pkg:golang/sigs.k8s.io/structured-merge-diff/v4@v4.4.1?type=module",
"pkg:golang/sigs.k8s.io/yaml@v1.3.0?type=module"
]
},
@@ -5032,7 +5032,7 @@
"pkg:golang/k8s.io/klog/v2@v2.100.1?type=module",
"pkg:golang/k8s.io/utils@v0.0.0-20230505201702-9f6742963106?type=module",
"pkg:golang/sigs.k8s.io/json@v0.0.0-20221116044647-bc3834ca7abd?type=module",
- "pkg:golang/sigs.k8s.io/structured-merge-diff/v4@v4.4.0?type=module",
+ "pkg:golang/sigs.k8s.io/structured-merge-diff/v4@v4.4.1?type=module",
"pkg:golang/sigs.k8s.io/yaml@v1.3.0?type=module"
]
},
@@ -5105,7 +5105,7 @@
"pkg:golang/k8s.io/kube-openapi@v0.0.0-20230501164219-8b0f38b5fd1f?type=module",
"pkg:golang/k8s.io/utils@v0.0.0-20230505201702-9f6742963106?type=module",
"pkg:golang/sigs.k8s.io/json@v0.0.0-20221116044647-bc3834ca7abd?type=module",
- "pkg:golang/sigs.k8s.io/structured-merge-diff/v4@v4.4.0?type=module",
+ "pkg:golang/sigs.k8s.io/structured-merge-diff/v4@v4.4.1?type=module",
"pkg:golang/sigs.k8s.io/yaml@v1.3.0?type=module"
]
},
@@ -5148,7 +5148,7 @@
"pkg:golang/k8s.io/kube-openapi@v0.0.0-20230501164219-8b0f38b5fd1f?type=module",
"pkg:golang/k8s.io/utils@v0.0.0-20230505201702-9f6742963106?type=module",
"pkg:golang/sigs.k8s.io/json@v0.0.0-20221116044647-bc3834ca7abd?type=module",
- "pkg:golang/sigs.k8s.io/structured-merge-diff/v4@v4.4.0?type=module",
+ "pkg:golang/sigs.k8s.io/structured-merge-diff/v4@v4.4.1?type=module",
"pkg:golang/sigs.k8s.io/yaml@v1.3.0?type=module"
]
},
@@ -5200,7 +5200,7 @@
"pkg:golang/k8s.io/kube-openapi@v0.0.0-20230501164219-8b0f38b5fd1f?type=module",
"pkg:golang/k8s.io/utils@v0.0.0-20230505201702-9f6742963106?type=module",
"pkg:golang/sigs.k8s.io/json@v0.0.0-20221116044647-bc3834ca7abd?type=module",
- "pkg:golang/sigs.k8s.io/structured-merge-diff/v4@v4.4.0?type=module",
+ "pkg:golang/sigs.k8s.io/structured-merge-diff/v4@v4.4.1?type=module",
"pkg:golang/sigs.k8s.io/yaml@v1.3.0?type=module"
]
},
@@ -5250,7 +5250,7 @@
"pkg:golang/k8s.io/kube-openapi@v0.0.0-20230501164219-8b0f38b5fd1f?type=module",
"pkg:golang/k8s.io/utils@v0.0.0-20230505201702-9f6742963106?type=module",
"pkg:golang/sigs.k8s.io/json@v0.0.0-20221116044647-bc3834ca7abd?type=module",
- "pkg:golang/sigs.k8s.io/structured-merge-diff/v4@v4.4.0?type=module",
+ "pkg:golang/sigs.k8s.io/structured-merge-diff/v4@v4.4.1?type=module",
"pkg:golang/sigs.k8s.io/yaml@v1.3.0?type=module"
]
},
@@ -5309,7 +5309,7 @@
"pkg:golang/k8s.io/kube-openapi@v0.0.0-20230501164219-8b0f38b5fd1f?type=module",
"pkg:golang/k8s.io/utils@v0.0.0-20230505201702-9f6742963106?type=module",
"pkg:golang/sigs.k8s.io/json@v0.0.0-20221116044647-bc3834ca7abd?type=module",
- "pkg:golang/sigs.k8s.io/structured-merge-diff/v4@v4.4.0?type=module",
+ "pkg:golang/sigs.k8s.io/structured-merge-diff/v4@v4.4.1?type=module",
"pkg:golang/sigs.k8s.io/yaml@v1.3.0?type=module"
]
},
@@ -5368,7 +5368,7 @@
"pkg:golang/k8s.io/klog/v2@v2.100.1?type=module",
"pkg:golang/k8s.io/utils@v0.0.0-20230505201702-9f6742963106?type=module",
"pkg:golang/sigs.k8s.io/json@v0.0.0-20221116044647-bc3834ca7abd?type=module",
- "pkg:golang/sigs.k8s.io/structured-merge-diff/v4@v4.4.0?type=module",
+ "pkg:golang/sigs.k8s.io/structured-merge-diff/v4@v4.4.1?type=module",
"pkg:golang/sigs.k8s.io/yaml@v1.3.0?type=module"
]
},
@@ -5427,7 +5427,7 @@
"pkg:golang/k8s.io/kube-openapi@v0.0.0-20230501164219-8b0f38b5fd1f?type=module",
"pkg:golang/k8s.io/utils@v0.0.0-20230505201702-9f6742963106?type=module",
"pkg:golang/sigs.k8s.io/json@v0.0.0-20221116044647-bc3834ca7abd?type=module",
- "pkg:golang/sigs.k8s.io/structured-merge-diff/v4@v4.4.0?type=module",
+ "pkg:golang/sigs.k8s.io/structured-merge-diff/v4@v4.4.1?type=module",
"pkg:golang/sigs.k8s.io/yaml@v1.3.0?type=module"
]
},
@@ -5527,7 +5527,7 @@
"pkg:golang/k8s.io/utils@v0.0.0-20230505201702-9f6742963106?type=module",
"pkg:golang/knative.dev/pkg@v0.0.0-20231011193800-bd99f2f98be7?type=module",
"pkg:golang/sigs.k8s.io/json@v0.0.0-20221116044647-bc3834ca7abd?type=module",
- "pkg:golang/sigs.k8s.io/structured-merge-diff/v4@v4.4.0?type=module",
+ "pkg:golang/sigs.k8s.io/structured-merge-diff/v4@v4.4.1?type=module",
"pkg:golang/sigs.k8s.io/yaml@v1.3.0?type=module"
]
},
@@ -5607,7 +5607,7 @@
"pkg:golang/k8s.io/utils@v0.0.0-20230505201702-9f6742963106?type=module",
"pkg:golang/knative.dev/pkg@v0.0.0-20231011193800-bd99f2f98be7?type=module",
"pkg:golang/sigs.k8s.io/json@v0.0.0-20221116044647-bc3834ca7abd?type=module",
- "pkg:golang/sigs.k8s.io/structured-merge-diff/v4@v4.4.0?type=module",
+ "pkg:golang/sigs.k8s.io/structured-merge-diff/v4@v4.4.1?type=module",
"pkg:golang/sigs.k8s.io/yaml@v1.3.0?type=module"
]
},
@@ -5686,7 +5686,7 @@
"pkg:golang/k8s.io/kube-openapi@v0.0.0-20230501164219-8b0f38b5fd1f?type=module",
"pkg:golang/k8s.io/utils@v0.0.0-20230505201702-9f6742963106?type=module",
"pkg:golang/sigs.k8s.io/json@v0.0.0-20221116044647-bc3834ca7abd?type=module",
- "pkg:golang/sigs.k8s.io/structured-merge-diff/v4@v4.4.0?type=module",
+ "pkg:golang/sigs.k8s.io/structured-merge-diff/v4@v4.4.1?type=module",
"pkg:golang/sigs.k8s.io/yaml@v1.3.0?type=module"
]
},
@@ -5703,7 +5703,7 @@
"pkg:golang/github.com/davecgh/go-spew@v1.1.2-0.20180830191138-d8f796af33cc?type=module",
"pkg:golang/github.com/docker/cli@v24.0.7+incompatible?type=module",
"pkg:golang/github.com/docker/distribution@v2.8.2+incompatible?type=module",
- "pkg:golang/github.com/docker/docker@v24.0.0+incompatible?type=module",
+ "pkg:golang/github.com/docker/docker@v24.0.7+incompatible?type=module",
"pkg:golang/github.com/docker/docker-credential-helpers@v0.7.0?type=module",
"pkg:golang/github.com/emicklei/go-restful/v3@v3.9.0?type=module",
"pkg:golang/github.com/evanphx/json-patch@v5.7.0+incompatible?type=module",
@@ -5781,7 +5781,7 @@
"pkg:golang/knative.dev/networking@v0.0.0-20231012062757-a5958051caf8?type=module",
"pkg:golang/knative.dev/pkg@v0.0.0-20231011193800-bd99f2f98be7?type=module",
"pkg:golang/sigs.k8s.io/json@v0.0.0-20221116044647-bc3834ca7abd?type=module",
- "pkg:golang/sigs.k8s.io/structured-merge-diff/v4@v4.4.0?type=module",
+ "pkg:golang/sigs.k8s.io/structured-merge-diff/v4@v4.4.1?type=module",
"pkg:golang/sigs.k8s.io/yaml@v1.3.0?type=module"
]
},
@@ -5844,7 +5844,7 @@
"pkg:golang/k8s.io/kube-openapi@v0.0.0-20230501164219-8b0f38b5fd1f?type=module",
"pkg:golang/k8s.io/utils@v0.0.0-20230505201702-9f6742963106?type=module",
"pkg:golang/sigs.k8s.io/json@v0.0.0-20221116044647-bc3834ca7abd?type=module",
- "pkg:golang/sigs.k8s.io/structured-merge-diff/v4@v4.4.0?type=module",
+ "pkg:golang/sigs.k8s.io/structured-merge-diff/v4@v4.4.1?type=module",
"pkg:golang/sigs.k8s.io/yaml@v1.3.0?type=module"
]
},
@@ -5852,7 +5852,7 @@
"ref": "pkg:golang/sigs.k8s.io/json@v0.0.0-20221116044647-bc3834ca7abd?type=module"
},
{
- "ref": "pkg:golang/sigs.k8s.io/structured-merge-diff/v4@v4.4.0?type=module",
+ "ref": "pkg:golang/sigs.k8s.io/structured-merge-diff/v4@v4.4.1?type=module",
"dependsOn": [
"pkg:golang/github.com/google/go-cmp@v0.6.0?type=module",
"pkg:golang/github.com/google/gofuzz@v1.2.0?type=module",