You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2022/12/11 16:43:53 UTC

[maven-reporting-impl] 02/04: [DOXIA-569] use Markdown output

This is an automated email from the ASF dual-hosted git repository.

hboutemy pushed a commit to branch maven-reporting-impl-3.x
in repository https://gitbox.apache.org/repos/asf/maven-reporting-impl.git

commit fe04f89c4ebd94074596ab38fd160ebabcf217f8
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Sun Dec 4 18:02:14 2022 +0100

    [DOXIA-569] use Markdown output
---
 pom.xml                                             | 15 +++++++++++++--
 src/it/use-as-direct-mojo-markup/invoker.properties |  2 +-
 src/it/use-as-direct-mojo-markup/verify.groovy      |  2 +-
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 688c09e..b9e6213 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
 
   <groupId>org.apache.maven.reporting</groupId>
   <artifactId>maven-reporting-impl</artifactId>
-  <version>3.2.1-SNAPSHOT</version>
+  <version>3.3.0-SNAPSHOT</version>
 
   <name>Apache Maven Reporting Implementation</name>
   <description>Abstract classes to manage report generation.</description>
@@ -70,7 +70,7 @@
   <properties>
     <javaVersion>7</javaVersion>
     <mavenVersion>3.1.0</mavenVersion>
-    <doxiaVersion>1.11.1</doxiaVersion>
+    <doxiaVersion>1.12.0-SNAPSHOT</doxiaVersion>
     <doxiaSitetoolsVersion>1.11.1</doxiaSitetoolsVersion>
     <reportingApiVersion>3.1.1</reportingApiVersion>
     <project.build.outputTimestamp>2022-08-06T21:52:45Z</project.build.outputTimestamp>
@@ -143,6 +143,17 @@
       <artifactId>doxia-module-xdoc</artifactId>
       <version>${doxiaVersion}</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.maven.doxia</groupId>
+      <artifactId>doxia-module-markdown</artifactId>
+      <version>${doxiaVersion}</version>
+      <exclusions>
+      	<exclusion>
+      		<groupId>com.vladsch.flexmark</groupId>
+      		<artifactId>flexmark-all</artifactId>
+      	</exclusion>
+      </exclusions>
+    </dependency>
 
     <!-- misc -->
     <dependency>
diff --git a/src/it/use-as-direct-mojo-markup/invoker.properties b/src/it/use-as-direct-mojo-markup/invoker.properties
index 3381aa4..65b6f8a 100644
--- a/src/it/use-as-direct-mojo-markup/invoker.properties
+++ b/src/it/use-as-direct-mojo-markup/invoker.properties
@@ -16,5 +16,5 @@
 # under the License.
 
 invoker.goals.1 = org.apache.maven.reporting.its:custom-reporting-plugin:1.0-SNAPSHOT:custom -Doutput.format=xdoc
-invoker.goals.2 = org.apache.maven.reporting.its:custom-reporting-plugin:1.0-SNAPSHOT:custom-renderer -Doutput.format=apt
+invoker.goals.2 = org.apache.maven.reporting.its:custom-reporting-plugin:1.0-SNAPSHOT:custom-renderer -Doutput.format=markdown
 invoker.goals.3 = org.apache.maven.reporting.its:custom-reporting-plugin:1.0-SNAPSHOT:external -Doutput.format=anything
diff --git a/src/it/use-as-direct-mojo-markup/verify.groovy b/src/it/use-as-direct-mojo-markup/verify.groovy
index 5773ff2..0b2b865 100644
--- a/src/it/use-as-direct-mojo-markup/verify.groovy
+++ b/src/it/use-as-direct-mojo-markup/verify.groovy
@@ -23,7 +23,7 @@ File f = new File( site, 'custom-report.xdoc' );
 assert f.exists();
 assert f.text.contains( 'Custom Maven Report content.' );
 
-f = new File( site, 'custom-report-with-renderer.apt' );
+f = new File( site, 'custom-report-with-renderer.markdown' );
 assert f.exists();
 assert f.text.contains( 'Custom Maven Report with Renderer content.' );