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 00:39:13 UTC
[hbase] branch branch-2.4 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-2.4
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.4 by this push:
new d1de64d3824 HBASE-26932 Skip generating ref guide when running 'mvn site' on branch other than master (#4360)
d1de64d3824 is described below
commit d1de64d3824c8e62c8b79a0e43d8114157c6e8e9
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 | 1 +
pom.xml | 117 -----------------------
2 files changed, 1 insertion(+), 117 deletions(-)
diff --git a/hbase-archetypes/hbase-archetype-builder/pom.xml b/hbase-archetypes/hbase-archetype-builder/pom.xml
index d8e2338e0d4..ae255b296f4 100644
--- a/hbase-archetypes/hbase-archetype-builder/pom.xml
+++ b/hbase-archetypes/hbase-archetype-builder/pom.xml
@@ -178,6 +178,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>xml-maven-plugin</artifactId>
+ <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 db3fcbec2e2..f5e5b7e0d0d 100755
--- a/pom.xml
+++ b/pom.xml
@@ -1197,41 +1197,6 @@
</executions>
</plugin>
<!-- parent-module only plugins -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>xml-maven-plugin</artifactId>
- <version>${xml.maven.version}</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>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 spotbugs just in the parent so
the filter file location can be more general (see definition in pluginManagement) -->
<plugin>
@@ -1271,65 +1236,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>${asciidoctorj.pdf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jruby</groupId>
- <artifactId>jruby-complete</artifactId>
- <version>${jruby.version}</version>
- </dependency>
- </dependencies>
- <configuration>
- <outputDirectory>${project.reporting.outputDirectory}/</outputDirectory>
- <doctype>book</doctype>
- <attributes>
- <docVersion>${project.version}</docVersion>
- <imagesdir>images</imagesdir>
- <source-highlighter>coderay</source-highlighter>
- </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>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
@@ -1378,27 +1284,6 @@
<escapeString>\</escapeString>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <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>site</phase>
- <configuration>
- <target name="rename file">
- <move file="${project.reporting.outputDirectory}/book.pdf" tofile="${project.reporting.outputDirectory}/apache_hbase_reference_guide.pdf" />
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
@@ -1505,8 +1390,6 @@
<commons-crypto.version>1.0.0</commons-crypto.version>
<curator.version>4.2.0</curator.version>
<!-- Plugin Dependencies -->
- <asciidoctor.plugin.version>2.1.0</asciidoctor.plugin.version>
- <asciidoctorj.pdf.version>1.5.3</asciidoctorj.pdf.version>
<build.helper.maven.version>3.0.0</build.helper.maven.version>
<buildnumber.maven.version>1.4</buildnumber.maven.version>
<!--