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-website.git
The following commit(s) were added to refs/heads/main by this push:
new e7b3fb4 update package.json with new extension versions, update util
e7b3fb4 is described below
commit e7b3fb47118419502a08d8aff53e45e63fe1c259
Author: David Jencks <[email protected]>
AuthorDate: Sat Oct 2 16:37:14 2021 -0700
update package.json with new extension versions, update util
add comment about sb-statistics attribute
add and use camel-quarkus 2.3.x: dont add camel-k 1.6.x with a comment on
why
---
antora-playbook.yml | 16 ++++++++++++----
package.json | 4 ++--
util/jsonpath-util.js | 42 ++++++++++++++++++++++++++++--------------
3 files changed, 42 insertions(+), 20 deletions(-)
diff --git a/antora-playbook.yml b/antora-playbook.yml
index 82c560e..6b451c2 100644
--- a/antora-playbook.yml
+++ b/antora-playbook.yml
@@ -36,6 +36,8 @@ content:
- url: https://github.com/apache/camel-k.git
branches:
- main
+# Release-1.6.x does not work because there is no corresponding
camel-k-runtime version for languages.
+# - release-1.6.x
- release-1.4.x
start_path: docs
@@ -50,11 +52,13 @@ content:
- url: https://github.com/apache/camel-quarkus.git
branches:
- main
- - release/2.0.0
+ - 2.3.x
+# - 2.2.x
+# - release/2.0.0
start_path: docs
- url: https://github.com/apache/camel-quarkus-examples.git
- branches: HEAD
+ branches: main
start_path: docs
- url: https://github.com/apache/camel-kafka-connector.git
@@ -94,11 +98,12 @@ output:
asciidoc:
attributes:
requires@: "'util=util/jsonpath-util.js'"
- # sb-statistics: on
+# uncomment sb-statistics to see more info on camel spring boot list page
such as non-spring-boot components.
+# This also tests the output of unused camel-spring-boot json detection and
fails the Antora build with errors.
+# sb-statistics: on
extensions:
- ./extensions/table.js
- ./extensions/inline-styles.js
- - "@djencks/asciidoctor-antora-indexer"
runtime:
log:
@@ -108,3 +113,6 @@ runtime:
pipeline:
extensions:
- require: '@djencks/asciidoctor-jsonpath'
+# trace: true
+ - require: '@djencks/asciidoctor-antora-indexer'
+# trace: true
diff --git a/package.json b/package.json
index a5f75f7..f5d979b 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,8 @@
"@antora/cli": "^3.0.0-alpha.9",
"@antora/site-generator-default": "^3.0.0-alpha.9",
"@deadlinks/cargo-deadlinks":
"github-release:deadlinks/cargo-deadlinks:0.8.0/deadlinks-linux",
- "@djencks/asciidoctor-antora-indexer": "^0.0.7",
- "@djencks/asciidoctor-jsonpath": "^0.0.4",
+ "@djencks/asciidoctor-antora-indexer": "^0.1.0-alpha.1",
+ "@djencks/asciidoctor-jsonpath": "^0.1.0-alpha.1",
"@oclif/errors": "^1.3.4",
"antora-ui-camel": "workspace:antora-ui-camel",
"del": "^6.0.0",
diff --git a/util/jsonpath-util.js b/util/jsonpath-util.js
index c428408..df51c70 100644
--- a/util/jsonpath-util.js
+++ b/util/jsonpath-util.js
@@ -1,3 +1,22 @@
+/*
+ * 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.
+ */
+
+const RESOURCEID_RX = /[^$]*\$json\/(.*)\.json/
+
module.exports = {
alias: (name, aliases) => {
for (expr of (aliases || '').split(',')) {
@@ -30,24 +49,15 @@ module.exports = {
}
},
- description2: (value) => {
- try {
- return module.exports.strong(value, 'Autowired')
- + module.exports.strong(value, 'Required')
- + module.exports.strong(value, 'Deprecated')
- + (value.description ?
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 ? text.split('{').join('\\{') : text
},
+ extractSBName: (resourceid) => {
+ const m =resourceid.match(RESOURCEID_RX)
+ return m ? m[1] : 'no match'
+ },
+
formatSignature: (signature) => {
return signature.split('$').join('.') + ';'
},
@@ -72,6 +82,10 @@ module.exports = {
return 'Both producer and consumer are supported'
},
+ starterArtifactId: (data) => {
+ return data['starter-artifactid'] ? data['starter-artifactid'] :
`${data.artifactid}-starter`
+ },
+
strong: (data, text) => {
return data[text.toLowerCase()] ? `*${text}* ` : ''
},
