You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zh...@apache.org on 2022/04/29 09:46:14 UTC
[hbase] branch branch-1 updated: HBASE-26932 Skip generating ref guide when running 'mvn site' on branch other than master (#4360)
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch branch-1
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-1 by this push:
new 5c15ac63de9 HBASE-26932 Skip generating ref guide when running 'mvn site' on branch other than master (#4360)
5c15ac63de9 is described below
commit 5c15ac63de930ff03e7b94ae01b3ab0c1cb4a623
Author: Duo Zhang <zh...@apache.org>
AuthorDate: Fri Apr 29 08:05:24 2022 +0800
HBASE-26932 Skip generating ref guide when running 'mvn site' on branch other than master (#4360)
Signed-off-by: GeorryHuang <hu...@apache.org>
(cherry picked from commit 30908482c5eb8434e93a28a7c6a861bf903d1f83)
---
hbase-archetypes/hbase-archetype-builder/pom.xml | 2 +-
pom.xml | 114 +----------------------
2 files changed, 2 insertions(+), 114 deletions(-)
diff --git a/hbase-archetypes/hbase-archetype-builder/pom.xml b/hbase-archetypes/hbase-archetype-builder/pom.xml
index c35c115d025..f914e7c8527 100644
--- a/hbase-archetypes/hbase-archetype-builder/pom.xml
+++ b/hbase-archetypes/hbase-archetype-builder/pom.xml
@@ -179,7 +179,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>xml-maven-plugin</artifactId>
- <version>1.0.1</version>
+ <version>${xml.maven.version}</version>
<executions>
<!-- xml-maven-plugin modifies each exemplar project's pom.xml file to convert to standalone project. -->
<execution>
diff --git a/pom.xml b/pom.xml
index d9ef8868978..bf5a3bda613 100644
--- a/pom.xml
+++ b/pom.xml
@@ -939,41 +939,6 @@
</executions>
</plugin>
<!-- parent-module only plugins -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>xml-maven-plugin</artifactId>
- <version>1.0</version>
- <inherited>false</inherited>
- <executions>
- <execution>
- <!-- Run the hbase-default.xml through a stylesheet so can show it in doc-->
- <goals>
- <goal>transform</goal>
- </goals>
- <phase>pre-site</phase>
- </execution>
- </executions>
- <configuration>
- <transformationSets>
- <!-- For asciidoc -->
- <transformationSet>
- <!--Reaching up and over into common sub-module for hbase-default.xml-->
- <dir>${basedir}/hbase-common/src/main/resources/</dir>
- <includes>
- <include>hbase-default.xml</include>
- </includes>
- <stylesheet>${basedir}/src/main/xslt/configuration_to_asciidoc_chapter.xsl</stylesheet>
- <fileMappers>
- <fileMapper implementation="org.codehaus.plexus.components.io.filemappers.RegExpFileMapper">
- <pattern>^(.*)\.xml$</pattern>
- <replacement>$1.adoc</replacement>
- </fileMapper>
- </fileMappers>
- <outputDir>${basedir}/target/asciidoc</outputDir>
- </transformationSet>
- </transformationSets>
- </configuration>
- </plugin>
<!-- Special configuration for findbugs just in the parent so
the filter file location can be more general (see definition in pluginManagement) -->
<plugin>
@@ -1108,83 +1073,6 @@
<outputEncoding>UTF-8</outputEncoding>
</configuration>
</plugin>
- <!-- For AsciiDoc docs building -->
- <plugin>
- <groupId>org.asciidoctor</groupId>
- <artifactId>asciidoctor-maven-plugin</artifactId>
- <version>${asciidoctor.plugin.version}</version>
- <inherited>false</inherited>
- <dependencies>
- <dependency>
- <groupId>org.asciidoctor</groupId>
- <artifactId>asciidoctorj-pdf</artifactId>
- <version>1.5.0-alpha.11</version>
- </dependency>
- </dependencies>
- <configuration>
- <outputDirectory>target/site</outputDirectory>
- <doctype>book</doctype>
- <imagesDir>images</imagesDir>
- <sourceHighlighter>coderay</sourceHighlighter>
- <attributes>
- <docVersion>${project.version}</docVersion>
- <sourcedir>${project.build.sourceDirectory}</sourcedir>
- <pdfmarks/>
- </attributes>
- </configuration>
- <executions>
- <execution>
- <id>output-html</id>
- <phase>site</phase>
- <goals>
- <goal>process-asciidoc</goal>
- </goals>
- <configuration>
- <attributes>
- <stylesheet>hbase.css</stylesheet>
- </attributes>
- <backend>html5</backend>
- </configuration>
- </execution>
- <execution>
- <id>output-pdf</id>
- <phase>site</phase>
- <goals>
- <goal>process-asciidoc</goal>
- </goals>
- <configuration>
- <backend>pdf</backend>
- <attributes>
- <pagenums/>
- <toc/>
- <idprefix/>
- <idseparator>-</idseparator>
- </attributes>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>${maven.antrun.version}</version>
- <inherited>false</inherited>
- <!-- Rename the book.pdf generated by asciidoctor -->
- <executions>
- <execution>
- <id>rename-pdf</id>
- <phase>post-site</phase>
- <configuration>
- <target name="rename file">
- <move file="${project.basedir}/target/site/book.pdf" tofile="${project.basedir}/target/site/apache_hbase_reference_guide.pdf" />
- <move file="${project.basedir}/target/site/book.pdfmarks" tofile="${project.basedir}/target/site/apache_hbase_reference_guide.pdfmarks" />
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
@@ -1300,10 +1188,10 @@
When updating checkstyle.version, please make the same change in `.idea/checkstyle-idea.xml`
-->
<checkstyle.version>6.18</checkstyle.version>
- <asciidoctor.plugin.version>1.5.3</asciidoctor.plugin.version>
<plexus.errorprone.javac.version>2.8.2</plexus.errorprone.javac.version>
<spotbugs.version>3.1.0-RC1</spotbugs.version>
<maven.enforcer.version>3.0.0-M1</maven.enforcer.version>
+ <xml.maven.version>1.0.1</xml.maven.version>
<!-- General Packaging -->
<package.prefix>/usr</package.prefix>
<package.conf.dir>/etc/hbase</package.conf.dir>