From 38b39075f5d14bd77970394cbb9da35becad24da Mon Sep 17 00:00:00 2001 From: David Jencks Date: Sun, 24 Oct 2021 21:26:54 -0700 Subject: [PATCH] Parameterize link to camel-k version. Fix the kamelets index page display --- docs/antora.yml | 22 ++++++++++++++++++++++ docs/modules/ROOT/pages/index.adoc | 6 ++---- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/docs/antora.yml b/docs/antora.yml index a01e301ec..763c6010a 100644 --- a/docs/antora.yml +++ b/docs/antora.yml @@ -1,3 +1,20 @@ +# +# 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. +# + name: camel-kamelets title: Kamelet Catalog version: next @@ -6,3 +23,8 @@ display-version: Next (Pre-release) nav: - modules/ROOT/nav.adoc + +# Update to appropriate released camel-k version on release +asciidoc: + attributes: + camel-k-version: next diff --git a/docs/modules/ROOT/pages/index.adoc b/docs/modules/ROOT/pages/index.adoc index 1462a7d1e..d2a0199fb 100644 --- a/docs/modules/ROOT/pages/index.adoc +++ b/docs/modules/ROOT/pages/index.adoc @@ -1,12 +1,10 @@ = Kamelet Catalog This page contains the default Apache Camel Kamelets catalog. -**We love contributions for this catalog**: you can follow the xref:next@camel-k::kamelets/kamelets-dev.adoc[Kamelets Developer Guide] +**We love contributions for this catalog**: you can follow the xref:{camel-k-version}@camel-k::kamelets/kamelets-dev.adoc[Kamelets Developer Guide] for information on how to create new Kamelets and contribute them to the official https://github.com/apache/camel-kamelets/[github.com/apache/camel-kamelets] repository. -//The `relative=!nav.adoc` filter is needed only to work around a bug or limitation in xref-checker. -//The filter should be removed when xref-checker is no longer used (i.e. Antora 3 alpha.9 upgrade is complete). -[indexBlock,xref,relative=!nav.adoc] +[indexBlock,'xref=$xref'] ---- [.catalog] [.item]#{xref}#