[GitHub] [camel-quarkus] jamesnetherton commented on pull request #3507: update antora.yml and source-map.yml for doc release
jamesnetherton commented on pull request #3507: URL: https://github.com/apache/camel-quarkus/pull/3507#issuecomment-1026542036 > I don't know why `extensions/qute/component/src/generated/resources/org/apache/camel/component/qute/qute.json` wasn't updated during the release... any ideas? It was - I haven't run a full build on the `2.7.x ` branch to regenerate it with the new SNAPSHOT version yet. > I'm assuming this is NOT LTS 2.7.x will be an LTS. -- 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: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch regen_bot_3.14.x updated (015d1d2 -> 9fb6e0e)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot_3.14.x in repository https://gitbox.apache.org/repos/asf/camel.git. from 015d1d2 typo fixed add 9fb6e0e Update zipdeflater-dataformat.adoc No new revisions were added by this update. Summary of changes: .../src/main/docs/gzipdeflater-dataformat.adoc| 12 ++-- .../src/main/docs/zipdeflater-dataformat.adoc | 15 ++- 2 files changed, 24 insertions(+), 3 deletions(-)
[GitHub] [camel-quarkus] github-actions[bot] commented on issue #2926: [CI] - Quarkus Main Branch Build Failure
github-actions[bot] commented on issue #2926: URL: https://github.com/apache/camel-quarkus/issues/2926#issuecomment-1026518436 Build fixed with: * Camel Quarkus Commit: a2ca7629a00bb324841a40bc3acad80ed581cc4b * Quarkus Main Commit: 7dc48c42ecfed4562e4eb2e4aa4f3a812af7f409 * Link to build: https://github.com/apache/camel-quarkus/actions/runs/1776036090 -- 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: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-quarkus] branch quarkus-main updated (5077489 -> a2ca762)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git. discard 5077489 Upgrade to Quarkus 2.8.0.CR1 add 7dc48c4 Fix #3496 Ban javax.servlet:javax.servlet-api in favor of jakarta.servlet:jakarta.servlet-api new a2ca762 Upgrade to Quarkus 2.8.0.CR1 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (5077489) \ N -- N -- N refs/heads/quarkus-main (a2ca762) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 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: extensions-jvm/cometd/runtime/pom.xml | 10 ++ extensions-jvm/hdfs/runtime/pom.xml| 8 extensions-jvm/spark/runtime/pom.xml | 8 extensions/avro-rpc/runtime/pom.xml| 10 ++ integration-tests-support/wiremock/pom.xml | 8 integration-tests/avro-rpc/pom.xml | 6 ++ integration-tests/oaipmh/pom.xml | 11 ++- pom.xml| 2 ++ 8 files changed, 62 insertions(+), 1 deletion(-)
[camel-quarkus] 01/01: Upgrade to Quarkus 2.8.0.CR1
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch quarkus-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit a2ca7629a00bb324841a40bc3acad80ed581cc4b
Author: James Netherton
AuthorDate: Thu Jan 20 07:52:37 2022 +
Upgrade to Quarkus 2.8.0.CR1
---
docs/antora.yml | 2 +-
integration-tests/http/pom.xml| 2 +-
integration-tests/vertx-websocket/pom.xml | 2 +-
pom.xml | 5 +++--
poms/build-parent/pom.xml | 9 +
5 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/docs/antora.yml b/docs/antora.yml
index ce03b9d..488a8a9 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -31,7 +31,7 @@ asciidoc:
target-maven-version: 3.8.4 # replace ${target-maven-version}
camel-version: 3.14.1 # replace ${camel.version}
camel-docs-version: 3.14.x # replace ${camel.docs.components.version}
-quarkus-version: 2.7.0.Final # replace ${quarkus.version}
+quarkus-version: 999-SNAPSHOT # replace ${quarkus.version}
graalvm-version: 21.3.0 # replace ${graalvm.version}
graalvm-docs-version: 21.3
# attributes used in xrefs to other Antora components
diff --git a/integration-tests/http/pom.xml b/integration-tests/http/pom.xml
index 68daa40..8994b61 100644
--- a/integration-tests/http/pom.xml
+++ b/integration-tests/http/pom.xml
@@ -61,7 +61,7 @@
io.quarkus
-quarkus-undertow-websockets
+quarkus-websockets
io.quarkus
diff --git a/integration-tests/vertx-websocket/pom.xml
b/integration-tests/vertx-websocket/pom.xml
index 7947fe5..abd5e2a 100644
--- a/integration-tests/vertx-websocket/pom.xml
+++ b/integration-tests/vertx-websocket/pom.xml
@@ -39,7 +39,7 @@
io.quarkus
-quarkus-undertow-websockets
+quarkus-websockets
test
diff --git a/pom.xml b/pom.xml
index 6207e78..c525de0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,7 +55,7 @@
1.0.0
2.3.0
1.0.3
-2.7.0.Final
+999-SNAPSHOT
2.0.0
0.32.0
@@ -65,6 +65,7 @@
1.18
3.5.2
1.11.0
+3.22.0
2.17.103
1.11.714
1.0.5
@@ -86,7 +87,7 @@
0.8.0
0.22.2
21.3.0
-1.43.2
+1.44.0
4.0
${hadoop3-version}
${hapi-version}
diff --git a/poms/build-parent/pom.xml b/poms/build-parent/pom.xml
index 21d4699..d8d6848 100644
--- a/poms/build-parent/pom.xml
+++ b/poms/build-parent/pom.xml
@@ -37,6 +37,15 @@
false
+
+
+
+org.assertj
+assertj-core
+${assertj.version}
+
+
+
[GitHub] [camel-quarkus] github-actions[bot] closed issue #2926: [CI] - Quarkus Main Branch Build Failure
github-actions[bot] closed issue #2926: URL: https://github.com/apache/camel-quarkus/issues/2926 -- 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: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch camel-3.14.x updated: Update zipdeflater-dataformat.adoc
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch camel-3.14.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.14.x by this push:
new 9fb6e0e Update zipdeflater-dataformat.adoc
9fb6e0e is described below
commit 9fb6e0e7122a82188398e9db60ffe1eb41340dee
Author: Chirag Sanghavi
AuthorDate: Tue Feb 1 00:00:22 2022 -0500
Update zipdeflater-dataformat.adoc
A dependency is required to use gzipDeflater and zipDeflater
---
.../src/main/docs/gzipdeflater-dataformat.adoc| 12 ++--
.../src/main/docs/zipdeflater-dataformat.adoc | 15 ++-
2 files changed, 24 insertions(+), 3 deletions(-)
diff --git
a/components/camel-zip-deflater/src/main/docs/gzipdeflater-dataformat.adoc
b/components/camel-zip-deflater/src/main/docs/gzipdeflater-dataformat.adoc
index da1a41b..8bf986c 100644
--- a/components/camel-zip-deflater/src/main/docs/gzipdeflater-dataformat.adoc
+++ b/components/camel-zip-deflater/src/main/docs/gzipdeflater-dataformat.adoc
@@ -56,8 +56,16 @@
from("activemq:queue:MY_QUEUE").unmarshal().gzipDeflater().process(new UnGZipped
== Dependencies
-This data format is provided in *camel-core* so no additional
-dependencies is needed.
+Maven users will need to add the following dependency to their pom.xml for
this component:
+[source,xml]
+
+
+org.apache.camel
+camel-zip-deflater
+
+x.x.x
+
+
include::spring-boot:partial$starter.adoc[]
diff --git
a/components/camel-zip-deflater/src/main/docs/zipdeflater-dataformat.adoc
b/components/camel-zip-deflater/src/main/docs/zipdeflater-dataformat.adoc
index b0f06be..47884a1 100644
--- a/components/camel-zip-deflater/src/main/docs/zipdeflater-dataformat.adoc
+++ b/components/camel-zip-deflater/src/main/docs/zipdeflater-dataformat.adoc
@@ -60,8 +60,21 @@ unmarshalling to avoid errors.
[source,java]
-from("activemq:queue:MY_QUEUE").unmarshal().zipDeflater().process(new
UnZippedMessageProcessor());
+from("activemq:queue:MY_QUEUE").unmarshal().zipDeflater().process(new
UnZippedMessageProcessor());
+== Dependencies
+
+Maven users will need to add the following dependency to their pom.xml for
this component:
+
+[source,xml]
+
+
+org.apache.camel
+camel-zip-deflater
+
+x.x.x
+
+
include::spring-boot:partial$starter.adoc[]
[GitHub] [camel] oscerd merged pull request #6864: Update zipdeflater-dataformat.adoc
oscerd merged pull request #6864: URL: https://github.com/apache/camel/pull/6864 -- 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: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] djencks commented on pull request #3507: update antora.yml and source-map.yml for doc release
djencks commented on pull request #3507: URL: https://github.com/apache/camel-quarkus/pull/3507#issuecomment-1026499797 As far as I can tell the groovy update scripts are now doing appropriate things at appropriate times. I don't know why `extensions/qute/component/src/generated/resources/org/apache/camel/component/qute/qute.json` wasn't updated during the release... any ideas? -- 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: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] djencks opened a new pull request #3508: fix update script
djencks opened a new pull request #3508: URL: https://github.com/apache/camel-quarkus/pull/3508 This should have the update script making only appropriate and correct updates to the doc versions on release and afterwards. It also updates the source-map.yml to the correct branch. Perhaps this can be ported to other sub-projects -- 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: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] chiragsanghavi opened a new pull request #6864: Update zipdeflater-dataformat.adoc
chiragsanghavi opened a new pull request #6864: URL: https://github.com/apache/camel/pull/6864 A dependency is required to use gzipDeflater and zipDeflater -- 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: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] github-actions[bot] commented on issue #2927: [CI] - Camel Main Branch Build Failure
github-actions[bot] commented on issue #2927: URL: https://github.com/apache/camel-quarkus/issues/2927#issuecomment-1026472247 The [camel-main](https://github.com/apache/camel-quarkus/tree/camel-main) branch build has failed: * Build ID: 1775595621-545-832695b9-5e5f-425a-9d9f-92dd03dacda7 * Camel Quarkus Commit: 2056e65dd8cfc588960a9a1741cffeb2be6c5115 * Camel Main Commit: 7dc48c42ecfed4562e4eb2e4aa4f3a812af7f409 * Link to build: https://github.com/apache/camel-quarkus/actions/runs/1775595621 -- 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: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-quarkus] branch main updated: Updated CHANGELOG.md
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-quarkus.git The following commit(s) were added to refs/heads/main by this push: new 2254061 Updated CHANGELOG.md 2254061 is described below commit 2254061c78ee4500775f174f8ba76c3ad6749aaa Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Tue Feb 1 03:14:17 2022 + Updated CHANGELOG.md --- CHANGELOG.md | 5 + 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 22ad512..4423016 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,8 +4,13 @@ [Full Changelog](https://github.com/apache/camel-quarkus/compare/2.7.0...HEAD) +**Closed issues:** + +- Ban javax.servlet:servlet-api in favor of jakarta.servlet:jakarta.servlet-api [\#3496](https://github.com/apache/camel-quarkus/issues/3496) + **Merged pull requests:** +- Fix \#3496 Ban javax.servlet:javax.servlet-api in favor of jakarta.ser… [\#3506](https://github.com/apache/camel-quarkus/pull/3506) ([zhfeng](https://github.com/zhfeng)) - Next is 2.8.0 [\#3502](https://github.com/apache/camel-quarkus/pull/3502) ([jamesnetherton](https://github.com/jamesnetherton)) - Use parametrized groupId for quarkus-maven-plugin so that it is possible to run our tests with io.quarkus.platform:quarkus-maven-plugin [\#3501](https://github.com/apache/camel-quarkus/pull/3501) ([ppalaga](https://github.com/ppalaga)) - Removed the deprecated @BuildTimeAvroDataFormat annotation \#2791 [\#3500](https://github.com/apache/camel-quarkus/pull/3500) ([aldettinger](https://github.com/aldettinger))
[camel-k] branch main updated: Updated CHANGELOG.md
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 The following commit(s) were added to refs/heads/main by this push: new 8b9be22 Updated CHANGELOG.md 8b9be22 is described below commit 8b9be228e30e8cc55b31640bf666285d30d0ae51 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Tue Feb 1 03:11:41 2022 + Updated CHANGELOG.md --- CHANGELOG.md | 9 - 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dc43d0c..7d383f8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,20 +6,26 @@ **Closed issues:** +- Configure Maven: Artifact Repository is not recognized [\#2966](https://github.com/apache/camel-k/issues/2966) +- camel-k-operator forbidden to get kafkachannels.messaging.knative.dev since 1.8.x [\#2950](https://github.com/apache/camel-k/issues/2950) - Enabling prometheus causes KameletBindings to be stuck in status "Creating" [\#2896](https://github.com/apache/camel-k/issues/2896) - Stale bot is setting issue `stale` where marked as `never-stale` [\#2893](https://github.com/apache/camel-k/issues/2893) - camel-k-client binary is missing in the latest release assets [\#2892](https://github.com/apache/camel-k/issues/2892) - Release 1.8.0 [\#2848](https://github.com/apache/camel-k/issues/2848) -- Expose UDP port using traits and make it accessible outside of the pod [\#2693](https://github.com/apache/camel-k/issues/2693) - Kamelet with MQTT Broker Mosquitto [\#2690](https://github.com/apache/camel-k/issues/2690) +- Json marshalling is needed for Rest route and uncommented code seems to be executed [\#2341](https://github.com/apache/camel-k/issues/2341) - Change autogen doc template to adoc [\#2289](https://github.com/apache/camel-k/issues/2289) - Kamel dump: make the command smarter [\#2189](https://github.com/apache/camel-k/issues/2189) **Merged pull requests:** +- fix\(cli\): Kamel CLI zero-code exists when trait properties validation fails [\#2964](https://github.com/apache/camel-k/pull/2964) ([astefanutti](https://github.com/astefanutti)) +- Generate crd API docs as AsciiDoc \(main\) \(Update\) [\#2963](https://github.com/apache/camel-k/pull/2963) ([djencks](https://github.com/djencks)) +- feat\(knative\): Rely on addressable-resolver ClusterRole to transfer RBAC for Knative Sinks [\#2958](https://github.com/apache/camel-k/pull/2958) ([astefanutti](https://github.com/astefanutti)) - \[TEST\] Add Global operator + namespaced kamelet test [\#2955](https://github.com/apache/camel-k/pull/2955) ([bouskaJ](https://github.com/bouskaJ)) - fix\(api\): Add missing loader metadata field in CamelCatalog API [\#2953](https://github.com/apache/camel-k/pull/2953) ([astefanutti](https://github.com/astefanutti)) - Kamel dump: make the command smarter [\#2952](https://github.com/apache/camel-k/pull/2952) ([oscerd](https://github.com/oscerd)) +- WIP separate v1 and v1alpha1 api packages as much as possible [\#2951](https://github.com/apache/camel-k/pull/2951) ([djencks](https://github.com/djencks)) - chore\(deps\): remove kamelet-reify [\#2949](https://github.com/apache/camel-k/pull/2949) ([squakez](https://github.com/squakez)) - fix\(e2e\): Patch OLM Subscription to avoid conflicting updates [\#2946](https://github.com/apache/camel-k/pull/2946) ([astefanutti](https://github.com/astefanutti)) - fix\(e2e\): Do not add snapshot bundle to stable channel [\#2939](https://github.com/apache/camel-k/pull/2939) ([astefanutti](https://github.com/astefanutti)) @@ -104,6 +110,7 @@ - camel k main latest to next [\#2716](https://github.com/apache/camel-k/pull/2716) ([djencks](https://github.com/djencks)) - \[TEST\] Add cross-channel upgrade test feature [\#2715](https://github.com/apache/camel-k/pull/2715) ([bouskaJ](https://github.com/bouskaJ)) - chore\(ci\): update to golangci-lint 1.42.x and use golangci/golangci-lint-action [\#2714](https://github.com/apache/camel-k/pull/2714) ([tadayosi](https://github.com/tadayosi)) +- E2E development allowing injection of secrets denoting testing on custom clusters [\#2711](https://github.com/apache/camel-k/pull/2711) ([phantomjinx](https://github.com/phantomjinx)) - fix refs to camel-quarkus docs to point to latest released version [\#2708](https://github.com/apache/camel-k/pull/2708) ([djencks](https://github.com/djencks)) - fix\(ci\): proper action/staleV3 configuration [\#2707](https://github.com/apache/camel-k/pull/2707) ([squakez](https://github.com/squakez)) - chore\(dev\): add .editorconfig [\#2705](https://github.com/apache/camel-k/pull/2705) ([tadayosi](https://github.com/tadayosi))
[camel-k-runtime] branch main updated: Updated CHANGELOG.md
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-runtime.git The following commit(s) were added to refs/heads/main by this push: new 60f6607 Updated CHANGELOG.md 60f6607 is described below commit 60f660743ac87875f97a843d492d2b6596e8f76d Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Tue Feb 1 03:04:42 2022 + Updated CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 10794a0..6b14d00 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ **Merged pull requests:** +- build\(deps\): bump versions-maven-plugin from 2.8.1 to 2.9.0 [\#787](https://github.com/apache/camel-k-runtime/pull/787) ([dependabot[bot]](https://github.com/apps/dependabot)) - build\(deps\): bump build-helper-maven-plugin from 3.2.0 to 3.3.0 [\#785](https://github.com/apache/camel-k-runtime/pull/785) ([dependabot[bot]](https://github.com/apps/dependabot)) - chore\(deps\): remove kamelet-reify [\#784](https://github.com/apache/camel-k-runtime/pull/784) ([squakez](https://github.com/squakez)) - build\(deps\): bump maven-plugin-plugin from 3.6.2 to 3.6.4 [\#783](https://github.com/apache/camel-k-runtime/pull/783) ([dependabot[bot]](https://github.com/apps/dependabot))
[camel-kafka-connector] branch main updated: Updated CHANGELOG.md
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-kafka-connector.git The following commit(s) were added to refs/heads/main by this push: new 7d0d58e Updated CHANGELOG.md 7d0d58e is described below commit 7d0d58edf46e3e2d898ef49c2063e4e8e45645d5 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Tue Feb 1 03:03:45 2022 + Updated CHANGELOG.md --- CHANGELOG.md | 5 + 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3fc7cd0..c978017 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ [Full Changelog](https://github.com/apache/camel-kafka-connector/compare/camel-kafka-connector-1.0.0...HEAD) +**Fixed bugs:** + +- CameHeader value is wrongly interpreted as BigDecimal and causes ClassCastException [\#1332](https://github.com/apache/camel-kafka-connector/issues/1332) + **Closed issues:** - Use SNS Aws2 connector with AWS Default Credential Provider [\#1335](https://github.com/apache/camel-kafka-connector/issues/1335) @@ -20,6 +24,7 @@ **Merged pull requests:** +- fix \#1332 : CameHeader value is wrongly interpreted as BigDecimal and… [\#1336](https://github.com/apache/camel-kafka-connector/pull/1336) ([valdar](https://github.com/valdar)) - fix \#1333: camel-kafka-connector-catalog version 1.0.0 is missing des… [\#1334](https://github.com/apache/camel-kafka-connector/pull/1334) ([valdar](https://github.com/valdar)) - camel-website \#701 camel-kafka-connector RI table improvement \(main\) [\#1327](https://github.com/apache/camel-kafka-connector/pull/1327) ([djencks](https://github.com/djencks)) - camel-website \#701: RI info in table \(main\) [\#1320](https://github.com/apache/camel-kafka-connector/pull/1320) ([djencks](https://github.com/djencks))
[GitHub] [camel-website] github-actions[bot] commented on pull request #770: camel quarkus 2.7.x doc branch, with preview
github-actions[bot] commented on pull request #770: URL: https://github.com/apache/camel-website/pull/770#issuecomment-1026407942 🚀 Preview is available at https://pr-770--camel.netlify.app -- 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: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] djencks commented on pull request #3507: update antora.yml and source-map.yml for doc release
djencks commented on pull request #3507: URL: https://github.com/apache/camel-quarkus/pull/3507#issuecomment-1026384933 I'm going to see if I can fix the groovy script that continually breaks antora.yml... -- 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: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-website] djencks opened a new pull request #770: camel quarkus 2.7.x doc branch, with preview
djencks opened a new pull request #770: URL: https://github.com/apache/camel-website/pull/770 REMOVE THE 2nd commit before merging!! -- 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: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] djencks opened a new pull request #3507: update antora.yml and source-map.yml for doc release
djencks opened a new pull request #3507: URL: https://github.com/apache/camel-quarkus/pull/3507 Minimal changes to set up 2.7.x doc branch. I'm assuming this is NOT LTS. -- 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: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] github-actions[bot] closed issue #2341: Json marshalling is needed for Rest route and uncommented code seems to be executed
github-actions[bot] closed issue #2341: URL: https://github.com/apache/camel-k/issues/2341 -- 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: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-karavan] branch main updated: Curves (#164)
This is an automated email from the ASF dual-hosted git repository.
marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
The following commit(s) were added to refs/heads/main by this push:
new 933fbc3 Curves (#164)
933fbc3 is described below
commit 933fbc3cc0537e862161b0249fc7043e9c905af2
Author: Marat Gubaidullin
AuthorDate: Mon Jan 31 18:02:47 2022 -0500
Curves (#164)
---
karavan-designer/src/designer/DslConnections.tsx | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/karavan-designer/src/designer/DslConnections.tsx
b/karavan-designer/src/designer/DslConnections.tsx
index 3ad074f..0a92bd9 100644
--- a/karavan-designer/src/designer/DslConnections.tsx
+++ b/karavan-designer/src/designer/DslConnections.tsx
@@ -162,11 +162,14 @@ export class DslConnections extends
React.Component {
}
}
+const lineXi = lineX1 + 40;
+const lineYi = lineY2;
+
return (
-
)
[GitHub] [camel-karavan] mgubaidullin merged pull request #164: Curves
mgubaidullin merged pull request #164: URL: https://github.com/apache/camel-karavan/pull/164 -- 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: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-karavan] mgubaidullin merged pull request #163: App fix error
mgubaidullin merged pull request #163: URL: https://github.com/apache/camel-karavan/pull/163 -- 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: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-karavan] mgubaidullin closed pull request #162: App fix
mgubaidullin closed pull request #162: URL: https://github.com/apache/camel-karavan/pull/162 -- 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: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-kafka-connector] valdar closed issue #1332: CameHeader value is wrongly interpreted as BigDecimal and causes ClassCastException
valdar closed issue #1332: URL: https://github.com/apache/camel-kafka-connector/issues/1332 -- 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: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-kafka-connector] branch main updated: fix #1332 : CameHeader value is wrongly interpreted as BigDecimal and causes ClassCastException.
This is an automated email from the ASF dual-hosted git repository.
valdar pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
The following commit(s) were added to refs/heads/main by this push:
new 9323f1e fix #1332 : CameHeader value is wrongly interpreted as
BigDecimal and causes ClassCastException.
9323f1e is described below
commit 9323f1ece25dd23d557c6b3b12b9c193a6e46f07
Author: Andrea Tarocchi
AuthorDate: Mon Jan 31 13:52:51 2022 +0100
fix #1332 : CameHeader value is wrongly interpreted as BigDecimal and
causes ClassCastException.
---
.../org/apache/camel/kafkaconnector/CamelSinkTask.java | 4 +++-
.../org/apache/camel/kafkaconnector/CamelSourceTask.java | 6 +++---
.../org/apache/camel/kafkaconnector/CamelSinkTaskTest.java | 14 --
.../apache/camel/kafkaconnector/CamelSourceTaskTest.java | 2 +-
4 files changed, 19 insertions(+), 7 deletions(-)
diff --git
a/core/src/main/java/org/apache/camel/kafkaconnector/CamelSinkTask.java
b/core/src/main/java/org/apache/camel/kafkaconnector/CamelSinkTask.java
index f5d942e..a53f298 100644
--- a/core/src/main/java/org/apache/camel/kafkaconnector/CamelSinkTask.java
+++ b/core/src/main/java/org/apache/camel/kafkaconnector/CamelSinkTask.java
@@ -240,7 +240,9 @@ public class CamelSinkTask extends SinkTask {
final String key = StringHelper.after(header.key(), prefix,
header.key());
final Schema schema = header.schema();
-if (schema.type().equals(Schema.BYTES_SCHEMA.type()) &&
Objects.equals(schema.name(), Decimal.LOGICAL_NAME)) {
+if (schema.type().equals(Schema.BYTES_SCHEMA.type())
+&& Objects.equals(schema.name(), Decimal.LOGICAL_NAME)
+&& header.value() instanceof byte[]) {
destination.put(key, Decimal.toLogical(schema, (byte[])
header.value()));
} else {
destination.put(key, header.value());
diff --git
a/core/src/main/java/org/apache/camel/kafkaconnector/CamelSourceTask.java
b/core/src/main/java/org/apache/camel/kafkaconnector/CamelSourceTask.java
index 05a0d96..8b993a2 100644
--- a/core/src/main/java/org/apache/camel/kafkaconnector/CamelSourceTask.java
+++ b/core/src/main/java/org/apache/camel/kafkaconnector/CamelSourceTask.java
@@ -36,7 +36,6 @@ import org.apache.camel.kafkaconnector.utils.SchemaHelper;
import org.apache.camel.kafkaconnector.utils.TaskHelper;
import org.apache.camel.support.UnitOfWorkHelper;
import org.apache.kafka.clients.producer.RecordMetadata;
-import org.apache.kafka.connect.data.Decimal;
import org.apache.kafka.connect.data.Schema;
import org.apache.kafka.connect.errors.ConnectException;
import org.apache.kafka.connect.source.SourceRecord;
@@ -357,8 +356,9 @@ public class CamelSourceTask extends SourceTask {
} else if (value instanceof Date) {
record.headers().addTimestamp(keyCamelHeader, (Date)value);
} else if (value instanceof BigDecimal) {
-Schema schema = Decimal.schema(((BigDecimal)value).scale());
-record.headers().add(keyCamelHeader,
Decimal.fromLogical(schema, (BigDecimal)value), schema);
+//XXX: kafka connect configured header converter takes care of
the encoding,
+//default:
org.apache.kafka.connect.storage.SimpleHeaderConverter
+record.headers().addDecimal(keyCamelHeader, (BigDecimal)value);
} else if (value instanceof Double) {
record.headers().addDouble(keyCamelHeader, (double)value);
} else if (value instanceof Float) {
diff --git
a/core/src/test/java/org/apache/camel/kafkaconnector/CamelSinkTaskTest.java
b/core/src/test/java/org/apache/camel/kafkaconnector/CamelSinkTaskTest.java
index bab0a5d..c08a4f7 100644
--- a/core/src/test/java/org/apache/camel/kafkaconnector/CamelSinkTaskTest.java
+++ b/core/src/test/java/org/apache/camel/kafkaconnector/CamelSinkTaskTest.java
@@ -33,6 +33,7 @@ import org.apache.kafka.connect.data.SchemaAndValue;
import org.apache.kafka.connect.data.SchemaBuilder;
import org.apache.kafka.connect.errors.ConnectException;
import org.apache.kafka.connect.sink.SinkRecord;
+import org.apache.kafka.connect.storage.SimpleHeaderConverter;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
@@ -118,7 +119,13 @@ public class CamelSinkTaskTest {
int myInteger = 100;
Long myLong = new Long("100");
BigDecimal myBigDecimal = new BigDecimal(1234567890);
-Schema schema = Decimal.schema(myBigDecimal.scale());
+Schema myBigDecimalSchema = Decimal.schema(myBigDecimal.scale());
+//reproducing bigDecimal encoding by kafka connect
+BigDecimal kafkaBigDecimal = new BigDecimal("6.9203120E+787");
+Schema kafkaBigDecimalSchema = Decimal.schema(kafkaBigDecimal.scale());
+SimpleHeaderConverter shc = new SimpleHeaderConverter();
+
[GitHub] [camel-kafka-connector] valdar merged pull request #1336: fix #1332 : CameHeader value is wrongly interpreted as BigDecimal and…
valdar merged pull request #1336: URL: https://github.com/apache/camel-kafka-connector/pull/1336 -- 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: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-karavan] mgubaidullin closed issue #157: Upgrade to kamelets 0.7.0
mgubaidullin closed issue #157: URL: https://github.com/apache/camel-karavan/issues/157 -- 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: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-karavan] mgubaidullin merged pull request #161: Bump versions
mgubaidullin merged pull request #161: URL: https://github.com/apache/camel-karavan/pull/161 -- 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: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-karavan] mgubaidullin merged pull request #160: Fixed #136
mgubaidullin merged pull request #160: URL: https://github.com/apache/camel-karavan/pull/160 -- 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: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-karavan] mgubaidullin closed issue #136: Implement Aggregation EIP
mgubaidullin closed issue #136: URL: https://github.com/apache/camel-karavan/issues/136 -- 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: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k-runtime] lburgazzoli merged pull request #787: build(deps): bump versions-maven-plugin from 2.8.1 to 2.9.0
lburgazzoli merged pull request #787: URL: https://github.com/apache/camel-k-runtime/pull/787 -- 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: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-k-runtime] branch main updated: build(deps): bump versions-maven-plugin from 2.8.1 to 2.9.0
This is an automated email from the ASF dual-hosted git repository. lburgazzoli pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git The following commit(s) were added to refs/heads/main by this push: new a147553 build(deps): bump versions-maven-plugin from 2.8.1 to 2.9.0 a147553 is described below commit a147553057b062b8dcfab93e0a12657b2b624b03 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Mon Jan 31 20:17:12 2022 + build(deps): bump versions-maven-plugin from 2.8.1 to 2.9.0 Bumps [versions-maven-plugin](https://github.com/mojohaus/versions-maven-plugin) from 2.8.1 to 2.9.0. - [Release notes](https://github.com/mojohaus/versions-maven-plugin/releases) - [Changelog](https://github.com/mojohaus/versions-maven-plugin/blob/master/ReleaseNotes.md) - [Commits](https://github.com/mojohaus/versions-maven-plugin/compare/versions-maven-plugin-2.8.1...versions-maven-plugin-2.9.0) --- updated-dependencies: - dependency-name: org.codehaus.mojo:versions-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 817b711..e8b3b2e 100644 --- a/pom.xml +++ b/pom.xml @@ -62,7 +62,7 @@ 3.0.0-M5 1.7.0 3.0.0-M5 -2.8.1 +2.9.0 1.0 3.0.0 4.1
[GitHub] [camel-k-runtime] dependabot[bot] opened a new pull request #787: build(deps): bump versions-maven-plugin from 2.8.1 to 2.9.0
dependabot[bot] opened a new pull request #787: URL: https://github.com/apache/camel-k-runtime/pull/787 Bumps [versions-maven-plugin](https://github.com/mojohaus/versions-maven-plugin) from 2.8.1 to 2.9.0. Release notes Sourced from https://github.com/mojohaus/versions-maven-plugin/releases";>versions-maven-plugin's releases. 2.9.0 Changes Fix detection of plugin updates requiring newer Maven for building than (https://github-redirect.dependabot.com/mojohaus/versions-maven-plugin/issues/527";>#527) https://github.com/kwin";>@kwin update-properties page was using use-releases goal instead (https://github-redirect.dependabot.com/mojohaus/versions-maven-plugin/issues/245";>#245) https://github.com/MarcoLotz";>@MarcoLotz Fixes https://github-redirect.dependabot.com/mojohaus/versions-maven-plugin/issues/439";>#439 : String index out of range: 9 (https://github-redirect.dependabot.com/mojohaus/versions-maven-plugin/issues/444";>#444) https://github.com/ghusta";>@ghusta 363:Force update parent version with real version (https://github-redirect.dependabot.com/mojohaus/versions-maven-plugin/issues/364";>#364) https://github.com/akilantech";>@akilantech Removal of not needed calls to toString() in the code base (https://github-redirect.dependabot.com/mojohaus/versions-maven-plugin/issues/468";>#468) https://github.com/obfischer";>@obfischer fix(resolve-ranges): fail properly on managed dep without version (https://github-redirect.dependabot.com/mojohaus/versions-maven-plugin/issues/452";>#452) https://github.com/mfriedenhagen";>@mfriedenhagen 🚀 New features and improvements Fixes https://github-redirect.dependabot.com/mojohaus/versions-maven-plugin/issues/426";>#426 restore default behavior on setting versions in all modules of the local aggregation root that was present before the fix for https://github-redirect.dependabot.com/mojohaus/versions-maven-plugin/issues/82";>#82 (https://github-redirect.dependabot.com/mojohaus/versions-maven-plugin/issues/427";>#427) https://github.com/stefanseifert";>@stefanseifert https://github-redirect.dependabot.com/mojohaus/versions-maven-plugin/issues/453";>#453 update Reproducible Builds outputTimestamp when setting version (https://github-redirect.dependabot.com/mojohaus/versions-maven-plugin/issues/522";>#522) https://github.com/hboutemy";>@hboutemy [Enhancement] Display "Latest" Versions in Reports Summary (https://github-redirect.dependabot.com/mojohaus/versions-maven-plugin/issues/478";>#478) https://github.com/sultan";>@sultan Fixes https://github-redirect.dependabot.com/mojohaus/versions-maven-plugin/issues/469";>#469 Support.property file in set-property (https://github-redirect.dependabot.com/mojohaus/versions-maven-plugin/issues/470";>#470) https://github.com/arkel-s";>@arkel-s Sort properties by Property name in "Property Updates Report" (https://github-redirect.dependabot.com/mojohaus/versions-maven-plugin/issues/455";>#455) https://github.com/sultan";>@sultan Upgrade parent 63 and Java 1.8 (https://github-redirect.dependabot.com/mojohaus/versions-maven-plugin/issues/461";>#461) https://github.com/olamy";>@olamy 📦 Dependency updates Bump woodstox-core from 6.2.7 to 6.2.8 (https://github-redirect.dependabot.com/mojohaus/versions-maven-plugin/issues/530";>#530) https://github.com/dependabot";>@dependabot Bump plexus-container-default from 2.1.0 to 2.1.1 (https://github-redirect.dependabot.com/mojohaus/versions-maven-plugin/issues/520";>#520) https://github.com/dependabot";>@dependabot Bump doxia-site-renderer from 1.10 to 1.11.1 (https://github-redirect.dependabot.com/mojohaus/versions-maven-plugin/issues/518";>#518) https://github.com/dependabot";>@dependabot Bump mockito-core from 4.1.0 to 4.2.0 (https://github-redirect.dependabot.com/mojohaus/versions-maven-plugin/issues/517";>#517) https://github.com/dependabot";>@dependabot Bump doxiaVersion from 1.10 to 1.11.1 (https://github-redirect.dependabot.com/mojohaus/versions-maven-plugin/issues/514";>#514) https://github.com/dependabot";>@dependabot Bump mockito-core from 3.12.4 to 4.1.0 (https://github-redirect.dependabot.com/mojohaus/versions-maven-plugin/issues/508";>#508) https://github.com/dependabot";>@dependabot Bump mrm-maven-plugin from 1.2.0 to 1.3.0 (https://github-redirect.dependabot.com/mojohaus/versions-maven-plugin/issues/511";>#511) https://github.com/dependabot";>@dependabot Bump junit-bom from 5.8.1 to 5.8.2 (https://github-redirect.dependabot.com/mojohaus/versions-maven-plugin/issues/512";>#512) https://github.com/dependabot";>@dependabot Bump maven-plugin-annotations from 3.6.1 to 3.6.2 (https://github-redirect.dependabot.com/mojohaus/versions-maven-plugin/issues/513";>#513) https://github.com/dependabot";>@dependabot Bump wagonVersion from 3.4.0 to 3.4.3 (https://github-redirect.dependabot.com/mojohaus/versions-maven-plugin/issues/4
[camel-k-runtime] branch dependabot/maven/org.codehaus.mojo-versions-maven-plugin-2.9.0 created (now f42bc13)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.codehaus.mojo-versions-maven-plugin-2.9.0 in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git. at f42bc13 build(deps): bump versions-maven-plugin from 2.8.1 to 2.9.0 No new revisions were added by this update.
[camel-karaf] branch release/3.15.0 updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a commit to branch release/3.15.0 in repository https://gitbox.apache.org/repos/asf/camel-karaf.git The following commit(s) were added to refs/heads/release/3.15.0 by this push: new 676294d [maven-release-plugin] prepare for next development iteration 676294d is described below commit 676294dae39b62a019e73f9638fb28d20d59fbad Author: Gregor Zurowski AuthorDate: Mon Jan 31 19:07:29 2022 + [maven-release-plugin] prepare for next development iteration --- archetypes/camel-archetype-blueprint/pom.xml | 2 +- archetypes/pom.xml | 2 +- bom/camel-karaf-bom/pom.xml| 2 +- bom/pom.xml| 2 +- catalog/camel-catalog-provider-karaf/pom.xml | 2 +- catalog/pom.xml| 2 +- components/camel-bean-osgi/pom.xml | 2 +- components/camel-bean-validator-osgi/pom.xml | 2 +- components/camel-blueprint-main/pom.xml| 2 +- components/camel-blueprint/pom.xml | 2 +- components/camel-cmis-osgi/pom.xml | 2 +- components/camel-cxf-blueprint/pom.xml | 2 +- components/camel-cxf-transport-blueprint/pom.xml | 2 +- components/camel-eventadmin/pom.xml| 2 +- components/camel-jcache-osgi/pom.xml | 2 +- components/camel-kura/pom.xml | 2 +- components/camel-paxlogging/pom.xml| 2 +- components/camel-servlet-osgi/pom.xml | 2 +- components/camel-test-blueprint/pom.xml| 2 +- components/camel-test-karaf/pom.xml| 2 +- components/camel-zookeeper-master-osgi/pom.xml | 2 +- components/pom.xml | 2 +- core/camel-core-osgi/pom.xml | 2 +- core/pom.xml | 2 +- platforms/commands/commands-core/pom.xml | 2 +- platforms/commands/pom.xml | 2 +- platforms/karaf/commands/pom.xml | 2 +- platforms/karaf/features/pom.xml | 2 +- platforms/karaf/pom.xml| 2 +- platforms/pom.xml | 2 +- pom.xml| 4 ++-- tests/camel-blueprint-cxf-test/pom.xml | 2 +- tests/camel-blueprint-test/pom.xml | 2 +- tests/camel-itest-osgi/pom.xml | 2 +- tests/pom.xml | 2 +- tooling/camel-catalog-generator-karaf-maven-plugin/pom.xml | 2 +- tooling/camel-karaf-maven-plugin/pom.xml | 2 +- tooling/pom.xml| 2 +- 38 files changed, 39 insertions(+), 39 deletions(-) diff --git a/archetypes/camel-archetype-blueprint/pom.xml b/archetypes/camel-archetype-blueprint/pom.xml index 8f9586f..75c724d 100644 --- a/archetypes/camel-archetype-blueprint/pom.xml +++ b/archetypes/camel-archetype-blueprint/pom.xml @@ -24,7 +24,7 @@ org.apache.camel.karaf archetypes -3.15.0 +3.15.1-SNAPSHOT org.apache.camel.archetypes diff --git a/archetypes/pom.xml b/archetypes/pom.xml index 8ef6927..08b67f4 100644 --- a/archetypes/pom.xml +++ b/archetypes/pom.xml @@ -24,7 +24,7 @@ org.apache.camel.karaf karaf -3.15.0 +3.15.1-SNAPSHOT .. diff --git a/bom/camel-karaf-bom/pom.xml b/bom/camel-karaf-bom/pom.xml index 6554332..d1e0f0b 100644 --- a/bom/camel-karaf-bom/pom.xml +++ b/bom/camel-karaf-bom/pom.xml @@ -22,7 +22,7 @@ org.apache.camel.karaf karaf -3.15.0 +3.15.1-SNAPSHOT ../../ camel-karaf-bom diff --git a/bom/pom.xml b/bom/pom.xml index 7139789..10bc0f4 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -23,7 +23,7 @@ org.apache.camel.karaf karaf -3.15.0 +3.15.1-SNAPSHOT .. diff --git a/catalog/camel-catalog-provider-karaf/pom.xml b/catalog/camel-catalog-provider-karaf/pom.xml index 0db8c95..acb919e 100644 --- a/catalog/camel-catalog-provider-karaf/pom.xml +++ b/catalog/camel-catalog-provider-karaf/pom.xml @@ -23,7 +23,7 @@ org.apache.camel.karaf catalog -3.15.0 +3.15.1-SNAPSHOT camel-catalog-provider-karaf diff --git a/catalog/pom.xml b/catalog/pom.xml index a23b289..420912e 100644 --- a/catalog/pom.xml +++ b/catalog/pom.xml @@ -24,7 +24,7 @@ org.apache.camel.karaf karaf -3.15.0 +3.15.1-SNAPSHOT ..
[camel-karaf] annotated tag camel-karaf-3.15.0 created (now 697795c)
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a change to annotated tag camel-karaf-3.15.0 in repository https://gitbox.apache.org/repos/asf/camel-karaf.git. at 697795c (tag) tagging 7da92ae8192b3021e78462b7c6f5c67eaa1d64c4 (commit) by Gregor Zurowski on Mon Jan 31 19:07:25 2022 + - Log - [maven-release-plugin] copy for tag camel-karaf-3.15.0 --- No new revisions were added by this update.
[camel-karaf] 02/02: [maven-release-plugin] prepare release camel-karaf-3.15.0
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a commit to branch release/3.15.0 in repository https://gitbox.apache.org/repos/asf/camel-karaf.git commit 7da92ae8192b3021e78462b7c6f5c67eaa1d64c4 Author: Gregor Zurowski AuthorDate: Mon Jan 31 19:07:20 2022 + [maven-release-plugin] prepare release camel-karaf-3.15.0 --- archetypes/camel-archetype-blueprint/pom.xml | 2 +- archetypes/pom.xml | 2 +- bom/camel-karaf-bom/pom.xml| 2 +- bom/pom.xml| 2 +- catalog/camel-catalog-provider-karaf/pom.xml | 5 +- catalog/pom.xml| 2 +- components/camel-bean-osgi/pom.xml | 2 +- components/camel-bean-validator-osgi/pom.xml | 2 +- components/camel-blueprint-main/pom.xml| 2 +- components/camel-blueprint/pom.xml | 60 ++ components/camel-cmis-osgi/pom.xml | 2 +- components/camel-cxf-blueprint/pom.xml | 2 +- components/camel-cxf-transport-blueprint/pom.xml | 2 +- components/camel-eventadmin/pom.xml| 2 +- components/camel-jcache-osgi/pom.xml | 2 +- components/camel-kura/pom.xml | 2 +- components/camel-paxlogging/pom.xml| 2 +- components/camel-servlet-osgi/pom.xml | 2 +- components/camel-test-blueprint/pom.xml| 2 +- components/camel-test-karaf/pom.xml| 2 +- components/camel-zookeeper-master-osgi/pom.xml | 2 +- components/pom.xml | 5 +- core/camel-core-osgi/pom.xml | 2 +- core/pom.xml | 2 +- platforms/commands/commands-core/pom.xml | 2 +- platforms/commands/pom.xml | 2 +- platforms/karaf/commands/pom.xml | 2 +- platforms/karaf/features/pom.xml | 2 +- platforms/karaf/pom.xml| 2 +- platforms/pom.xml | 2 +- pom.xml| 4 +- tests/camel-blueprint-cxf-test/pom.xml | 2 +- tests/camel-blueprint-test/pom.xml | 2 +- tests/camel-itest-osgi/pom.xml | 2 +- tests/pom.xml | 2 +- .../pom.xml| 2 +- tooling/camel-karaf-maven-plugin/pom.xml | 2 +- tooling/pom.xml| 2 +- 38 files changed, 67 insertions(+), 75 deletions(-) diff --git a/archetypes/camel-archetype-blueprint/pom.xml b/archetypes/camel-archetype-blueprint/pom.xml index 475040a..8f9586f 100644 --- a/archetypes/camel-archetype-blueprint/pom.xml +++ b/archetypes/camel-archetype-blueprint/pom.xml @@ -24,7 +24,7 @@ org.apache.camel.karaf archetypes -3.15.0-SNAPSHOT +3.15.0 org.apache.camel.archetypes diff --git a/archetypes/pom.xml b/archetypes/pom.xml index 92cb194..8ef6927 100644 --- a/archetypes/pom.xml +++ b/archetypes/pom.xml @@ -24,7 +24,7 @@ org.apache.camel.karaf karaf -3.15.0-SNAPSHOT +3.15.0 .. diff --git a/bom/camel-karaf-bom/pom.xml b/bom/camel-karaf-bom/pom.xml index a6e98ed..6554332 100644 --- a/bom/camel-karaf-bom/pom.xml +++ b/bom/camel-karaf-bom/pom.xml @@ -22,7 +22,7 @@ org.apache.camel.karaf karaf -3.15.0-SNAPSHOT +3.15.0 ../../ camel-karaf-bom diff --git a/bom/pom.xml b/bom/pom.xml index 0e43ba8..7139789 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -23,7 +23,7 @@ org.apache.camel.karaf karaf -3.15.0-SNAPSHOT +3.15.0 .. diff --git a/catalog/camel-catalog-provider-karaf/pom.xml b/catalog/camel-catalog-provider-karaf/pom.xml index 64c22f1..0db8c95 100644 --- a/catalog/camel-catalog-provider-karaf/pom.xml +++ b/catalog/camel-catalog-provider-karaf/pom.xml @@ -17,14 +17,13 @@ limitations under the License. --> -http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> 4.0.0 org.apache.camel.karaf catalog -3.15.0-SNAPSHOT +3.15.0 camel-catalog-provider-karaf diff --git a/catalog/pom.xml b/catalog/pom.xml index e676aab..a23b289 100644 --- a/catalog/pom.xml +++ b/catalog/pom.xml @@ -24,7 +24,7 @@ org.apache.camel.karaf karaf -3.15.0-SNAPSHOT +3.15.0
[camel-karaf] 01/02: Target Camel 3.15.0 for release
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a commit to branch release/3.15.0 in repository https://gitbox.apache.org/repos/asf/camel-karaf.git commit f366d5182b0c1ffe96bdf6d886046fcd7bd3a376 Author: Gregor Zurowski AuthorDate: Mon Jan 31 19:01:39 2022 + Target Camel 3.15.0 for release --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 68fa1b4..c758a60 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.apache.camel camel-dependencies -3.15.0-SNAPSHOT +3.15.0 org.apache.camel.karaf @@ -108,7 +108,7 @@ 4.3.6 -3.15.0-SNAPSHOT +3.15.0 1.7.0_6 3.5.2_1 @@ -757,7 +757,7 @@ dev -3.15.0-SNAPSHOT +3.15.0
[camel-karaf] branch release/3.15.0 updated (9bc9967 -> 7da92ae)
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a change to branch release/3.15.0 in repository https://gitbox.apache.org/repos/asf/camel-karaf.git. from 9bc9967 Regen new f366d51 Target Camel 3.15.0 for release new 7da92ae [maven-release-plugin] prepare release camel-karaf-3.15.0 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: archetypes/camel-archetype-blueprint/pom.xml | 2 +- archetypes/pom.xml | 2 +- bom/camel-karaf-bom/pom.xml| 2 +- bom/pom.xml| 2 +- catalog/camel-catalog-provider-karaf/pom.xml | 5 +- catalog/pom.xml| 2 +- components/camel-bean-osgi/pom.xml | 2 +- components/camel-bean-validator-osgi/pom.xml | 2 +- components/camel-blueprint-main/pom.xml| 2 +- components/camel-blueprint/pom.xml | 60 ++ components/camel-cmis-osgi/pom.xml | 2 +- components/camel-cxf-blueprint/pom.xml | 2 +- components/camel-cxf-transport-blueprint/pom.xml | 2 +- components/camel-eventadmin/pom.xml| 2 +- components/camel-jcache-osgi/pom.xml | 2 +- components/camel-kura/pom.xml | 2 +- components/camel-paxlogging/pom.xml| 2 +- components/camel-servlet-osgi/pom.xml | 2 +- components/camel-test-blueprint/pom.xml| 2 +- components/camel-test-karaf/pom.xml| 2 +- components/camel-zookeeper-master-osgi/pom.xml | 2 +- components/pom.xml | 5 +- core/camel-core-osgi/pom.xml | 2 +- core/pom.xml | 2 +- platforms/commands/commands-core/pom.xml | 2 +- platforms/commands/pom.xml | 2 +- platforms/karaf/commands/pom.xml | 2 +- platforms/karaf/features/pom.xml | 2 +- platforms/karaf/pom.xml| 2 +- platforms/pom.xml | 2 +- pom.xml| 10 ++-- tests/camel-blueprint-cxf-test/pom.xml | 2 +- tests/camel-blueprint-test/pom.xml | 2 +- tests/camel-itest-osgi/pom.xml | 2 +- tests/pom.xml | 2 +- .../pom.xml| 2 +- tooling/camel-karaf-maven-plugin/pom.xml | 2 +- tooling/pom.xml| 2 +- 38 files changed, 70 insertions(+), 78 deletions(-)
[GitHub] [camel-k] djencks commented on pull request #2951: WIP separate v1 and v1alpha1 api packages as much as possible
djencks commented on pull request #2951: URL: https://github.com/apache/camel-k/pull/2951#issuecomment-1026081690 I hope I interpreted your comment correctly as suggesting I merge this PR... if I misunderstood feel free to revert the merge. -- 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: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-k] 06/06: generated change in pkg/resources/resources.go
This is an automated email from the ASF dual-hosted git repository.
djencks pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 7adbc4266be83aed80bf977563932032577fabf3
Author: David Jencks
AuthorDate: Wed Jan 26 18:41:28 2022 -0800
generated change in pkg/resources/resources.go
---
pkg/resources/resources.go | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pkg/resources/resources.go b/pkg/resources/resources.go
index 1ed2736..d58b3a0 100644
--- a/pkg/resources/resources.go
+++ b/pkg/resources/resources.go
@@ -152,16 +152,16 @@ var assets = func() http.FileSystem {
"/crd/bases/camel.apache.org_kameletbindings.yaml":
&vfsgen۰CompressedFileInfo{
name:
"camel.apache.org_kameletbindings.yaml",
modTime: time.Time{},
- uncompressedSize: 432720,
+ uncompressedSize: 432723,
- compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xbd\xfb\x73\x1b\x37\x96\x30\xfa\x7b\xfe\x0a\x94\x9c\xfa\x24\x6d\x44\xca\xce\xcc\xce\xdd\xf1\x9d\xfa\x52\x1a\x59\xce\xe8\xc6\x96\x59\x96\xe2\x7c\x29\x27\x9b\x05\xbb\x41\x12\xab\x6e\xa0\x17\x40\x53\xe2\x5e\xdf\xff\xfd\x16\x0e\x80\x7e\xf0\x25\x9c\xa6\xa8\x28\x3b\x8d\xa9\x9a\x98\x22\xfb\x34\x5e\xe7\xfd\x7a\x41\x06\x8f\x37\xbe\x7a\x41\xde\xf1\x84\x09\xcd\x52\x62\x24\x31\x33\x46\xce\x0a\x9a\xcc\x18\xb9\x96\x13\x73\x47\x
[...]
+ compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xbd\xfb\x73\x1b\x37\x96\x30\xfa\x7b\xfe\x0a\x94\x9c\xfa\x24\x6d\x44\xca\xce\xcc\xce\xdd\xf1\x9d\xfa\x52\x1a\x59\xce\xe8\xc6\x96\x59\x96\xe2\x7c\x29\x27\x9b\x05\xbb\x41\x12\xab\x6e\xa0\x17\x40\x53\xe2\x5e\xdf\xff\xfd\x16\x0e\x80\x7e\xf0\x25\x9c\xa6\xa8\x28\x3b\x8d\xa9\x9a\x98\x22\xfb\x34\x5e\xe7\xfd\x7a\x41\x06\x8f\x37\xbe\x7a\x41\xde\xf1\x84\x09\xcd\x52\x62\x24\x31\x33\x46\xce\x0a\x9a\xcc\x18\xb9\x96\x13\x73\x47\x
[...]
},
"/crd/bases/camel.apache.org_kamelets.yaml":
&vfsgen۰CompressedFileInfo{
name: "camel.apache.org_kamelets.yaml",
modTime: time.Time{},
- uncompressedSize: 24280,
+ uncompressedSize: 24282,
- compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x5c\x7d\x53\xe3\x38\x9a\xff\x3f\x9f\xe2\x29\x98\xaa\xa6\xab\x70\x48\x08\x30\xdd\xb9\x3f\x28\x06\x9a\xbd\xdc\xd0\x40\x11\xd8\xbd\x39\xe8\xad\x52\xec\x27\x89\x16\x5b\xf2\x4a\x32\x2f\x3b\xf0\xdd\xaf\x24\xd9\x8e\xf3\x62\x5b\x09\x81\xed\xba\x3a\x55\x4d\x0d\x76\xa4\x9f\x9e\x37\x3d\x7a\xfb\xb5\x37\xc1\x5b\x5f\x69\x6c\xc2\x19\xf5\x91\x49\x0c\x40\x71\x50\x63\x84\xa3\x98\xf8\x63\x84\x3e\x1f\xaa\x47\x22\x10\x4e\x79\xc2\x02\x
[...]
+ compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x5c\x7b\x53\xeb\x38\x96\xff\x3f\x9f\xe2\x14\x74\xd5\x85\x2a\x1c\x12\x02\xf4\xed\xec\x1f\x14\x0d\x97\xd9\x6c\xd3\x40\x11\x98\xd9\x5e\xb8\x53\xa5\xd8\x27\x89\x06\x5b\xf2\x48\x32\x8f\x69\xf8\xee\x5b\x92\x6c\xc7\x79\xd8\x56\x42\x60\x6e\x6d\xad\xaa\xba\x1a\x3b\xd2\x4f\xe7\xa5\xa3\xd7\xef\x7a\x13\xbc\xf5\x95\xc6\x26\x9c\x53\x1f\x99\xc4\x00\x14\x07\x35\x46\x38\x8e\x89\x3f\x46\xe8\xf3\xa1\x7a\x22\x02\xe1\x8c\x27\x2c\x20\x
[...]
},
"/manager": &vfsgen۰DirInfo{
name:"manager",
[camel-k] 03/06: tweak other pkg: disable flow>template conversion in kamelet trait
This is an automated email from the ASF dual-hosted git repository.
djencks pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 6d2616909c3830337a590627e644276ff476375b
Author: David Jencks
AuthorDate: Wed Jan 26 18:01:25 2022 -0800
tweak other pkg: disable flow>template conversion in kamelet trait
---
pkg/apis/camel/v1alpha1/error_handler_types.go | 2 --
pkg/trait/kamelets.go | 13 +++--
pkg/util/dsl/template.go | 2 +-
pkg/util/dsl/template_test.go | 2 +-
4 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/pkg/apis/camel/v1alpha1/error_handler_types.go
b/pkg/apis/camel/v1alpha1/error_handler_types.go
index 987f1f7..7f24605 100644
--- a/pkg/apis/camel/v1alpha1/error_handler_types.go
+++ b/pkg/apis/camel/v1alpha1/error_handler_types.go
@@ -19,8 +19,6 @@ package v1alpha1
import (
"encoding/json"
-
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
)
// ErrorHandlerRefName --
diff --git a/pkg/trait/kamelets.go b/pkg/trait/kamelets.go
index 06d2122..4d6cf4c 100644
--- a/pkg/trait/kamelets.go
+++ b/pkg/trait/kamelets.go
@@ -257,12 +257,13 @@ func (t *kameletsTrait) addKameletAsSource(e
*Environment, kamelet *v1alpha1.Kam
// nolint: staticcheck
if kamelet.Spec.Template != nil || kamelet.Spec.Flow != nil {
template := kamelet.Spec.Template
- if template == nil {
- // Backward compatibility with Kamelets using flow
- template = &v1.Template{
- RawMessage: kamelet.Spec.Flow.RawMessage,
- }
- }
+ //if template == nil {
+ // // Backward compatibility with Kamelets using flow
+ // var bytes []byte = kamelet.Spec.Flow.RawMessage
+ // template = &v1alpha1.Template{
+ // RawMessage: v1alpha1.RawMessage{bytes},
+ // }
+ //}
flowData, err := dsl.TemplateToYamlDSL(*template, kamelet.Name)
if err != nil {
return err
diff --git a/pkg/util/dsl/template.go b/pkg/util/dsl/template.go
index 5f83ca3..7862aae 100644
--- a/pkg/util/dsl/template.go
+++ b/pkg/util/dsl/template.go
@@ -23,7 +23,7 @@ import (
yaml2 "gopkg.in/yaml.v2"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
)
// TemplateToYamlDSL converts a kamelet template into its Camel YAML DSL
equivalent.
diff --git a/pkg/util/dsl/template_test.go b/pkg/util/dsl/template_test.go
index b2fb016..2098da2 100644
--- a/pkg/util/dsl/template_test.go
+++ b/pkg/util/dsl/template_test.go
@@ -20,7 +20,7 @@ package dsl
import (
"testing"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
"github.com/stretchr/testify/assert"
)
[camel-k] 02/06: move Template to Kamelets
This is an automated email from the ASF dual-hosted git repository.
djencks pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 91f08d66addaaf0e6c9ee02addb1a18430b2f945
Author: David Jencks
AuthorDate: Tue Jan 25 23:21:32 2022 -0800
move Template to Kamelets
---
pkg/apis/camel/v1/common_types.go| 6 +++---
pkg/apis/camel/v1/zz_generated.deepcopy.go | 20
pkg/apis/camel/v1alpha1/kamelet_types.go | 7 ++-
pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go | 22 +-
4 files changed, 30 insertions(+), 25 deletions(-)
diff --git a/pkg/apis/camel/v1/common_types.go
b/pkg/apis/camel/v1/common_types.go
index 5826a06..6b97918 100644
--- a/pkg/apis/camel/v1/common_types.go
+++ b/pkg/apis/camel/v1/common_types.go
@@ -175,9 +175,9 @@ type Flow struct {
}
// Template is an unstructured object representing a Kamelet template in
YAML/JSON DSL
-type Template struct {
- RawMessage `json:",inline"`
-}
+//type Template struct {
+// RawMessage `json:",inline"`
+//}
// RuntimeProvider --
type RuntimeProvider string
diff --git a/pkg/apis/camel/v1/zz_generated.deepcopy.go
b/pkg/apis/camel/v1/zz_generated.deepcopy.go
index 76fa84a..69ddb11 100644
--- a/pkg/apis/camel/v1/zz_generated.deepcopy.go
+++ b/pkg/apis/camel/v1/zz_generated.deepcopy.go
@@ -1618,26 +1618,6 @@ func (in *Task) DeepCopy() *Task {
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver,
writing into out. in must be non-nil.
-func (in *Template) DeepCopyInto(out *Template) {
- *out = *in
- if in.RawMessage != nil {
- in, out := &in.RawMessage, &out.RawMessage
- *out = make(RawMessage, len(*in))
- copy(*out, *in)
- }
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver,
creating a new Template.
-func (in *Template) DeepCopy() *Template {
- if in == nil {
- return nil
- }
- out := new(Template)
- in.DeepCopyInto(out)
- return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver,
writing into out. in must be non-nil.
func (in *TraitConfiguration) DeepCopyInto(out *TraitConfiguration) {
*out = *in
if in.RawMessage != nil {
diff --git a/pkg/apis/camel/v1alpha1/kamelet_types.go
b/pkg/apis/camel/v1alpha1/kamelet_types.go
index 5674c2f..63895e0 100644
--- a/pkg/apis/camel/v1alpha1/kamelet_types.go
+++ b/pkg/apis/camel/v1alpha1/kamelet_types.go
@@ -45,7 +45,7 @@ var (
type KameletSpec struct {
Definition *JSONSchemaProps `json:"definition,omitempty"`
Sources[]camelv1.SourceSpec `json:"sources,omitempty"`
- Template *camelv1.Template`json:"template,omitempty"`
+ Template *Template`json:"template,omitempty"`
// Deprecated: use template
Flow *camelv1.Flow `json:"flow,omitempty"`
Authorization *AuthorizationSpec
`json:"authorization,omitempty"`
@@ -53,6 +53,11 @@ type KameletSpec struct {
Dependencies []string
`json:"dependencies,omitempty"`
}
+// Template is an unstructured object representing a Kamelet template in
YAML/JSON DSL
+type Template struct {
+ RawMessage `json:",inline"`
+}
+
type EventTypeSpec struct {
MediaType string `json:"mediaType,omitempty"`
Schema*JSONSchemaProps `json:"schema,omitempty"`
diff --git a/pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go
b/pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go
index e6ec185..e760a6b 100644
--- a/pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go
+++ b/pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go
@@ -626,7 +626,7 @@ func (in *KameletSpec) DeepCopyInto(out *KameletSpec) {
}
if in.Template != nil {
in, out := &in.Template, &out.Template
- *out = new(v1.Template)
+ *out = new(Template)
(*in).DeepCopyInto(*out)
}
if in.Flow != nil {
@@ -708,3 +708,23 @@ func (in RawMessage) DeepCopy() RawMessage {
in.DeepCopyInto(out)
return *out
}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver,
writing into out. in must be non-nil.
+func (in *Template) DeepCopyInto(out *Template) {
+ *out = *in
+ if in.RawMessage != nil {
+ in, out := &in.RawMessage, &out.RawMessage
+ *out = make(RawMessage, len(*in))
+ copy(*out, *in)
+ }
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver,
creating a new Template.
+func (in *Template) DeepCopy() *Template {
+ if in == nil {
+ return nil
+ }
+ out := new(Template)
+ in.DeepCopyInto(out)
+ return out
+}
[camel-k] 01/06: kamelets always use own RawMessage
This is an automated email from the ASF dual-hosted git repository.
djencks pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 0af1f4f34455f3bd19a1561fd512d4843d07b41d
Author: David Jencks
AuthorDate: Tue Jan 25 23:15:01 2022 -0800
kamelets always use own RawMessage
---
pkg/apis/camel/v1/zz_generated.deepcopy.go | 1 +
pkg/apis/camel/v1alpha1/error_handler_types.go | 6 +++---
pkg/apis/camel/v1alpha1/kamelet_binding_types.go | 2 +-
pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go | 9 +
4 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/pkg/apis/camel/v1/zz_generated.deepcopy.go
b/pkg/apis/camel/v1/zz_generated.deepcopy.go
index ba10726..76fa84a 100644
--- a/pkg/apis/camel/v1/zz_generated.deepcopy.go
+++ b/pkg/apis/camel/v1/zz_generated.deepcopy.go
@@ -1,3 +1,4 @@
+//go:build !ignore_autogenerated
// +build !ignore_autogenerated
// Code generated by controller-gen. DO NOT EDIT.
diff --git a/pkg/apis/camel/v1alpha1/error_handler_types.go
b/pkg/apis/camel/v1alpha1/error_handler_types.go
index af038cb..987f1f7 100644
--- a/pkg/apis/camel/v1alpha1/error_handler_types.go
+++ b/pkg/apis/camel/v1alpha1/error_handler_types.go
@@ -34,17 +34,17 @@ const ErrorHandlerAppPropertiesPrefix =
"camel.beans.defaultErrorHandler"
// ErrorHandlerSpec represents an unstructured object for an error handler
type ErrorHandlerSpec struct {
- v1.RawMessage `json:",omitempty"`
+ RawMessage `json:",omitempty"`
}
// ErrorHandlerParameters represent an unstructured object for error handler
parameters
type ErrorHandlerParameters struct {
- v1.RawMessage `json:",omitempty"`
+ RawMessage `json:",omitempty"`
}
// BeanProperties represent an unstructured object properties to be set on a
bean
type BeanProperties struct {
- v1.RawMessage `json:",omitempty"`
+ RawMessage `json:",omitempty"`
}
// +kubebuilder:object:generate=false
diff --git a/pkg/apis/camel/v1alpha1/kamelet_binding_types.go
b/pkg/apis/camel/v1alpha1/kamelet_binding_types.go
index a0c52c4..d06e028 100644
--- a/pkg/apis/camel/v1alpha1/kamelet_binding_types.go
+++ b/pkg/apis/camel/v1alpha1/kamelet_binding_types.go
@@ -63,7 +63,7 @@ const (
// EndpointProperties is a key/value struct represented as JSON raw to allow
numeric/boolean values
type EndpointProperties struct {
- v1.RawMessage `json:",inline"`
+ RawMessage `json:",inline"`
}
// KameletBindingStatus --
diff --git a/pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go
b/pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go
index a5c99f3..e6ec185 100644
--- a/pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go
+++ b/pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go
@@ -1,3 +1,4 @@
+//go:build !ignore_autogenerated
// +build !ignore_autogenerated
// Code generated by controller-gen. DO NOT EDIT.
@@ -31,7 +32,7 @@ func (in *BeanProperties) DeepCopyInto(out *BeanProperties) {
*out = *in
if in.RawMessage != nil {
in, out := &in.RawMessage, &out.RawMessage
- *out = make(v1.RawMessage, len(*in))
+ *out = make(RawMessage, len(*in))
copy(*out, *in)
}
}
@@ -88,7 +89,7 @@ func (in *EndpointProperties) DeepCopyInto(out
*EndpointProperties) {
*out = *in
if in.RawMessage != nil {
in, out := &in.RawMessage, &out.RawMessage
- *out = make(v1.RawMessage, len(*in))
+ *out = make(RawMessage, len(*in))
copy(*out, *in)
}
}
@@ -145,7 +146,7 @@ func (in *ErrorHandlerParameters) DeepCopyInto(out
*ErrorHandlerParameters) {
*out = *in
if in.RawMessage != nil {
in, out := &in.RawMessage, &out.RawMessage
- *out = make(v1.RawMessage, len(*in))
+ *out = make(RawMessage, len(*in))
copy(*out, *in)
}
}
@@ -186,7 +187,7 @@ func (in *ErrorHandlerSpec) DeepCopyInto(out
*ErrorHandlerSpec) {
*out = *in
if in.RawMessage != nil {
in, out := &in.RawMessage, &out.RawMessage
- *out = make(v1.RawMessage, len(*in))
+ *out = make(RawMessage, len(*in))
copy(*out, *in)
}
}
[camel-k] 05/06: generated comment change ???
This is an automated email from the ASF dual-hosted git repository. djencks pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git commit d2d408d6fdfe10c5dec92430371fb7d5a77adab8 Author: David Jencks AuthorDate: Wed Jan 26 18:39:03 2022 -0800 generated comment change ??? --- addons/keda/duck/v1alpha1/zz_generated.deepcopy.go | 1 + addons/strimzi/duck/v1beta2/zz_generated.deepcopy.go | 1 + 2 files changed, 2 insertions(+) diff --git a/addons/keda/duck/v1alpha1/zz_generated.deepcopy.go b/addons/keda/duck/v1alpha1/zz_generated.deepcopy.go index 9762e39..7bbeb3f 100644 --- a/addons/keda/duck/v1alpha1/zz_generated.deepcopy.go +++ b/addons/keda/duck/v1alpha1/zz_generated.deepcopy.go @@ -1,3 +1,4 @@ +//go:build !ignore_autogenerated // +build !ignore_autogenerated // Code generated by controller-gen. DO NOT EDIT. diff --git a/addons/strimzi/duck/v1beta2/zz_generated.deepcopy.go b/addons/strimzi/duck/v1beta2/zz_generated.deepcopy.go index 6a7dd3b..3a04649 100644 --- a/addons/strimzi/duck/v1beta2/zz_generated.deepcopy.go +++ b/addons/strimzi/duck/v1beta2/zz_generated.deepcopy.go @@ -1,3 +1,4 @@ +//go:build !ignore_autogenerated // +build !ignore_autogenerated // Code generated by controller-gen. DO NOT EDIT.
[camel-k] branch main updated (0c815fd -> 7adbc42)
This is an automated email from the ASF dual-hosted git repository. djencks pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git. from 0c815fd update templates to use exposed sanitizeId function new 0af1f4f kamelets always use own RawMessage new 91f08d6 move Template to Kamelets new 6d26169 tweak other pkg: disable flow>template conversion in kamelet trait new e1474f3 re-enable Flow >> Template conversion, fix v1/v1alpha1.RawMessage type errors new d2d408d generated comment change ??? new 7adbc42 generated change in pkg/resources/resources.go The 6 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: addons/keda/duck/v1alpha1/zz_generated.deepcopy.go | 1 + .../strimzi/duck/v1beta2/zz_generated.deepcopy.go | 1 + pkg/apis/camel/v1/common_types.go | 6 ++--- pkg/apis/camel/v1/zz_generated.deepcopy.go | 21 +-- pkg/apis/camel/v1alpha1/error_handler_types.go | 8 +++--- pkg/apis/camel/v1alpha1/kamelet_binding_types.go | 2 +- pkg/apis/camel/v1alpha1/kamelet_types.go | 7 - pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go | 31 ++ pkg/cmd/bind.go| 2 +- pkg/controller/kameletbinding/error_handler.go | 5 ++-- pkg/resources/resources.go | 8 +++--- pkg/trait/kamelets.go | 6 +++-- pkg/util/dsl/template.go | 2 +- pkg/util/dsl/template_test.go | 2 +- 14 files changed, 55 insertions(+), 47 deletions(-)
[camel-k] 04/06: re-enable Flow >> Template conversion, fix v1/v1alpha1.RawMessage type errors
This is an automated email from the ASF dual-hosted git repository.
djencks pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit e1474f3d0f10132bc6894ead0420e0d236d2c52a
Author: David Jencks
AuthorDate: Wed Jan 26 18:31:55 2022 -0800
re-enable Flow >> Template conversion, fix v1/v1alpha1.RawMessage type
errors
---
pkg/cmd/bind.go| 2 +-
pkg/controller/kameletbinding/error_handler.go | 5 ++---
pkg/trait/kamelets.go | 15 ---
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/pkg/cmd/bind.go b/pkg/cmd/bind.go
index b81d49d..4e581ce 100644
--- a/pkg/cmd/bind.go
+++ b/pkg/cmd/bind.go
@@ -343,7 +343,7 @@ func (o *bindCmdOptions) asEndpointProperties(props
map[string]string) (*v1alpha
return nil, err
}
return &v1alpha1.EndpointProperties{
- RawMessage: v1.RawMessage(data),
+ RawMessage: v1alpha1.RawMessage(data),
}, nil
}
diff --git a/pkg/controller/kameletbinding/error_handler.go
b/pkg/controller/kameletbinding/error_handler.go
index 48f1639..f7dc600 100644
--- a/pkg/controller/kameletbinding/error_handler.go
+++ b/pkg/controller/kameletbinding/error_handler.go
@@ -21,7 +21,6 @@ import (
"encoding/json"
"fmt"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
"github.com/apache/camel-k/pkg/util/bindings"
"github.com/pkg/errors"
@@ -57,8 +56,8 @@ func maybeErrorHandler(errHandlConf
*v1alpha1.ErrorHandlerSpec, bindingContext b
return nil, nil
}
-func parseErrorHandler(rawMessage v1.RawMessage) (v1alpha1.ErrorHandler,
error) {
- var properties map[v1alpha1.ErrorHandlerType]v1.RawMessage
+func parseErrorHandler(rawMessage v1alpha1.RawMessage) (v1alpha1.ErrorHandler,
error) {
+ var properties map[v1alpha1.ErrorHandlerType]v1alpha1.RawMessage
err := json.Unmarshal(rawMessage, &properties)
if err != nil {
return nil, err
diff --git a/pkg/trait/kamelets.go b/pkg/trait/kamelets.go
index 4d6cf4c..a5c1c93 100644
--- a/pkg/trait/kamelets.go
+++ b/pkg/trait/kamelets.go
@@ -257,13 +257,14 @@ func (t *kameletsTrait) addKameletAsSource(e
*Environment, kamelet *v1alpha1.Kam
// nolint: staticcheck
if kamelet.Spec.Template != nil || kamelet.Spec.Flow != nil {
template := kamelet.Spec.Template
- //if template == nil {
- // // Backward compatibility with Kamelets using flow
- // var bytes []byte = kamelet.Spec.Flow.RawMessage
- // template = &v1alpha1.Template{
- // RawMessage: v1alpha1.RawMessage{bytes},
- // }
- //}
+ if template == nil {
+ // Backward compatibility with Kamelets using flow
+ var bytes []byte = kamelet.Spec.Flow.RawMessage
+ template = &v1alpha1.Template{
+ RawMessage: make(v1alpha1.RawMessage,
len(bytes)),
+ }
+ copy(template.RawMessage, bytes)
+ }
flowData, err := dsl.TemplateToYamlDSL(*template, kamelet.Name)
if err != nil {
return err
[GitHub] [camel-k] djencks merged pull request #2951: WIP separate v1 and v1alpha1 api packages as much as possible
djencks merged pull request #2951: URL: https://github.com/apache/camel-k/pull/2951 -- 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: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-spring-boot] annotated tag camel-spring-boot-3.15.0 created (now e8af6be)
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a change to annotated tag camel-spring-boot-3.15.0 in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git. at e8af6be (tag) tagging d761f18a3649ddb4a16708cdfa38e81d21602d79 (commit) by Gregor Zurowski on Mon Jan 31 17:21:37 2022 + - Log - [maven-release-plugin] copy for tag camel-spring-boot-3.15.0 --- No new revisions were added by this update.
[camel] branch regen_bot updated (9979ec1 -> 60a8242)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git. omit 9979ec1 Regen for commit b62260e19db2aa61fa4a6180eaf24b04194c5944 add 60a8242 Regen for commit b62260e19db2aa61fa4a6180eaf24b04194c5944 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (9979ec1) \ N -- N -- N refs/heads/regen_bot (60a8242) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes:
[GitHub] [camel-k] k0pper closed issue #2966: Configure Maven: Artifact Repository is not recognized
k0pper closed issue #2966: URL: https://github.com/apache/camel-k/issues/2966 -- 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: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] k0pper commented on issue #2966: Configure Maven: Artifact Repository is not recognized
k0pper commented on issue #2966: URL: https://github.com/apache/camel-k/issues/2966#issuecomment-1026002036 Thanks a lot. It works now. I updated the gist. I had to explicitly enable the gitlab-maven repository, as you can read in the gist. -- 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: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-karavan] mgubaidullin merged pull request #159: New Look and Feel
mgubaidullin merged pull request #159: URL: https://github.com/apache/camel-karavan/pull/159 -- 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: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-k] branch main updated: update templates to use exposed sanitizeId function
This is an automated email from the ASF dual-hosted git repository.
djencks pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/main by this push:
new 0c815fd update templates to use exposed sanitizeId function
0c815fd is described below
commit 0c815fdb6d3203c12f9684689dcc366ef5926cb7
Author: David Jencks
AuthorDate: Sun Jan 30 19:26:39 2022 -0800
update templates to use exposed sanitizeId function
---
script/gen_crd/gen_crd_api.sh | 5 +++--
script/gen_crd/template/members.tpl | 2 +-
script/gen_crd/template/pkg.tpl | 2 +-
script/gen_crd/template/type.tpl| 4 ++--
4 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/script/gen_crd/gen_crd_api.sh b/script/gen_crd/gen_crd_api.sh
index f4d696f..696d21e 100755
--- a/script/gen_crd/gen_crd_api.sh
+++ b/script/gen_crd/gen_crd_api.sh
@@ -24,13 +24,14 @@ echo "Generating CRD API documentation..."
# to run a local copy use something like
#go run /Users/david/projects/camel/gen-crd-api-reference-docs/main.go \
#you will probably need to comment out use of blackfriday.
-go run
github.com/djencks/gen-crd-api-reference-docs@7400a10b36d7cfa7563ea48ce0df15a9d4c2de87
\
+go run
github.com/djencks/gen-crd-api-reference-docs@e63530f10b55be5f2d82e223d83f86c13e5158e5
\
-config $location/gen-crd-api-config.json \
-template-dir $location/template \
-api-dir "github.com/apache/camel-k/pkg/apis/camel/v1" \
-out-file $crd_file_camel
-go run
github.com/djencks/gen-crd-api-reference-docs@7400a10b36d7cfa7563ea48ce0df15a9d4c2de87
\
+#go run /Users/david/projects/camel/gen-crd-api-reference-docs/main.go \
+go run
github.com/djencks/gen-crd-api-reference-docs@e63530f10b55be5f2d82e223d83f86c13e5158e5
\
-config $location/gen-kamelets-crd-api-config.json \
-template-dir $location/template \
-api-dir "github.com/apache/camel-k/pkg/apis/camel/v1alpha1" \
diff --git a/script/gen_crd/template/members.tpl
b/script/gen_crd/template/members.tpl
index 5771f11..23afa37 100644
--- a/script/gen_crd/template/members.tpl
+++ b/script/gen_crd/template/members.tpl
@@ -5,7 +5,7 @@
|`{{ fieldName . }}` +
{{ if linkForType .Type -}}
{{- if isLocalType .Type -}}
-*xref:{{ linkForType .Type}}[{{ asciiDocAttributeEscape (typeDisplayName
.Type) }}]*
+*xref:#{{ sanitizeId (anchorIDForType .Type) }}[{{ asciiDocAttributeEscape
(typeDisplayName .Type) }}]*
{{- else -}}
*{{ linkForType .Type}}[{{ asciiDocAttributeEscape (typeDisplayName .Type) }}]*
{{- end -}}
diff --git a/script/gen_crd/template/pkg.tpl b/script/gen_crd/template/pkg.tpl
index c0cb3b4..e539cdc 100644
--- a/script/gen_crd/template/pkg.tpl
+++ b/script/gen_crd/template/pkg.tpl
@@ -1,7 +1,7 @@
{{ define "packages" -}}
{{ range .packages -}}
-[#{{ packageAnchorID . }}]
+[#{{ sanitizeId (packageAnchorID .) }}]
== {{ packageDisplayName . }}
{{- with (index .GoPackages 0 ) -}}
diff --git a/script/gen_crd/template/type.tpl b/script/gen_crd/template/type.tpl
index d6f0dcf..d52c4c3 100644
--- a/script/gen_crd/template/type.tpl
+++ b/script/gen_crd/template/type.tpl
@@ -1,12 +1,12 @@
{{ define "type" }}
-[#{{ anchorIDForType . }}]
+[#{{ sanitizeId (anchorIDForType .) }}]
=== {{ .Name.Name }}{{ if eq .Kind "Alias" }}(`{{.Underlying}}` alias){{ end }}
{{- with (typeReferences .) }}
*Appears on:*
{{ range . }}
-* <<{{ linkForType . }}, {{ typeDisplayName . }}>>
+* <<#{{ sanitizeId (anchorIDForType .) }}, {{ typeDisplayName . }}>>
{{- end -}}
{{- end }}
[camel-k] 05/05: update templates to use exposed sanitizeId function
This is an automated email from the ASF dual-hosted git repository.
djencks pushed a commit to branch release-1.8.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 1bb3cf1d28ac3958bebd7435943338412204460e
Author: David Jencks
AuthorDate: Sun Jan 30 19:26:39 2022 -0800
update templates to use exposed sanitizeId function
---
script/gen_crd/gen_crd_api.sh | 5 +++--
script/gen_crd/template/members.tpl | 2 +-
script/gen_crd/template/pkg.tpl | 2 +-
script/gen_crd/template/type.tpl| 4 ++--
4 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/script/gen_crd/gen_crd_api.sh b/script/gen_crd/gen_crd_api.sh
index f4d696f..696d21e 100755
--- a/script/gen_crd/gen_crd_api.sh
+++ b/script/gen_crd/gen_crd_api.sh
@@ -24,13 +24,14 @@ echo "Generating CRD API documentation..."
# to run a local copy use something like
#go run /Users/david/projects/camel/gen-crd-api-reference-docs/main.go \
#you will probably need to comment out use of blackfriday.
-go run
github.com/djencks/gen-crd-api-reference-docs@7400a10b36d7cfa7563ea48ce0df15a9d4c2de87
\
+go run
github.com/djencks/gen-crd-api-reference-docs@e63530f10b55be5f2d82e223d83f86c13e5158e5
\
-config $location/gen-crd-api-config.json \
-template-dir $location/template \
-api-dir "github.com/apache/camel-k/pkg/apis/camel/v1" \
-out-file $crd_file_camel
-go run
github.com/djencks/gen-crd-api-reference-docs@7400a10b36d7cfa7563ea48ce0df15a9d4c2de87
\
+#go run /Users/david/projects/camel/gen-crd-api-reference-docs/main.go \
+go run
github.com/djencks/gen-crd-api-reference-docs@e63530f10b55be5f2d82e223d83f86c13e5158e5
\
-config $location/gen-kamelets-crd-api-config.json \
-template-dir $location/template \
-api-dir "github.com/apache/camel-k/pkg/apis/camel/v1alpha1" \
diff --git a/script/gen_crd/template/members.tpl
b/script/gen_crd/template/members.tpl
index 5771f11..23afa37 100644
--- a/script/gen_crd/template/members.tpl
+++ b/script/gen_crd/template/members.tpl
@@ -5,7 +5,7 @@
|`{{ fieldName . }}` +
{{ if linkForType .Type -}}
{{- if isLocalType .Type -}}
-*xref:{{ linkForType .Type}}[{{ asciiDocAttributeEscape (typeDisplayName
.Type) }}]*
+*xref:#{{ sanitizeId (anchorIDForType .Type) }}[{{ asciiDocAttributeEscape
(typeDisplayName .Type) }}]*
{{- else -}}
*{{ linkForType .Type}}[{{ asciiDocAttributeEscape (typeDisplayName .Type) }}]*
{{- end -}}
diff --git a/script/gen_crd/template/pkg.tpl b/script/gen_crd/template/pkg.tpl
index c0cb3b4..e539cdc 100644
--- a/script/gen_crd/template/pkg.tpl
+++ b/script/gen_crd/template/pkg.tpl
@@ -1,7 +1,7 @@
{{ define "packages" -}}
{{ range .packages -}}
-[#{{ packageAnchorID . }}]
+[#{{ sanitizeId (packageAnchorID .) }}]
== {{ packageDisplayName . }}
{{- with (index .GoPackages 0 ) -}}
diff --git a/script/gen_crd/template/type.tpl b/script/gen_crd/template/type.tpl
index d6f0dcf..d52c4c3 100644
--- a/script/gen_crd/template/type.tpl
+++ b/script/gen_crd/template/type.tpl
@@ -1,12 +1,12 @@
{{ define "type" }}
-[#{{ anchorIDForType . }}]
+[#{{ sanitizeId (anchorIDForType .) }}]
=== {{ .Name.Name }}{{ if eq .Kind "Alias" }}(`{{.Underlying}}` alias){{ end }}
{{- with (typeReferences .) }}
*Appears on:*
{{ range . }}
-* <<{{ linkForType . }}, {{ typeDisplayName . }}>>
+* <<#{{ sanitizeId (anchorIDForType .) }}, {{ typeDisplayName . }}>>
{{- end -}}
{{- end }}
[camel-k] 04/05: generated resources.go change
This is an automated email from the ASF dual-hosted git repository.
djencks pushed a commit to branch release-1.8.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 931eda24f83f076373a85e0a9e8a79b40e3b97a1
Author: David Jencks
AuthorDate: Fri Jan 28 09:30:10 2022 -0800
generated resources.go change
---
pkg/resources/resources.go | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pkg/resources/resources.go b/pkg/resources/resources.go
index 0b4e74d..7803e2a 100644
--- a/pkg/resources/resources.go
+++ b/pkg/resources/resources.go
@@ -152,16 +152,16 @@ var assets = func() http.FileSystem {
"/crd/bases/camel.apache.org_kameletbindings.yaml":
&vfsgen۰CompressedFileInfo{
name:
"camel.apache.org_kameletbindings.yaml",
modTime: time.Time{},
- uncompressedSize: 432720,
+ uncompressedSize: 432723,
- compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xbd\xfb\x73\x1b\x37\x96\x30\xfa\x7b\xfe\x0a\x94\x9c\xfa\x24\x6d\x44\xca\xce\xcc\xce\xdd\xf1\x9d\xfa\x52\x1a\x59\xce\xe8\xc6\x96\x59\x96\xe2\x7c\x29\x27\x9b\x05\xbb\x41\x12\xab\x6e\xa0\x17\x40\x53\xe2\x5e\xdf\xff\xfd\x16\x0e\x80\x7e\xf0\x25\x9c\xa6\xa8\x28\x3b\x8d\xa9\x9a\x98\x22\xfb\x34\x5e\xe7\xfd\x7a\x41\x06\x8f\x37\xbe\x7a\x41\xde\xf1\x84\x09\xcd\x52\x62\x24\x31\x33\x46\xce\x0a\x9a\xcc\x18\xb9\x96\x13\x73\x47\x
[...]
+ compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xbd\xfb\x73\x1b\x37\x96\x30\xfa\x7b\xfe\x0a\x94\x9c\xfa\x24\x6d\x44\xca\xce\xcc\xce\xdd\xf1\x9d\xfa\x52\x1a\x59\xce\xe8\xc6\x96\x59\x96\xe2\x7c\x29\x27\x9b\x05\xbb\x41\x12\xab\x6e\xa0\x17\x40\x53\xe2\x5e\xdf\xff\xfd\x16\x0e\x80\x7e\xf0\x25\x9c\xa6\xa8\x28\x3b\x8d\xa9\x9a\x98\x22\xfb\x34\x5e\xe7\xfd\x7a\x41\x06\x8f\x37\xbe\x7a\x41\xde\xf1\x84\x09\xcd\x52\x62\x24\x31\x33\x46\xce\x0a\x9a\xcc\x18\xb9\x96\x13\x73\x47\x
[...]
},
"/crd/bases/camel.apache.org_kamelets.yaml":
&vfsgen۰CompressedFileInfo{
name: "camel.apache.org_kamelets.yaml",
modTime: time.Time{},
- uncompressedSize: 24280,
+ uncompressedSize: 24282,
- compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x5c\x7d\x53\xe3\x38\x9a\xff\x3f\x9f\xe2\x29\x98\xaa\xa6\xab\x70\x48\x08\x30\xdd\xb9\x3f\x28\x06\x9a\xbd\xdc\xd0\x40\x11\xd8\xbd\x39\xe8\xad\x52\xec\x27\x89\x16\x5b\xf2\x4a\x32\x2f\x3b\xf0\xdd\xaf\x24\xd9\x8e\xf3\x62\x5b\x09\x81\xed\xba\x3a\x55\x4d\x0d\x76\xa4\x9f\x9e\x37\x3d\x7a\xfb\xb5\x37\xc1\x5b\x5f\x69\x6c\xc2\x19\xf5\x91\x49\x0c\x40\x71\x50\x63\x84\xa3\x98\xf8\x63\x84\x3e\x1f\xaa\x47\x22\x10\x4e\x79\xc2\x02\x
[...]
+ compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x5c\x7b\x53\xeb\x38\x96\xff\x3f\x9f\xe2\x14\x74\xd5\x85\x2a\x1c\x12\x02\xf4\xed\xec\x1f\x14\x0d\x97\xd9\x6c\xd3\x40\x11\x98\xd9\x5e\xb8\x53\xa5\xd8\x27\x89\x06\x5b\xf2\x48\x32\x8f\x69\xf8\xee\x5b\x92\x6c\xc7\x79\xd8\x56\x42\x60\x6e\x6d\xad\xaa\xba\x1a\x3b\xd2\x4f\xe7\xa5\xa3\xd7\xef\x7a\x13\xbc\xf5\x95\xc6\x26\x9c\x53\x1f\x99\xc4\x00\x14\x07\x35\x46\x38\x8e\x89\x3f\x46\xe8\xf3\xa1\x7a\x22\x02\xe1\x8c\x27\x2c\x20\x
[...]
},
"/manager": &vfsgen۰DirInfo{
name:"manager",
[camel-k] 02/05: update gen_crd_api script/config to use go run and asciidoc config
This is an automated email from the ASF dual-hosted git repository.
djencks pushed a commit to branch release-1.8.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 17f2783e344e279de6c9a18c8e114afc1059aa2a
Author: David Jencks
AuthorDate: Thu Jan 20 20:47:52 2022 -0800
update gen_crd_api script/config to use go run and asciidoc config
add /github.com to .gitignore, it's similar to /vendor
use AsciiDoc API templates
---
.gitignore | 1 +
script/gen_crd/gen-crd-api-config.json | 3 +-
...onfig.json => gen-kamelets-crd-api-config.json} | 7 +-
script/gen_crd/gen_crd_api.sh | 31 -
script/gen_crd/template/members.tpl| 70 ---
script/gen_crd/template/pkg.tpl| 67 ---
script/gen_crd/template/type.tpl | 78 --
7 files changed, 103 insertions(+), 154 deletions(-)
diff --git a/.gitignore b/.gitignore
index 6a7118a..dfa66a7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
# Go vendor
/vendor
+/github.com
# Binary files
/kamel
diff --git a/script/gen_crd/gen-crd-api-config.json
b/script/gen_crd/gen-crd-api-config.json
index 5e4031c..1a6ae0d 100644
--- a/script/gen_crd/gen-crd-api-config.json
+++ b/script/gen_crd/gen-crd-api-config.json
@@ -17,5 +17,6 @@
"k8s.io/api/": "Kubernetes ",
"k8s.io/apimachinery/pkg/apis/": "Kubernetes "
},
-"markdownDisabled": false
+"markdownDisabled": true,
+"asciiDoc": true
}
diff --git a/script/gen_crd/gen-crd-api-config.json
b/script/gen_crd/gen-kamelets-crd-api-config.json
similarity index 71%
copy from script/gen_crd/gen-crd-api-config.json
copy to script/gen_crd/gen-kamelets-crd-api-config.json
index 5e4031c..0e67016 100644
--- a/script/gen_crd/gen-crd-api-config.json
+++ b/script/gen_crd/gen-kamelets-crd-api-config.json
@@ -11,11 +11,16 @@
{
"typeMatchPrefix": "^k8s\\.io/(api|apimachinery/pkg/apis)/",
"docsURLTemplate":
"https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#{{lower
.TypeIdentifier}}-{{arrIndex .PackageSegments -1}}-{{arrIndex .PackageSegments
-2}}"
+},
+{
+ "typeMatchPrefix":
"^github\\.com/apache/camel-k/pkg/apis/camel/v1\\.",
+ "docsURLTemplate":
"xref:apis/camel-k.adoc#_camel_apache_org_v1_{{.TypeIdentifier}}"
}
],
"typeDisplayNamePrefixOverrides": {
"k8s.io/api/": "Kubernetes ",
"k8s.io/apimachinery/pkg/apis/": "Kubernetes "
},
-"markdownDisabled": false
+"markdownDisabled": true,
+"asciiDoc": true
}
diff --git a/script/gen_crd/gen_crd_api.sh b/script/gen_crd/gen_crd_api.sh
index 77f2f97..f4d696f 100755
--- a/script/gen_crd/gen_crd_api.sh
+++ b/script/gen_crd/gen_crd_api.sh
@@ -17,26 +17,23 @@
location=$(dirname $0)
rootdir=$location/../..
-crd_file=$rootdir/docs/modules/ROOT/partials/apis/crds-html.adoc
-
-echo "Downloading gen-crd-api-reference-docs binary..."
-TMPFILE=`mktemp`
-TMPDIR=`mktemp -d`
-PWD=`pwd`
-# TODO detect proper binary, based on the OS running this script
-wget -v
https://github.com/ahmetb/gen-crd-api-reference-docs/releases/download/v0.1.5/gen-crd-api-reference-docs_linux_amd64.tar.gz
-O $TMPFILE
-tar -C $TMPDIR -xf $TMPFILE
+crd_file_camel=$rootdir/docs/modules/ROOT/partials/apis/camel-k-crds.adoc
+crd_file_kamelets=$rootdir/docs/modules/ROOT/partials/apis/kamelets-crds.adoc
echo "Generating CRD API documentation..."
-$TMPDIR/gen-crd-api-reference-docs \
+# to run a local copy use something like
+#go run /Users/david/projects/camel/gen-crd-api-reference-docs/main.go \
+#you will probably need to comment out use of blackfriday.
+go run
github.com/djencks/gen-crd-api-reference-docs@7400a10b36d7cfa7563ea48ce0df15a9d4c2de87
\
-config $location/gen-crd-api-config.json \
-template-dir $location/template \
--api-dir "github.com/apache/camel-k/pkg/apis/camel" \
--out-file $crd_file
+-api-dir "github.com/apache/camel-k/pkg/apis/camel/v1" \
+-out-file $crd_file_camel
-# Workaround: https://github.com/ahmetb/gen-crd-api-reference-docs/issues/33
-sed -i -E "s/%2f/\//" $crd_file
+go run
github.com/djencks/gen-crd-api-reference-docs@7400a10b36d7cfa7563ea48ce0df15a9d4c2de87
\
+-config $location/gen-kamelets-crd-api-config.json \
+-template-dir $location/template \
+-api-dir "github.com/apache/camel-k/pkg/apis/camel/v1alpha1" \
+-out-file $crd_file_kamelets
-echo "Cleaning the gen-crd-api-reference-docs binary..."
-rm $TMPFILE
-rm -rf $TMPDIR
+echo "Generating CRD API documentation... Done."
diff --git a/script/gen_crd/template/members.tpl
b/script/gen_crd/template/members.tpl
index a529c67..5771f11 100644
--- a/script/gen_crd/template/members.tpl
+++ b/script/gen_crd/template/members.tpl
@@ -1,48 +1,30 @@
-{{ define "members" }}
+{{ define "members" -}}
-{{ range .Memb
[GitHub] [camel-k] djencks merged pull request #2961: Generate crd API docs as AsciiDoc (Release 1.6.x)
djencks merged pull request #2961: URL: https://github.com/apache/camel-k/pull/2961 -- 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: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] djencks merged pull request #2960: Generate crd API docs as AsciiDoc (Release 1.7.x)
djencks merged pull request #2960: URL: https://github.com/apache/camel-k/pull/2960 -- 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: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-k] 06/06: update templates to use exposed sanitizeId function
This is an automated email from the ASF dual-hosted git repository.
djencks pushed a commit to branch release-1.7.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 189eacb7b6231446ac2e4b009b2097c68d4bceef
Author: David Jencks
AuthorDate: Sun Jan 30 19:26:39 2022 -0800
update templates to use exposed sanitizeId function
---
script/gen_crd/gen_crd_api.sh | 5 +++--
script/gen_crd/template/members.tpl | 2 +-
script/gen_crd/template/pkg.tpl | 2 +-
script/gen_crd/template/type.tpl| 4 ++--
4 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/script/gen_crd/gen_crd_api.sh b/script/gen_crd/gen_crd_api.sh
index f4d696f..696d21e 100755
--- a/script/gen_crd/gen_crd_api.sh
+++ b/script/gen_crd/gen_crd_api.sh
@@ -24,13 +24,14 @@ echo "Generating CRD API documentation..."
# to run a local copy use something like
#go run /Users/david/projects/camel/gen-crd-api-reference-docs/main.go \
#you will probably need to comment out use of blackfriday.
-go run
github.com/djencks/gen-crd-api-reference-docs@7400a10b36d7cfa7563ea48ce0df15a9d4c2de87
\
+go run
github.com/djencks/gen-crd-api-reference-docs@e63530f10b55be5f2d82e223d83f86c13e5158e5
\
-config $location/gen-crd-api-config.json \
-template-dir $location/template \
-api-dir "github.com/apache/camel-k/pkg/apis/camel/v1" \
-out-file $crd_file_camel
-go run
github.com/djencks/gen-crd-api-reference-docs@7400a10b36d7cfa7563ea48ce0df15a9d4c2de87
\
+#go run /Users/david/projects/camel/gen-crd-api-reference-docs/main.go \
+go run
github.com/djencks/gen-crd-api-reference-docs@e63530f10b55be5f2d82e223d83f86c13e5158e5
\
-config $location/gen-kamelets-crd-api-config.json \
-template-dir $location/template \
-api-dir "github.com/apache/camel-k/pkg/apis/camel/v1alpha1" \
diff --git a/script/gen_crd/template/members.tpl
b/script/gen_crd/template/members.tpl
index 5771f11..23afa37 100644
--- a/script/gen_crd/template/members.tpl
+++ b/script/gen_crd/template/members.tpl
@@ -5,7 +5,7 @@
|`{{ fieldName . }}` +
{{ if linkForType .Type -}}
{{- if isLocalType .Type -}}
-*xref:{{ linkForType .Type}}[{{ asciiDocAttributeEscape (typeDisplayName
.Type) }}]*
+*xref:#{{ sanitizeId (anchorIDForType .Type) }}[{{ asciiDocAttributeEscape
(typeDisplayName .Type) }}]*
{{- else -}}
*{{ linkForType .Type}}[{{ asciiDocAttributeEscape (typeDisplayName .Type) }}]*
{{- end -}}
diff --git a/script/gen_crd/template/pkg.tpl b/script/gen_crd/template/pkg.tpl
index c0cb3b4..e539cdc 100644
--- a/script/gen_crd/template/pkg.tpl
+++ b/script/gen_crd/template/pkg.tpl
@@ -1,7 +1,7 @@
{{ define "packages" -}}
{{ range .packages -}}
-[#{{ packageAnchorID . }}]
+[#{{ sanitizeId (packageAnchorID .) }}]
== {{ packageDisplayName . }}
{{- with (index .GoPackages 0 ) -}}
diff --git a/script/gen_crd/template/type.tpl b/script/gen_crd/template/type.tpl
index d6f0dcf..d52c4c3 100644
--- a/script/gen_crd/template/type.tpl
+++ b/script/gen_crd/template/type.tpl
@@ -1,12 +1,12 @@
{{ define "type" }}
-[#{{ anchorIDForType . }}]
+[#{{ sanitizeId (anchorIDForType .) }}]
=== {{ .Name.Name }}{{ if eq .Kind "Alias" }}(`{{.Underlying}}` alias){{ end }}
{{- with (typeReferences .) }}
*Appears on:*
{{ range . }}
-* <<{{ linkForType . }}, {{ typeDisplayName . }}>>
+* <<#{{ sanitizeId (anchorIDForType .) }}, {{ typeDisplayName . }}>>
{{- end -}}
{{- end }}
[camel-k] 04/06: newly generated files
This is an automated email from the ASF dual-hosted git repository. djencks pushed a commit to branch release-1.6.x in repository https://gitbox.apache.org/repos/asf/camel-k.git commit c37024a316ad8fe1ffafc5c543d8b27f750e3aa1 Author: David Jencks AuthorDate: Fri Jan 28 13:23:37 2022 -0800 newly generated files --- addons/tracing/zz_desc_generated.go | 1 + addons/tracing/zz_generated_doc.go | 1 + 2 files changed, 2 insertions(+) diff --git a/addons/tracing/zz_desc_generated.go b/addons/tracing/zz_desc_generated.go new file mode 100644 index 000..5881eae --- /dev/null +++ b/addons/tracing/zz_desc_generated.go @@ -0,0 +1 @@ +package tracing diff --git a/addons/tracing/zz_generated_doc.go b/addons/tracing/zz_generated_doc.go new file mode 100644 index 000..5881eae --- /dev/null +++ b/addons/tracing/zz_generated_doc.go @@ -0,0 +1 @@ +package tracing
[camel-k] 02/06: update gen_crd_api script/config to use go run and asciidoc config
This is an automated email from the ASF dual-hosted git repository.
djencks pushed a commit to branch release-1.6.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit ccb35f3fbfed337293c6a08956e24c68617c1f13
Author: David Jencks
AuthorDate: Thu Jan 20 20:47:52 2022 -0800
update gen_crd_api script/config to use go run and asciidoc config
add /github.com to .gitignore, it's similar to /vendor
use AsciiDoc API templates
---
.gitignore | 1 +
script/gen_crd/gen-crd-api-config.json | 3 +-
...onfig.json => gen-kamelets-crd-api-config.json} | 7 +-
script/gen_crd/gen_crd_api.sh | 31 -
script/gen_crd/template/members.tpl| 70 ---
script/gen_crd/template/pkg.tpl| 67 ---
script/gen_crd/template/type.tpl | 78 --
7 files changed, 103 insertions(+), 154 deletions(-)
diff --git a/.gitignore b/.gitignore
index 26458eb..ad19d16 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
# Go vendor
/vendor
+/github.com
# Binary files
/kamel
diff --git a/script/gen_crd/gen-crd-api-config.json
b/script/gen_crd/gen-crd-api-config.json
index 5e4031c..1a6ae0d 100644
--- a/script/gen_crd/gen-crd-api-config.json
+++ b/script/gen_crd/gen-crd-api-config.json
@@ -17,5 +17,6 @@
"k8s.io/api/": "Kubernetes ",
"k8s.io/apimachinery/pkg/apis/": "Kubernetes "
},
-"markdownDisabled": false
+"markdownDisabled": true,
+"asciiDoc": true
}
diff --git a/script/gen_crd/gen-crd-api-config.json
b/script/gen_crd/gen-kamelets-crd-api-config.json
similarity index 71%
copy from script/gen_crd/gen-crd-api-config.json
copy to script/gen_crd/gen-kamelets-crd-api-config.json
index 5e4031c..0e67016 100644
--- a/script/gen_crd/gen-crd-api-config.json
+++ b/script/gen_crd/gen-kamelets-crd-api-config.json
@@ -11,11 +11,16 @@
{
"typeMatchPrefix": "^k8s\\.io/(api|apimachinery/pkg/apis)/",
"docsURLTemplate":
"https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#{{lower
.TypeIdentifier}}-{{arrIndex .PackageSegments -1}}-{{arrIndex .PackageSegments
-2}}"
+},
+{
+ "typeMatchPrefix":
"^github\\.com/apache/camel-k/pkg/apis/camel/v1\\.",
+ "docsURLTemplate":
"xref:apis/camel-k.adoc#_camel_apache_org_v1_{{.TypeIdentifier}}"
}
],
"typeDisplayNamePrefixOverrides": {
"k8s.io/api/": "Kubernetes ",
"k8s.io/apimachinery/pkg/apis/": "Kubernetes "
},
-"markdownDisabled": false
+"markdownDisabled": true,
+"asciiDoc": true
}
diff --git a/script/gen_crd/gen_crd_api.sh b/script/gen_crd/gen_crd_api.sh
index c8bf224..f4d696f 100755
--- a/script/gen_crd/gen_crd_api.sh
+++ b/script/gen_crd/gen_crd_api.sh
@@ -17,26 +17,23 @@
location=$(dirname $0)
rootdir=$location/../..
-crd_file=$rootdir/docs/modules/ROOT/partials/apis/crds-html.adoc
-
-echo "Downloading gen-crd-api-reference-docs binary..."
-TMPFILE=`mktemp`
-TMPDIR=`mktemp -d`
-PWD=`pwd`
-# TODO detect proper binary, based on the OS running this script
-wget -q --show-progress
https://github.com/ahmetb/gen-crd-api-reference-docs/releases/download/v0.1.5/gen-crd-api-reference-docs_linux_amd64.tar.gz
-O $TMPFILE
-tar -C $TMPDIR -xf $TMPFILE
+crd_file_camel=$rootdir/docs/modules/ROOT/partials/apis/camel-k-crds.adoc
+crd_file_kamelets=$rootdir/docs/modules/ROOT/partials/apis/kamelets-crds.adoc
echo "Generating CRD API documentation..."
-$TMPDIR/gen-crd-api-reference-docs \
+# to run a local copy use something like
+#go run /Users/david/projects/camel/gen-crd-api-reference-docs/main.go \
+#you will probably need to comment out use of blackfriday.
+go run
github.com/djencks/gen-crd-api-reference-docs@7400a10b36d7cfa7563ea48ce0df15a9d4c2de87
\
-config $location/gen-crd-api-config.json \
-template-dir $location/template \
--api-dir "github.com/apache/camel-k/pkg/apis/camel" \
--out-file $crd_file
+-api-dir "github.com/apache/camel-k/pkg/apis/camel/v1" \
+-out-file $crd_file_camel
-# Workaround: https://github.com/ahmetb/gen-crd-api-reference-docs/issues/33
-sed -i -E "s/%2f/\//" $crd_file
+go run
github.com/djencks/gen-crd-api-reference-docs@7400a10b36d7cfa7563ea48ce0df15a9d4c2de87
\
+-config $location/gen-kamelets-crd-api-config.json \
+-template-dir $location/template \
+-api-dir "github.com/apache/camel-k/pkg/apis/camel/v1alpha1" \
+-out-file $crd_file_kamelets
-echo "Cleaning the gen-crd-api-reference-docs binary..."
-rm $TMPFILE
-rm -rf $TMPDIR
\ No newline at end of file
+echo "Generating CRD API documentation... Done."
diff --git a/script/gen_crd/template/members.tpl
b/script/gen_crd/template/members.tpl
index a529c67..5771f11 100644
--- a/script/gen_crd/template/members.tpl
+++ b/script/gen_crd/template/members.tpl
@@ -1,48 +1,30 @@
-{{ define "members" }
[GitHub] [camel-k] djencks merged pull request #2963: Generate crd API docs as AsciiDoc (main) (Update)
djencks merged pull request #2963: URL: https://github.com/apache/camel-k/pull/2963 -- 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: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-k] branch release-1.6.x updated (22d14a9 -> 03cea91)
This is an automated email from the ASF dual-hosted git repository.
djencks pushed a change to branch release-1.6.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git.
from 22d14a9 fix(e2e): Do not add snapshot bundle to stable channel
new 38da6a2 fix apparent typos in jsonschema_types.go
new ccb35f3 update gen_crd_api script/config to use go run and asciidoc
config
new bd24173 Switch to separate camel-k and kamelets API pages. Generated
AsciiDoc API docs
new c37024a newly generated files
new aff627d generated modified resources.go file
new 03cea91 update templates to use exposed sanitizeId function
The 6 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:
.gitignore |1 +
addons/tracing/zz_desc_generated.go|1 +
addons/tracing/zz_generated_doc.go |1 +
.../bases/camel.apache.org_kameletbindings.yaml| 12 +-
config/crd/bases/camel.apache.org_kamelets.yaml|8 +-
docs/modules/ROOT/nav-end.adoc |4 +-
docs/modules/ROOT/pages/apis/camel-k.adoc |4 +
docs/modules/ROOT/pages/apis/camel.adoc|5 -
docs/modules/ROOT/pages/apis/kamelets.adoc |3 +
docs/modules/ROOT/partials/apis/camel-k-crds.adoc | 3090 +
docs/modules/ROOT/partials/apis/crds-html.adoc | 6783
docs/modules/ROOT/partials/apis/kamelets-crds.adoc | 1189
helm/camel-k/crds/crd-kamelet-binding.yaml | 12 +-
helm/camel-k/crds/crd-kamelet.yaml |8 +-
pkg/apis/camel/v1alpha1/jsonschema_types.go|4 +-
pkg/resources/resources.go | 18 +-
script/gen_crd/gen-crd-api-config.json |3 +-
...onfig.json => gen-kamelets-crd-api-config.json} |7 +-
script/gen_crd/gen_crd_api.sh | 32 +-
script/gen_crd/template/members.tpl| 70 +-
script/gen_crd/template/pkg.tpl| 67 +-
script/gen_crd/template/type.tpl | 78 +-
22 files changed, 4426 insertions(+), 6974 deletions(-)
create mode 100644 addons/tracing/zz_desc_generated.go
create mode 100644 addons/tracing/zz_generated_doc.go
create mode 100644 docs/modules/ROOT/pages/apis/camel-k.adoc
delete mode 100644 docs/modules/ROOT/pages/apis/camel.adoc
create mode 100644 docs/modules/ROOT/pages/apis/kamelets.adoc
create mode 100644 docs/modules/ROOT/partials/apis/camel-k-crds.adoc
delete mode 100644 docs/modules/ROOT/partials/apis/crds-html.adoc
create mode 100644 docs/modules/ROOT/partials/apis/kamelets-crds.adoc
copy script/gen_crd/{gen-crd-api-config.json =>
gen-kamelets-crd-api-config.json} (71%)
[camel-k] 01/05: fix apparent typos in jsonschema_types.go
This is an automated email from the ASF dual-hosted git repository.
djencks pushed a commit to branch release-1.8.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 54c94878db3248d91b2ef3c9381c43a7f6c20975
Author: David Jencks
AuthorDate: Wed Jan 19 16:40:26 2022 -0800
fix apparent typos in jsonschema_types.go
propagate typo fixes to generated yaml
---
config/crd/bases/camel.apache.org_kameletbindings.yaml | 12 ++--
config/crd/bases/camel.apache.org_kamelets.yaml| 8
helm/camel-k/crds/crd-kamelet-binding.yaml | 12 ++--
helm/camel-k/crds/crd-kamelet.yaml | 8
pkg/apis/camel/v1alpha1/jsonschema_types.go| 4 ++--
5 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/config/crd/bases/camel.apache.org_kameletbindings.yaml
b/config/crd/bases/camel.apache.org_kameletbindings.yaml
index 0891d1f..da6e75c 100644
--- a/config/crd/bases/camel.apache.org_kameletbindings.yaml
+++ b/config/crd/bases/camel.apache.org_kameletbindings.yaml
@@ -5793,10 +5793,10 @@ spec:
with any non digit characters mixed in -
ssn:
a U.S. social security number following
the
regex ^d{3}[- ]?d{2}[-
]?d{4}$ -
- hexcolor: an hexadecimal color code like
\"#FF:
+ hexcolor: an hexadecimal color code like
\"#FF\"
following the regex
^#?([0-9a-fA-F]{3}|[0-9a-fA-F]{6})$
- rgbcolor: an RGB color code like rgb
like
- \"rgb(255,255,2559\" - byte: base64
encoded
+ \"rgb(255,255,255)\" - byte: base64
encoded
binary data - password: any kind of
string -
date: a date string like \"2006-01-02\"
as defined
by full-date in RFC3339 - duration: a
duration
@@ -6008,10 +6008,10 @@ spec:
with any non digit characters mixed in -
ssn:
a U.S. social security number following
the
regex ^d{3}[- ]?d{2}[-
]?d{4}$ -
- hexcolor: an hexadecimal color code like
\"#FF:
+ hexcolor: an hexadecimal color code like
\"#FF\"
following the regex
^#?([0-9a-fA-F]{3}|[0-9a-fA-F]{6})$
- rgbcolor: an RGB color code like rgb
like
- \"rgb(255,255,2559\" - byte: base64
encoded
+ \"rgb(255,255,255)\" - byte: base64
encoded
binary data - password: any kind of
string -
date: a date string like \"2006-01-02\"
as defined
by full-date in RFC3339 - duration: a
duration
@@ -6228,9 +6228,9 @@ spec:
a U.S. social security number
following the
regex ^d{3}[- ]?d{2}[-
]?d{4}$
- hexcolor: an hexadecimal color code
like
-\"#FF: following the regex
^#?([0-9a-fA-F]{3}|[0-9a-fA-F]{6})$
+\"#FF\" following the regex
^#?([0-9a-fA-F]{3}|[0-9a-fA-F]{6})$
- rgbcolor: an RGB color code like rgb
like
-\"rgb(255,255,2559\" - byte: base64
encoded
+\"rgb(255,255,255)\" - byte: base64
encoded
binary data - password: any kind of
string
- date: a date string like
\"2006-01-02\"
as defined by full-date in RFC3339 -
duration:
diff --git a/config/crd/bases/camel.apache.org_kamelets.yaml
b/config/crd/bases/camel.apache.org_kamelets.yaml
index dada3b0..09410dd 100644
--- a/config/crd/bases/camel.apache.org_kamelets.yaml
+++ b/config/crd/bases/camel.apache.org_kamelets.yaml
@@ -143,8 +143,8 @@ spec:
with any non digit characters mixed in - ssn: a
U.S. social
security number following the regex ^d{3}[-
]?d{2}[-
]?d{4}$ - hexcolor: an hexadecimal color code
like
-\"#FF: following the regex
^#?([0-9a-fA-F]{3}|[0-9a-fA-F]{6})$
-- rgbcolor: an RGB color code like rgb like
\"rgb(255,255,2559\"
+
[camel-k] branch release-1.8.x updated (6424294 -> 1bb3cf1)
This is an automated email from the ASF dual-hosted git repository.
djencks pushed a change to branch release-1.8.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git.
from 6424294 [TEST] Add Global operator + namespaced kamelet test
new 54c9487 fix apparent typos in jsonschema_types.go
new 17f2783 update gen_crd_api script/config to use go run and asciidoc
config
new 3c0cfc0 Switch to separate camel-k and kamelets API pages. Generated
AsciiDoc API docs
new 931eda2 generated resources.go change
new 1bb3cf1 update templates to use exposed sanitizeId function
The 5 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:
.gitignore |1 +
.../bases/camel.apache.org_kameletbindings.yaml| 12 +-
config/crd/bases/camel.apache.org_kamelets.yaml|8 +-
docs/modules/ROOT/nav-end.adoc |4 +-
docs/modules/ROOT/pages/apis/camel-k.adoc |4 +
docs/modules/ROOT/pages/apis/camel.adoc|5 -
docs/modules/ROOT/pages/apis/kamelets.adoc |3 +
docs/modules/ROOT/pages/running/running.adoc |2 +-
docs/modules/ROOT/partials/apis/camel-k-crds.adoc | 3112 +
docs/modules/ROOT/partials/apis/crds-html.adoc | 6733
docs/modules/ROOT/partials/apis/kamelets-crds.adoc | 1130
helm/camel-k/crds/crd-kamelet-binding.yaml | 12 +-
helm/camel-k/crds/crd-kamelet.yaml |8 +-
pkg/apis/camel/v1alpha1/jsonschema_types.go|4 +-
pkg/resources/resources.go |8 +-
script/gen_crd/gen-crd-api-config.json |3 +-
...onfig.json => gen-kamelets-crd-api-config.json} |7 +-
script/gen_crd/gen_crd_api.sh | 32 +-
script/gen_crd/template/members.tpl| 70 +-
script/gen_crd/template/pkg.tpl| 67 +-
script/gen_crd/template/type.tpl | 78 +-
21 files changed, 4383 insertions(+), 6920 deletions(-)
create mode 100644 docs/modules/ROOT/pages/apis/camel-k.adoc
delete mode 100644 docs/modules/ROOT/pages/apis/camel.adoc
create mode 100644 docs/modules/ROOT/pages/apis/kamelets.adoc
create mode 100644 docs/modules/ROOT/partials/apis/camel-k-crds.adoc
delete mode 100644 docs/modules/ROOT/partials/apis/crds-html.adoc
create mode 100644 docs/modules/ROOT/partials/apis/kamelets-crds.adoc
copy script/gen_crd/{gen-crd-api-config.json =>
gen-kamelets-crd-api-config.json} (71%)
[GitHub] [camel-k] djencks merged pull request #2959: Generate crd API docs as AsciiDoc (Release 1.8.x)
djencks merged pull request #2959: URL: https://github.com/apache/camel-k/pull/2959 -- 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: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-k] 04/06: newly generated files
This is an automated email from the ASF dual-hosted git repository. djencks pushed a commit to branch release-1.7.x in repository https://gitbox.apache.org/repos/asf/camel-k.git commit 232595ba3536429487c56344959a014559486437 Author: David Jencks AuthorDate: Fri Jan 28 13:01:26 2022 -0800 newly generated files --- addons/tracing/zz_desc_generated.go | 1 + addons/tracing/zz_generated_doc.go | 1 + 2 files changed, 2 insertions(+) diff --git a/addons/tracing/zz_desc_generated.go b/addons/tracing/zz_desc_generated.go new file mode 100644 index 000..5881eae --- /dev/null +++ b/addons/tracing/zz_desc_generated.go @@ -0,0 +1 @@ +package tracing diff --git a/addons/tracing/zz_generated_doc.go b/addons/tracing/zz_generated_doc.go new file mode 100644 index 000..5881eae --- /dev/null +++ b/addons/tracing/zz_generated_doc.go @@ -0,0 +1 @@ +package tracing
[camel-k] 02/06: update gen_crd_api script/config to use go run and asciidoc config
This is an automated email from the ASF dual-hosted git repository.
djencks pushed a commit to branch release-1.7.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 0c5d1dd38862916badc91e1ee0a3134526c45cf8
Author: David Jencks
AuthorDate: Thu Jan 20 20:47:52 2022 -0800
update gen_crd_api script/config to use go run and asciidoc config
add /github.com to .gitignore, it's similar to /vendor
use AsciiDoc API templates
---
.gitignore | 1 +
script/gen_crd/gen-crd-api-config.json | 3 +-
...onfig.json => gen-kamelets-crd-api-config.json} | 7 +-
script/gen_crd/gen_crd_api.sh | 31 -
script/gen_crd/template/members.tpl| 70 ---
script/gen_crd/template/pkg.tpl| 67 ---
script/gen_crd/template/type.tpl | 78 --
7 files changed, 103 insertions(+), 154 deletions(-)
diff --git a/.gitignore b/.gitignore
index 6a7118a..dfa66a7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
# Go vendor
/vendor
+/github.com
# Binary files
/kamel
diff --git a/script/gen_crd/gen-crd-api-config.json
b/script/gen_crd/gen-crd-api-config.json
index 5e4031c..1a6ae0d 100644
--- a/script/gen_crd/gen-crd-api-config.json
+++ b/script/gen_crd/gen-crd-api-config.json
@@ -17,5 +17,6 @@
"k8s.io/api/": "Kubernetes ",
"k8s.io/apimachinery/pkg/apis/": "Kubernetes "
},
-"markdownDisabled": false
+"markdownDisabled": true,
+"asciiDoc": true
}
diff --git a/script/gen_crd/gen-crd-api-config.json
b/script/gen_crd/gen-kamelets-crd-api-config.json
similarity index 71%
copy from script/gen_crd/gen-crd-api-config.json
copy to script/gen_crd/gen-kamelets-crd-api-config.json
index 5e4031c..0e67016 100644
--- a/script/gen_crd/gen-crd-api-config.json
+++ b/script/gen_crd/gen-kamelets-crd-api-config.json
@@ -11,11 +11,16 @@
{
"typeMatchPrefix": "^k8s\\.io/(api|apimachinery/pkg/apis)/",
"docsURLTemplate":
"https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#{{lower
.TypeIdentifier}}-{{arrIndex .PackageSegments -1}}-{{arrIndex .PackageSegments
-2}}"
+},
+{
+ "typeMatchPrefix":
"^github\\.com/apache/camel-k/pkg/apis/camel/v1\\.",
+ "docsURLTemplate":
"xref:apis/camel-k.adoc#_camel_apache_org_v1_{{.TypeIdentifier}}"
}
],
"typeDisplayNamePrefixOverrides": {
"k8s.io/api/": "Kubernetes ",
"k8s.io/apimachinery/pkg/apis/": "Kubernetes "
},
-"markdownDisabled": false
+"markdownDisabled": true,
+"asciiDoc": true
}
diff --git a/script/gen_crd/gen_crd_api.sh b/script/gen_crd/gen_crd_api.sh
index c8bf224..f4d696f 100755
--- a/script/gen_crd/gen_crd_api.sh
+++ b/script/gen_crd/gen_crd_api.sh
@@ -17,26 +17,23 @@
location=$(dirname $0)
rootdir=$location/../..
-crd_file=$rootdir/docs/modules/ROOT/partials/apis/crds-html.adoc
-
-echo "Downloading gen-crd-api-reference-docs binary..."
-TMPFILE=`mktemp`
-TMPDIR=`mktemp -d`
-PWD=`pwd`
-# TODO detect proper binary, based on the OS running this script
-wget -q --show-progress
https://github.com/ahmetb/gen-crd-api-reference-docs/releases/download/v0.1.5/gen-crd-api-reference-docs_linux_amd64.tar.gz
-O $TMPFILE
-tar -C $TMPDIR -xf $TMPFILE
+crd_file_camel=$rootdir/docs/modules/ROOT/partials/apis/camel-k-crds.adoc
+crd_file_kamelets=$rootdir/docs/modules/ROOT/partials/apis/kamelets-crds.adoc
echo "Generating CRD API documentation..."
-$TMPDIR/gen-crd-api-reference-docs \
+# to run a local copy use something like
+#go run /Users/david/projects/camel/gen-crd-api-reference-docs/main.go \
+#you will probably need to comment out use of blackfriday.
+go run
github.com/djencks/gen-crd-api-reference-docs@7400a10b36d7cfa7563ea48ce0df15a9d4c2de87
\
-config $location/gen-crd-api-config.json \
-template-dir $location/template \
--api-dir "github.com/apache/camel-k/pkg/apis/camel" \
--out-file $crd_file
+-api-dir "github.com/apache/camel-k/pkg/apis/camel/v1" \
+-out-file $crd_file_camel
-# Workaround: https://github.com/ahmetb/gen-crd-api-reference-docs/issues/33
-sed -i -E "s/%2f/\//" $crd_file
+go run
github.com/djencks/gen-crd-api-reference-docs@7400a10b36d7cfa7563ea48ce0df15a9d4c2de87
\
+-config $location/gen-kamelets-crd-api-config.json \
+-template-dir $location/template \
+-api-dir "github.com/apache/camel-k/pkg/apis/camel/v1alpha1" \
+-out-file $crd_file_kamelets
-echo "Cleaning the gen-crd-api-reference-docs binary..."
-rm $TMPFILE
-rm -rf $TMPDIR
\ No newline at end of file
+echo "Generating CRD API documentation... Done."
diff --git a/script/gen_crd/template/members.tpl
b/script/gen_crd/template/members.tpl
index a529c67..5771f11 100644
--- a/script/gen_crd/template/members.tpl
+++ b/script/gen_crd/template/members.tpl
@@ -1,48 +1,30 @@
-{{ define "members" }
[camel-k] 05/06: generated modified resources.go file
This is an automated email from the ASF dual-hosted git repository.
djencks pushed a commit to branch release-1.7.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 348f84597d832f722cf5c1afefeaaccf508af649
Author: David Jencks
AuthorDate: Fri Jan 28 13:10:38 2022 -0800
generated modified resources.go file
---
pkg/resources/resources.go | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/pkg/resources/resources.go b/pkg/resources/resources.go
index f585d0e..9f5a8a2 100644
--- a/pkg/resources/resources.go
+++ b/pkg/resources/resources.go
@@ -124,9 +124,9 @@ var assets = func() http.FileSystem {
"/crd/bases/camel.apache.org_camelcatalogs.yaml":
&vfsgen۰CompressedFileInfo{
name: "camel.apache.org_camelcatalogs.yaml",
modTime: time.Time{},
- uncompressedSize: 13131,
+ uncompressedSize: 13197,
- compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x5a\x4b\x73\xe3\xb8\x11\xbe\xf3\x57\x74\x8d\x0e\xb3\x5b\x65\x51\x3b\x49\x0e\x29\xe5\xa4\x68\x3c\x15\xd5\xcc\xda\x2e\x4b\x3b\x5b\x7b\x84\xc8\x16\x85\x31\x08\x30\x00\x28\x59\x49\xe5\xbf\xa7\x00\x90\x22\x29\x89\x24\xe8\xd5\x94\xf3\x70\x9f\x24\xa2\xd1\xe8\xfe\xfa\xc9\xc7\x08\xc6\xd7\xa3\x60\x04\x5f\x68\x84\x5c\x61\x0c\x5a\x80\xde\x22\xcc\x32\x12\x6d\x11\x96\x62\xa3\xf7\x44\x22\x7c\x12\x39\x8f\x89\xa6\x82\xc3\x0f\xb3\x
[...]
+ compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x5a\x5f\x8f\xdb\xb8\x11\x7f\xd7\xa7\x18\xc4\x0f\xb9\x03\xd6\xf2\xa5\xed\x43\xe1\x3e\xb9\xce\x06\x35\x92\xf3\x2e\xd6\xbe\x1c\xee\x91\x96\xc6\x32\xb3\x14\xa9\x92\x94\x1d\xb7\xe8\x77\x2f\x48\x4a\x96\x64\x5b\x12\x95\xf8\x90\xf6\xb2\xf3\x64\x8b\xc3\xe1\xf0\x37\x7f\x45\x71\x04\xe3\xdb\x51\x30\x82\x0f\x34\x42\xae\x30\x06\x2d\x40\xef\x10\x66\x19\x89\x76\x08\x2b\xb1\xd5\x07\x22\x11\xde\x89\x9c\xc7\x44\x53\xc1\xe1\x87\xd9\x
[...]
},
"/crd/bases/camel.apache.org_integrationkits.yaml":
&vfsgen۰CompressedFileInfo{
name:
"camel.apache.org_integrationkits.yaml",
@@ -152,16 +152,16 @@ var assets = func() http.FileSystem {
"/crd/bases/camel.apache.org_kameletbindings.yaml":
&vfsgen۰CompressedFileInfo{
name:
"camel.apache.org_kameletbindings.yaml",
modTime: time.Time{},
- uncompressedSize: 431973,
+ uncompressedSize: 431976,
- compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xbd\xfb\x73\x1b\x37\x96\x30\xfa\x7b\xfe\x0a\x94\x9c\xfa\x24\x6d\x44\xca\xce\xcc\xce\xdd\xf1\x9d\xfa\x52\x1a\x59\xce\xe8\xc6\x96\x59\x96\xe2\x7c\x29\x27\x9b\x05\xbb\x41\x12\xab\x6e\xa0\x17\x40\x53\xe2\x5e\xdf\xff\xfd\x16\x0e\x80\x7e\xf0\x25\x9c\xa6\xa8\x28\x3b\x8d\xa9\x9a\x98\x22\xfb\x34\x5e\xe7\xfd\x7a\x41\x06\x8f\x37\xbe\x7a\x41\xde\xf1\x84\x09\xcd\x52\x62\x24\x31\x33\x46\xce\x0a\x9a\xcc\x18\xb9\x96\x13\x73\x47\x
[...]
+ compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xbd\xfb\x73\x1b\x37\x96\x30\xfa\x7b\xfe\x0a\x94\x9c\xfa\x24\x6d\x44\xca\xce\xcc\xce\xdd\xf1\x9d\xfa\x52\x1a\x59\xce\xe8\xc6\x96\x59\x96\xe2\x7c\x29\x27\x9b\x05\xbb\x41\x12\xab\x6e\xa0\x17\x40\x53\xe2\x5e\xdf\xff\xfd\x16\x0e\x80\x7e\xf0\x25\x9c\xa6\xa8\x28\x3b\x8d\xa9\x9a\x98\x22\xfb\x34\x5e\xe7\xfd\x7a\x41\x06\x8f\x37\xbe\x7a\x41\xde\xf1\x84\x09\xcd\x52\x62\x24\x31\x33\x46\xce\x0a\x9a\xcc\x18\xb9\x96\x13\x73\x47\x
[...]
},
"/crd/bases/camel.apache.org_kamelets.yaml":
&vfsgen۰CompressedFileInfo{
name: "camel.apache.org_kamelets.yaml",
modTime: time.Time{},
- uncompressedSize: 24256,
+ uncompressedSize: 24258,
- compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x5c\x7d\x4f\xe3\x3a\xba\xff\xbf\x9f\xe2\x11\x1c\x69\x18\x89\x94\x96\xc2\x9c\x99\xde\x3f\x10\x07\x86\xbd\xbd\x87\x03\x88\xc2\xae\xce\x85\x59\xc9\x4d\x9e\xb6\x5e\x12\x3b\x6b\x3b\x14\xf6\xc0\x77\xbf\xb2\x9d\xa4\xe9\x4b\x12\xb7\x14\xf6\xe8\x6a\x2d\x8d\xa6\x49\xec\x9f\x9f\x37\x3f\x7e\xc9\x8f\x6c\x83\xb7\xb9\xd2\xd8\x86\x73\xea\x23\x93\x18\x80\xe2\xa0\xc6\x08\xc7\x31\xf1\xc7\x08\x7d\x3e\x54\x13\x22\x10\xce\x78\xc2\x02\x
[...]
+ compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x5c\x7d\x4f\xe3\x3a\xba\xff\xbf\x9f\xe2\x11\x1c\x69\x18\x89\x94\x96\xc2\x9c\x39\xbd\x7f\x20\x0e\x0c\x7b\x7b\x0f\x07\x10\x85\x5d\x9d\x0b\xb3\x92\x9b\x3c\x6d\xbd\x24\x76\xd6\x76\x28\xec\x81\xef\x7e\x65\x3b\x49\xd3\x97\x24\x6e\x29\xec\xe8\x6a\x2d\x8d\xa6\x49\xec\x9f\x9f\x37\x3f\x7e\xc9\x8f\x6c\x83\xb7\xb9\xd2\xd8\x86\x73\xea\x23\x93\x18\x80\xe2\xa0\xc6\x08\xc7\x31\x
[camel-k] 01/06: fix apparent typos in jsonschema_types.go
This is an automated email from the ASF dual-hosted git repository.
djencks pushed a commit to branch release-1.7.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 9fa38f2220597ec7cd250a0b3144b4a684162dc1
Author: David Jencks
AuthorDate: Wed Jan 19 16:40:26 2022 -0800
fix apparent typos in jsonschema_types.go
propagate typo fixes to generated yaml
---
config/crd/bases/camel.apache.org_kameletbindings.yaml | 12 ++--
config/crd/bases/camel.apache.org_kamelets.yaml| 8
helm/camel-k/crds/crd-kamelet-binding.yaml | 12 ++--
helm/camel-k/crds/crd-kamelet.yaml | 8
pkg/apis/camel/v1alpha1/jsonschema_types.go| 4 ++--
5 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/config/crd/bases/camel.apache.org_kameletbindings.yaml
b/config/crd/bases/camel.apache.org_kameletbindings.yaml
index 5da3ec1..a55a474 100644
--- a/config/crd/bases/camel.apache.org_kameletbindings.yaml
+++ b/config/crd/bases/camel.apache.org_kameletbindings.yaml
@@ -5785,10 +5785,10 @@ spec:
with any non digit characters mixed in -
ssn:
a U.S. social security number following
the
regex ^d{3}[- ]?d{2}[-
]?d{4}$ -
- hexcolor: an hexadecimal color code like
\"#FF:
+ hexcolor: an hexadecimal color code like
\"#FF\"
following the regex
^#?([0-9a-fA-F]{3}|[0-9a-fA-F]{6})$
- rgbcolor: an RGB color code like rgb
like
- \"rgb(255,255,2559\" - byte: base64
encoded
+ \"rgb(255,255,255)\" - byte: base64
encoded
binary data - password: any kind of
string -
date: a date string like \"2006-01-02\"
as defined
by full-date in RFC3339 - duration: a
duration
@@ -5999,10 +5999,10 @@ spec:
with any non digit characters mixed in -
ssn:
a U.S. social security number following
the
regex ^d{3}[- ]?d{2}[-
]?d{4}$ -
- hexcolor: an hexadecimal color code like
\"#FF:
+ hexcolor: an hexadecimal color code like
\"#FF\"
following the regex
^#?([0-9a-fA-F]{3}|[0-9a-fA-F]{6})$
- rgbcolor: an RGB color code like rgb
like
- \"rgb(255,255,2559\" - byte: base64
encoded
+ \"rgb(255,255,255)\" - byte: base64
encoded
binary data - password: any kind of
string -
date: a date string like \"2006-01-02\"
as defined
by full-date in RFC3339 - duration: a
duration
@@ -6218,9 +6218,9 @@ spec:
a U.S. social security number
following the
regex ^d{3}[- ]?d{2}[-
]?d{4}$
- hexcolor: an hexadecimal color code
like
-\"#FF: following the regex
^#?([0-9a-fA-F]{3}|[0-9a-fA-F]{6})$
+\"#FF\" following the regex
^#?([0-9a-fA-F]{3}|[0-9a-fA-F]{6})$
- rgbcolor: an RGB color code like rgb
like
-\"rgb(255,255,2559\" - byte: base64
encoded
+\"rgb(255,255,255)\" - byte: base64
encoded
binary data - password: any kind of
string
- date: a date string like
\"2006-01-02\"
as defined by full-date in RFC3339 -
duration:
diff --git a/config/crd/bases/camel.apache.org_kamelets.yaml
b/config/crd/bases/camel.apache.org_kamelets.yaml
index 8dd01d6..db01d39 100644
--- a/config/crd/bases/camel.apache.org_kamelets.yaml
+++ b/config/crd/bases/camel.apache.org_kamelets.yaml
@@ -143,8 +143,8 @@ spec:
with any non digit characters mixed in - ssn: a
U.S. social
security number following the regex ^d{3}[-
]?d{2}[-
]?d{4}$ - hexcolor: an hexadecimal color code
like
-\"#FF: following the regex
^#?([0-9a-fA-F]{3}|[0-9a-fA-F]{6})$
-- rgbcolor: an RGB color code like rgb like
\"rgb(255,255,2559\"
+
[camel-k] branch release-1.7.x updated (638dc33 -> 189eacb)
This is an automated email from the ASF dual-hosted git repository.
djencks pushed a change to branch release-1.7.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git.
from 638dc33 [TEST] Global kamelet test - support for openshift
new 9fa38f2 fix apparent typos in jsonschema_types.go
new 0c5d1dd update gen_crd_api script/config to use go run and asciidoc
config
new fe74497 Switch to separate camel-k and kamelets API pages. Generated
AsciiDoc API docs
new 232595b newly generated files
new 348f845 generated modified resources.go file
new 189eacb update templates to use exposed sanitizeId function
The 6 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:
.gitignore |1 +
addons/tracing/zz_desc_generated.go|1 +
addons/tracing/zz_generated_doc.go |1 +
.../bases/camel.apache.org_kameletbindings.yaml| 12 +-
config/crd/bases/camel.apache.org_kamelets.yaml|8 +-
docs/modules/ROOT/nav-end.adoc |4 +-
docs/modules/ROOT/pages/apis/camel-k.adoc |4 +
docs/modules/ROOT/pages/apis/camel.adoc|5 -
docs/modules/ROOT/pages/apis/kamelets.adoc |3 +
docs/modules/ROOT/partials/apis/camel-k-crds.adoc | 3090 +
docs/modules/ROOT/partials/apis/crds-html.adoc | 6783
docs/modules/ROOT/partials/apis/kamelets-crds.adoc | 1189
helm/camel-k/crds/crd-kamelet-binding.yaml | 12 +-
helm/camel-k/crds/crd-kamelet.yaml |8 +-
pkg/apis/camel/v1alpha1/jsonschema_types.go|4 +-
pkg/resources/resources.go | 12 +-
script/gen_crd/gen-crd-api-config.json |3 +-
...onfig.json => gen-kamelets-crd-api-config.json} |7 +-
script/gen_crd/gen_crd_api.sh | 32 +-
script/gen_crd/template/members.tpl| 70 +-
script/gen_crd/template/pkg.tpl| 67 +-
script/gen_crd/template/type.tpl | 78 +-
22 files changed, 4423 insertions(+), 6971 deletions(-)
create mode 100644 addons/tracing/zz_desc_generated.go
create mode 100644 addons/tracing/zz_generated_doc.go
create mode 100644 docs/modules/ROOT/pages/apis/camel-k.adoc
delete mode 100644 docs/modules/ROOT/pages/apis/camel.adoc
create mode 100644 docs/modules/ROOT/pages/apis/kamelets.adoc
create mode 100644 docs/modules/ROOT/partials/apis/camel-k-crds.adoc
delete mode 100644 docs/modules/ROOT/partials/apis/crds-html.adoc
create mode 100644 docs/modules/ROOT/partials/apis/kamelets-crds.adoc
copy script/gen_crd/{gen-crd-api-config.json =>
gen-kamelets-crd-api-config.json} (71%)
[camel-k] 06/06: update templates to use exposed sanitizeId function
This is an automated email from the ASF dual-hosted git repository.
djencks pushed a commit to branch release-1.6.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 03cea91d9baa96ca74f42a91c75761d4d406d5ae
Author: David Jencks
AuthorDate: Sun Jan 30 19:26:39 2022 -0800
update templates to use exposed sanitizeId function
---
script/gen_crd/gen_crd_api.sh | 5 +++--
script/gen_crd/template/members.tpl | 2 +-
script/gen_crd/template/pkg.tpl | 2 +-
script/gen_crd/template/type.tpl| 4 ++--
4 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/script/gen_crd/gen_crd_api.sh b/script/gen_crd/gen_crd_api.sh
index f4d696f..696d21e 100755
--- a/script/gen_crd/gen_crd_api.sh
+++ b/script/gen_crd/gen_crd_api.sh
@@ -24,13 +24,14 @@ echo "Generating CRD API documentation..."
# to run a local copy use something like
#go run /Users/david/projects/camel/gen-crd-api-reference-docs/main.go \
#you will probably need to comment out use of blackfriday.
-go run
github.com/djencks/gen-crd-api-reference-docs@7400a10b36d7cfa7563ea48ce0df15a9d4c2de87
\
+go run
github.com/djencks/gen-crd-api-reference-docs@e63530f10b55be5f2d82e223d83f86c13e5158e5
\
-config $location/gen-crd-api-config.json \
-template-dir $location/template \
-api-dir "github.com/apache/camel-k/pkg/apis/camel/v1" \
-out-file $crd_file_camel
-go run
github.com/djencks/gen-crd-api-reference-docs@7400a10b36d7cfa7563ea48ce0df15a9d4c2de87
\
+#go run /Users/david/projects/camel/gen-crd-api-reference-docs/main.go \
+go run
github.com/djencks/gen-crd-api-reference-docs@e63530f10b55be5f2d82e223d83f86c13e5158e5
\
-config $location/gen-kamelets-crd-api-config.json \
-template-dir $location/template \
-api-dir "github.com/apache/camel-k/pkg/apis/camel/v1alpha1" \
diff --git a/script/gen_crd/template/members.tpl
b/script/gen_crd/template/members.tpl
index 5771f11..23afa37 100644
--- a/script/gen_crd/template/members.tpl
+++ b/script/gen_crd/template/members.tpl
@@ -5,7 +5,7 @@
|`{{ fieldName . }}` +
{{ if linkForType .Type -}}
{{- if isLocalType .Type -}}
-*xref:{{ linkForType .Type}}[{{ asciiDocAttributeEscape (typeDisplayName
.Type) }}]*
+*xref:#{{ sanitizeId (anchorIDForType .Type) }}[{{ asciiDocAttributeEscape
(typeDisplayName .Type) }}]*
{{- else -}}
*{{ linkForType .Type}}[{{ asciiDocAttributeEscape (typeDisplayName .Type) }}]*
{{- end -}}
diff --git a/script/gen_crd/template/pkg.tpl b/script/gen_crd/template/pkg.tpl
index c0cb3b4..e539cdc 100644
--- a/script/gen_crd/template/pkg.tpl
+++ b/script/gen_crd/template/pkg.tpl
@@ -1,7 +1,7 @@
{{ define "packages" -}}
{{ range .packages -}}
-[#{{ packageAnchorID . }}]
+[#{{ sanitizeId (packageAnchorID .) }}]
== {{ packageDisplayName . }}
{{- with (index .GoPackages 0 ) -}}
diff --git a/script/gen_crd/template/type.tpl b/script/gen_crd/template/type.tpl
index d6f0dcf..d52c4c3 100644
--- a/script/gen_crd/template/type.tpl
+++ b/script/gen_crd/template/type.tpl
@@ -1,12 +1,12 @@
{{ define "type" }}
-[#{{ anchorIDForType . }}]
+[#{{ sanitizeId (anchorIDForType .) }}]
=== {{ .Name.Name }}{{ if eq .Kind "Alias" }}(`{{.Underlying}}` alias){{ end }}
{{- with (typeReferences .) }}
*Appears on:*
{{ range . }}
-* <<{{ linkForType . }}, {{ typeDisplayName . }}>>
+* <<#{{ sanitizeId (anchorIDForType .) }}, {{ typeDisplayName . }}>>
{{- end -}}
{{- end }}
[camel-k] 05/06: generated modified resources.go file
This is an automated email from the ASF dual-hosted git repository.
djencks pushed a commit to branch release-1.6.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit aff627d62ee3fbe824266192ae362017998c
Author: David Jencks
AuthorDate: Fri Jan 28 13:34:37 2022 -0800
generated modified resources.go file
---
pkg/resources/resources.go | 18 +-
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/pkg/resources/resources.go b/pkg/resources/resources.go
index b94846c..11f4ca4 100644
--- a/pkg/resources/resources.go
+++ b/pkg/resources/resources.go
@@ -85,9 +85,9 @@ var assets = func() http.FileSystem {
"/crd/bases/camel.apache.org_camelcatalogs.yaml":
&vfsgen۰CompressedFileInfo{
name: "camel.apache.org_camelcatalogs.yaml",
modTime: time.Time{},
- uncompressedSize: 13131,
+ uncompressedSize: 13197,
- compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x5a\x4b\x73\xe3\xb8\x11\xbe\xf3\x57\x74\x8d\x0e\xb3\x5b\x65\x51\x3b\x49\x0e\x29\xe5\xa4\x68\x3c\x15\xd5\xcc\xda\x2e\x4b\x3b\x5b\x7b\x84\xc8\x16\x85\x31\x08\x30\x00\x28\x59\x49\xe5\xbf\xa7\x00\x90\x22\x29\x89\x24\xe8\xd5\x94\xf3\x70\x9f\x24\xa2\xd1\xe8\xfe\xfa\xc9\xc7\x08\xc6\xd7\xa3\x60\x04\x5f\x68\x84\x5c\x61\x0c\x5a\x80\xde\x22\xcc\x32\x12\x6d\x11\x96\x62\xa3\xf7\x44\x22\x7c\x12\x39\x8f\x89\xa6\x82\xc3\x0f\xb3\x
[...]
+ compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x5a\x5f\x8f\xdb\xb8\x11\x7f\xd7\xa7\x18\xc4\x0f\xb9\x03\xd6\xf2\xa5\xed\x43\xe1\x3e\xb9\xce\x06\x35\x92\xf3\x2e\xd6\xbe\x1c\xee\x91\x96\xc6\x32\xb3\x14\xa9\x92\x94\x1d\xb7\xe8\x77\x2f\x48\x4a\x96\x64\x5b\x12\x95\xf8\x90\xf6\xb2\xf3\x64\x8b\xc3\xe1\xf0\x37\x7f\x45\x71\x04\xe3\xdb\x51\x30\x82\x0f\x34\x42\xae\x30\x06\x2d\x40\xef\x10\x66\x19\x89\x76\x08\x2b\xb1\xd5\x07\x22\x11\xde\x89\x9c\xc7\x44\x53\xc1\xe1\x87\xd9\x
[...]
},
"/crd/bases/camel.apache.org_integrationkits.yaml":
&vfsgen۰CompressedFileInfo{
name:
"camel.apache.org_integrationkits.yaml",
@@ -113,16 +113,16 @@ var assets = func() http.FileSystem {
"/crd/bases/camel.apache.org_kameletbindings.yaml":
&vfsgen۰CompressedFileInfo{
name:
"camel.apache.org_kameletbindings.yaml",
modTime: time.Time{},
- uncompressedSize: 431973,
+ uncompressedSize: 431976,
- compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xbd\xfb\x73\x1b\x37\x96\x30\xfa\x7b\xfe\x0a\x94\x9c\xfa\x24\x6d\x44\xca\xce\xcc\xce\xdd\xf1\x9d\xfa\x52\x1a\x59\xce\xe8\xc6\x96\x59\x96\xe2\x7c\x29\x27\x9b\x05\xbb\x41\x12\xab\x6e\xa0\x17\x40\x53\xe2\x5e\xdf\xff\xfd\x16\x0e\x80\x7e\xf0\x25\x9c\xa6\xa8\x28\x3b\x8d\xa9\x9a\x98\x22\xfb\x34\x5e\xe7\xfd\x7a\x41\x06\x8f\x37\xbe\x7a\x41\xde\xf1\x84\x09\xcd\x52\x62\x24\x31\x33\x46\xce\x0a\x9a\xcc\x18\xb9\x96\x13\x73\x47\x
[...]
+ compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xbd\xfb\x73\x1b\x37\x96\x30\xfa\x7b\xfe\x0a\x94\x9c\xfa\x24\x6d\x44\xca\xce\xcc\xce\xdd\xf1\x9d\xfa\x52\x1a\x59\xce\xe8\xc6\x96\x59\x96\xe2\x7c\x29\x27\x9b\x05\xbb\x41\x12\xab\x6e\xa0\x17\x40\x53\xe2\x5e\xdf\xff\xfd\x16\x0e\x80\x7e\xf0\x25\x9c\xa6\xa8\x28\x3b\x8d\xa9\x9a\x98\x22\xfb\x34\x5e\xe7\xfd\x7a\x41\x06\x8f\x37\xbe\x7a\x41\xde\xf1\x84\x09\xcd\x52\x62\x24\x31\x33\x46\xce\x0a\x9a\xcc\x18\xb9\x96\x13\x73\x47\x
[...]
},
"/crd/bases/camel.apache.org_kamelets.yaml":
&vfsgen۰CompressedFileInfo{
name: "camel.apache.org_kamelets.yaml",
modTime: time.Time{},
- uncompressedSize: 24256,
+ uncompressedSize: 24258,
- compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x5c\x7d\x4f\xe3\x3a\xba\xff\xbf\x9f\xe2\x11\x1c\x69\x18\x89\x94\x96\xc2\x9c\x99\xde\x3f\x10\x07\x86\xbd\xbd\x87\x03\x88\xc2\xae\xce\x85\x59\xc9\x4d\x9e\xb6\x5e\x12\x3b\x6b\x3b\x14\xf6\xc0\x77\xbf\xb2\x9d\xa4\xe9\x4b\x12\xb7\x14\xf6\xe8\x6a\x2d\x8d\xa6\x49\xec\x9f\x9f\x37\x3f\x7e\xc9\x8f\x6c\x83\xb7\xb9\xd2\xd8\x86\x73\xea\x23\x93\x18\x80\xe2\xa0\xc6\x08\xc7\x31\xf1\xc7\x08\x7d\x3e\x54\x13\x22\x10\xce\x78\xc2\x02\x
[...]
+ compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x5c\x7d\x4f\xe3\x3a\xba\xff\xbf\x9f\xe2\x11\x1c\x69\x18\x89\x94\x96\xc2\x9c\x39\xbd\x7f\x20\x0e\x0c\x7b\x7b\x0f\x07\x10\x85\x5d\x9d\x0b\xb3\x92\x9b\x3c\x6d\xbd\x24\x76\xd6\x76\x28\xec\x81\xef\x7e\x65\x3b\x49\xd3\x97\x24\x6e\x29\xec\xe8\x6a\x2d\x8d\xa6\x49\xec\x9f\x9f\x37\x3f\x7e\xc9\x8f\x6c\x83\xb7\xb9\xd2\xd8\x86\x73\xea\x23\x93\x18\x80\xe2\xa0\xc6\x08\xc7\x
[GitHub] [camel-k] djencks merged pull request #2962: Generate crd API docs as AsciiDoc (Release 1.4.x)
djencks merged pull request #2962: URL: https://github.com/apache/camel-k/pull/2962 -- 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: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-k] 01/06: fix apparent typos in jsonschema_types.go
This is an automated email from the ASF dual-hosted git repository.
djencks pushed a commit to branch release-1.6.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 38da6a2c5aadd1846da301989acff00092feb8e1
Author: David Jencks
AuthorDate: Wed Jan 19 16:40:26 2022 -0800
fix apparent typos in jsonschema_types.go
propagate typo fixes to generated yaml
---
config/crd/bases/camel.apache.org_kameletbindings.yaml | 12 ++--
config/crd/bases/camel.apache.org_kamelets.yaml| 8
helm/camel-k/crds/crd-kamelet-binding.yaml | 12 ++--
helm/camel-k/crds/crd-kamelet.yaml | 8
pkg/apis/camel/v1alpha1/jsonschema_types.go| 4 ++--
5 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/config/crd/bases/camel.apache.org_kameletbindings.yaml
b/config/crd/bases/camel.apache.org_kameletbindings.yaml
index 5da3ec1..a55a474 100644
--- a/config/crd/bases/camel.apache.org_kameletbindings.yaml
+++ b/config/crd/bases/camel.apache.org_kameletbindings.yaml
@@ -5785,10 +5785,10 @@ spec:
with any non digit characters mixed in -
ssn:
a U.S. social security number following
the
regex ^d{3}[- ]?d{2}[-
]?d{4}$ -
- hexcolor: an hexadecimal color code like
\"#FF:
+ hexcolor: an hexadecimal color code like
\"#FF\"
following the regex
^#?([0-9a-fA-F]{3}|[0-9a-fA-F]{6})$
- rgbcolor: an RGB color code like rgb
like
- \"rgb(255,255,2559\" - byte: base64
encoded
+ \"rgb(255,255,255)\" - byte: base64
encoded
binary data - password: any kind of
string -
date: a date string like \"2006-01-02\"
as defined
by full-date in RFC3339 - duration: a
duration
@@ -5999,10 +5999,10 @@ spec:
with any non digit characters mixed in -
ssn:
a U.S. social security number following
the
regex ^d{3}[- ]?d{2}[-
]?d{4}$ -
- hexcolor: an hexadecimal color code like
\"#FF:
+ hexcolor: an hexadecimal color code like
\"#FF\"
following the regex
^#?([0-9a-fA-F]{3}|[0-9a-fA-F]{6})$
- rgbcolor: an RGB color code like rgb
like
- \"rgb(255,255,2559\" - byte: base64
encoded
+ \"rgb(255,255,255)\" - byte: base64
encoded
binary data - password: any kind of
string -
date: a date string like \"2006-01-02\"
as defined
by full-date in RFC3339 - duration: a
duration
@@ -6218,9 +6218,9 @@ spec:
a U.S. social security number
following the
regex ^d{3}[- ]?d{2}[-
]?d{4}$
- hexcolor: an hexadecimal color code
like
-\"#FF: following the regex
^#?([0-9a-fA-F]{3}|[0-9a-fA-F]{6})$
+\"#FF\" following the regex
^#?([0-9a-fA-F]{3}|[0-9a-fA-F]{6})$
- rgbcolor: an RGB color code like rgb
like
-\"rgb(255,255,2559\" - byte: base64
encoded
+\"rgb(255,255,255)\" - byte: base64
encoded
binary data - password: any kind of
string
- date: a date string like
\"2006-01-02\"
as defined by full-date in RFC3339 -
duration:
diff --git a/config/crd/bases/camel.apache.org_kamelets.yaml
b/config/crd/bases/camel.apache.org_kamelets.yaml
index 8dd01d6..db01d39 100644
--- a/config/crd/bases/camel.apache.org_kamelets.yaml
+++ b/config/crd/bases/camel.apache.org_kamelets.yaml
@@ -143,8 +143,8 @@ spec:
with any non digit characters mixed in - ssn: a
U.S. social
security number following the regex ^d{3}[-
]?d{2}[-
]?d{4}$ - hexcolor: an hexadecimal color code
like
-\"#FF: following the regex
^#?([0-9a-fA-F]{3}|[0-9a-fA-F]{6})$
-- rgbcolor: an RGB color code like rgb like
\"rgb(255,255,2559\"
+
[camel-k] 04/06: newly generated files
This is an automated email from the ASF dual-hosted git repository. djencks pushed a commit to branch release-1.4.x in repository https://gitbox.apache.org/repos/asf/camel-k.git commit 5c83604ab470014e05c11c8ecdfc4d443f47f988 Author: David Jencks AuthorDate: Fri Jan 28 13:54:24 2022 -0800 newly generated files --- addons/tracing/zz_desc_generated.go | 1 + addons/tracing/zz_generated_doc.go | 1 + 2 files changed, 2 insertions(+) diff --git a/addons/tracing/zz_desc_generated.go b/addons/tracing/zz_desc_generated.go new file mode 100644 index 000..5881eae --- /dev/null +++ b/addons/tracing/zz_desc_generated.go @@ -0,0 +1 @@ +package tracing diff --git a/addons/tracing/zz_generated_doc.go b/addons/tracing/zz_generated_doc.go new file mode 100644 index 000..5881eae --- /dev/null +++ b/addons/tracing/zz_generated_doc.go @@ -0,0 +1 @@ +package tracing
[camel-k] 05/06: generated modified resources.go file
This is an automated email from the ASF dual-hosted git repository.
djencks pushed a commit to branch release-1.4.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit ea804f4ce7aa9fefee08306355d6d40c62549894
Author: David Jencks
AuthorDate: Fri Jan 28 14:02:35 2022 -0800
generated modified resources.go file
---
pkg/resources/resources.go | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pkg/resources/resources.go b/pkg/resources/resources.go
index f8b5c62..2d82fab 100644
--- a/pkg/resources/resources.go
+++ b/pkg/resources/resources.go
@@ -113,16 +113,16 @@ var assets = func() http.FileSystem {
"/crd/bases/camel.apache.org_kameletbindings.yaml":
&vfsgen۰CompressedFileInfo{
name:
"camel.apache.org_kameletbindings.yaml",
modTime: time.Time{},
- uncompressedSize: 55429,
+ uncompressedSize: 55432,
- compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x7d\x7f\x6f\xdb\x38\xf2\xf7\xff\x79\x15\x83\xe4\x80\xb6\x40\x64\xc7\x49\xda\xdd\xf5\xf3\x47\x91\x26\xdb\xfb\xfa\x69\x37\x2d\x92\xf4\x0e\xf7\xb4\x3d\x80\x96\xc6\x36\x2f\x12\xa9\x23\xa9\x38\x7e\xb6\x7d\xef\x5f\xf0\x87\x64\xd9\xb1\x64\xca\xb1\xbb\x29\x20\x02\x8b\xad\x2d\x6a\x38\x33\x1c\x0e\x67\x86\xfc\x38\x07\x10\x6c\xaf\xed\x1d\xc0\x7b\x1a\x22\x93\x18\x81\xe2\xa0\x26\x08\x67\x29\x09\x27\x08\xd7\x7c\xa4\xa6\x44\x20\x
[...]
+ compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x7d\x7f\x6f\xdb\x38\xf2\xf7\xff\x79\x15\x83\xe4\x80\xb6\x40\x64\xc7\x49\xda\xdd\xf5\xf3\x47\x91\x26\xdb\xfb\xfa\x69\x37\x2d\x92\xf4\x0e\xf7\xb4\x3d\x80\x96\xc6\x36\x2f\x12\xa9\x23\xa9\x38\x7e\xb6\x7d\xef\x5f\xf0\x87\x64\xd9\xb1\x64\xca\xb1\xbb\x29\x20\x02\x8b\xad\x2d\x6a\x38\x33\x1c\x0e\x67\x86\xfc\x38\x07\x10\x6c\xaf\xed\x1d\xc0\x7b\x1a\x22\x93\x18\x81\xe2\xa0\x26\x08\x67\x29\x09\x27\x08\xd7\x7c\xa4\xa6\x44\x20\x
[...]
},
"/crd/bases/camel.apache.org_kamelets.yaml":
&vfsgen۰CompressedFileInfo{
name: "camel.apache.org_kamelets.yaml",
modTime: time.Time{},
- uncompressedSize: 24017,
+ uncompressedSize: 24019,
- compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x5c\x7d\x4f\xeb\x38\xba\xff\xbf\x9f\xe2\x11\x8c\x34\x1c\x89\x94\x96\xc2\x99\x73\x7a\xff\x40\x0c\x1c\xf6\xf6\x0e\x03\x88\xc2\xae\xe6\xc2\x59\xc9\x4d\x9e\xb6\x5e\x12\x3b\x6b\x3b\x14\x76\xe0\xbb\x5f\xd9\x4e\xda\xf4\x25\x89\x53\x0a\x7b\x74\xb5\x96\x46\x43\x52\xfb\xe7\xe7\xcd\x8f\xdf\x7e\x27\xdb\xe0\x6d\xae\x34\xb6\xe1\x9c\xfa\xc8\x24\x06\xa0\x38\xa8\x31\xc2\x71\x4c\xfc\x31\x42\x9f\x0f\xd5\x84\x08\x84\x33\x9e\xb0\x80\x
[...]
+ compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x5c\x7d\x4f\xeb\x38\xba\xff\xbf\x9f\xe2\x11\x8c\x34\x1c\x89\x94\x96\xc2\x99\x73\x7a\xff\x40\x0c\x1c\xf6\xf6\x0e\x03\x88\xc2\xae\xe6\xc2\x59\xc9\x4d\x9e\xb6\x5e\x12\x3b\x6b\x3b\x14\x76\xe0\xbb\x5f\xd9\x4e\xda\xf4\x25\x89\x53\x0a\x7b\x74\xb5\x96\x46\x43\x52\xfb\xe7\xe7\xcd\x8f\xdf\x7e\x27\xdb\xe0\x6d\xae\x34\xb6\xe1\x9c\xfa\xc8\x24\x06\xa0\x38\xa8\x31\xc2\x71\x4c\xfc\x31\x42\x9f\x0f\xd5\x84\x08\x84\x33\x9e\xb0\x80\x
[...]
},
"/default": &vfsgen۰DirInfo{
name:"default",
[camel-k] 01/06: fix apparent typos in jsonschema_types.go
This is an automated email from the ASF dual-hosted git repository.
djencks pushed a commit to branch release-1.4.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 5a9eedf53e1f12b374991755b684a57602a5fd25
Author: David Jencks
AuthorDate: Wed Jan 19 16:40:26 2022 -0800
fix apparent typos in jsonschema_types.go
propagate typo fixes to generated yaml
---
config/crd/bases/camel.apache.org_kameletbindings.yaml | 12 ++--
config/crd/bases/camel.apache.org_kamelets.yaml| 8
helm/camel-k/crds/crd-kamelet-binding.yaml | 12 ++--
helm/camel-k/crds/crd-kamelet.yaml | 8
pkg/apis/camel/v1alpha1/jsonschema_types.go| 4 ++--
5 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/config/crd/bases/camel.apache.org_kameletbindings.yaml
b/config/crd/bases/camel.apache.org_kameletbindings.yaml
index 60ac3ba..c463c9a 100644
--- a/config/crd/bases/camel.apache.org_kameletbindings.yaml
+++ b/config/crd/bases/camel.apache.org_kameletbindings.yaml
@@ -389,10 +389,10 @@ spec:
with any non digit characters mixed in -
ssn:
a U.S. social security number following
the
regex ^d{3}[- ]?d{2}[-
]?d{4}$ -
- hexcolor: an hexadecimal color code like
\"#FF:
+ hexcolor: an hexadecimal color code like
\"#FF\"
following the regex
^#?([0-9a-fA-F]{3}|[0-9a-fA-F]{6})$
- rgbcolor: an RGB color code like rgb
like
- \"rgb(255,255,2559\" - byte: base64
encoded
+ \"rgb(255,255,255)\" - byte: base64
encoded
binary data - password: any kind of
string -
date: a date string like \"2006-01-02\"
as defined
by full-date in RFC3339 - duration: a
duration
@@ -603,10 +603,10 @@ spec:
with any non digit characters mixed in -
ssn:
a U.S. social security number following
the
regex ^d{3}[- ]?d{2}[-
]?d{4}$ -
- hexcolor: an hexadecimal color code like
\"#FF:
+ hexcolor: an hexadecimal color code like
\"#FF\"
following the regex
^#?([0-9a-fA-F]{3}|[0-9a-fA-F]{6})$
- rgbcolor: an RGB color code like rgb
like
- \"rgb(255,255,2559\" - byte: base64
encoded
+ \"rgb(255,255,255)\" - byte: base64
encoded
binary data - password: any kind of
string -
date: a date string like \"2006-01-02\"
as defined
by full-date in RFC3339 - duration: a
duration
@@ -822,9 +822,9 @@ spec:
a U.S. social security number
following the
regex ^d{3}[- ]?d{2}[-
]?d{4}$
- hexcolor: an hexadecimal color code
like
-\"#FF: following the regex
^#?([0-9a-fA-F]{3}|[0-9a-fA-F]{6})$
+\"#FF\" following the regex
^#?([0-9a-fA-F]{3}|[0-9a-fA-F]{6})$
- rgbcolor: an RGB color code like rgb
like
-\"rgb(255,255,2559\" - byte: base64
encoded
+\"rgb(255,255,255)\" - byte: base64
encoded
binary data - password: any kind of
string
- date: a date string like
\"2006-01-02\"
as defined by full-date in RFC3339 -
duration:
diff --git a/config/crd/bases/camel.apache.org_kamelets.yaml
b/config/crd/bases/camel.apache.org_kamelets.yaml
index e8371f9..ee29c7e 100644
--- a/config/crd/bases/camel.apache.org_kamelets.yaml
+++ b/config/crd/bases/camel.apache.org_kamelets.yaml
@@ -143,8 +143,8 @@ spec:
with any non digit characters mixed in - ssn: a
U.S. social
security number following the regex ^d{3}[-
]?d{2}[-
]?d{4}$ - hexcolor: an hexadecimal color code
like
-\"#FF: following the regex
^#?([0-9a-fA-F]{3}|[0-9a-fA-F]{6})$
-- rgbcolor: an RGB color code like rgb like
\"rgb(255,255,2559\"
+
[camel-k] 06/06: update templates to use exposed sanitizeId function
This is an automated email from the ASF dual-hosted git repository.
djencks pushed a commit to branch release-1.4.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 822b729209739dac4b44adcee10f42f14be749bb
Author: David Jencks
AuthorDate: Sun Jan 30 19:26:39 2022 -0800
update templates to use exposed sanitizeId function
---
script/gen_crd/gen_crd_api.sh | 5 +++--
script/gen_crd/template/members.tpl | 2 +-
script/gen_crd/template/pkg.tpl | 2 +-
script/gen_crd/template/type.tpl| 4 ++--
4 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/script/gen_crd/gen_crd_api.sh b/script/gen_crd/gen_crd_api.sh
index f4d696f..696d21e 100755
--- a/script/gen_crd/gen_crd_api.sh
+++ b/script/gen_crd/gen_crd_api.sh
@@ -24,13 +24,14 @@ echo "Generating CRD API documentation..."
# to run a local copy use something like
#go run /Users/david/projects/camel/gen-crd-api-reference-docs/main.go \
#you will probably need to comment out use of blackfriday.
-go run
github.com/djencks/gen-crd-api-reference-docs@7400a10b36d7cfa7563ea48ce0df15a9d4c2de87
\
+go run
github.com/djencks/gen-crd-api-reference-docs@e63530f10b55be5f2d82e223d83f86c13e5158e5
\
-config $location/gen-crd-api-config.json \
-template-dir $location/template \
-api-dir "github.com/apache/camel-k/pkg/apis/camel/v1" \
-out-file $crd_file_camel
-go run
github.com/djencks/gen-crd-api-reference-docs@7400a10b36d7cfa7563ea48ce0df15a9d4c2de87
\
+#go run /Users/david/projects/camel/gen-crd-api-reference-docs/main.go \
+go run
github.com/djencks/gen-crd-api-reference-docs@e63530f10b55be5f2d82e223d83f86c13e5158e5
\
-config $location/gen-kamelets-crd-api-config.json \
-template-dir $location/template \
-api-dir "github.com/apache/camel-k/pkg/apis/camel/v1alpha1" \
diff --git a/script/gen_crd/template/members.tpl
b/script/gen_crd/template/members.tpl
index 5771f11..23afa37 100644
--- a/script/gen_crd/template/members.tpl
+++ b/script/gen_crd/template/members.tpl
@@ -5,7 +5,7 @@
|`{{ fieldName . }}` +
{{ if linkForType .Type -}}
{{- if isLocalType .Type -}}
-*xref:{{ linkForType .Type}}[{{ asciiDocAttributeEscape (typeDisplayName
.Type) }}]*
+*xref:#{{ sanitizeId (anchorIDForType .Type) }}[{{ asciiDocAttributeEscape
(typeDisplayName .Type) }}]*
{{- else -}}
*{{ linkForType .Type}}[{{ asciiDocAttributeEscape (typeDisplayName .Type) }}]*
{{- end -}}
diff --git a/script/gen_crd/template/pkg.tpl b/script/gen_crd/template/pkg.tpl
index c0cb3b4..e539cdc 100644
--- a/script/gen_crd/template/pkg.tpl
+++ b/script/gen_crd/template/pkg.tpl
@@ -1,7 +1,7 @@
{{ define "packages" -}}
{{ range .packages -}}
-[#{{ packageAnchorID . }}]
+[#{{ sanitizeId (packageAnchorID .) }}]
== {{ packageDisplayName . }}
{{- with (index .GoPackages 0 ) -}}
diff --git a/script/gen_crd/template/type.tpl b/script/gen_crd/template/type.tpl
index d6f0dcf..d52c4c3 100644
--- a/script/gen_crd/template/type.tpl
+++ b/script/gen_crd/template/type.tpl
@@ -1,12 +1,12 @@
{{ define "type" }}
-[#{{ anchorIDForType . }}]
+[#{{ sanitizeId (anchorIDForType .) }}]
=== {{ .Name.Name }}{{ if eq .Kind "Alias" }}(`{{.Underlying}}` alias){{ end }}
{{- with (typeReferences .) }}
*Appears on:*
{{ range . }}
-* <<{{ linkForType . }}, {{ typeDisplayName . }}>>
+* <<#{{ sanitizeId (anchorIDForType .) }}, {{ typeDisplayName . }}>>
{{- end -}}
{{- end }}
[camel-k] 03/06: Switch to separate camel-k and kamelets API pages. Generated AsciiDoc API docs
This is an automated email from the ASF dual-hosted git repository. djencks pushed a commit to branch release-1.4.x in repository https://gitbox.apache.org/repos/asf/camel-k.git commit 8544ac677fb93e6317a679714170f35bde6ceff2 Author: David Jencks AuthorDate: Thu Jan 20 20:56:57 2022 -0800 Switch to separate camel-k and kamelets API pages. Generated AsciiDoc API docs --- docs/modules/ROOT/nav-end.adoc |3 + docs/modules/ROOT/pages/apis/camel-k.adoc |4 + docs/modules/ROOT/pages/apis/kamelets.adoc |3 + docs/modules/ROOT/partials/apis/camel-k-crds.adoc | 2830 docs/modules/ROOT/partials/apis/kamelets-crds.adoc | 1161 5 files changed, 4001 insertions(+) diff --git a/docs/modules/ROOT/nav-end.adoc b/docs/modules/ROOT/nav-end.adoc index 2929ab5..977cb34 100644 --- a/docs/modules/ROOT/nav-end.adoc +++ b/docs/modules/ROOT/nav-end.adoc @@ -15,6 +15,9 @@ ** xref:architecture/runtime.adoc[Runtime] ** xref:architecture/traits.adoc[Traits] ** xref:architecture/sources.adoc[Sources] +* API +** xref:apis/camel-k.adoc[Camel-K API] +** xref:apis/kamelets.adoc[Kamelets API] * xref:uninstalling.adoc[Uninstalling] * xref:contributing/developers.adoc[Contributing] ** xref:contributing/local-development.adoc[Local development] diff --git a/docs/modules/ROOT/pages/apis/camel-k.adoc b/docs/modules/ROOT/pages/apis/camel-k.adoc new file mode 100644 index 000..be64b8c --- /dev/null +++ b/docs/modules/ROOT/pages/apis/camel-k.adoc @@ -0,0 +1,4 @@ += Camel K API +:page-aliases: camel.adoc + +include::partial$apis/camel-k-crds.adoc[] diff --git a/docs/modules/ROOT/pages/apis/kamelets.adoc b/docs/modules/ROOT/pages/apis/kamelets.adoc new file mode 100644 index 000..f9139da --- /dev/null +++ b/docs/modules/ROOT/pages/apis/kamelets.adoc @@ -0,0 +1,3 @@ += Kamelets API + +include::partial$apis/kamelets-crds.adoc[] diff --git a/docs/modules/ROOT/partials/apis/camel-k-crds.adoc b/docs/modules/ROOT/partials/apis/camel-k-crds.adoc new file mode 100644 index 000..c276ec1 --- /dev/null +++ b/docs/modules/ROOT/partials/apis/camel-k-crds.adoc @@ -0,0 +1,2830 @@ +[#_camel_apache_org_v1] +== camel.apache.org/v1 + +Package v1 contains API Schema definitions for the camel v1 API group + +== Resource Types + +[#_camel_apache_org_v1_Build] +=== Build + +Build is the Schema for the builds API + +[cols="2,2a",options="header"] +|=== +|Field +|Description + +|`apiVersion` + +string +|`camel.apache.org/v1` + +|`kind` + +string +|`Build` +|`metadata` + +*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#objectmeta-v1-meta[Kubernetes meta/v1.ObjectMeta]* +| + + + + +Refer to the Kubernetes API documentation for the fields of the `metadata` field. +|`spec` + +*xref:#_camel_apache_org_v1_BuildSpec[BuildSpec]* +| + + + + +|`status` + +*xref:#_camel_apache_org_v1_BuildStatus[BuildStatus]* +| + + + + + +|=== + +[#_camel_apache_org_v1_CamelCatalog] +=== CamelCatalog + +CamelCatalog is the Schema for the camelcatalogs API + +[cols="2,2a",options="header"] +|=== +|Field +|Description + +|`apiVersion` + +string +|`camel.apache.org/v1` + +|`kind` + +string +|`CamelCatalog` +|`metadata` + +*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#objectmeta-v1-meta[Kubernetes meta/v1.ObjectMeta]* +| + + + + +Refer to the Kubernetes API documentation for the fields of the `metadata` field. +|`status` + +*xref:#_camel_apache_org_v1_CamelCatalogStatus[CamelCatalogStatus]* +| + + + + +|`spec` + +*xref:#_camel_apache_org_v1_CamelCatalogSpec[CamelCatalogSpec]* +| + + + + + +|=== + +[#_camel_apache_org_v1_Integration] +=== Integration + +Integration is the Schema for the integrations API + +[cols="2,2a",options="header"] +|=== +|Field +|Description + +|`apiVersion` + +string +|`camel.apache.org/v1` + +|`kind` + +string +|`Integration` +|`metadata` + +*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#objectmeta-v1-meta[Kubernetes meta/v1.ObjectMeta]* +| + + + + +Refer to the Kubernetes API documentation for the fields of the `metadata` field. +|`spec` + +*xref:#_camel_apache_org_v1_IntegrationSpec[IntegrationSpec]* +| + + + + +|`status` + +*xref:#_camel_apache_org_v1_IntegrationStatus[IntegrationStatus]* +| + + + + + +|=== + +[#_camel_apache_org_v1_IntegrationKit] +=== IntegrationKit + +IntegrationKit is the Schema for the integrationkits API + +[cols="2,2a",options="header"] +|=== +|Field +|Description + +|`apiVersion` + +string +|`camel.apache.org/v1` + +|`kind` + +string +|`IntegrationKit` +|`metadata` + +*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#objectmeta-v1-meta[Kubernetes meta/v1.ObjectMeta]* +| + + + + +Refer to the Kubernetes API documentation for the fields of the `metadata` field. +|`spec` + +*xref:#_camel_apache_org_v1_IntegrationKitSpec[IntegrationKitSpec]* +| + + + + +|`status` + +*xref:#_camel_apache_org_v1_IntegrationKitStatus[IntegrationKitStatus]* +| + + + + +
[camel-k] branch release-1.4.x updated (08b020c -> 822b729)
This is an automated email from the ASF dual-hosted git repository. djencks pushed a change to branch release-1.4.x in repository https://gitbox.apache.org/repos/asf/camel-k.git. from 08b020c RI table setup new 5a9eedf fix apparent typos in jsonschema_types.go new 2e59c98 Generate api documentation similarly to later versions. new 8544ac6 Switch to separate camel-k and kamelets API pages. Generated AsciiDoc API docs new 5c83604 newly generated files new ea804f4 generated modified resources.go file new 822b729 update templates to use exposed sanitizeId function The 6 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: .gitignore |1 + addons/tracing/zz_desc_generated.go|1 + addons/tracing/zz_generated_doc.go |1 + .../bases/camel.apache.org_kameletbindings.yaml| 12 +- config/crd/bases/camel.apache.org_kamelets.yaml|8 +- docs/modules/ROOT/nav-end.adoc |3 + docs/modules/ROOT/pages/apis/camel-k.adoc |4 + docs/modules/ROOT/pages/apis/kamelets.adoc |3 + docs/modules/ROOT/partials/apis/camel-k-crds.adoc | 2830 docs/modules/ROOT/partials/apis/kamelets-crds.adoc | 1161 helm/camel-k/crds/crd-kamelet-binding.yaml | 12 +- helm/camel-k/crds/crd-kamelet.yaml |8 +- pkg/apis/camel/v1alpha1/jsonschema_types.go|4 +- pkg/resources/resources.go |8 +- script/gen_crd/gen-crd-api-config.json | 22 + script/gen_crd/gen-kamelets-crd-api-config.json| 26 + script/gen_crd/gen_crd_api.sh | 40 + script/gen_crd/template/members.tpl| 30 + script/gen_crd/template/pkg.tpl| 32 + script/gen_crd/template/type.tpl | 32 + script/gen_doc.sh |6 +- 21 files changed, 4217 insertions(+), 27 deletions(-) create mode 100644 addons/tracing/zz_desc_generated.go create mode 100644 addons/tracing/zz_generated_doc.go create mode 100644 docs/modules/ROOT/pages/apis/camel-k.adoc create mode 100644 docs/modules/ROOT/pages/apis/kamelets.adoc create mode 100644 docs/modules/ROOT/partials/apis/camel-k-crds.adoc create mode 100644 docs/modules/ROOT/partials/apis/kamelets-crds.adoc create mode 100644 script/gen_crd/gen-crd-api-config.json create mode 100644 script/gen_crd/gen-kamelets-crd-api-config.json create mode 100755 script/gen_crd/gen_crd_api.sh create mode 100644 script/gen_crd/template/members.tpl create mode 100644 script/gen_crd/template/pkg.tpl create mode 100644 script/gen_crd/template/type.tpl
[camel-k] 02/06: Generate api documentation similarly to later versions.
This is an automated email from the ASF dual-hosted git repository.
djencks pushed a commit to branch release-1.4.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 2e59c983b5c95e7e8954e1d7b34af15139023eb6
Author: David Jencks
AuthorDate: Thu Jan 20 20:47:52 2022 -0800
Generate api documentation similarly to later versions.
update gen_crd_api script/config to use go run and asciidoc config
add /github.com to .gitignore, it's similar to /vendor
use AsciiDoc API templates
---
.gitignore | 1 +
script/gen_crd/gen-crd-api-config.json | 22 ++
script/gen_crd/gen-kamelets-crd-api-config.json | 26 +
script/gen_crd/gen_crd_api.sh | 39 +
script/gen_crd/template/members.tpl | 30 +++
script/gen_crd/template/pkg.tpl | 32
script/gen_crd/template/type.tpl| 32
script/gen_doc.sh | 6 +++-
8 files changed, 187 insertions(+), 1 deletion(-)
diff --git a/.gitignore b/.gitignore
index 4698207..0d4d8b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
# Go vendor
/vendor
+/github.com
# Binary files
/kamel
diff --git a/script/gen_crd/gen-crd-api-config.json
b/script/gen_crd/gen-crd-api-config.json
new file mode 100644
index 000..1a6ae0d
--- /dev/null
+++ b/script/gen_crd/gen-crd-api-config.json
@@ -0,0 +1,22 @@
+{
+"hideMemberFields": [
+"TypeMeta",
+"baseErrorHandler"
+],
+"hideTypePatterns": [
+"ParseError$",
+"List$"
+],
+"externalPackages": [
+{
+"typeMatchPrefix": "^k8s\\.io/(api|apimachinery/pkg/apis)/",
+"docsURLTemplate":
"https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#{{lower
.TypeIdentifier}}-{{arrIndex .PackageSegments -1}}-{{arrIndex .PackageSegments
-2}}"
+}
+],
+"typeDisplayNamePrefixOverrides": {
+"k8s.io/api/": "Kubernetes ",
+"k8s.io/apimachinery/pkg/apis/": "Kubernetes "
+},
+"markdownDisabled": true,
+"asciiDoc": true
+}
diff --git a/script/gen_crd/gen-kamelets-crd-api-config.json
b/script/gen_crd/gen-kamelets-crd-api-config.json
new file mode 100644
index 000..0e67016
--- /dev/null
+++ b/script/gen_crd/gen-kamelets-crd-api-config.json
@@ -0,0 +1,26 @@
+{
+"hideMemberFields": [
+"TypeMeta",
+"baseErrorHandler"
+],
+"hideTypePatterns": [
+"ParseError$",
+"List$"
+],
+"externalPackages": [
+{
+"typeMatchPrefix": "^k8s\\.io/(api|apimachinery/pkg/apis)/",
+"docsURLTemplate":
"https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#{{lower
.TypeIdentifier}}-{{arrIndex .PackageSegments -1}}-{{arrIndex .PackageSegments
-2}}"
+},
+{
+ "typeMatchPrefix":
"^github\\.com/apache/camel-k/pkg/apis/camel/v1\\.",
+ "docsURLTemplate":
"xref:apis/camel-k.adoc#_camel_apache_org_v1_{{.TypeIdentifier}}"
+}
+],
+"typeDisplayNamePrefixOverrides": {
+"k8s.io/api/": "Kubernetes ",
+"k8s.io/apimachinery/pkg/apis/": "Kubernetes "
+},
+"markdownDisabled": true,
+"asciiDoc": true
+}
diff --git a/script/gen_crd/gen_crd_api.sh b/script/gen_crd/gen_crd_api.sh
new file mode 100755
index 000..f4d696f
--- /dev/null
+++ b/script/gen_crd/gen_crd_api.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+location=$(dirname $0)
+rootdir=$location/../..
+crd_file_camel=$rootdir/docs/modules/ROOT/partials/apis/camel-k-crds.adoc
+crd_file_kamelets=$rootdir/docs/modules/ROOT/partials/apis/kamelets-crds.adoc
+
+echo "Generating CRD API documentation..."
+# to run a local copy use something like
+#go run /Users/david/projects/camel/gen-crd-api-reference-docs/main.go \
+#you will probably need to comment out use of blackfriday.
+go run
github.com/djencks/gen-crd-api-reference-docs@7400a10b36d7cfa7563ea48ce0df15a9d4c2de87
\
+-config $location/gen-crd-api-config.json \
+-template-dir $location/template \
+-api-dir "github.c
[camel-quarkus] branch quarkus-main updated (92c7bac -> 5077489)
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a change to branch quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git. discard 92c7bac Upgrade to Quarkus 2.8.0.CR1 new 5077489 Upgrade to Quarkus 2.8.0.CR1 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (92c7bac) \ N -- N -- N refs/heads/quarkus-main (5077489) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 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: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[camel-quarkus] 01/01: Upgrade to Quarkus 2.8.0.CR1
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch quarkus-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 5077489195718ea8f9074285f8edafcae1a8a841
Author: James Netherton
AuthorDate: Thu Jan 20 07:52:37 2022 +
Upgrade to Quarkus 2.8.0.CR1
---
docs/antora.yml | 2 +-
integration-tests/http/pom.xml| 2 +-
integration-tests/vertx-websocket/pom.xml | 2 +-
pom.xml | 5 +++--
poms/build-parent/pom.xml | 9 +
5 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/docs/antora.yml b/docs/antora.yml
index ce03b9d..488a8a9 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -31,7 +31,7 @@ asciidoc:
target-maven-version: 3.8.4 # replace ${target-maven-version}
camel-version: 3.14.1 # replace ${camel.version}
camel-docs-version: 3.14.x # replace ${camel.docs.components.version}
-quarkus-version: 2.7.0.Final # replace ${quarkus.version}
+quarkus-version: 999-SNAPSHOT # replace ${quarkus.version}
graalvm-version: 21.3.0 # replace ${graalvm.version}
graalvm-docs-version: 21.3
# attributes used in xrefs to other Antora components
diff --git a/integration-tests/http/pom.xml b/integration-tests/http/pom.xml
index 68daa40..8994b61 100644
--- a/integration-tests/http/pom.xml
+++ b/integration-tests/http/pom.xml
@@ -61,7 +61,7 @@
io.quarkus
-quarkus-undertow-websockets
+quarkus-websockets
io.quarkus
diff --git a/integration-tests/vertx-websocket/pom.xml
b/integration-tests/vertx-websocket/pom.xml
index 7947fe5..abd5e2a 100644
--- a/integration-tests/vertx-websocket/pom.xml
+++ b/integration-tests/vertx-websocket/pom.xml
@@ -39,7 +39,7 @@
io.quarkus
-quarkus-undertow-websockets
+quarkus-websockets
test
diff --git a/pom.xml b/pom.xml
index 9db28ec..6ae091a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,7 +55,7 @@
1.0.0
2.3.0
1.0.3
-2.7.0.Final
+999-SNAPSHOT
2.0.0
0.32.0
@@ -65,6 +65,7 @@
1.18
3.5.2
1.11.0
+3.22.0
2.17.103
1.11.714
1.0.5
@@ -86,7 +87,7 @@
0.8.0
0.22.2
21.3.0
-1.43.2
+1.44.0
4.0
${hadoop3-version}
${hapi-version}
diff --git a/poms/build-parent/pom.xml b/poms/build-parent/pom.xml
index 21d4699..d8d6848 100644
--- a/poms/build-parent/pom.xml
+++ b/poms/build-parent/pom.xml
@@ -37,6 +37,15 @@
false
+
+
+
+org.assertj
+assertj-core
+${assertj.version}
+
+
+
[camel] branch main updated: Regen for commit b62260e19db2aa61fa4a6180eaf24b04194c5944
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 60a8242 Regen for commit b62260e19db2aa61fa4a6180eaf24b04194c5944
60a8242 is described below
commit 60a8242cec1e18643842d1a87c1f1fdf8d00590c
Author: davsclaus
AuthorDate: Mon Jan 31 15:55:28 2022 +
Regen for commit b62260e19db2aa61fa4a6180eaf24b04194c5944
Signed-off-by: GitHub
---
.../resources/org/apache/camel/catalog/models/camelContext.json | 4 ++--
.../resources/org/apache/camel/catalog/schemas/camel-spring.xsd | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/camelContext.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/camelContext.json
index a53b993..9212a3e 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/camelContext.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/camelContext.json
@@ -46,8 +46,8 @@
"typeConverterStatisticsEnabled": { "kind": "attribute", "displayName":
"Type Converter Statistics Enabled", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "Sets whether or not type converter statistics
is enabled. By default the type converter utilization statistics is disabled.
Notice: If enabled then there is a slight performance impact under very heavy
load. You can enable\/disable the [...]
"loadHealthChecks": { "kind": "attribute", "displayName": "Load Health
Checks", "required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
"false", "description": "Whether to load custom health checks by scanning
classpath." },
"inflightRepositoryBrowseEnabled": { "kind": "attribute", "displayName":
"Inflight Repository Browse Enabled", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "Sets whether the inflight repository should
allow browsing each inflight exchange. This is by default disabled as there is
a very slight performance overhead when enabled." },
-"typeConverterExists": { "kind": "attribute", "displayName": "Type
Converter Exists", "required": false, "type": "enum", "javaType":
"org.apache.camel.TypeConverterExists", "enum": [ "fail", "ignore", "override"
], "deprecated": false, "autowired": false, "secret": false, "defaultValue":
"Override", "description": "What should happen when attempting to add a
duplicate type converter. The default behavior is to override the existing." },
-"typeConverterExistsLoggingLevel": { "kind": "attribute", "displayName":
"Type Converter Exists Logging Level", "required": false, "type": "enum",
"javaType": "org.apache.camel.LoggingLevel", "enum": [ "debug", "error",
"info", "off", "trace", "warn" ], "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "WARN", "description": "The logging level to
use when logging that a type converter already exists when attempting to add a
duplicate type converter. The defaul [...]
+"typeConverterExists": { "kind": "attribute", "displayName": "Type
Converter Exists", "required": false, "type": "enum", "javaType":
"org.apache.camel.TypeConverterExists", "enum": [ "fail", "ignore", "override"
], "deprecated": false, "autowired": false, "secret": false, "defaultValue":
"Ignore", "description": "What should happen when attempting to add a duplicate
type converter. The default behavior is to ignore the duplicate." },
+"typeConverterExistsLoggingLevel": { "kind": "attribute", "displayName":
"Type Converter Exists Logging Level", "required": false, "type": "enum",
"javaType": "org.apache.camel.LoggingLevel", "enum": [ "debug", "error",
"info", "off", "trace", "warn" ], "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "DEBUG", "description": "The logging level to
use when logging that a type converter already exists when attempting to add a
duplicate type converter. The defau [...]
"globalOptions": { "kind": "element", "displayName": "Global Options",
"required": false, "type": "object", "javaType":
"org.apache.camel.model.GlobalOptionsDefinition", "deprecated": false,
"autowired": false, "secret": false, "description": "Configuration of
CamelContext properties such as limit of debug logging and other general
options." },
"propertyPlaceholder": { "kind": "element", "displayName": "Property
Placeholder", "required": false, "type": "object", "javaType":
"org.apache.camel.core.xml.CamelPropertyPlaceholderDefinition", "deprecated":
false, "autowired":
[GitHub] [camel] oscerd merged pull request #6863: Generated sources regen
oscerd merged pull request #6863: URL: https://github.com/apache/camel/pull/6863 -- 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: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch regen_bot updated (97167a1 -> 9979ec1)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git. from 97167a1 Attempt to fix releasing Apache Camel in the camel-dependencies sync generator. add b62260e CAMEL-17568: camel-core - TypeConverterExists change default to ignore. Fix adding type converter that previously was missed. add 9979ec1 Regen for commit b62260e19db2aa61fa4a6180eaf24b04194c5944 No new revisions were added by this update. Summary of changes: .../org/apache/camel/catalog/models/camelContext.json| 4 ++-- .../org/apache/camel/catalog/schemas/camel-spring.xsd| 6 +++--- .../resources/org/apache/camel/spring/xml/camelContext.json | 4 ++-- .../org/apache/camel/spring/xml/CamelContextFactoryBean.java | 8 .../java/org/apache/camel/spi/TypeConverterRegistry.java | 8 .../camel/impl/converter/CoreTypeConverterRegistry.java | 12 +--- .../modules/ROOT/pages/camel-3x-upgrade-guide-3_16.adoc | 9 + 7 files changed, 33 insertions(+), 18 deletions(-)
[GitHub] [camel] github-actions[bot] opened a new pull request #6863: Generated sources regen
github-actions[bot] opened a new pull request #6863: URL: https://github.com/apache/camel/pull/6863 Regen bot :robot: found some uncommited changes after running build on :camel: main. Please do not delete `regen_bot` branch after merge/rebase. -- 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: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch regen_bot updated (05c5112 -> 97167a1)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git. from 05c5112 CAMEL-17567: camel-main - Add basePackageScan to auto discover route builders, configuration classes, and type converters. add 97167a1 Attempt to fix releasing Apache Camel in the camel-dependencies sync generator. No new revisions were added by this update. Summary of changes: tooling/maven/sync-properties-maven-plugin/pom.xml | 4 ++ .../maven/sync/properties/SyncPropertiesMojo.java | 49 ++ 2 files changed, 27 insertions(+), 26 deletions(-)
[GitHub] [camel-k] astefanutti merged pull request #2964: fix(cli): Kamel CLI zero-code exists when trait properties validation fails
astefanutti merged pull request #2964: URL: https://github.com/apache/camel-k/pull/2964 -- 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: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-k] branch main updated: fix(cli): Kamel CLI zero-code exists when trait properties validation fails
This is an automated email from the ASF dual-hosted git repository.
astefanutti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/main by this push:
new 34bc81d fix(cli): Kamel CLI zero-code exists when trait properties
validation fails
34bc81d is described below
commit 34bc81d35932caf51c4e88cc52c903931d9950f1
Author: Antonin Stefanutti
AuthorDate: Mon Jan 31 09:35:51 2022 +0100
fix(cli): Kamel CLI zero-code exists when trait properties validation fails
---
pkg/cmd/run.go | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/pkg/cmd/run.go b/pkg/cmd/run.go
index 4721fef..516099d 100644
--- a/pkg/cmd/run.go
+++ b/pkg/cmd/run.go
@@ -297,8 +297,7 @@ func (o *runCmdOptions) run(cmd *cobra.Command, args
[]string) error {
prefix = prefix[0:strings.Index(prefix, "[")]
}
if !util.StringSliceExists(tp, prefix) {
- fmt.Printf("Error: %s is not a valid trait property\n",
t)
- return nil
+ return fmt.Errorf("%s is not a valid trait property", t)
}
}
[camel] branch main updated: CAMEL-17568: camel-core - TypeConverterExists change default to ignore. Fix adding type converter that previously was missed.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new b62260e CAMEL-17568: camel-core - TypeConverterExists change default
to ignore. Fix adding type converter that previously was missed.
b62260e is described below
commit b62260e19db2aa61fa4a6180eaf24b04194c5944
Author: Claus Ibsen
AuthorDate: Mon Jan 31 15:50:24 2022 +0100
CAMEL-17568: camel-core - TypeConverterExists change default to ignore. Fix
adding type converter that previously was missed.
---
.../resources/org/apache/camel/spring/xml/camelContext.json | 4 ++--
.../org/apache/camel/spring/xml/CamelContextFactoryBean.java | 8
.../java/org/apache/camel/spi/TypeConverterRegistry.java | 8
.../camel/impl/converter/CoreTypeConverterRegistry.java | 12 +---
.../modules/ROOT/pages/camel-3x-upgrade-guide-3_16.adoc | 9 +
5 files changed, 28 insertions(+), 13 deletions(-)
diff --git
a/components/camel-spring-xml/src/generated/resources/org/apache/camel/spring/xml/camelContext.json
b/components/camel-spring-xml/src/generated/resources/org/apache/camel/spring/xml/camelContext.json
index a53b993..9212a3e 100644
---
a/components/camel-spring-xml/src/generated/resources/org/apache/camel/spring/xml/camelContext.json
+++
b/components/camel-spring-xml/src/generated/resources/org/apache/camel/spring/xml/camelContext.json
@@ -46,8 +46,8 @@
"typeConverterStatisticsEnabled": { "kind": "attribute", "displayName":
"Type Converter Statistics Enabled", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "Sets whether or not type converter statistics
is enabled. By default the type converter utilization statistics is disabled.
Notice: If enabled then there is a slight performance impact under very heavy
load. You can enable\/disable the [...]
"loadHealthChecks": { "kind": "attribute", "displayName": "Load Health
Checks", "required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
"false", "description": "Whether to load custom health checks by scanning
classpath." },
"inflightRepositoryBrowseEnabled": { "kind": "attribute", "displayName":
"Inflight Repository Browse Enabled", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "Sets whether the inflight repository should
allow browsing each inflight exchange. This is by default disabled as there is
a very slight performance overhead when enabled." },
-"typeConverterExists": { "kind": "attribute", "displayName": "Type
Converter Exists", "required": false, "type": "enum", "javaType":
"org.apache.camel.TypeConverterExists", "enum": [ "fail", "ignore", "override"
], "deprecated": false, "autowired": false, "secret": false, "defaultValue":
"Override", "description": "What should happen when attempting to add a
duplicate type converter. The default behavior is to override the existing." },
-"typeConverterExistsLoggingLevel": { "kind": "attribute", "displayName":
"Type Converter Exists Logging Level", "required": false, "type": "enum",
"javaType": "org.apache.camel.LoggingLevel", "enum": [ "debug", "error",
"info", "off", "trace", "warn" ], "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "WARN", "description": "The logging level to
use when logging that a type converter already exists when attempting to add a
duplicate type converter. The defaul [...]
+"typeConverterExists": { "kind": "attribute", "displayName": "Type
Converter Exists", "required": false, "type": "enum", "javaType":
"org.apache.camel.TypeConverterExists", "enum": [ "fail", "ignore", "override"
], "deprecated": false, "autowired": false, "secret": false, "defaultValue":
"Ignore", "description": "What should happen when attempting to add a duplicate
type converter. The default behavior is to ignore the duplicate." },
+"typeConverterExistsLoggingLevel": { "kind": "attribute", "displayName":
"Type Converter Exists Logging Level", "required": false, "type": "enum",
"javaType": "org.apache.camel.LoggingLevel", "enum": [ "debug", "error",
"info", "off", "trace", "warn" ], "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "DEBUG", "description": "The logging level to
use when logging that a type converter already exists when attempting to add a
duplicate type converter. The defau [...]
"globalOptions": { "kind": "element", "displayName": "Global Options",
"required": false, "type": "object", "javaType":
"org.apache.camel.model.GlobalOptionsDefinition", "deprecated": false,
"autowired": false, "secret": false, "description": "Co
[GitHub] [camel-k] astefanutti commented on issue #2966: Configure Maven: Artifact Repository is not recognized
astefanutti commented on issue #2966: URL: https://github.com/apache/camel-k/issues/2966#issuecomment-1025829499 Could you try by adding your own repositories to the following settings: ``` kubectl get cm camel-k-maven-settings -o yaml apiVersion: v1 data: settings.xml: |- http://maven.apache.org/SETTINGS/1.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 https://maven.apache.org/xsd/settings-1.0.0.xsd";> camel-k true central https://repo.maven.apache.org/maven2 false fail false fail apache-snapshots https://repository.apache.org/content/repositories/snapshots false fail false fail central https://repo.maven.apache.org/maven2 false fail false fail kind: ConfigMap ``` -- 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: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] ppalaga commented on issue #3503: Camel-xslt-quarkus: add extension functions support
ppalaga commented on issue #3503: URL: https://github.com/apache/camel-quarkus/issues/3503#issuecomment-1025793940 > Proposal: > > 1. Add setting `quarkus.camel.xslt.transformerFactory` > 2. Add setting `quarkus.camel.xslt.extensionFunctions` I guess those should be new configuration parameters, right? Could you please specify their expected range of values, defaults, and explain what they should actually do? -- 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: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] k0pper commented on issue #2966: Configure Maven: Artifact Repository is not recognized
k0pper commented on issue #2966: URL: https://github.com/apache/camel-k/issues/2966#issuecomment-1025785521 I changed the settings.xml, and reapplied it as a configmap. It still doesn't work. Can you provide a full working example of the settings.xml with your changes? -- 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: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch main updated: Attempt to fix releasing Apache Camel in the camel-dependencies sync generator.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 97167a1 Attempt to fix releasing Apache Camel in the
camel-dependencies sync generator.
97167a1 is described below
commit 97167a18aca7d49f42c881020b0dad0ce517ac45
Author: Claus Ibsen
AuthorDate: Mon Jan 31 15:03:29 2022 +0100
Attempt to fix releasing Apache Camel in the camel-dependencies sync
generator.
---
tooling/maven/sync-properties-maven-plugin/pom.xml | 4 ++
.../maven/sync/properties/SyncPropertiesMojo.java | 49 ++
2 files changed, 27 insertions(+), 26 deletions(-)
diff --git a/tooling/maven/sync-properties-maven-plugin/pom.xml
b/tooling/maven/sync-properties-maven-plugin/pom.xml
index da3a8a4..6c99f7c 100644
--- a/tooling/maven/sync-properties-maven-plugin/pom.xml
+++ b/tooling/maven/sync-properties-maven-plugin/pom.xml
@@ -51,6 +51,10 @@
camel-util
+org.apache.camel
+camel-tooling-util
+
+
org.apache.maven.resolver
maven-resolver-api
diff --git
a/tooling/maven/sync-properties-maven-plugin/src/main/java/org/apache/camel/maven/sync/properties/SyncPropertiesMojo.java
b/tooling/maven/sync-properties-maven-plugin/src/main/java/org/apache/camel/maven/sync/properties/SyncPropertiesMojo.java
index 1fbc19c..b7ea3e7 100644
---
a/tooling/maven/sync-properties-maven-plugin/src/main/java/org/apache/camel/maven/sync/properties/SyncPropertiesMojo.java
+++
b/tooling/maven/sync-properties-maven-plugin/src/main/java/org/apache/camel/maven/sync/properties/SyncPropertiesMojo.java
@@ -18,13 +18,15 @@ package org.apache.camel.maven.sync.properties;
import java.io.File;
import java.io.FileInputStream;
-import java.io.FileOutputStream;
import java.io.FileReader;
import java.io.FileWriter;
import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
import java.util.Properties;
import java.util.TreeMap;
+import org.apache.camel.tooling.util.FileUtil;
+import org.apache.camel.tooling.util.PackageHelper;
import org.apache.camel.util.IOHelper;
import org.apache.camel.util.OrderedProperties;
import org.apache.maven.model.Model;
@@ -45,19 +47,10 @@ import org.apache.maven.project.MavenProject;
public class SyncPropertiesMojo extends AbstractMojo {
/**
- * The source POM file from which the required properties should be copied.
+ * The base directory
*/
-@Parameter(defaultValue = "${basedir}/../../parent/pom.xml")
-protected File sourcePom;
-
-@Parameter(defaultValue = "${basedir}/../../camel-dependencies/pom.xml")
-protected File targetPom;
-
-/**
- * The license header file that should be inserted at the top of the
destination POM file.
- */
-@Parameter(defaultValue = "${basedir}/../../etc/apache-header.xml")
-protected File licenseHeader;
+@Parameter(defaultValue = "${project.basedir}")
+protected File baseDir;
/**
* The Maven project.
@@ -67,12 +60,18 @@ public class SyncPropertiesMojo extends AbstractMojo {
@Override
public void execute() throws MojoExecutionException, MojoFailureException {
+File dir = PackageHelper.findCamelDirectory(baseDir, "parent");
+File sourcePom = new File(dir, "pom.xml");
+dir = PackageHelper.findCamelDirectory(baseDir, "camel-dependencies");
+File targetPom = new File(dir, "pom.xml");
+dir = PackageHelper.findCamelDirectory(baseDir, "etc");
+File licenseHeader = new File(dir, "apache-header.xml");
+
try {
Properties parentProp;
String generatedVersion;
-String artifactId = "camel-dependencies";
-getLog().info("Reading source file " + sourcePom.toPath());
+getLog().debug("Reading source file " + sourcePom.toPath());
try (FileReader reader = new FileReader(sourcePom)) {
MavenXpp3Reader mavenReader = new MavenXpp3Reader();
Model model = mavenReader.read(reader);
@@ -88,14 +87,14 @@ public class SyncPropertiesMojo extends AbstractMojo {
MavenXpp3Reader mavenReader = new MavenXpp3Reader();
Model model = mavenReader.read(is);
-// lets sort the properties
+// sort the properties
OrderedProperties op = new OrderedProperties();
op.putAll(new TreeMap<>(parentProp));
MavenProject targetProject = new MavenProject(model);
targetProject.getModel().setProperties(op);
-getLog().info("Set version of target pom to " +
generatedVersion);
+getLog().debug("Set version of target pom to " +
generatedVersion);
targetProject.setVersion(generatedVersion);
[GitHub] [camel-k] astefanutti edited a comment on issue #2966: Configure Maven: Artifact Repository is not recognized
astefanutti edited a comment on issue #2966: URL: https://github.com/apache/camel-k/issues/2966#issuecomment-1025770002 Maven central is added by default to the "platform" Maven settings, so you have to disable it in your custom Maven settings, e.g.: ```xml central http://repo1.maven.org/maven2 false false central http://repo1.maven.org/maven2 false false ``` -- 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: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
