Skip to content

Commit

Permalink
Fixes asciidoctor#280 Upgrade Doxia for maven-site-plugin 3.4+ compat…
Browse files Browse the repository at this point in the history
…ibility (asciidoctor#289)

* fixes asciidoctor#280 upgrades Doxia for compatibility with maven-site-plugin 3.4+

* upgraded README
  • Loading branch information
abelsromero authored Mar 28, 2017
1 parent 582b8b3 commit 0c42ef6
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 51 deletions.
4 changes: 3 additions & 1 deletion README.adoc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
= Asciidoctor Maven Plugin
// Metadata
:release-version: 1.5.3
:release-version: 1.5.5
// Settings
:page-layout: base
:idprefix:
Expand Down Expand Up @@ -314,6 +314,8 @@ This allows an easier way of defining common configuration options.

To author your Maven-generated site in AsciiDoc, you must first add a dependency on the Asciidoctor plugin to your maven-site-plugin declaration.

IMPORTANT: Since asciidoctor-maven-plugin v1.5.6 it is required to use maven-site-plugin v3.4 or above.

[source,xml,subs=attributes+]
.Maven site integration
-----
Expand Down
2 changes: 1 addition & 1 deletion README_zh-CN.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
:translators: D瓜哥
ifdef::env-github[Translated by: {translators}]
// Metadata
:release-version: 1.5.2
:release-version: 1.5.5
// Settings
:page-layout: base
:idprefix:
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
<plexus.component.metadata.version>1.5.5</plexus.component.metadata.version>
<netty.version>4.0.38.Final</netty.version>
<commons.io.version>2.4</commons.io.version>
<doxia.version>1.6</doxia.version>
<doxia.version>1.7</doxia.version>
<gmaven.version>1.5</gmaven.version>
</properties>

Expand Down
3 changes: 2 additions & 1 deletion src/it/maven-site-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.3</version>
<!-- doxia 1.7 is only compatible with maven-site-plugin 3.4 or + -->
<version>3.4</version>
<configuration>
<asciidoc>
<templateDirs>
Expand Down

This file was deleted.

0 comments on commit 0c42ef6

Please sign in to comment.