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/12 19:26:53 UTC

[solr] 01/02: Bump Antora version to 3.0.0-rc.2

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

commit 84d3ae138ed657feac1dc36ff0b93145d869f928
Author: Cassandra Targett <ct...@apache.org>
AuthorDate: Wed Dec 8 11:57:02 2021 -0600

    Bump Antora version to 3.0.0-rc.2
---
 solr/solr-ref-guide/build.gradle      |   3 +-
 solr/solr-ref-guide/package-lock.json | 319 +++++++++++++++++++++++++++++++++-
 solr/solr-ref-guide/ui/.gitlab-ci.yml |  55 ------
 3 files changed, 316 insertions(+), 61 deletions(-)

diff --git a/solr/solr-ref-guide/build.gradle b/solr/solr-ref-guide/build.gradle
index fa2762e..46b704f 100644
--- a/solr/solr-ref-guide/build.gradle
+++ b/solr/solr-ref-guide/build.gradle
@@ -295,6 +295,5 @@ abstract class PrepareSources extends DefaultTask {
 
 antora {
   playbookFile = file("playbook.yml")
-  antoraVersion = "3.0.0-beta.4"
-  arguments = ["--generator @antora/site-generator"]
+  antoraVersion = "3.0.0-rc.2"
 }
diff --git a/solr/solr-ref-guide/package-lock.json b/solr/solr-ref-guide/package-lock.json
index 3417ec1..1f08935 100644
--- a/solr/solr-ref-guide/package-lock.json
+++ b/solr/solr-ref-guide/package-lock.json
@@ -400,11 +400,322 @@
       }
     },
     "@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==",
+      "version": "3.0.0-rc.2",
+      "resolved": "https://registry.npmjs.org/@antora/site-generator-default/-/site-generator-default-3.0.0-rc.2.tgz",
+      "integrity": "sha512-l8qkPNQSgTEJgiw4/qB5mTYQoMYYbUQ9toXBhw6vrBaB3qq3OQ9veWTwgx/QGdUVDWmJbB5CyiPSFa669mFiEQ==",
       "requires": {
-        "@antora/site-generator": "3.0.0-beta.4"
+        "@antora/site-generator": "3.0.0-rc.2"
+      },
+      "dependencies": {
+        "@antora/asciidoc-loader": {
+          "version": "3.0.0-rc.2",
+          "resolved": "https://registry.npmjs.org/@antora/asciidoc-loader/-/asciidoc-loader-3.0.0-rc.2.tgz",
+          "integrity": "sha512-9IwlelJf+wSKuUVg2SpiZ5Fh8mDEhQDLvwSvGOBEWJshNI9jEpAkynTIckpYT3StXAsDZbjCY8TK8ppuHR6pyg==",
+          "requires": {
+            "@antora/logger": "3.0.0-rc.2",
+            "@antora/user-require-helper": "~2.0",
+            "@asciidoctor/core": "~2.2"
+          }
+        },
+        "@antora/content-aggregator": {
+          "version": "3.0.0-rc.2",
+          "resolved": "https://registry.npmjs.org/@antora/content-aggregator/-/content-aggregator-3.0.0-rc.2.tgz",
+          "integrity": "sha512-PuHGPdqMt+p1P/eIfyHW/A9L/Z9crIEVGl6ZeYgY1vlK4eQbXY4zZY3cIQBQreJQ30Wi8jncpzg8vk8HNtDRuw==",
+          "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",
+            "multi-progress": "~4.0",
+            "picomatch": "~2.3",
+            "progress": "~2.0",
+            "should-proxy": "~1.0",
+            "simple-get": "~4.0",
+            "vinyl": "~2.2"
+          }
+        },
+        "@antora/content-classifier": {
+          "version": "3.0.0-rc.2",
+          "resolved": "https://registry.npmjs.org/@antora/content-classifier/-/content-classifier-3.0.0-rc.2.tgz",
+          "integrity": "sha512-5VFQYkuWdmJZQxLsRPDGzPhu5bkQH0wYR89NfjhYaqWj9xrMLUzvdCHgkovfraCgiS1M9702IbrjAzIriWoyzg==",
+          "requires": {
+            "@antora/logger": "3.0.0-rc.2",
+            "mime-types": "~2.1",
+            "vinyl": "~2.2"
+          }
+        },
+        "@antora/document-converter": {
+          "version": "3.0.0-rc.2",
+          "resolved": "https://registry.npmjs.org/@antora/document-converter/-/document-converter-3.0.0-rc.2.tgz",
+          "integrity": "sha512-Y1vHgZcnxPeTNwsi12vMWu9/pSrGUAciw46jrOAF2bodJx2eO7DZo4i4bdDME/zHEpkAlbafq+P2Ag/Z800KaA==",
+          "requires": {
+            "@antora/asciidoc-loader": "3.0.0-rc.2"
+          }
+        },
+        "@antora/file-publisher": {
+          "version": "3.0.0-rc.2",
+          "resolved": "https://registry.npmjs.org/@antora/file-publisher/-/file-publisher-3.0.0-rc.2.tgz",
+          "integrity": "sha512-1mAH+iCyutabnomqODyJS6RKrg2ips8xfrSHKGwejf+5Xrj9Ersei8C38nohZ8lCA0lzVQWIsh8IGzRntv7uGQ==",
+          "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-rc.2",
+          "resolved": "https://registry.npmjs.org/@antora/logger/-/logger-3.0.0-rc.2.tgz",
+          "integrity": "sha512-LiYtFKcEpPGdeRqgplCqyMvLrqsGhR1d2l0XBUiBglfx/FCCzVcfHFeoBDd5lpwWzn0OUoZ9wUoK1JEF7lj1/g==",
+          "requires": {
+            "@antora/expand-path-helper": "~2.0",
+            "pino": "~7.5",
+            "pino-pretty": "~7.2",
+            "sonic-boom": "~2.4"
+          }
+        },
+        "@antora/navigation-builder": {
+          "version": "3.0.0-rc.2",
+          "resolved": "https://registry.npmjs.org/@antora/navigation-builder/-/navigation-builder-3.0.0-rc.2.tgz",
+          "integrity": "sha512-S8WJ3+avXB5gBXt/TIqLuZmsRAqeb0GrZKshhxpaiTeXoaT0q9K2fN2Tz4jgAxvlo7dgOI6sze+p2xxahqQGmg==",
+          "requires": {
+            "@antora/asciidoc-loader": "3.0.0-rc.2"
+          }
+        },
+        "@antora/page-composer": {
+          "version": "3.0.0-rc.2",
+          "resolved": "https://registry.npmjs.org/@antora/page-composer/-/page-composer-3.0.0-rc.2.tgz",
+          "integrity": "sha512-Qp0h173IAqsjnNjsPWR5qNG/et2DhJRbAcZ1Cegoe4xHhDIDAfbdYnpKX0u6/uUhwPiaH0KLQcvKdVycNZMqQA==",
+          "requires": {
+            "@antora/logger": "3.0.0-rc.2",
+            "handlebars": "~4.7",
+            "require-from-string": "~2.0"
+          }
+        },
+        "@antora/playbook-builder": {
+          "version": "3.0.0-rc.2",
+          "resolved": "https://registry.npmjs.org/@antora/playbook-builder/-/playbook-builder-3.0.0-rc.2.tgz",
+          "integrity": "sha512-lPPBbQrTXr0NQUaTVObWyQIhjTLhJ6xYnLEd9Lq5jGi8uDF3YtfCokoSpcGEfXvScH/rIvmEMGdT3mzbs7l+Lw==",
+          "requires": {
+            "@iarna/toml": "~2.2",
+            "camelcase-keys": "~7.0",
+            "convict": "~6.2",
+            "js-yaml": "~4.1",
+            "json5": "~2.2"
+          }
+        },
+        "@antora/redirect-producer": {
+          "version": "3.0.0-rc.2",
+          "resolved": "https://registry.npmjs.org/@antora/redirect-producer/-/redirect-producer-3.0.0-rc.2.tgz",
+          "integrity": "sha512-brGc0brI+UE2ycoTQc+z/AaY7bn0WRbNJRJRS1ZrCwKY+Q40txgF6zZYpqk/8IoEwu9H7zNyu/pEb7tA1rippw==",
+          "requires": {
+            "vinyl": "~2.2"
+          }
+        },
+        "@antora/site-generator": {
+          "version": "3.0.0-rc.2",
+          "resolved": "https://registry.npmjs.org/@antora/site-generator/-/site-generator-3.0.0-rc.2.tgz",
+          "integrity": "sha512-q1aNqnz1RkZM2YBsBjjqAiSaAapprGdRloKIjhfO7azWIo+YGvGIwEbpIwFeJxugQRlEK8lgTmbZ2WTdJspHSQ==",
+          "requires": {
+            "@antora/asciidoc-loader": "3.0.0-rc.2",
+            "@antora/content-aggregator": "3.0.0-rc.2",
+            "@antora/content-classifier": "3.0.0-rc.2",
+            "@antora/document-converter": "3.0.0-rc.2",
+            "@antora/file-publisher": "3.0.0-rc.2",
+            "@antora/logger": "3.0.0-rc.2",
+            "@antora/navigation-builder": "3.0.0-rc.2",
+            "@antora/page-composer": "3.0.0-rc.2",
+            "@antora/playbook-builder": "3.0.0-rc.2",
+            "@antora/redirect-producer": "3.0.0-rc.2",
+            "@antora/site-mapper": "3.0.0-rc.2",
+            "@antora/site-publisher": "3.0.0-rc.2",
+            "@antora/ui-loader": "3.0.0-rc.2",
+            "@antora/user-require-helper": "~2.0"
+          }
+        },
+        "@antora/site-mapper": {
+          "version": "3.0.0-rc.2",
+          "resolved": "https://registry.npmjs.org/@antora/site-mapper/-/site-mapper-3.0.0-rc.2.tgz",
+          "integrity": "sha512-EWeXFKHMSZvGFWfoSVBAiYejriXMj8NK+M9sDNrl/H1+sAbyAIHMD/gJWnejCyULT/NMWb7tgV7OBYwBcbd8Wg==",
+          "requires": {
+            "@antora/content-classifier": "3.0.0-rc.2",
+            "vinyl": "~2.2"
+          }
+        },
+        "@antora/site-publisher": {
+          "version": "3.0.0-rc.2",
+          "resolved": "https://registry.npmjs.org/@antora/site-publisher/-/site-publisher-3.0.0-rc.2.tgz",
+          "integrity": "sha512-AxBGAnvQT1n0ttXZLvUO2h+8WbNZnVNjxlmAt0sG3zA39CbFXhO1+R4BAPsH9y/3uuPIMWRqblSjgQZk8Pmt3g==",
+          "requires": {
+            "@antora/file-publisher": "3.0.0-rc.2"
+          }
+        },
+        "@antora/ui-loader": {
+          "version": "3.0.0-rc.2",
+          "resolved": "https://registry.npmjs.org/@antora/ui-loader/-/ui-loader-3.0.0-rc.2.tgz",
+          "integrity": "sha512-Ej1HrNjnLtp7TBUXqgZzlN6fOBYGZJbqyOsvkIqW49uCWoY7dgI5njTJQrTAaBESjYAh3+57dJNNhwXPAzPIMQ==",
+          "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-get": "~4.0",
+            "vinyl": "~2.2"
+          }
+        },
+        "camelcase": {
+          "version": "6.2.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.1.tgz",
+          "integrity": "sha512-tVI4q5jjFV5CavAU8DXfza/TJcZutVKo/5Foskmsqcm0MsL91moHvwiGNnqaa2o6PF/7yT5ikDRcVcl8Rj6LCA=="
+        },
+        "camelcase-keys": {
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-7.0.1.tgz",
+          "integrity": "sha512-P331lEls98pW8JLyodNWfzuz91BEDVA4VpW2/SwXnyv2K495tq1N777xzDbFgnEigfA7UIY0xa6PwR/H9jijjA==",
+          "requires": {
+            "camelcase": "^6.2.0",
+            "map-obj": "^4.1.0",
+            "quick-lru": "^5.1.1",
+            "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.5.1",
+          "resolved": "https://registry.npmjs.org/pino/-/pino-7.5.1.tgz",
+          "integrity": "sha512-Wzo2G7CLaRHKOz3+Ex006LC5Xi0xEUm+mwm/h0NKzuKZONdekcbmjXg7vWDoO8hVTGX+1RuUy2fwlzvZ24EI5A==",
+          "requires": {
+            "fast-redact": "^3.0.0",
+            "fastify-warning": "^0.2.0",
+            "get-caller-file": "^2.0.5",
+            "on-exit-leak-free": "^0.2.0",
+            "pino-abstract-transport": "v0.5.0",
+            "pino-std-serializers": "^4.0.0",
+            "quick-format-unescaped": "^4.0.3",
+            "real-require": "^0.1.0",
+            "safe-stable-stringify": "^2.1.0",
+            "sonic-boom": "^2.2.1",
+            "thread-stream": "^0.13.0"
+          }
+        },
+        "pino-abstract-transport": {
+          "version": "0.5.0",
+          "resolved": "https://registry.npmjs.org/pino-abstract-transport/-/pino-abstract-transport-0.5.0.tgz",
+          "integrity": "sha512-+KAgmVeqXYbTtU2FScx1XS3kNyfZ5TrXY07V96QnUSFqo2gAqlvmaxH67Lj7SWazqsMabf+58ctdTcBgnOLUOQ==",
+          "requires": {
+            "duplexify": "^4.1.2",
+            "split2": "^4.0.0"
+          }
+        },
+        "pino-pretty": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/pino-pretty/-/pino-pretty-7.2.0.tgz",
+          "integrity": "sha512-pkZhaF1JiyQt4BRqkLANYWuZTxavmuXh3OHsb8goeQasTFgNdzOECXkZWyPYrA0YMRa8zKoVsCzeYz9lI2NYwA==",
+          "requires": {
+            "args": "^5.0.1",
+            "colorette": "^2.0.7",
+            "dateformat": "^4.6.3",
+            "fast-safe-stringify": "^2.0.7",
+            "joycon": "^3.0.0",
+            "pino-abstract-transport": "^0.5.0",
+            "pump": "^3.0.0",
+            "readable-stream": "^3.6.0",
+            "rfdc": "^1.3.0",
+            "secure-json-parse": "^2.4.0",
+            "sonic-boom": "^2.2.0",
+            "strip-json-comments": "^3.1.1"
+          }
+        },
+        "pino-std-serializers": {
+          "version": "4.0.0",
+          "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",
+          "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA=="
+        },
+        "sonic-boom": {
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/sonic-boom/-/sonic-boom-2.4.1.tgz",
+          "integrity": "sha512-WgtVLfGl347/zS1oTuLaOAvVD5zijgjphAJHgbbnBJGgexnr+C1ULSj0j7ftoGxpuxR4PaV635NkwFemG8m/5w==",
+          "requires": {
+            "atomic-sleep": "^1.0.0"
+          }
+        },
+        "split2": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/split2/-/split2-4.1.0.tgz",
+          "integrity": "sha512-VBiJxFkxiXRlUIeyMQi8s4hgvKCSjtknJv/LVYbrgALPwf5zSKmEwV9Lst25AkvMDnvxODugjdl6KZgwKM1WYQ=="
+        }
       }
     },
     "@antora/site-mapper": {
diff --git a/solr/solr-ref-guide/ui/.gitlab-ci.yml b/solr/solr-ref-guide/ui/.gitlab-ci.yml
deleted file mode 100644
index b183e33..0000000
--- a/solr/solr-ref-guide/ui/.gitlab-ci.yml
+++ /dev/null
@@ -1,55 +0,0 @@
-image: node:10.14.2-stretch
-stages: [setup, verify, deploy]
-install:
-  stage: setup
-  cache:
-    paths:
-    - .cache/npm
-  script:
-  - &npm_install
-    npm install --quiet --no-progress --cache=.cache/npm
-lint:
-  stage: verify
-  cache: &pull_cache
-    policy: pull
-    paths:
-    - .cache/npm
-  script:
-  - *npm_install
-  - node_modules/.bin/gulp lint
-bundle-stable:
-  stage: deploy
-  only:
-  - master@antora/antora-ui-default
-  cache: *pull_cache
-  script:
-  - *npm_install
-  - node_modules/.bin/gulp bundle
-  artifacts:
-    paths:
-    - build/ui-bundle.zip
-bundle-dev:
-  stage: deploy
-  except:
-  - master
-  cache: *pull_cache
-  script:
-  - *npm_install
-  - node_modules/.bin/gulp bundle
-  artifacts:
-    expire_in: 1 day # unless marked as keep from job page
-    paths:
-    - build/ui-bundle.zip
-pages:
-  stage: deploy
-  only:
-  - master@antora/antora-ui-default
-  cache: *pull_cache
-  script:
-  - *npm_install
-  - node_modules/.bin/gulp preview:build
-  # FIXME figure out a way to avoid copying these files to preview site
-  - rm -rf public/_/{helpers,layouts,partials}
-  artifacts:
-    paths:
-    - public