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 efda8ea4d5d29e0a9808187384f4c9627286284e Author: David Jencks <[email protected]> AuthorDate: Mon Oct 25 11:08:53 2021 -0700 latest to next --- docs/antora.yml | 9 +++++++-- pom.xml | 3 ++- tooling/scripts/update-antora-config.groovy | 13 +++++++------ tooling/scripts/update-antora-yaml.groovy | 26 +++++++++++++++----------- 4 files changed, 31 insertions(+), 20 deletions(-) diff --git a/docs/antora.yml b/docs/antora.yml index 5c319a9..8c60818 100644 --- a/docs/antora.yml +++ b/docs/antora.yml @@ -17,12 +17,17 @@ name: camel-quarkus title: Camel Quarkus -version: latest +version: 2.4.x nav: - modules/ROOT/nav.adoc asciidoc: attributes: - cq-camel-components: 3.12.x@components # replace ${camel.docs.components.xref} min-maven-version: 3.6.2 # replace ${min-maven-version} target-maven-version: 3.8.1 # replace ${target-maven-version} quarkus-version: 2.4.0.Final # replace ${quarkus.version} + # attributes used in xrefs to other Antora components + cq-camel-components: 3.12.x@components # replace ${camel.docs.components.xref} + quarkus-examples-version: latest + # indexTable common + indexer-version: 3.12.x # replace ${camel.docs.components.version} + indexer-component: components \ No newline at end of file diff --git a/pom.xml b/pom.xml index 612025c..67c0630 100644 --- a/pom.xml +++ b/pom.xml @@ -41,7 +41,8 @@ <!-- Primary dependencies - maintained manually --> <camel.major.minor>3.12</camel.major.minor> <!-- run after each change: cd docs && mvnd validate --> <camel.version>${camel.major.minor}.0</camel.version> - <camel.docs.components.xref>${camel.major.minor}.x@components</camel.docs.components.xref><!-- the version in Camel's docs/components/antora.yml --> + <camel.docs.components.version>${camel.major.minor}.x</camel.docs.components.version><!-- the version in Camel's docs/components/antora.yml --> + <camel.docs.components.xref>${camel.docs.components.version}@components</camel.docs.components.xref><!-- the version in Camel's docs/components/antora.yml --> <camel.docs.branch>camel-${camel.major.minor}.x</camel.docs.branch><!-- The stable camel branch on which our Antora docs depends --> <camel.sb.docs.branch>camel-spring-boot-${camel.major.minor}.x</camel.sb.docs.branch><!-- The stable camel-spring-boot branch on which our Antora docs depends --> diff --git a/tooling/scripts/update-antora-config.groovy b/tooling/scripts/update-antora-config.groovy index 63a642b..cceb873 100644 --- a/tooling/scripts/update-antora-config.groovy +++ b/tooling/scripts/update-antora-config.groovy @@ -59,12 +59,13 @@ replaceInFiles.each { path -> m.appendTail(newContent) String newContentString = newContent.toString() - if (path.getFileName().toString().equals('antora.yml')) { - final String versionReplacement = 'version: ' + (project.version.endsWith('-SNAPSHOT') ? 'latest' : project.version) - println ' - setting '+ versionReplacement - final Pattern versionPattern = ~'version: [^\\s]+' - newContentString = versionPattern.matcher(newContentString).replaceFirst(versionReplacement) - } + //This must not be run on branches +// if (path.getFileName().toString().equals('antora.yml')) { +// final String versionReplacement = 'version: ' + (project.version.endsWith('-SNAPSHOT') ? 'latest' : project.version) +// println ' - setting '+ versionReplacement +// final Pattern versionPattern = ~'version: [^\\s]+' +// newContentString = versionPattern.matcher(newContentString).replaceFirst(versionReplacement) +// } if (!newContentString.equals(content)) { println 'Updated ' + path diff --git a/tooling/scripts/update-antora-yaml.groovy b/tooling/scripts/update-antora-yaml.groovy index e7dba01..a0fbf6a 100644 --- a/tooling/scripts/update-antora-yaml.groovy +++ b/tooling/scripts/update-antora-yaml.groovy @@ -31,16 +31,20 @@ final Path treeRootDir = Paths.get(properties['maven.multiModuleProjectDirectory final Path path = treeRootDir.resolve('docs/antora.yml') -println 'Updating ' + path -final String content = path.getText('UTF-8') -final String versionReplacement = 'version: ' + (project.version.endsWith('-SNAPSHOT') ? 'latest' : project.version) -println ' - seting '+ versionReplacement -final Pattern versionPattern = ~'version: [^\\s]+' -final String newContentString = versionPattern.matcher(content).replaceFirst(versionReplacement) - -if (!newContentString.equals(content)) { - println 'Updated ' + path - Files.write(path, newContentString.getBytes('UTF-8')) +if (project.version.endsWith('-SNAPSHOT')) { + println 'not updating ' + path + ' on snapshot version' } else { - println 'No change in ' + path + println 'Updating ' + path + final String content = path.getText('UTF-8') + final String versionReplacement = 'version: ' project.version + println ' - seting ' + versionReplacement + final Pattern versionPattern = ~'version: [^\\s]+' + final String newContentString = versionPattern.matcher(content).replaceFirst(versionReplacement) + + if (!newContentString.equals(content)) { + println 'Updated ' + path + Files.write(path, newContentString.getBytes('UTF-8')) + } else { + println 'No change in ' + path + } }
