This is an automated email from the ASF dual-hosted git repository.
cwylie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/druid.git
The following commit(s) were added to refs/heads/master by this push:
new ebea73d fix website build (#10172)
ebea73d is described below
commit ebea73d0817d8679aa6b183e9b5142272288138b
Author: Clint Wylie <[email protected]>
AuthorDate: Sat Jul 11 22:01:43 2020 -0700
fix website build (#10172)
* fix mvn website build to use mvn supplied nodejs, fix broken redirects,
move block from custom.css to custom.scss so will be correctly generated
* sidebar
* fix lol
---
website/i18n/en.json | 3 +++
website/pom.xml | 2 ++
website/redirects.json | 8 ++++----
website/scss/custom.scss | 9 +++++++++
website/sidebars.json | 6 ++++--
website/static/css/custom.css | 3 +--
6 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/website/i18n/en.json b/website/i18n/en.json
index 6c40a61..6feceaf 100644
--- a/website/i18n/en.json
+++ b/website/i18n/en.json
@@ -89,6 +89,9 @@
"development/experimental": {
"title": "Experimental features"
},
+ "development/extensions-contrib/aliyun-oss": {
+ "title": "Aliyun OSS"
+ },
"development/extensions-contrib/ambari-metrics-emitter": {
"title": "Ambari Metrics Emitter"
},
diff --git a/website/pom.xml b/website/pom.xml
index 06dbdd2..b5857be 100644
--- a/website/pom.xml
+++ b/website/pom.xml
@@ -82,6 +82,7 @@
<goal>exec</goal>
</goals>
<configuration>
+
<environmentVariables><PATH>${project.build.directory}/node:${env.PATH}</PATH></environmentVariables>
<executable>script/build-to-docs</executable>
<arguments>
<argument>${website.version}</argument>
@@ -97,6 +98,7 @@
<goal>exec</goal>
</goals>
<configuration>
+
<environmentVariables><PATH>${project.build.directory}/node:${env.PATH}</PATH></environmentVariables>
<executable>script/build-to-docs</executable>
<arguments>
<argument>latest</argument>
diff --git a/website/redirects.json b/website/redirects.json
index 3eaf352..6435eab 100644
--- a/website/redirects.json
+++ b/website/redirects.json
@@ -32,7 +32,7 @@
{"source": "Evaluate.html", "target": "tutorials/cluster.html"}
{"source": "Examples.html", "target": "tutorials/index.html"}
{"source": "Filters.html", "target": "querying/filters.html"}
-{"source": "Firehose.html", "target": "ingestion/native-batch.html#firehoses"}
+{"source": "Firehose.html", "target":
"ingestion/native-batch.html#firehoses-deprecated"}
{"source": "GeographicQueries.html", "target": "development/geo.html"}
{"source": "Granularities.html", "target": "querying/granularities.html"}
{"source": "GroupByQuery.html", "target": "querying/groupbyquery.html"}
@@ -47,7 +47,7 @@
{"source": "Ingestion-FAQ.html", "target": "ingestion/faq.html"}
{"source": "Ingestion-overview.html", "target": "tutorials/index.html"}
{"source": "Ingestion.html", "target": "ingestion/index.html"}
-{"source": "Integrating-Druid-With-Other-Technologies.html", "target":
"development/integrating-druid-with-other-technologies.html"}
+{"source": "Integrating-Druid-With-Other-Technologies.html", "target":
"ingestion/index.html"}
{"source": "Kafka-Eight.html", "target":
"development/extensions-core/kafka-ingestion.html"}
{"source": "Libraries.html", "target": "/libraries.html"}
{"source": "LimitSpec.html", "target": "querying/limitspec.html"}
@@ -73,7 +73,7 @@
{"source": "Realtime-Config.html", "target":
"ingestion/standalone-realtime.html"}
{"source": "Realtime-ingestion.html", "target": "ingestion/index.html"}
{"source": "Realtime.html", "target": "ingestion/standalone-realtime.html"}
-{"source": "Recommendations.html", "target": "operations/recommendations.html"}
+{"source": "Recommendations.html", "target":
"operations/basic-cluster-tuning.html"}
{"source": "Rolling-Updates.html", "target": "operations/rolling-updates.html"}
{"source": "Router.html", "target": "design/router.html"}
{"source": "Rule-Configuration.html", "target":
"operations/rule-configuration.html"}
@@ -159,7 +159,7 @@
{"source": "ingestion/command-line-hadoop-indexer.html", "target":
"hadoop.html#cli"}
{"source": "ingestion/compaction.html", "target":
"data-management.html#compact"}
{"source": "ingestion/delete-data.html", "target":
"data-management.html#delete"}
-{"source": "ingestion/firehose.html", "target": "native-batch.html#firehoses"}
+{"source": "ingestion/firehose.html", "target":
"native-batch.html#firehoses-deprecated"}
{"source": "ingestion/flatten-json.html", "target": "index.html#flattenspec"}
{"source": "ingestion/hadoop-vs-native-batch.html", "target":
"index.html#batch"}
{"source": "ingestion/ingestion-spec.html", "target": "index.html#spec"}
diff --git a/website/scss/custom.scss b/website/scss/custom.scss
index c8ad7bd..3564298 100644
--- a/website/scss/custom.scss
+++ b/website/scss/custom.scss
@@ -110,3 +110,12 @@ footer.druid-footer {
.navGroups > .navGroup:last-child {
display: none;
}
+
+/* testing inline images */
+article p img,
+article iframe {
+ display: inline;
+ margin-left: auto;
+ margin-right: auto;
+ max-width: 100%;
+}
diff --git a/website/sidebars.json b/website/sidebars.json
index c3d18d0..f3e1f61 100644
--- a/website/sidebars.json
+++ b/website/sidebars.json
@@ -188,6 +188,7 @@
"development/extensions-core/lookups-cached-global",
"development/extensions-core/mysql",
"development/extensions-core/orc",
+ "development/extensions-core/druid-pac4j",
"development/extensions-core/parquet",
"development/extensions-core/postgresql",
"development/extensions-core/protobuf",
@@ -200,8 +201,6 @@
"development/extensions-contrib/cloudfiles",
"development/extensions-contrib/distinctcount",
"development/extensions-contrib/graphite",
- "querying/hll-old",
- "querying/select-query",
"development/extensions-contrib/influx",
"development/extensions-contrib/influxdb-emitter",
"development/extensions-contrib/kafka-emitter",
@@ -216,6 +215,9 @@
"development/extensions-contrib/thrift",
"development/extensions-contrib/time-min-max",
"development/extensions-contrib/gce-extensions",
+ "development/extensions-contrib/aliyun-oss",
+ "querying/hll-old",
+ "querying/select-query",
"ingestion/standalone-realtime"
]
}
diff --git a/website/static/css/custom.css b/website/static/css/custom.css
index 160f3b4..76be31f 100644
--- a/website/static/css/custom.css
+++ b/website/static/css/custom.css
@@ -90,5 +90,4 @@ article iframe {
display: inline;
margin-left: auto;
margin-right: auto;
- max-width: 100%;
-}
+ max-width: 100%; }
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
