You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by dj...@apache.org on 2022/01/24 17:08:27 UTC
[camel-k] branch release-1.8.x updated: RI table setup
This is an automated email from the ASF dual-hosted git repository.
djencks pushed a commit to branch release-1.8.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/release-1.8.x by this push:
new 79662f8 RI table setup
79662f8 is described below
commit 79662f8fbe191b05e53a6d90e0786c79662b9969
Author: David Jencks <dj...@apache.org>
AuthorDate: Thu Jan 20 22:08:48 2022 -0800
RI table setup
set up for 1.8.x
---
docs/antora.yml | 25 ++++++++++++-------------
docs/modules/ROOT/examples/js/ck.js | 22 ++++++++++++++++++++++
docs/modules/ROOT/pages/index.adoc | 20 ++++++++++++++++++++
3 files changed, 54 insertions(+), 13 deletions(-)
diff --git a/docs/antora.yml b/docs/antora.yml
index dc16a5f..d313c2d 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -19,9 +19,7 @@
name: camel-k
title: Camel K
-version: next
-prerelease: true
-display-version: Next (Pre-release)
+version: 1.8.x
nav:
- modules/ROOT/nav.adoc
- modules/languages/nav-languages.adoc
@@ -30,16 +28,17 @@ nav:
# On release, update this to the appropriate released camel version.
asciidoc:
attributes:
- prerelease: true
- camel-kamelets-version: 0.5.0 # Makefile KAMELET_CATALOG_REPO_BRANCH
- camel-kamelets-docs-version: 0.5.x # Makefile KAMELET_CATALOG_REPO_BRANCH
- camel-k-runtime-version: 1.10.0 # Makefile RUNTIME_VERSION
+ requires: "'util=camel-website-util,ck=xref:js/ck.js'"
+ camel-kamelets-version: 0.7.0 # Makefile KAMELET_CATALOG_REPO_BRANCH
+ camel-kamelets-docs-version: 0.7.x # Makefile KAMELET_CATALOG_REPO_BRANCH
+ camel-k-runtime-version: 1.11.0 # Makefile RUNTIME_VERSION
camel-api-versions: camel.apache.org/v1 camel.apache.org/v1alpha1 # Makefile BUNDLE_CAMEL_APIS
# from camel-k-runtime parent pom:
- camel-version: 3.12.0
- camel-docs-version: 3.12.x
- camel-quarkus-version: 2.4.0
- camel-quarkus-docs-version: 2.4.x
- quarkus-version: 2.4.0.Final
- graalvm-version: 21.2.0
+ camel-version: 3.14.0
+ camel-docs-version: 3.14.x
+ camel-quarkus-version: 2.6.0
+ camel-quarkus-docs-version: 2.6.x
+ quarkus-version: 2.6.0.Final
+ graalvm-version: 21.3.0
+ graalvm-docs-version: 21.3
diff --git a/docs/modules/ROOT/examples/js/ck.js b/docs/modules/ROOT/examples/js/ck.js
new file mode 100644
index 0000000..b18a1ab
--- /dev/null
+++ b/docs/modules/ROOT/examples/js/ck.js
@@ -0,0 +1,22 @@
+/*
+ * 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.
+ */
+
+module.exports = {
+ branch: (version) => version === 'next' ?
+ 'https://github.com/apache/camel-k[main]' :
+ `https://github.com/apache/camel-k/tree/release-${version}[release-${version}]`,
+}
diff --git a/docs/modules/ROOT/pages/index.adoc b/docs/modules/ROOT/pages/index.adoc
index f10415b..cae681b 100644
--- a/docs/modules/ROOT/pages/index.adoc
+++ b/docs/modules/ROOT/pages/index.adoc
@@ -42,3 +42,23 @@ kamel run helloworld.groovy
The integration code immediately runs in the cloud. **Nothing else** is needed.
Continue reading the documentation to xref:installation/installation.adoc[install and get started with Camel K].
+
+== Compatibility Matrix
+
+[caption=]
+.Compatibility between Camel-K and dependencies
+[width="100%",cols="4,2,2,2,2,2,2,1,3",options="header"]
+|===
+|Camel-K Version
+|Camel-K-Runtime version
+|Camel Version
+|Camel-Quarkus Version
+|Quarkus Version
+|GraalVM Version
+|Kamelets Version
+|LTS Until
+|Branch
+|===
+
+//cannot use top level index.adoc as the page with the query is always omitted.
+indexTable::[version="*",relative="running/running.adoc",cellformats="util.ckRef(pageComponentDisplayVersion, pageComponentVersion)|camelKRuntimeVersion|util.camelRef(camelVersion, camelDocsVersion)|util.camelQuarkusRef(camelQuarkusVersion, camelQuarkusDocsVersion)|util.quarkusRef(quarkusVersion)|util.graalvmRef(graalvmVersion, graalvmDocsVersion)|util.kameletsRef(camelKameletsVersion, camelKameletsDocsVersion)|lts|ck.branch(pageComponentVersion)", requires={requires},transform=util.sort [...]