You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pc...@apache.org on 2022/12/21 11:36:21 UTC

[camel-k] 02/02: chore: testing update docs script

This is an automated email from the ASF dual-hosted git repository.

pcongiusti pushed a commit to branch release-1.10.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git

commit f15124949e43bb859d07f555b9e510956d6ed823
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Wed Dec 21 12:16:09 2022 +0100

    chore: testing update docs script
---
 docs/antora.yml | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/docs/antora.yml b/docs/antora.yml
index 575c56d65..a30d88756 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -27,25 +27,18 @@ nav:
 asciidoc:
   attributes:
     requires: "'util=camel-website-util,ck=xref:js/ck.js'"
-<<<<<<< HEAD
     lts: LTS
     prerelease: false
     camel-kamelets-version: 0.9.3 # Makefile KAMELET_CATALOG_REPO_BRANCH
     camel-kamelets-docs-version: 0.9.x # Makefile KAMELET_CATALOG_REPO_BRANCH
     camel-k-runtime-version: 1.15.2 # Makefile RUNTIME_VERSION
-=======
-    prerelease: true
-    camel-kamelets-version: 0.10.0 # Makefile KAMELET_CATALOG_REPO_BRANCH
-    camel-kamelets-docs-version: 0.10.x # Makefile KAMELET_CATALOG_REPO_BRANCH
-    camel-k-runtime-version: 1.16.0 # Makefile RUNTIME_VERSION
->>>>>>> 80f3e3865 (chore: update docs script)
     camel-api-versions: camel.apache.org/v1 camel.apache.org/v1alpha1 # Makefile BUNDLE_CAMEL_APIS
     # from camel-k-runtime parent pom:
-    camel-version: 3.18.2
+    camel-version: 3.18.3
     camel-docs-version: 3.18.x
     camel-quarkus-version: 2.13.1
     camel-quarkus-docs-version: 2.13.x
-    quarkus-version: 2.13.0.Final
+    quarkus-version: 2.13.4.Final
     graalvm-version: 22.1.0
     graalvm-docs-version: 22.1
     buildah-version: 1.23.3
@@ -54,5 +47,5 @@ asciidoc:
     kubernetes-api-version: 0.23.8
     operator-fwk-api-version: 0.13.0
     knative-api-version: 0.33.0
-    service-binding-op-version: 1.3.1
+    service-binding-op-version: 1.1.1
     prometheus-op-version: 0.50.0