davsclaus commented on PR #3136:
URL: https://github.com/apache/camel-kamelets/pull/3136#issuecomment-6947435617

   @jamesnetherton could you rebase this on `main` when you have a moment?
   
   Since this PR was opened, `main` has moved by about 20 commits: the Kamelet 
description rewrite (#3140, #3141–#3155), the fixes #3156–#3158, and #3164. 
Many of them touch the same Kamelet YAML files as this PR. A trial merge shows 
that the Kamelet YAML merges cleanly, since those commits change descriptions 
and this PR changes dependencies. Only two files conflict:
   
   - `pom.xml`
   - `camel-kamelets-sbom/camel-kamelets-catalog-sbom.json` (generated, so 
regenerate it rather than resolving it by hand)
   
   After the rebase, run `./mvnw clean install` twice. The build copies the 
Kamelets into `library/camel-kamelets` and regenerates `kamelets-index.json`, 
and the first build still tests the old copy.
   
   _Claude Code on behalf of Claus Ibsen_


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: [email protected]

For queries about this service, please contact Infrastructure at:
[email protected]

Reply via email to