This is an automated email from the ASF dual-hosted git repository. djencks pushed a commit to branch 2.4.x in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 4b89e18d18d8cad975cbea213af23b55f16f9334 Author: David Jencks <djen...@apache.org> AuthorDate: Tue Dec 14 16:49:12 2021 -0800 local build setup fix tooling enough so it doesn't break build --- docs/antora-playbook-dev.yml | 62 ---------------------- docs/antora-playbook.yml | 80 ----------------------------- docs/local-build.sh | 37 +++++++++++++ docs/pom.xml | 74 +++++++++++++------------- docs/source-map.yml | 25 +++++++++ docs/source-watch.yml | 33 ++++++++++++ tooling/scripts/update-antora-config.groovy | 2 - 7 files changed, 132 insertions(+), 181 deletions(-) diff --git a/docs/antora-playbook-dev.yml b/docs/antora-playbook-dev.yml deleted file mode 100644 index d4ab0d0..0000000 --- a/docs/antora-playbook-dev.yml +++ /dev/null @@ -1,62 +0,0 @@ -# -# 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. -# - -site: - title: Apache Camel extensions for Quarkus - url: https://camel.apache.org - start_page: camel-quarkus::index.adoc -content: - sources: - - url: ./../ - branches: HEAD - start_path: docs - - url: g...@github.com:apache/camel.git - branches: - - camel-3.12.x # replace ${camel.docs.branch} - start_paths: - - docs/components - - url: g...@github.com:apache/camel.git - branches: - - main - start_paths: - - docs/user-manual - - docs/components - - core/camel-core-engine/src/main/docs - branches: HEAD - start_path: docs/components - #- url: ./../../camel-quarkus-examples - - url: g...@github.com:apache/camel-quarkus-examples.git - branches: HEAD - start_path: docs - - url: g...@github.com:apache/camel-spring-boot.git - branches: main - start_path: docs - -asciidoc: - extensions: - - "@djencks/asciidoctor-antora-indexer" - attributes: - eip-vc: latest@components - -ui: - bundle: - url: https://gitlab.com/antora/antora-ui-default/-/jobs/artifacts/master/raw/build/ui-bundle.zip?job=bundle-stable - snapshot: true -output: - dir: ./target/site -urls: - redirect_facility: httpd diff --git a/docs/antora-playbook.yml b/docs/antora-playbook.yml deleted file mode 100644 index 82acd50..0000000 --- a/docs/antora-playbook.yml +++ /dev/null @@ -1,80 +0,0 @@ -# -# 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. -# - -site: - title: Apache Camel extensions for Quarkus - url: https://camel.apache.org - start_page: camel-quarkus::index.adoc - -content: - sources: - - url: ./../ - branches: HEAD - start_path: docs - - - url: https://github.com/apache/camel-quarkus-examples.git - branches: main - start_path: docs - -# The version/branch of main camel 'components' this version of camel-quarkus uses - - url: https://github.com/apache/camel.git - branches: - - camel-3.12.x # replace ${camel.docs.branch} - start_paths: - # eip - - core/camel-core-engine/src/main/docs - # main components doc - - docs/components - -# There is only one version of the user manual - - url: https://github.com/apache/camel.git - branches: - - main - start_paths: - - docs/user-manual - -# The camel-spring-boot version corresponding to the main camel 'components' version/branch - - url: https://github.com/apache/camel-spring-boot.git - branches: - - camel-spring-boot-3.12.x # replace ${camel.sb.docs.branch} - start_path: docs/components - -asciidoc: - attributes: - requires@: "'util=util/jsonpath-util.js'" - -ui: - bundle: - url: https://gitlab.com/antora/antora-ui-default/-/jobs/artifacts/master/raw/build/ui-bundle.zip?job=bundle-stable - snapshot: true - -output: - dir: ./target/site - -urls: - redirect_facility: httpd - -runtime: - log: - level: warn - failure_level: warn - -pipeline: - extensions: - - require: '@djencks/asciidoctor-jsonpath' - - require: '@djencks/asciidoctor-antora-indexer' - diff --git a/docs/local-build.sh b/docs/local-build.sh new file mode 100755 index 0000000..eca2e14 --- /dev/null +++ b/docs/local-build.sh @@ -0,0 +1,37 @@ +#!/bin/sh + +# +# 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. +# + +CW=./../../camel-website +LOCAL=./../camel-quarkus + +cd $CW || (echo 'camel-website not in expected location $CW' && exit) +cp antora-playbook.yml local-antora-playbook-full.yml +cat $LOCAL/docs/source-map.yml >> local-antora-playbook-full.yml +cat playbook-patch-full.yml >> local-antora-playbook-full.yml + +cp antora-playbook.yml local-antora-playbook-partial.yml +cat $LOCAL/docs/source-map.yml >> local-antora-playbook-partial.yml +cat $LOCAL/docs/source-watch.yml >> local-antora-playbook-partial.yml + +if [ "$1" = "full" ] || [ "$1" = "1" ] +then + yarn build:antora-local-full +else + yarn build:antora-local-partial +fi \ No newline at end of file diff --git a/docs/pom.xml b/docs/pom.xml index 5bc88be9..f674437 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -85,43 +85,43 @@ </activation> <build> <plugins> - <plugin> - <groupId>com.github.eirslett</groupId> - <artifactId>frontend-maven-plugin</artifactId> - <version>${frontend-maven-plugin.version}</version> - <executions> - <execution> - <id>install node and yarn</id> - <goals> - <goal>install-node-and-yarn</goal> - </goals> - <configuration> - <nodeVersion>v14.16.0</nodeVersion> - <yarnVersion>v2.4.1</yarnVersion> - </configuration> - </execution> - <execution> - <id>yarn install</id> - <goals> - <goal>yarn</goal> - </goals> - <phase>verify</phase> - <configuration> - <arguments>install</arguments> - </configuration> - </execution> - <execution> - <id>antora-xref-check</id> - <goals> - <goal>yarn</goal> - </goals> - <phase>verify</phase> - <configuration> - <arguments>run checks</arguments> - </configuration> - </execution> - </executions> - </plugin> +<!-- <plugin>--> +<!-- <groupId>com.github.eirslett</groupId>--> +<!-- <artifactId>frontend-maven-plugin</artifactId>--> +<!-- <version>${frontend-maven-plugin.version}</version>--> +<!-- <executions>--> +<!-- <execution>--> +<!-- <id>install node and yarn</id>--> +<!-- <goals>--> +<!-- <goal>install-node-and-yarn</goal>--> +<!-- </goals>--> +<!-- <configuration>--> +<!-- <nodeVersion>v14.16.0</nodeVersion>--> +<!-- <yarnVersion>v2.4.1</yarnVersion>--> +<!-- </configuration>--> +<!-- </execution>--> +<!-- <execution>--> +<!-- <id>yarn install</id>--> +<!-- <goals>--> +<!-- <goal>yarn</goal>--> +<!-- </goals>--> +<!-- <phase>verify</phase>--> +<!-- <configuration>--> +<!-- <arguments>install</arguments>--> +<!-- </configuration>--> +<!-- </execution>--> +<!-- <execution>--> +<!-- <id>antora-xref-check</id>--> +<!-- <goals>--> +<!-- <goal>yarn</goal>--> +<!-- </goals>--> +<!-- <phase>verify</phase>--> +<!-- <configuration>--> +<!-- <arguments>run checks</arguments>--> +<!-- </configuration>--> +<!-- </execution>--> +<!-- </executions>--> +<!-- </plugin>--> </plugins> </build> </profile> diff --git a/docs/source-map.yml b/docs/source-map.yml new file mode 100644 index 0000000..fa28a52 --- /dev/null +++ b/docs/source-map.yml @@ -0,0 +1,25 @@ +# +# 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. +# + + - require: '@djencks/antora-source-map' +# log_level: trace + source-map: + - url: 'https://github.com/apache/camel-quarkus.git' + mapped-url: './../camel-quarkus' + branches: + - branch: 2.4.x + mapped-branch: HEAD diff --git a/docs/source-watch.yml b/docs/source-watch.yml new file mode 100644 index 0000000..0c10d6e --- /dev/null +++ b/docs/source-watch.yml @@ -0,0 +1,33 @@ +# +# 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. +# + + - require: '@djencks/antora-source-watch' +# log_level: trace + sources: + - url: ./../camel-quarkus + - url: https://github.com/apache/camel-quarkus-examples.git + + - require: "@djencks/antora-site-manifest" + import-manifests: + - primary-site-manifest-url: ./documentation/site-manifest.json + partial-components: true + local-urls: true + + - require: '@djencks/antora-timer' + log_level: info + + generator: '@djencks/antora-source-watch' \ No newline at end of file diff --git a/tooling/scripts/update-antora-config.groovy b/tooling/scripts/update-antora-config.groovy index cceb873..b2104c1 100644 --- a/tooling/scripts/update-antora-config.groovy +++ b/tooling/scripts/update-antora-config.groovy @@ -30,8 +30,6 @@ import java.util.regex.Matcher final Path treeRootDir = Paths.get(properties['maven.multiModuleProjectDirectory']) final List<Path> replaceInFiles = [ - treeRootDir.resolve('docs/antora-playbook.yml'), - treeRootDir.resolve('docs/antora-playbook-dev.yml'), treeRootDir.resolve('docs/antora.yml') ] as List