You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2021/09/21 17:11:45 UTC
[camel-quarkus] branch main updated (57edc73 -> 9191d41)
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git.
from 57edc73 aws2-lambda: Added updateFunction and getFunction tests #2749
new 02712e5 replicate more of the main camel website build: use @djencks/asciidoctor-jsonpath and include quarkus examples
new 527ecfb add license header to util.js
new 9191d41 use only https git urls
The 3 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:
docs/.pnp.js | 54 ++++++++++++++++++++++++++++++
docs/antora-playbook.yml | 14 ++++++--
docs/package.json | 1 +
docs/util/jsonpath-util.js | 82 ++++++++++++++++++++++++++++++++++++++++++++++
docs/yarn.lock | 63 ++++++++++++++++++++++++++++++++---
5 files changed, 206 insertions(+), 8 deletions(-)
create mode 100644 docs/util/jsonpath-util.js
[camel-quarkus] 01/03: replicate more of the main camel website
build: use @djencks/asciidoctor-jsonpath and include quarkus examples
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 02712e510f3f76d29d6e35e6d3dd183d9410feca
Author: David Jencks <dj...@apache.org>
AuthorDate: Mon Sep 20 08:26:04 2021 -0700
replicate more of the main camel website build: use @djencks/asciidoctor-jsonpath and include quarkus examples
---
docs/.pnp.js | 54 ++++++++++++++++++++++++++++++++++++++
docs/antora-playbook.yml | 10 ++++++-
docs/package.json | 1 +
docs/util/jsonpath-util.js | 65 ++++++++++++++++++++++++++++++++++++++++++++++
docs/yarn.lock | 63 ++++++++++++++++++++++++++++++++++++++++----
5 files changed, 187 insertions(+), 6 deletions(-)
diff --git a/docs/.pnp.js b/docs/.pnp.js
index 4e08fec..60bc4cb 100755
--- a/docs/.pnp.js
+++ b/docs/.pnp.js
@@ -40,6 +40,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
["@antora/cli", "npm:3.0.0-alpha.9"],
["@antora/site-generator-default", "npm:3.0.0-alpha.9"],
["@djencks/asciidoctor-antora-indexer", "npm:0.0.6"],
+ ["@djencks/asciidoctor-jsonpath", "npm:0.0.4"],
["lite-server", "npm:2.5.4"],
["pino-pretty", "npm:5.1.3"]
],
@@ -289,6 +290,22 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
"linkType": "HARD",
}]
]],
+ ["@djencks/asciidoctor-jsonpath", [
+ ["npm:0.0.4", {
+ "packageLocation": "./.yarn/cache/@djencks-asciidoctor-jsonpath-npm-0.0.4-daa788a548-ba33c6567c.zip/node_modules/@djencks/asciidoctor-jsonpath/",
+ "packageDependencies": [
+ ["@djencks/asciidoctor-jsonpath", "npm:0.0.4"],
+ ["@antora/user-require-helper", "npm:2.0.0"],
+ ["@iarna/toml", "npm:2.2.5"],
+ ["esprima", "npm:4.0.1"],
+ ["js-yaml", "npm:4.1.0"],
+ ["json5", "npm:2.2.0"],
+ ["jsonpath", "npm:1.1.1"],
+ ["static-eval", "npm:2.1.0"]
+ ],
+ "linkType": "HARD",
+ }]
+ ]],
["@hapi/bourne", [
["npm:2.0.0", {
"packageLocation": "./.yarn/cache/@hapi-bourne-npm-2.0.0-8eeda7e0a2-97a3e6d44c.zip/node_modules/@hapi/bourne/",
@@ -952,6 +969,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
["@antora/cli", "npm:3.0.0-alpha.9"],
["@antora/site-generator-default", "npm:3.0.0-alpha.9"],
["@djencks/asciidoctor-antora-indexer", "npm:0.0.6"],
+ ["@djencks/asciidoctor-jsonpath", "npm:0.0.4"],
["lite-server", "npm:2.5.4"],
["pino-pretty", "npm:5.1.3"]
],
@@ -1792,6 +1810,13 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
}]
]],
["esprima", [
+ ["npm:1.2.2", {
+ "packageLocation": "./.yarn/cache/esprima-npm-1.2.2-506b351d14-8cb4d8a7f6.zip/node_modules/esprima/",
+ "packageDependencies": [
+ ["esprima", "npm:1.2.2"]
+ ],
+ "linkType": "HARD",
+ }],
["npm:4.0.1", {
"packageLocation": "./.yarn/cache/esprima-npm-4.0.1-1084e98778-5df45a3d9c.zip/node_modules/esprima/",
"packageDependencies": [
@@ -2979,6 +3004,18 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
"linkType": "HARD",
}]
]],
+ ["jsonpath", [
+ ["npm:1.1.1", {
+ "packageLocation": "./.yarn/cache/jsonpath-npm-1.1.1-d88994ce7e-4741e517f4.zip/node_modules/jsonpath/",
+ "packageDependencies": [
+ ["jsonpath", "npm:1.1.1"],
+ ["esprima", "npm:1.2.2"],
+ ["static-eval", "npm:2.0.2"],
+ ["underscore", "npm:1.12.1"]
+ ],
+ "linkType": "HARD",
+ }]
+ ]],
["kind-of", [
["npm:3.2.2", {
"packageLocation": "./.yarn/cache/kind-of-npm-3.2.2-7deaffa5f9-e8a1835c4b.zip/node_modules/kind-of/",
@@ -4971,6 +5008,14 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
}]
]],
["static-eval", [
+ ["npm:2.0.2", {
+ "packageLocation": "./.yarn/cache/static-eval-npm-2.0.2-047eda8cb5-58a3e85b2e.zip/node_modules/static-eval/",
+ "packageDependencies": [
+ ["static-eval", "npm:2.0.2"],
+ ["escodegen", "npm:1.14.3"]
+ ],
+ "linkType": "HARD",
+ }],
["npm:2.1.0", {
"packageLocation": "./.yarn/cache/static-eval-npm-2.1.0-d3c8eda113-6c8b0dfdba.zip/node_modules/static-eval/",
"packageDependencies": [
@@ -5328,6 +5373,15 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
"linkType": "HARD",
}]
]],
+ ["underscore", [
+ ["npm:1.12.1", {
+ "packageLocation": "./.yarn/cache/underscore-npm-1.12.1-f5ca0889f5-b53ae924fe.zip/node_modules/underscore/",
+ "packageDependencies": [
+ ["underscore", "npm:1.12.1"]
+ ],
+ "linkType": "HARD",
+ }]
+ ]],
["union-value", [
["npm:1.0.1", {
"packageLocation": "./.yarn/cache/union-value-npm-1.0.1-76c6e8a88f-bd6ae611f0.zip/node_modules/union-value/",
diff --git a/docs/antora-playbook.yml b/docs/antora-playbook.yml
index 8cc182c..2a38a9c 100644
--- a/docs/antora-playbook.yml
+++ b/docs/antora-playbook.yml
@@ -26,6 +26,10 @@ content:
branches: HEAD
start_path: docs
+ - url: https://github.com/apache/camel-quarkus-examples.git
+ branches: HEAD
+ start_path: docs
+
- url: git@github.com:apache/camel.git
branches:
- camel-3.11.x # replace ${camel.docs.branch}
@@ -67,5 +71,9 @@ urls:
runtime:
log:
- level: info
+ level: warn
failure_level: warn
+
+pipeline:
+ extensions:
+ - require: '@djencks/asciidoctor-jsonpath'
diff --git a/docs/package.json b/docs/package.json
index 907cfd2..f1cd251 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -13,6 +13,7 @@
"@antora/cli": "^3.0.0-alpha.9",
"@antora/site-generator-default": "^3.0.0-alpha.9",
"@djencks/asciidoctor-antora-indexer": "^0.0.6",
+ "@djencks/asciidoctor-jsonpath": "^0.0.4",
"lite-server": "^2.4.0",
"pino-pretty": "^5.0.0"
},
diff --git a/docs/util/jsonpath-util.js b/docs/util/jsonpath-util.js
new file mode 100644
index 0000000..d28ef02
--- /dev/null
+++ b/docs/util/jsonpath-util.js
@@ -0,0 +1,65 @@
+module.exports = {
+ alias: (name, aliases) => {
+ for (expr of (aliases || '').split(',')) {
+ const {pattern, alias} = splitOnce(expr)
+ const re = new RegExp(pattern, 'i')
+ if (re.test(name)) {
+ return alias
+ }
+ }
+ return ''
+ },
+
+ description: (value) => {
+ try {
+ return module.exports.strong(value, "Autowired")
+ + module.exports.strong(value, "Required")
+ + module.exports.strong(value, "Deprecated")
+ + module.exports.escapeAttributes(value.description) + (value.description.endsWith(".") ? "" : ".")
+ + (value.deprecatedNote ? `\n\nNOTE: ${value.deprecatedNote}` : "")
+ + (value.enum ? `${["\n\nEnum values:\n"].concat(value.enum).join("\n* ")}` : "")
+ } catch (e) {
+ console.log('error', e)
+ return e.msg()
+ }
+ },
+
+ escapeAttributes: (text) => {
+ return text.split('{').join('\\{')
+ },
+
+ formatSignature: (signature) => {
+ return signature.split('$').join('.') + ';'
+ },
+
+ javaSimpleName: (name) => {
+ return name.split(/<.*>/).join('').split('.').pop()
+ },
+
+ pascalCase: (input) => {
+ return input ?
+ input.split('-').map((segment) => {
+ return segment.length ?
+ segment.charAt(0).toUpperCase() + segment.slice(1) :
+ segment
+ }).join('') :
+ input
+ },
+
+ producerConsumerLong: (consumerOnly, producerOnly) => {
+ if (consumerOnly) return 'Only consumer is supported'
+ if (producerOnly) return 'Only producer is supported'
+ return 'Both producer and consumer are supported'
+ },
+
+ strong: (data, text) => {
+ return data[text.toLowerCase()] ? `*${text}* ` : ''
+ },
+}
+
+function splitOnce (querySpec, token = '=') {
+ const index = querySpec.indexOf(token)
+ const pattern = querySpec.substring(0, index).trim()
+ const alias = querySpec.substring(index + 1).trim()
+ return { pattern, alias }
+}
diff --git a/docs/yarn.lock b/docs/yarn.lock
index 5c6cd6e..74410cd 100644
--- a/docs/yarn.lock
+++ b/docs/yarn.lock
@@ -200,7 +200,7 @@ __metadata:
languageName: node
linkType: hard
-"@antora/user-require-helper@npm:~2.0":
+"@antora/user-require-helper@npm:^2.0.0, @antora/user-require-helper@npm:~2.0":
version: 2.0.0
resolution: "@antora/user-require-helper@npm:2.0.0"
dependencies:
@@ -231,6 +231,21 @@ __metadata:
languageName: node
linkType: hard
+"@djencks/asciidoctor-jsonpath@npm:^0.0.4":
+ version: 0.0.4
+ resolution: "@djencks/asciidoctor-jsonpath@npm:0.0.4"
+ dependencies:
+ "@antora/user-require-helper": ^2.0.0
+ "@iarna/toml": ^2.2.5
+ esprima: ^4.0.1
+ js-yaml: ^4.1.0
+ json5: ^2.2.0
+ jsonpath: ^1.1.1
+ static-eval: ^2.1.0
+ checksum: ba33c6567cb4814f778aeafc4a9519a0b9acc27c832c542143294bff69684cdeb2d2c2bbf69fdadb13493a6fd8be7c6de32247e954f85b11ead12bc2af649da0
+ languageName: node
+ linkType: hard
+
"@hapi/bourne@npm:^2.0.0":
version: 2.0.0
resolution: "@hapi/bourne@npm:2.0.0"
@@ -238,7 +253,7 @@ __metadata:
languageName: node
linkType: hard
-"@iarna/toml@npm:~2.2":
+"@iarna/toml@npm:^2.2.5, @iarna/toml@npm:~2.2":
version: 2.2.5
resolution: "@iarna/toml@npm:2.2.5"
checksum: 929a8516a24996b75768f7e0591815e37004f2cdda12b245c9a5ae64f423b4bd2bdd6943fc80e9bb5360a7be0b6d05bac57c178578d9a73acfb2eab125c594ee
@@ -808,6 +823,7 @@ __metadata:
"@antora/cli": ^3.0.0-alpha.9
"@antora/site-generator-default": ^3.0.0-alpha.9
"@djencks/asciidoctor-antora-indexer": ^0.0.6
+ "@djencks/asciidoctor-jsonpath": ^0.0.4
lite-server: ^2.4.0
pino-pretty: ^5.0.0
dependenciesMeta:
@@ -1516,7 +1532,7 @@ __metadata:
languageName: node
linkType: hard
-"escodegen@npm:^1.11.1":
+"escodegen@npm:^1.11.1, escodegen@npm:^1.8.1":
version: 1.14.3
resolution: "escodegen@npm:1.14.3"
dependencies:
@@ -1535,6 +1551,16 @@ __metadata:
languageName: node
linkType: hard
+"esprima@npm:1.2.2":
+ version: 1.2.2
+ resolution: "esprima@npm:1.2.2"
+ bin:
+ esparse: ./bin/esparse.js
+ esvalidate: ./bin/esvalidate.js
+ checksum: 8cb4d8a7f61db2a4ba4d58ad5fcf91079e760f7e46bd302a64b5a543f0460a3c642dfc87dd185d7195bdf7a6cc7ffc06a1c690b9ef24237b508255d4ed5251d9
+ languageName: node
+ linkType: hard
+
"esprima@npm:^4.0.1":
version: 4.0.1
resolution: "esprima@npm:4.0.1"
@@ -2570,7 +2596,7 @@ fsevents@^1.2.7:
languageName: node
linkType: hard
-"js-yaml@npm:~4.1":
+"js-yaml@npm:^4.1.0, js-yaml@npm:~4.1":
version: 4.1.0
resolution: "js-yaml@npm:4.1.0"
dependencies:
@@ -2588,7 +2614,7 @@ fsevents@^1.2.7:
languageName: node
linkType: hard
-"json5@npm:~2.2":
+"json5@npm:^2.2.0, json5@npm:~2.2":
version: 2.2.0
resolution: "json5@npm:2.2.0"
dependencies:
@@ -2611,6 +2637,17 @@ fsevents@^1.2.7:
languageName: node
linkType: hard
+"jsonpath@npm:^1.1.1":
+ version: 1.1.1
+ resolution: "jsonpath@npm:1.1.1"
+ dependencies:
+ esprima: 1.2.2
+ static-eval: 2.0.2
+ underscore: 1.12.1
+ checksum: 4741e517f425e4b7c004c1c1452d8bf13084784cd75a1fd011fb1fa824d07675d1dc2b69111ffb45ada74266e289eef78efb7adccc9022e1e3ab6dea68ad0539
+ languageName: node
+ linkType: hard
+
"kind-of@npm:^3.0.2, kind-of@npm:^3.0.3, kind-of@npm:^3.2.0":
version: 3.2.2
resolution: "kind-of@npm:3.2.2"
@@ -4389,6 +4426,15 @@ resolve@^1.10.0:
languageName: node
linkType: hard
+"static-eval@npm:2.0.2":
+ version: 2.0.2
+ resolution: "static-eval@npm:2.0.2"
+ dependencies:
+ escodegen: ^1.8.1
+ checksum: 58a3e85b2e1ee16e1b779bb1440da71dc515b76d086e811bf31d399b998b0ad42ebd30ac6eef54971708f059f1c393efe2146fceb6c2b413c2ed48e27d5f5a53
+ languageName: node
+ linkType: hard
+
"static-eval@npm:^2.1.0":
version: 2.1.0
resolution: "static-eval@npm:2.1.0"
@@ -4716,6 +4762,13 @@ resolve@^1.10.0:
languageName: node
linkType: hard
+"underscore@npm:1.12.1":
+ version: 1.12.1
+ resolution: "underscore@npm:1.12.1"
+ checksum: b53ae924fe3608ac7875a0eec20988611a02dc174bad40680dbb9fe994c40fc457b6d4f618f8b9af930c31549809c27f70dddccd83957a32bab27b1eea858c1b
+ languageName: node
+ linkType: hard
+
"union-value@npm:^1.0.0":
version: 1.0.1
resolution: "union-value@npm:1.0.1"
[camel-quarkus] 02/03: add license header to util.js
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 527ecfbe55d26faa79140b3e7b2b6a46b5e43bc6
Author: David Jencks <dj...@apache.org>
AuthorDate: Mon Sep 20 11:05:13 2021 -0700
add license header to util.js
---
docs/util/jsonpath-util.js | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/docs/util/jsonpath-util.js b/docs/util/jsonpath-util.js
index d28ef02..e0b7d7d 100644
--- a/docs/util/jsonpath-util.js
+++ b/docs/util/jsonpath-util.js
@@ -1,3 +1,20 @@
+/*
+ * 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.
+ */
+
module.exports = {
alias: (name, aliases) => {
for (expr of (aliases || '').split(',')) {
[camel-quarkus] 03/03: use only https git urls
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 9191d41df93cc6a09016d9950f34a33593025d04
Author: David Jencks <dj...@apache.org>
AuthorDate: Tue Sep 21 08:29:54 2021 -0700
use only https git urls
---
docs/antora-playbook.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/docs/antora-playbook.yml b/docs/antora-playbook.yml
index 2a38a9c..ac412d1 100644
--- a/docs/antora-playbook.yml
+++ b/docs/antora-playbook.yml
@@ -30,13 +30,13 @@ content:
branches: HEAD
start_path: docs
- - url: git@github.com:apache/camel.git
+ - url: https://github.com/apache/camel.git
branches:
- camel-3.11.x # replace ${camel.docs.branch}
start_paths:
- docs/components
- - url: git@github.com:apache/camel.git
+ - url: https://github.com/apache/camel.git
branches:
- main
start_paths: