You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by ct...@apache.org on 2021/12/02 19:06:07 UTC
[solr] branch jira/solr-15556-antora updated: Update to antora 3.0.0-beta.4 & add comments to antora.yml about version parsing
This is an automated email from the ASF dual-hosted git repository.
ctargett pushed a commit to branch jira/solr-15556-antora
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/jira/solr-15556-antora by this push:
new 1144a09 Update to antora 3.0.0-beta.4 & add comments to antora.yml about version parsing
1144a09 is described below
commit 1144a097ef37e27b50b4bd4dd1c3d34734c9184f
Author: Cassandra Targett <ct...@apache.org>
AuthorDate: Thu Dec 2 13:05:40 2021 -0600
Update to antora 3.0.0-beta.4 & add comments to antora.yml about version parsing
---
solr/solr-ref-guide/antora.yml | 1 +
solr/solr-ref-guide/build.gradle | 3 +-
solr/solr-ref-guide/package-lock.json | 197 ++++++++++++++++++++++------------
3 files changed, 134 insertions(+), 67 deletions(-)
diff --git a/solr/solr-ref-guide/antora.yml b/solr/solr-ref-guide/antora.yml
index 0c0af92..1b7138f 100644
--- a/solr/solr-ref-guide/antora.yml
+++ b/solr/solr-ref-guide/antora.yml
@@ -2,6 +2,7 @@ name: solr
# Assigns the version based on parsing the branch name:
# 'branch_(*)_(*)': $1.$2' (or $1_$2)
# This could also be put in the content source in playbook.yml
+# This doesn't really work on Jenkins since it calls all checkouts HEAD
version:
'*/(*)': '$1'
prerelease: true
diff --git a/solr/solr-ref-guide/build.gradle b/solr/solr-ref-guide/build.gradle
index cf5a98f..fa2762e 100644
--- a/solr/solr-ref-guide/build.gradle
+++ b/solr/solr-ref-guide/build.gradle
@@ -295,5 +295,6 @@ abstract class PrepareSources extends DefaultTask {
antora {
playbookFile = file("playbook.yml")
- antoraVersion = "3.0.0-beta.3"
+ antoraVersion = "3.0.0-beta.4"
+ arguments = ["--generator @antora/site-generator"]
}
diff --git a/solr/solr-ref-guide/package-lock.json b/solr/solr-ref-guide/package-lock.json
index 546befa..3417ec1 100644
--- a/solr/solr-ref-guide/package-lock.json
+++ b/solr/solr-ref-guide/package-lock.json
@@ -58,6 +58,18 @@
"resolved": "https://registry.npmjs.org/@antora/expand-path-helper/-/expand-path-helper-2.0.0.tgz",
"integrity": "sha512-CSMBGC+tI21VS2kGW3PV7T2kQTM5eT3f2GTPVLttwaNYbNxDve08en/huzszHJfxo11CcEs26Ostr0F2c1QqeA=="
},
+ "@antora/file-publisher": {
+ "version": "3.0.0-beta.4",
+ "resolved": "https://registry.npmjs.org/@antora/file-publisher/-/file-publisher-3.0.0-beta.4.tgz",
+ "integrity": "sha512-62Tdh06EltPl8w6xLyE3LQkYRdW4ZZgGePpmA36r790hXct6ULPjNW+0QI/eqsgXvUSY10j1EPBE/rJFSlpcUQ==",
+ "requires": {
+ "@antora/expand-path-helper": "~2.0",
+ "@antora/user-require-helper": "~2.0",
+ "gulp-vinyl-zip": "~2.5",
+ "vinyl": "~2.2",
+ "vinyl-fs": "~3.0"
+ }
+ },
"@antora/logger": {
"version": "3.0.0-alpha.10",
"resolved": "https://registry.npmjs.org/@antora/logger/-/logger-3.0.0-alpha.10.tgz",
@@ -109,45 +121,46 @@
"vinyl": "~2.2"
}
},
- "@antora/site-generator-default": {
- "version": "3.0.0-beta.3",
- "resolved": "https://registry.npmjs.org/@antora/site-generator-default/-/site-generator-default-3.0.0-beta.3.tgz",
- "integrity": "sha512-EJkuZdZKiZ1U96rFhShSIGWbuTTXNJ/8IDC0bBNOH2gg97pM7iq2ahJG0jNJfd8nwBeZjRFKy0OrAunsTApkNQ==",
- "requires": {
- "@antora/asciidoc-loader": "3.0.0-beta.3",
- "@antora/content-aggregator": "3.0.0-beta.3",
- "@antora/content-classifier": "3.0.0-beta.3",
- "@antora/document-converter": "3.0.0-beta.3",
- "@antora/logger": "3.0.0-beta.3",
- "@antora/navigation-builder": "3.0.0-beta.3",
- "@antora/page-composer": "3.0.0-beta.3",
- "@antora/redirect-producer": "3.0.0-beta.3",
- "@antora/site-mapper": "3.0.0-beta.3",
- "@antora/site-publisher": "3.0.0-beta.3",
- "@antora/ui-loader": "3.0.0-beta.3",
+ "@antora/site-generator": {
+ "version": "3.0.0-beta.4",
+ "resolved": "https://registry.npmjs.org/@antora/site-generator/-/site-generator-3.0.0-beta.4.tgz",
+ "integrity": "sha512-iEGxIcjKYUtx1gcvNcvHQolnNODnLcrcqbY/haNXMqLu0mVuJaIxKlJrxJMO2UiH3CUdjLb8jFCzl470ytoGPw==",
+ "requires": {
+ "@antora/asciidoc-loader": "3.0.0-beta.4",
+ "@antora/content-aggregator": "3.0.0-beta.4",
+ "@antora/content-classifier": "3.0.0-beta.4",
+ "@antora/document-converter": "3.0.0-beta.4",
+ "@antora/file-publisher": "3.0.0-beta.4",
+ "@antora/logger": "3.0.0-beta.4",
+ "@antora/navigation-builder": "3.0.0-beta.4",
+ "@antora/page-composer": "3.0.0-beta.4",
+ "@antora/redirect-producer": "3.0.0-beta.4",
+ "@antora/site-mapper": "3.0.0-beta.4",
+ "@antora/ui-loader": "3.0.0-beta.4",
"@antora/user-require-helper": "~2.0"
},
"dependencies": {
"@antora/asciidoc-loader": {
- "version": "3.0.0-beta.3",
- "resolved": "https://registry.npmjs.org/@antora/asciidoc-loader/-/asciidoc-loader-3.0.0-beta.3.tgz",
- "integrity": "sha512-AqOxnj5aqpgl3oBMyzf0tGdm49CL1sNJU/qPJGZOfmeIrjk6zjKVhntOxk5RM7jW03RqrcQSsDPplQguoQyfFQ==",
+ "version": "3.0.0-beta.4",
+ "resolved": "https://registry.npmjs.org/@antora/asciidoc-loader/-/asciidoc-loader-3.0.0-beta.4.tgz",
+ "integrity": "sha512-Wg/nEZA47wcEGk51KtjIQJaSotHdwrm+m4ekC7lH36w0vHlecMSA1rQAcJw2TDgyDmhCyBkRrNPnhQ1Vy1jKwg==",
"requires": {
- "@antora/logger": "3.0.0-beta.3",
+ "@antora/logger": "3.0.0-beta.4",
"@antora/user-require-helper": "~2.0",
"@asciidoctor/core": "~2.2"
}
},
"@antora/content-aggregator": {
- "version": "3.0.0-beta.3",
- "resolved": "https://registry.npmjs.org/@antora/content-aggregator/-/content-aggregator-3.0.0-beta.3.tgz",
- "integrity": "sha512-b3gWR/aQ4ryPh6fAKqsl5IL5oTze2d4W4Y2jUuQbTALC0rB2h//F1eHvrjjP9FUOg1YDHEjW+TT5L++lN6SBJw==",
+ "version": "3.0.0-beta.4",
+ "resolved": "https://registry.npmjs.org/@antora/content-aggregator/-/content-aggregator-3.0.0-beta.4.tgz",
+ "integrity": "sha512-8aMiud8pHhvk5NEzxx2mYBc3jHMv+6Tci6G25YG9P2xQv+S5+LG2EzPP09LSHSmBPH95KpSSbsTuMrl11s96pA==",
"requires": {
"@antora/expand-path-helper": "~2.0",
"@antora/user-require-helper": "~2.0",
"braces": "~3.0",
"cache-directory": "~2.0",
"camelcase-keys": "~7.0",
+ "glob-stream": "~7.0",
"hpagent": "~0.1.0",
"isomorphic-git": "~1.10",
"js-yaml": "~4.1",
@@ -160,27 +173,27 @@
}
},
"@antora/content-classifier": {
- "version": "3.0.0-beta.3",
- "resolved": "https://registry.npmjs.org/@antora/content-classifier/-/content-classifier-3.0.0-beta.3.tgz",
- "integrity": "sha512-ORo+jxfgIOqKIfuyzkt30J33bwNDs73WOudP/koeKNFsQaNLNMAHCNjvhSdLMPui0sMSklhYyLxVJs7J0Yri/g==",
+ "version": "3.0.0-beta.4",
+ "resolved": "https://registry.npmjs.org/@antora/content-classifier/-/content-classifier-3.0.0-beta.4.tgz",
+ "integrity": "sha512-IleIsHJxIvd6p7A0IvrasJ2r5NjL89s+TRP88o1XkPnA0ehFaSW2KkS0gHyZL9qGQidKrxA3gnlblV87+GQBRA==",
"requires": {
- "@antora/logger": "3.0.0-beta.3",
+ "@antora/logger": "3.0.0-beta.4",
"mime-types": "~2.1",
"vinyl": "~2.2"
}
},
"@antora/document-converter": {
- "version": "3.0.0-beta.3",
- "resolved": "https://registry.npmjs.org/@antora/document-converter/-/document-converter-3.0.0-beta.3.tgz",
- "integrity": "sha512-LiBX9eWMu+MNI4aasqKX2YAQNGDcWawnCE6rpzNhRCJ6pQsug0UM6jtU3wimih4vZMvX9fUXL+lYSYD6m+l4lA==",
+ "version": "3.0.0-beta.4",
+ "resolved": "https://registry.npmjs.org/@antora/document-converter/-/document-converter-3.0.0-beta.4.tgz",
+ "integrity": "sha512-AGfs/L8pi1tkTpq0QxRVjaBZO+09FxI/SSQtcSla6lRtmWBpY0p5MTYtfAPK4EJEPuFU9lTb7ypvnqwe1Dum8A==",
"requires": {
- "@antora/asciidoc-loader": "3.0.0-beta.3"
+ "@antora/asciidoc-loader": "3.0.0-beta.4"
}
},
"@antora/logger": {
- "version": "3.0.0-beta.3",
- "resolved": "https://registry.npmjs.org/@antora/logger/-/logger-3.0.0-beta.3.tgz",
- "integrity": "sha512-iZGc+rTiDQ2BXsv+qUXVdffFC5HRv7nz+W9w86sU5kbXugvNmIVcHCoCPtRotnF0PwDBZQRSq6N9gu+gx1s2gA==",
+ "version": "3.0.0-beta.4",
+ "resolved": "https://registry.npmjs.org/@antora/logger/-/logger-3.0.0-beta.4.tgz",
+ "integrity": "sha512-aI8KCv4LaodT6bYQAZxJKMocdpxy6bptkfk0enf7k+KCGIE34YYu46CkvVGM1Q1Vwk88abUYwkKmBmI9/xmB2w==",
"requires": {
"@antora/expand-path-helper": "~2.0",
"pino": "~7.4",
@@ -189,68 +202,56 @@
}
},
"@antora/navigation-builder": {
- "version": "3.0.0-beta.3",
- "resolved": "https://registry.npmjs.org/@antora/navigation-builder/-/navigation-builder-3.0.0-beta.3.tgz",
- "integrity": "sha512-8pAs32bjs/8IaZeSRQHdaehOh8QF7S7TpqG9RwFy+Aqi3frq3auVNV+BYFwi+6Jgf1bbNcHexkdNXq3wNlQCtw==",
+ "version": "3.0.0-beta.4",
+ "resolved": "https://registry.npmjs.org/@antora/navigation-builder/-/navigation-builder-3.0.0-beta.4.tgz",
+ "integrity": "sha512-fe4tk8pXgX1HfbuzmkXh9LWZblXVJ1vl2hp112rN61a3pTN9iTEEvMhFLCgf0bpstdUSVJEdnGFtfYuquW2xpg==",
"requires": {
- "@antora/asciidoc-loader": "3.0.0-beta.3"
+ "@antora/asciidoc-loader": "3.0.0-beta.4"
}
},
"@antora/page-composer": {
- "version": "3.0.0-beta.3",
- "resolved": "https://registry.npmjs.org/@antora/page-composer/-/page-composer-3.0.0-beta.3.tgz",
- "integrity": "sha512-yY/aqr+4SHrJxeKEKcK8xa+2d7mMMw1uQ+Z+Gv/bvgiYV255OV415cprvc8KwlJPQ2EwuVSpw+WCk1VYLWE7QA==",
+ "version": "3.0.0-beta.4",
+ "resolved": "https://registry.npmjs.org/@antora/page-composer/-/page-composer-3.0.0-beta.4.tgz",
+ "integrity": "sha512-PtC75t9POrroPSF99GAjnMmlVbpI/O1Ed728jhxkLAJfA+tKXo7QXJvxdkfrURBxPkG1Zc/W2fxbDC1vGBYC2Q==",
"requires": {
- "@antora/logger": "3.0.0-beta.3",
+ "@antora/logger": "3.0.0-beta.4",
"handlebars": "~4.7",
"require-from-string": "~2.0"
}
},
"@antora/redirect-producer": {
- "version": "3.0.0-beta.3",
- "resolved": "https://registry.npmjs.org/@antora/redirect-producer/-/redirect-producer-3.0.0-beta.3.tgz",
- "integrity": "sha512-CT4i3TGURR7i33Q7t28Ejxg+oeBswU90LtnvKfhod1JOxEGPIHJHT0MCa8aJ7WzGdokjvfakfH+vGsCC43Vb4g==",
+ "version": "3.0.0-beta.4",
+ "resolved": "https://registry.npmjs.org/@antora/redirect-producer/-/redirect-producer-3.0.0-beta.4.tgz",
+ "integrity": "sha512-C6K1vywoCUuUFuc1PyOiVw7Mwn9c74mkb1LS3L6PbAMFbN+5wngz+KQQgCriy+uiI72YsteOz9Ae60GtcEY8tw==",
"requires": {
- "@antora/asciidoc-loader": "3.0.0-beta.3",
+ "@antora/asciidoc-loader": "3.0.0-beta.4",
"vinyl": "~2.2"
}
},
"@antora/site-mapper": {
- "version": "3.0.0-beta.3",
- "resolved": "https://registry.npmjs.org/@antora/site-mapper/-/site-mapper-3.0.0-beta.3.tgz",
- "integrity": "sha512-OhYEARy0MT/pb20dIeKVeIAWO34b3NXE/MPrnKsDSxEwKG4kk5N97LJ3jyPSEhuuCUdqXmXIp/lDR4NtoN9EGg==",
+ "version": "3.0.0-beta.4",
+ "resolved": "https://registry.npmjs.org/@antora/site-mapper/-/site-mapper-3.0.0-beta.4.tgz",
+ "integrity": "sha512-Fg5bRpBKjKCnIkVK5klbWMe/tqvdGlWG9zDIiW+K7EYHK/Q5tknToi0eCmbOPfOTQ2/WHXMuG+5TX9zZ4V6r6Q==",
"requires": {
- "@antora/content-classifier": "3.0.0-beta.3",
+ "@antora/content-classifier": "3.0.0-beta.4",
"vinyl": "~2.2"
}
},
- "@antora/site-publisher": {
- "version": "3.0.0-beta.3",
- "resolved": "https://registry.npmjs.org/@antora/site-publisher/-/site-publisher-3.0.0-beta.3.tgz",
- "integrity": "sha512-8jGhOf+jr6sk7m2eETW8y7erbuI8Q/oiJ5YLc9/Dicayx0+z6E7wzNSJk5dxjpMn6yNLomowKW4HNAlwHvJSYA==",
- "requires": {
- "@antora/expand-path-helper": "~2.0",
- "@antora/user-require-helper": "~2.0",
- "gulp-vinyl-zip": "~2.5",
- "vinyl": "~2.2",
- "vinyl-fs": "~3.0"
- }
- },
"@antora/ui-loader": {
- "version": "3.0.0-beta.3",
- "resolved": "https://registry.npmjs.org/@antora/ui-loader/-/ui-loader-3.0.0-beta.3.tgz",
- "integrity": "sha512-2NfIP6zCrMoEVJFiKhivtUbeRIDhzfHLaXTHEinv07Wq9A3BL5ivH+C+FEb7eLWG0zIDgUwCPyQR/u3YTZEiZQ==",
+ "version": "3.0.0-beta.4",
+ "resolved": "https://registry.npmjs.org/@antora/ui-loader/-/ui-loader-3.0.0-beta.4.tgz",
+ "integrity": "sha512-b8QlPgX0F9A5nDGgG05PQj2GATQci4tTYoXnxGtk1tzR8o14Bkvafh+ejR1Jmxy9cMs40VIzQdqo/oVBqsvMNw==",
"requires": {
"@antora/expand-path-helper": "~2.0",
"braces": "~3.0",
"cache-directory": "~2.0",
"camelcase-keys": "~7.0",
+ "glob-stream": "~7.0",
"gulp-vinyl-zip": "~2.5",
"hpagent": "~0.1.0",
"js-yaml": "~4.1",
"picomatch": "~2.3",
"should-proxy": "~1.0",
- "simple-concat": "~1.0",
"simple-get": "~4.0",
"vinyl": "~2.2"
}
@@ -271,6 +272,52 @@
"type-fest": "^1.2.1"
}
},
+ "glob": {
+ "version": "7.2.0",
+ "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
+ "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
+ "requires": {
+ "fs.realpath": "^1.0.0",
+ "inflight": "^1.0.4",
+ "inherits": "2",
+ "minimatch": "^3.0.4",
+ "once": "^1.3.0",
+ "path-is-absolute": "^1.0.0"
+ }
+ },
+ "glob-parent": {
+ "version": "6.0.2",
+ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+ "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+ "requires": {
+ "is-glob": "^4.0.3"
+ }
+ },
+ "glob-stream": {
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-7.0.0.tgz",
+ "integrity": "sha512-evR4kvr6s0Yo5t4CD4H171n4T8XcnPFznvsbeN8K9FPzc0Q0wYqcOWyGtck2qcvJSLXKnU6DnDyfmbDDabYvRQ==",
+ "requires": {
+ "extend": "^3.0.2",
+ "glob": "^7.2.0",
+ "glob-parent": "^6.0.2",
+ "is-negated-glob": "^1.0.0",
+ "ordered-read-streams": "^1.0.1",
+ "pumpify": "^2.0.1",
+ "readable-stream": "^3.6.0",
+ "remove-trailing-separator": "^1.1.0",
+ "to-absolute-glob": "^2.0.2",
+ "unique-stream": "^2.3.1"
+ }
+ },
+ "is-glob": {
+ "version": "4.0.3",
+ "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+ "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+ "requires": {
+ "is-extglob": "^2.1.1"
+ }
+ },
"pino": {
"version": "7.4.1",
"resolved": "https://registry.npmjs.org/pino/-/pino-7.4.1.tgz",
@@ -322,6 +369,16 @@
"resolved": "https://registry.npmjs.org/pino-std-serializers/-/pino-std-serializers-4.0.0.tgz",
"integrity": "sha512-cK0pekc1Kjy5w9V2/n+8MkZwusa6EyyxfeQCB799CQRhRt/CqYKiWs5adeu8Shve2ZNffvfC/7J64A2PJo1W/Q=="
},
+ "pumpify": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-2.0.1.tgz",
+ "integrity": "sha512-m7KOje7jZxrmutanlkS1daj1dS6z6BgslzOXmcSEpIlCxM3VJH7lG5QLeck/6hgF6F4crFf01UtQmNsJfweTAw==",
+ "requires": {
+ "duplexify": "^4.1.1",
+ "inherits": "^2.0.3",
+ "pump": "^3.0.0"
+ }
+ },
"quick-lru": {
"version": "5.1.1",
"resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz",
@@ -342,6 +399,14 @@
}
}
},
+ "@antora/site-generator-default": {
+ "version": "3.0.0-beta.4",
+ "resolved": "https://registry.npmjs.org/@antora/site-generator-default/-/site-generator-default-3.0.0-beta.4.tgz",
+ "integrity": "sha512-I+gcMTeNtJSVGZQqiwEun2QukOzwoBwpiCKqT8AsfbReG042kCUXFT5ep0u8A/9h4s6Fv3bBHz0+MqZk73UlmQ==",
+ "requires": {
+ "@antora/site-generator": "3.0.0-beta.4"
+ }
+ },
"@antora/site-mapper": {
"version": "3.0.0-alpha.10",
"resolved": "https://registry.npmjs.org/@antora/site-mapper/-/site-mapper-3.0.0-alpha.10.tgz",