This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-components.git
The following commit(s) were added to refs/heads/master by this push:
new 56eff6f Using variable for asciidoc version
56eff6f is described below
commit 56eff6f8db0486ffbd8e19fe39ea934b758e9e82
Author: Martin Stockhammer <[email protected]>
AuthorDate: Sat Nov 23 21:20:57 2019 +0100
Using variable for asciidoc version
---
pom.xml | 31 ++++++++++++++++---------------
1 file changed, 16 insertions(+), 15 deletions(-)
diff --git a/pom.xml b/pom.xml
index 9cd0d5d..0f01f99 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,6 +57,8 @@
<!-- The git repository, where the site content is placed -->
<siteRepositoryUrl>scm:git:https://gitbox.apache.org/repos/asf/archiva-web-content.git</siteRepositoryUrl>
<site.staging.base>${project.basedir}</site.staging.base>
+
+
<asciidoctor.maven.plugin.version>2.0.0-RC.1</asciidoctor.maven.plugin.version>
</properties>
<description>Parent Pom for various components used in Apache Archiva and
Redback.</description>
@@ -216,6 +218,7 @@
<version>${junit.jupiter.version}</version>
<scope>test</scope>
</dependency>
+
</dependencies>
</dependencyManagement>
<dependencies>
@@ -279,11 +282,12 @@
<configuration>
<skipDeploy>true</skipDeploy>
</configuration>
+
<dependencies>
<dependency>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctor-maven-plugin</artifactId>
- <version>1.5.8</version>
+ <version>${asciidoctor.maven.plugin.version}</version>
</dependency>
</dependencies>
</plugin>
@@ -355,10 +359,17 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.7.1</version>
-
<configuration>
+ <!-- disable generateReports if you don't want to include the
built-in reports -->
+ <generateReports>true</generateReports>
+ <generateSitemap>true</generateSitemap>
+ <relativizeDecorationLinks>false</relativizeDecorationLinks>
+ <locales>en</locales>
+ <inputEncoding>UTF-8</inputEncoding>
+ <outputEncoding>UTF-8</outputEncoding>
+ <skipDeploy>true</skipDeploy>
<asciidoc>
- <!-- site-wide AsciiDoc attributes -->
+ <!-- optional site-wide AsciiDoc attributes -->
<attributes>
<icons>font</icons>
<source-highlighter>coderay</source-highlighter>
@@ -366,22 +377,12 @@
<toclevels>2</toclevels>
</attributes>
</asciidoc>
- <skipDeploy>true</skipDeploy>
-
<stagingDirectory>${site.staging.base}/target/staging/components/</stagingDirectory>
</configuration>
- <executions>
- <execution>
- <id>attach-descriptor</id>
- <goals>
- <goal>attach-descriptor</goal>
- </goals>
- </execution>
- </executions>
<dependencies>
- <dependency><!-- add Asciidoctor Doxia Parser Module -->
+ <dependency>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctor-maven-plugin</artifactId>
- <version>1.5.8</version>
+ <version>${asciidoctor.maven.plugin.version}</version>
</dependency>
</dependencies>
</plugin>
