This is an automated email from the ASF dual-hosted git repository. djencks pushed a commit to branch 2.6.x in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit f35d711d308a44d8b9404d75a33e187ed03e14b7 Author: David Jencks <[email protected]> AuthorDate: Sat Dec 18 19:13:56 2021 -0800 claim version 2.6.x and prevent scripts from changing it --- docs/antora.yml | 4 +-- pom.xml | 40 ++++++++++++++--------------- tooling/scripts/update-antora-config.groovy | 12 ++++----- tooling/scripts/update-antora-yaml.groovy | 2 +- 4 files changed, 28 insertions(+), 30 deletions(-) diff --git a/docs/antora.yml b/docs/antora.yml index fdf3bc5..f820b57 100644 --- a/docs/antora.yml +++ b/docs/antora.yml @@ -17,9 +17,7 @@ name: camel-quarkus title: Camel Quarkus -version: latest -prerelease: true -display-version: Next (Pre-release) +version: 2.6.x nav: - modules/ROOT/nav.adoc asciidoc: diff --git a/pom.xml b/pom.xml index 884de47..c0e8ece 100644 --- a/pom.xml +++ b/pom.xml @@ -988,26 +988,26 @@ <id>commit-release-changes</id> <build> <plugins> - <plugin> - <groupId>org.codehaus.gmaven</groupId> - <artifactId>groovy-maven-plugin</artifactId> - <executions> - <execution> - <id>update-antora-yaml</id> - <inherited>false</inherited> - <goals> - <goal>execute</goal> - </goals> - <phase>validate</phase> - <configuration> - <source>file://${maven.multiModuleProjectDirectory}/tooling/scripts/update-antora-yaml.groovy</source> - <properties> - <maven.multiModuleProjectDirectory>${maven.multiModuleProjectDirectory}</maven.multiModuleProjectDirectory> - </properties> - </configuration> - </execution> - </executions> - </plugin> +<!-- <plugin>--> +<!-- <groupId>org.codehaus.gmaven</groupId>--> +<!-- <artifactId>groovy-maven-plugin</artifactId>--> +<!-- <executions>--> +<!-- <execution>--> +<!-- <id>update-antora-yaml</id>--> +<!-- <inherited>false</inherited>--> +<!-- <goals>--> +<!-- <goal>execute</goal>--> +<!-- </goals>--> +<!-- <phase>validate</phase>--> +<!-- <configuration>--> +<!-- <source>file://${maven.multiModuleProjectDirectory}/tooling/scripts/update-antora-yaml.groovy</source>--> +<!-- <properties>--> +<!-- <maven.multiModuleProjectDirectory>${maven.multiModuleProjectDirectory}</maven.multiModuleProjectDirectory>--> +<!-- </properties>--> +<!-- </configuration>--> +<!-- </execution>--> +<!-- </executions>--> +<!-- </plugin>--> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-scm-plugin</artifactId> diff --git a/tooling/scripts/update-antora-config.groovy b/tooling/scripts/update-antora-config.groovy index a9340cd..5f5bb0b 100644 --- a/tooling/scripts/update-antora-config.groovy +++ b/tooling/scripts/update-antora-config.groovy @@ -58,12 +58,12 @@ replaceInFiles.each { path -> String newContentString = newContent.toString() // This can only work on main branch or during a release. Otherwise it will break antora.yml. - if (path.getFileName().toString().equals('antora.yml')) { - final String versionReplacement = 'version: ' + (project.version.endsWith('-SNAPSHOT') ? 'next' : project.version) - println ' - setting '+ versionReplacement - final Pattern versionPattern = ~'version: [^\\s]+' - newContentString = versionPattern.matcher(newContentString).replaceFirst(versionReplacement) - } +// if (path.getFileName().toString().equals('antora.yml')) { +// final String versionReplacement = 'version: ' + (project.version.endsWith('-SNAPSHOT') ? 'next' : 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..e3760c9 100644 --- a/tooling/scripts/update-antora-yaml.groovy +++ b/tooling/scripts/update-antora-yaml.groovy @@ -34,7 +34,7 @@ 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 +println ' - setting '+ versionReplacement final Pattern versionPattern = ~'version: [^\\s]+' final String newContentString = versionPattern.matcher(content).replaceFirst(versionReplacement)
