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/06/02 23:45:16 UTC
[camel-k] branch main updated (289cacfca -> 580f2125f)
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 289cacfca chore(ci): split upgrade from install
new 17718d3f0 chore: changelog automatic update
new 580f2125f Periodic Sync of Camel K Main Branch for SBOM Generation
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 | 3 ++
camel-k-sbom/camel-k-sbom.json | 120 +++++++++++++++++++++++++++++++----------
2 files changed, 96 insertions(+), 27 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 17718d3f0b7e4eb2831830e9202539ae8e6a1235
Author: github-actions[bot] <41...@users.noreply.github.com>
AuthorDate: Fri Jun 2 23:42:29 2023 +0000
chore: changelog automatic update
---
CHANGELOG.md | 3 +++
1 file changed, 3 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2c6b03f50..5556c68d3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,9 @@
**Merged pull requests:**
+- chore\(e2e\): split upgrade from install [\#4454](https://github.com/apache/camel-k/pull/4454) ([squakez](https://github.com/squakez))
+- chore\(deps\): revert vfs-gen removal [\#4450](https://github.com/apache/camel-k/pull/4450) ([gansheer](https://github.com/gansheer))
+- fix\(ci\): temporarily repair upgrade checks [\#4449](https://github.com/apache/camel-k/pull/4449) ([squakez](https://github.com/squakez))
- chore\(ci\): use ubuntu-latest [\#4445](https://github.com/apache/camel-k/pull/4445) ([squakez](https://github.com/squakez))
- chore\(deps\): bump github.com/cloudflare/circl from 1.1.0 to 1.3.3 [\#4442](https://github.com/apache/camel-k/pull/4442) ([dependabot[bot]](https://github.com/apps/dependabot))
- chore\(deps\): bump github.com/cloudflare/circl from 1.1.0 to 1.3.3 in /pkg/kamelet/repository [\#4441](https://github.com/apache/camel-k/pull/4441) ([dependabot[bot]](https://github.com/apps/dependabot))
[camel-k] 02/02: Periodic Sync of Camel K Main Branch for SBOM Generation
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 580f2125faf38d868b809c8236de2bcff662b291
Author: github-actions[bot] <41...@users.noreply.github.com>
AuthorDate: Fri Jun 2 23:45:10 2023 +0000
Periodic Sync of Camel K Main Branch for SBOM Generation
---
camel-k-sbom/camel-k-sbom.json | 120 +++++++++++++++++++++++++++++++----------
1 file changed, 93 insertions(+), 27 deletions(-)
diff --git a/camel-k-sbom/camel-k-sbom.json b/camel-k-sbom/camel-k-sbom.json
index 96a499ac2..323e66d51 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:e40e912e-09b9-47cd-9889-206f69012b18",
+ "serialNumber": "urn:uuid:9ebf9a44-685e-4cf5-8f1e-ed8335206ab9",
"version": 1,
"metadata": {
- "timestamp": "2023-06-01T23:44:54Z",
+ "timestamp": "2023-06-02T23:45:10Z",
"tools": [
{
"vendor": "CycloneDX",
@@ -46,11 +46,11 @@
}
],
"component": {
- "bom-ref": "pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20230601234207-2e7ffbde8cc7?type=module",
+ "bom-ref": "pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20230602234229-17718d3f0b7e?type=module",
"type": "application",
"name": "github.com/apache/camel-k/v2",
- "version": "v0.0.0-20230601234207-2e7ffbde8cc7",
- "purl": "pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20230601234207-2e7ffbde8cc7?type=module\u0026goos=linux\u0026goarch=amd64",
+ "version": "v0.0.0-20230602234229-17718d3f0b7e",
+ "purl": "pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20230602234229-17718d3f0b7e?type=module\u0026goos=linux\u0026goarch=amd64",
"externalReferences": [
{
"url": "https://github.com/apache/camel-k",
@@ -423,18 +423,18 @@
}
},
{
- "bom-ref": "pkg:golang/github.com/apache/camel-k/v2/pkg/apis/camel@v0.0.0-20230601234207-2e7ffbde8cc7?type=module",
+ "bom-ref": "pkg:golang/github.com/apache/camel-k/v2/pkg/apis/camel@v0.0.0-20230602234229-17718d3f0b7e?type=module",
"type": "library",
"name": "github.com/apache/camel-k/v2/pkg/apis/camel",
- "version": "v0.0.0-20230601234207-2e7ffbde8cc7",
+ "version": "v0.0.0-20230602234229-17718d3f0b7e",
"scope": "required",
"hashes": [
{
"alg": "SHA-256",
- "content": "f760720faba6697203fc8276a1df5438193ff13b6ba90f71ae5c1225224924c8"
+ "content": "4f72352d893c7ff92777a1f332d44ad3c0a10ddf0de2c8859f5a4643c72b21e1"
}
],
- "purl": "pkg:golang/github.com/apache/camel-k/v2/pkg/apis/camel@v0.0.0-20230601234207-2e7ffbde8cc7?type=module\u0026goos=linux\u0026goarch=amd64",
+ "purl": "pkg:golang/github.com/apache/camel-k/v2/pkg/apis/camel@v0.0.0-20230602234229-17718d3f0b7e?type=module\u0026goos=linux\u0026goarch=amd64",
"externalReferences": [
{
"url": "https://github.com/apache/camel-k/v2/pkg/apis/camel",
@@ -443,18 +443,18 @@
]
},
{
- "bom-ref": "pkg:golang/github.com/apache/camel-k/v2/pkg/client/camel@v0.0.0-20230601234207-2e7ffbde8cc7?type=module",
+ "bom-ref": "pkg:golang/github.com/apache/camel-k/v2/pkg/client/camel@v0.0.0-20230602234229-17718d3f0b7e?type=module",
"type": "library",
"name": "github.com/apache/camel-k/v2/pkg/client/camel",
- "version": "v0.0.0-20230601234207-2e7ffbde8cc7",
+ "version": "v0.0.0-20230602234229-17718d3f0b7e",
"scope": "required",
"hashes": [
{
"alg": "SHA-256",
- "content": "0e409eb11e5ae862202040d3643bc6c34179ba7daf0cd0f481335880e565b4be"
+ "content": "78354230e17c7906abd4da1f8aeed4a6e6fed58c89fa250c5d0c9ab7896d9e7b"
}
],
- "purl": "pkg:golang/github.com/apache/camel-k/v2/pkg/client/camel@v0.0.0-20230601234207-2e7ffbde8cc7?type=module\u0026goos=linux\u0026goarch=amd64",
+ "purl": "pkg:golang/github.com/apache/camel-k/v2/pkg/client/camel@v0.0.0-20230602234229-17718d3f0b7e?type=module\u0026goos=linux\u0026goarch=amd64",
"externalReferences": [
{
"url": "https://github.com/apache/camel-k/v2/pkg/client/camel",
@@ -463,18 +463,18 @@
]
},
{
- "bom-ref": "pkg:golang/github.com/apache/camel-k/v2/pkg/kamelet/repository@v0.0.0-20230601234207-2e7ffbde8cc7?type=module",
+ "bom-ref": "pkg:golang/github.com/apache/camel-k/v2/pkg/kamelet/repository@v0.0.0-20230602234229-17718d3f0b7e?type=module",
"type": "library",
"name": "github.com/apache/camel-k/v2/pkg/kamelet/repository",
- "version": "v0.0.0-20230601234207-2e7ffbde8cc7",
+ "version": "v0.0.0-20230602234229-17718d3f0b7e",
"scope": "required",
"hashes": [
{
"alg": "SHA-256",
- "content": "4d62c3e4fc93debf20cd8541450e4fce9466e2884758abc4c2ae573cd168dde5"
+ "content": "04ec54665266e8efe95fe1a15d600b03eea72fd8d8c7f2a6722583c531cf4d4e"
}
],
- "purl": "pkg:golang/github.com/apache/camel-k/v2/pkg/kamelet/repository@v0.0.0-20230601234207-2e7ffbde8cc7?type=module\u0026goos=linux\u0026goarch=amd64",
+ "purl": "pkg:golang/github.com/apache/camel-k/v2/pkg/kamelet/repository@v0.0.0-20230602234229-17718d3f0b7e?type=module\u0026goos=linux\u0026goarch=amd64",
"externalReferences": [
{
"url": "https://github.com/apache/camel-k/v2/pkg/kamelet/repository",
@@ -2715,6 +2715,64 @@
]
}
},
+ {
+ "bom-ref": "pkg:golang/github.com/shurcooL/httpfs@v0.0.0-20190707220628-8d4bc4ba7749?type=module",
+ "type": "library",
+ "name": "github.com/shurcooL/httpfs",
+ "version": "v0.0.0-20190707220628-8d4bc4ba7749",
+ "scope": "required",
+ "hashes": [
+ {
+ "alg": "SHA-256",
+ "content": "6d41ac127c8d6d53f0d3a06cf34b0278044094af25870a86ca2e944fcca6b869"
+ }
+ ],
+ "purl": "pkg:golang/github.com/shurcooL/httpfs@v0.0.0-20190707220628-8d4bc4ba7749?type=module\u0026goos=linux\u0026goarch=amd64",
+ "externalReferences": [
+ {
+ "url": "https://github.com/shurcooL/httpfs",
+ "type": "vcs"
+ }
+ ],
+ "evidence": {
+ "licenses": [
+ {
+ "license": {
+ "id": "MIT"
+ }
+ }
+ ]
+ }
+ },
+ {
+ "bom-ref": "pkg:golang/github.com/shurcooL/vfsgen@v0.0.0-20181202132449-6a9ea43bcacd?type=module",
+ "type": "library",
+ "name": "github.com/shurcooL/vfsgen",
+ "version": "v0.0.0-20181202132449-6a9ea43bcacd",
+ "scope": "required",
+ "hashes": [
+ {
+ "alg": "SHA-256",
+ "content": "ba0ecfa52381e5104f2b52a0eaab24181a0fdd59e3fda358153ce75af9641a8d"
+ }
+ ],
+ "purl": "pkg:golang/github.com/shurcooL/vfsgen@v0.0.0-20181202132449-6a9ea43bcacd?type=module\u0026goos=linux\u0026goarch=amd64",
+ "externalReferences": [
+ {
+ "url": "https://github.com/shurcooL/vfsgen",
+ "type": "vcs"
+ }
+ ],
+ "evidence": {
+ "licenses": [
+ {
+ "license": {
+ "id": "MIT"
+ }
+ }
+ ]
+ }
+ },
{
"bom-ref": "pkg:golang/github.com/sirupsen/logrus@v1.9.2?type=module",
"type": "library",
@@ -3995,12 +4053,12 @@
],
"dependencies": [
{
- "ref": "pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20230601234207-2e7ffbde8cc7?type=module",
+ "ref": "pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20230602234229-17718d3f0b7e?type=module",
"dependsOn": [
"pkg:golang/github.com/Masterminds/semver@v1.5.0?type=module",
- "pkg:golang/github.com/apache/camel-k/v2/pkg/apis/camel@v0.0.0-20230601234207-2e7ffbde8cc7?type=module",
- "pkg:golang/github.com/apache/camel-k/v2/pkg/client/camel@v0.0.0-20230601234207-2e7ffbde8cc7?type=module",
- "pkg:golang/github.com/apache/camel-k/v2/pkg/kamelet/repository@v0.0.0-20230601234207-2e7ffbde8cc7?type=module",
+ "pkg:golang/github.com/apache/camel-k/v2/pkg/apis/camel@v0.0.0-20230602234229-17718d3f0b7e?type=module",
+ "pkg:golang/github.com/apache/camel-k/v2/pkg/client/camel@v0.0.0-20230602234229-17718d3f0b7e?type=module",
+ "pkg:golang/github.com/apache/camel-k/v2/pkg/kamelet/repository@v0.0.0-20230602234229-17718d3f0b7e?type=module",
"pkg:golang/github.com/container-tools/spectrum@v0.6.19?type=module",
"pkg:golang/github.com/evanphx/json-patch@v5.6.0+incompatible?type=module",
"pkg:golang/github.com/gertd/go-pluralize@v0.2.1?type=module",
@@ -4022,6 +4080,8 @@
"pkg:golang/github.com/redhat-developer/service-binding-operator@v1.3.4?type=module",
"pkg:golang/github.com/rs/xid@v1.5.0?type=module",
"pkg:golang/github.com/scylladb/go-set@v1.0.2?type=module",
+ "pkg:golang/github.com/shurcooL/httpfs@v0.0.0-20190707220628-8d4bc4ba7749?type=module",
+ "pkg:golang/github.com/shurcooL/vfsgen@v0.0.0-20181202132449-6a9ea43bcacd?type=module",
"pkg:golang/github.com/sirupsen/logrus@v1.9.2?type=module",
"pkg:golang/github.com/spf13/cobra@v1.7.0?type=module",
"pkg:golang/github.com/spf13/pflag@v1.0.5?type=module",
@@ -4155,7 +4215,7 @@
"ref": "pkg:golang/github.com/antlr/antlr4/runtime/Go/antlr@v1.4.10?type=module"
},
{
- "ref": "pkg:golang/github.com/apache/camel-k/v2/pkg/apis/camel@v0.0.0-20230601234207-2e7ffbde8cc7?type=module",
+ "ref": "pkg:golang/github.com/apache/camel-k/v2/pkg/apis/camel@v0.0.0-20230602234229-17718d3f0b7e?type=module",
"dependsOn": [
"pkg:golang/github.com/imdario/mergo@v0.3.13?type=module",
"pkg:golang/github.com/stretchr/testify@v1.8.4?type=module",
@@ -4181,9 +4241,9 @@
]
},
{
- "ref": "pkg:golang/github.com/apache/camel-k/v2/pkg/client/camel@v0.0.0-20230601234207-2e7ffbde8cc7?type=module",
+ "ref": "pkg:golang/github.com/apache/camel-k/v2/pkg/client/camel@v0.0.0-20230602234229-17718d3f0b7e?type=module",
"dependsOn": [
- "pkg:golang/github.com/apache/camel-k/v2/pkg/apis/camel@v0.0.0-20230601234207-2e7ffbde8cc7?type=module",
+ "pkg:golang/github.com/apache/camel-k/v2/pkg/apis/camel@v0.0.0-20230602234229-17718d3f0b7e?type=module",
"pkg:golang/k8s.io/api@v0.25.6?type=module",
"pkg:golang/k8s.io/apimachinery@v0.25.6?type=module",
"pkg:golang/k8s.io/client-go@v0.25.6?type=module",
@@ -4227,10 +4287,10 @@
]
},
{
- "ref": "pkg:golang/github.com/apache/camel-k/v2/pkg/kamelet/repository@v0.0.0-20230601234207-2e7ffbde8cc7?type=module",
+ "ref": "pkg:golang/github.com/apache/camel-k/v2/pkg/kamelet/repository@v0.0.0-20230602234229-17718d3f0b7e?type=module",
"dependsOn": [
- "pkg:golang/github.com/apache/camel-k/v2/pkg/apis/camel@v0.0.0-20230601234207-2e7ffbde8cc7?type=module",
- "pkg:golang/github.com/apache/camel-k/v2/pkg/client/camel@v0.0.0-20230601234207-2e7ffbde8cc7?type=module",
+ "pkg:golang/github.com/apache/camel-k/v2/pkg/apis/camel@v0.0.0-20230602234229-17718d3f0b7e?type=module",
+ "pkg:golang/github.com/apache/camel-k/v2/pkg/client/camel@v0.0.0-20230602234229-17718d3f0b7e?type=module",
"pkg:golang/github.com/stretchr/testify@v1.8.4?type=module",
"pkg:golang/golang.org/x/oauth2@v0.8.0?type=module",
"pkg:golang/k8s.io/apimachinery@v0.25.6?type=module",
@@ -4874,6 +4934,12 @@
{
"ref": "pkg:golang/github.com/scylladb/go-set@v1.0.2?type=module"
},
+ {
+ "ref": "pkg:golang/github.com/shurcooL/httpfs@v0.0.0-20190707220628-8d4bc4ba7749?type=module"
+ },
+ {
+ "ref": "pkg:golang/github.com/shurcooL/vfsgen@v0.0.0-20181202132449-6a9ea43bcacd?type=module"
+ },
{
"ref": "pkg:golang/github.com/sirupsen/logrus@v1.9.2?type=module",
"dependsOn": [