This is an automated email from the ASF dual-hosted git repository.
oscerd pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git
The following commit(s) were added to refs/heads/main by this push:
new 1decc0e25 chore: Migrate GitHub kamelets from camel-github to
camel-github2 (#2860)
1decc0e25 is described below
commit 1decc0e254f399973ca864b8d9f9284ca4b45902
Author: Andrea Cosentino <[email protected]>
AuthorDate: Thu Jun 11 13:16:20 2026 +0200
chore: Migrate GitHub kamelets from camel-github to camel-github2 (#2860)
The camel-github component was removed in Camel 4.21.0 and replaced by
camel-github2. Update all GitHub source kamelets to use the new
camel:github2 dependency and github2:// URI scheme, and update the
KameletPrefixSchemeEnum mappings accordingly. Also add null-safety in
KameletsCatalog.getKameletSupportedHeaders to prevent NPE when a
component model is not found in the catalog.
Signed-off-by: Andrea Cosentino <[email protected]>
Co-authored-by: Claude Opus 4.6 (1M context) <[email protected]>
---
kamelets/github-commit-source.kamelet.yaml | 4 ++--
kamelets/github-event-source.kamelet.yaml | 4 ++--
kamelets/github-pullrequest-comment-source.kamelet.yaml | 4 ++--
kamelets/github-pullrequest-source.kamelet.yaml | 4 ++--
kamelets/github-tag-source.kamelet.yaml | 4 ++--
.../org/apache/camel/kamelets/catalog/KameletsCatalog.java | 5 +++--
.../camel/kamelets/catalog/model/KameletPrefixSchemeEnum.java | 10 +++++-----
.../main/resources/kamelets/github-commit-source.kamelet.yaml | 4 ++--
.../main/resources/kamelets/github-event-source.kamelet.yaml | 4 ++--
.../kamelets/github-pullrequest-comment-source.kamelet.yaml | 4 ++--
.../resources/kamelets/github-pullrequest-source.kamelet.yaml | 4 ++--
.../src/main/resources/kamelets/github-tag-source.kamelet.yaml | 4 ++--
12 files changed, 28 insertions(+), 27 deletions(-)
diff --git a/kamelets/github-commit-source.kamelet.yaml
b/kamelets/github-commit-source.kamelet.yaml
index 01246b212..77fbd1cb0 100644
--- a/kamelets/github-commit-source.kamelet.yaml
+++ b/kamelets/github-commit-source.kamelet.yaml
@@ -68,11 +68,11 @@ spec:
mediaType: application/json
dependencies:
- "camel:jackson"
- - "camel:github"
+ - "camel:github2"
- "camel:kamelet"
template:
from:
- uri: "github://commit/{{branch}}"
+ uri: "github2://commit/{{branch}}"
parameters:
repoName: "{{repoName}}"
repoOwner: "{{repoOwner}}"
diff --git a/kamelets/github-event-source.kamelet.yaml
b/kamelets/github-event-source.kamelet.yaml
index 3ce5618dd..a0dcc9058 100644
--- a/kamelets/github-event-source.kamelet.yaml
+++ b/kamelets/github-event-source.kamelet.yaml
@@ -57,11 +57,11 @@ spec:
mediaType: application/json
dependencies:
- "camel:jackson"
- - "camel:github"
+ - "camel:github2"
- "camel:kamelet"
template:
from:
- uri: "github://event"
+ uri: "github2://event"
parameters:
repoName: "{{repoName}}"
repoOwner: "{{repoOwner}}"
diff --git a/kamelets/github-pullrequest-comment-source.kamelet.yaml
b/kamelets/github-pullrequest-comment-source.kamelet.yaml
index d6d634c6a..05fb4ba80 100644
--- a/kamelets/github-pullrequest-comment-source.kamelet.yaml
+++ b/kamelets/github-pullrequest-comment-source.kamelet.yaml
@@ -57,11 +57,11 @@ spec:
mediaType: application/json
dependencies:
- "camel:jackson"
- - "camel:github"
+ - "camel:github2"
- "camel:kamelet"
template:
from:
- uri: "github://pullRequestComment"
+ uri: "github2://pullRequestComment"
parameters:
repoName: "{{repoName}}"
repoOwner: "{{repoOwner}}"
diff --git a/kamelets/github-pullrequest-source.kamelet.yaml
b/kamelets/github-pullrequest-source.kamelet.yaml
index fea8572eb..aaf6a194d 100644
--- a/kamelets/github-pullrequest-source.kamelet.yaml
+++ b/kamelets/github-pullrequest-source.kamelet.yaml
@@ -57,11 +57,11 @@ spec:
mediaType: application/json
dependencies:
- "camel:jackson"
- - "camel:github"
+ - "camel:github2"
- "camel:kamelet"
template:
from:
- uri: "github://pullRequest"
+ uri: "github2://pullRequest"
parameters:
repoName: "{{repoName}}"
repoOwner: "{{repoOwner}}"
diff --git a/kamelets/github-tag-source.kamelet.yaml
b/kamelets/github-tag-source.kamelet.yaml
index d8f566d2c..8b1646df2 100644
--- a/kamelets/github-tag-source.kamelet.yaml
+++ b/kamelets/github-tag-source.kamelet.yaml
@@ -57,11 +57,11 @@ spec:
mediaType: application/json
dependencies:
- "camel:jackson"
- - "camel:github"
+ - "camel:github2"
- "camel:kamelet"
template:
from:
- uri: "github://tag"
+ uri: "github2://tag"
parameters:
repoName: "{{repoName}}"
repoOwner: "{{repoOwner}}"
diff --git
a/library/camel-kamelets-catalog/src/main/java/org/apache/camel/kamelets/catalog/KameletsCatalog.java
b/library/camel-kamelets-catalog/src/main/java/org/apache/camel/kamelets/catalog/KameletsCatalog.java
index 60dbbb0ff..e95260e15 100644
---
a/library/camel-kamelets-catalog/src/main/java/org/apache/camel/kamelets/catalog/KameletsCatalog.java
+++
b/library/camel-kamelets-catalog/src/main/java/org/apache/camel/kamelets/catalog/KameletsCatalog.java
@@ -231,8 +231,9 @@ public class KameletsCatalog {
String prefixName = local.getMetadata().getName().substring(0,
lastIndex);
String schemeName = enumValue(prefixName);
if (schemeName != null) {
- if
(ObjectHelper.isNotEmpty(cc.componentModel(schemeName).getEndpointHeaders())) {
- List<ComponentModel.EndpointHeaderModel> headers =
cc.componentModel(schemeName).getEndpointHeaders();
+ ComponentModel componentModel = cc.componentModel(schemeName);
+ if (componentModel != null &&
ObjectHelper.isNotEmpty(componentModel.getEndpointHeaders())) {
+ List<ComponentModel.EndpointHeaderModel> headers =
componentModel.getEndpointHeaders();
for (ComponentModel.EndpointHeaderModel e : headers) {
if (ObjectHelper.isEmpty(e.getLabel()) ||
e.getLabel().equalsIgnoreCase(camelType)) {
resultingHeaders.add(e);
diff --git
a/library/camel-kamelets-catalog/src/main/java/org/apache/camel/kamelets/catalog/model/KameletPrefixSchemeEnum.java
b/library/camel-kamelets-catalog/src/main/java/org/apache/camel/kamelets/catalog/model/KameletPrefixSchemeEnum.java
index 587e9eb52..2a58dd39c 100644
---
a/library/camel-kamelets-catalog/src/main/java/org/apache/camel/kamelets/catalog/model/KameletPrefixSchemeEnum.java
+++
b/library/camel-kamelets-catalog/src/main/java/org/apache/camel/kamelets/catalog/model/KameletPrefixSchemeEnum.java
@@ -55,11 +55,11 @@ public enum KameletPrefixSchemeEnum {
file_watch("file-watch", "file-watch"),
ftp("ftp", "ftp"),
ftps("ftps", "ftps"),
- github_commit("github-commit", "github"),
- github_event("github-event", "github"),
- github_pr_comments("github-pullrequest-comment", "github"),
- github_pr("github-pullrequest", "github"),
- github_tag("github-tag", "github"),
+ github_commit("github-commit", "github2"),
+ github_event("github-event", "github2"),
+ github_pr_comments("github-pullrequest-comment", "github2"),
+ github_pr("github-pullrequest", "github2"),
+ github_tag("github-tag", "github2"),
google_bigquery("google-bigquery", "google-bigquery"),
google_calendar("google-calendar", "google-calendar-stream"),
google_functions("google-functions", "google-functions"),
diff --git
a/library/camel-kamelets/src/main/resources/kamelets/github-commit-source.kamelet.yaml
b/library/camel-kamelets/src/main/resources/kamelets/github-commit-source.kamelet.yaml
index 01246b212..77fbd1cb0 100644
---
a/library/camel-kamelets/src/main/resources/kamelets/github-commit-source.kamelet.yaml
+++
b/library/camel-kamelets/src/main/resources/kamelets/github-commit-source.kamelet.yaml
@@ -68,11 +68,11 @@ spec:
mediaType: application/json
dependencies:
- "camel:jackson"
- - "camel:github"
+ - "camel:github2"
- "camel:kamelet"
template:
from:
- uri: "github://commit/{{branch}}"
+ uri: "github2://commit/{{branch}}"
parameters:
repoName: "{{repoName}}"
repoOwner: "{{repoOwner}}"
diff --git
a/library/camel-kamelets/src/main/resources/kamelets/github-event-source.kamelet.yaml
b/library/camel-kamelets/src/main/resources/kamelets/github-event-source.kamelet.yaml
index 3ce5618dd..a0dcc9058 100644
---
a/library/camel-kamelets/src/main/resources/kamelets/github-event-source.kamelet.yaml
+++
b/library/camel-kamelets/src/main/resources/kamelets/github-event-source.kamelet.yaml
@@ -57,11 +57,11 @@ spec:
mediaType: application/json
dependencies:
- "camel:jackson"
- - "camel:github"
+ - "camel:github2"
- "camel:kamelet"
template:
from:
- uri: "github://event"
+ uri: "github2://event"
parameters:
repoName: "{{repoName}}"
repoOwner: "{{repoOwner}}"
diff --git
a/library/camel-kamelets/src/main/resources/kamelets/github-pullrequest-comment-source.kamelet.yaml
b/library/camel-kamelets/src/main/resources/kamelets/github-pullrequest-comment-source.kamelet.yaml
index d6d634c6a..05fb4ba80 100644
---
a/library/camel-kamelets/src/main/resources/kamelets/github-pullrequest-comment-source.kamelet.yaml
+++
b/library/camel-kamelets/src/main/resources/kamelets/github-pullrequest-comment-source.kamelet.yaml
@@ -57,11 +57,11 @@ spec:
mediaType: application/json
dependencies:
- "camel:jackson"
- - "camel:github"
+ - "camel:github2"
- "camel:kamelet"
template:
from:
- uri: "github://pullRequestComment"
+ uri: "github2://pullRequestComment"
parameters:
repoName: "{{repoName}}"
repoOwner: "{{repoOwner}}"
diff --git
a/library/camel-kamelets/src/main/resources/kamelets/github-pullrequest-source.kamelet.yaml
b/library/camel-kamelets/src/main/resources/kamelets/github-pullrequest-source.kamelet.yaml
index fea8572eb..aaf6a194d 100644
---
a/library/camel-kamelets/src/main/resources/kamelets/github-pullrequest-source.kamelet.yaml
+++
b/library/camel-kamelets/src/main/resources/kamelets/github-pullrequest-source.kamelet.yaml
@@ -57,11 +57,11 @@ spec:
mediaType: application/json
dependencies:
- "camel:jackson"
- - "camel:github"
+ - "camel:github2"
- "camel:kamelet"
template:
from:
- uri: "github://pullRequest"
+ uri: "github2://pullRequest"
parameters:
repoName: "{{repoName}}"
repoOwner: "{{repoOwner}}"
diff --git
a/library/camel-kamelets/src/main/resources/kamelets/github-tag-source.kamelet.yaml
b/library/camel-kamelets/src/main/resources/kamelets/github-tag-source.kamelet.yaml
index d8f566d2c..8b1646df2 100644
---
a/library/camel-kamelets/src/main/resources/kamelets/github-tag-source.kamelet.yaml
+++
b/library/camel-kamelets/src/main/resources/kamelets/github-tag-source.kamelet.yaml
@@ -57,11 +57,11 @@ spec:
mediaType: application/json
dependencies:
- "camel:jackson"
- - "camel:github"
+ - "camel:github2"
- "camel:kamelet"
template:
from:
- uri: "github://tag"
+ uri: "github2://tag"
parameters:
repoName: "{{repoName}}"
repoOwner: "{{repoOwner}}"
