[maven-site-plugin] branch master updated: [MSITE-853] prepare ITs to check DOXIA-597 and DOXIA-571 fixes

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[maven-site-plugin] branch master updated: [MSITE-853] prepare ITs to check DOXIA-597 and DOXIA-571 fixes

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

hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git


The following commit(s) were added to refs/heads/master by this push:
     new 58658d8  [MSITE-853] prepare ITs to check DOXIA-597 and DOXIA-571 fixes
58658d8 is described below

commit 58658d82629af1cb34e99655311c81e7b0e7cc3e
Author: Hervé Boutemy <[hidden email]>
AuthorDate: Fri Feb 14 21:38:06 2020 +0100

    [MSITE-853] prepare ITs to check DOXIA-597 and DOXIA-571 fixes
---
 src/it/projects/doxia-formats/pom.xml                       | 10 ----------
 src/it/projects/doxia-formats/src/site/apt/index.apt        | 13 +++++++++++++
 src/it/projects/doxia-formats/src/site/markdown/markdown.md | 13 +++++++++++++
 src/it/projects/doxia-formats/src/site/site.xml             |  8 +++++++-
 src/it/projects/doxia-formats/verify.groovy                 |  4 +++-
 5 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/src/it/projects/doxia-formats/pom.xml b/src/it/projects/doxia-formats/pom.xml
index bbc6666..2acd9ee 100644
--- a/src/it/projects/doxia-formats/pom.xml
+++ b/src/it/projects/doxia-formats/pom.xml
@@ -56,21 +56,11 @@ under the License.
             </attributes>
           </configuration>
           <dependencies>
-            <dependency>
-              <groupId>org.apache.velocity</groupId>
-              <artifactId>velocity</artifactId>
-              <version>1.5</version>
-            </dependency>
             <dependency><!-- MSITE-782 -->
               <groupId>${project.groupId}</groupId>
               <artifactId>${project.artifactId}</artifactId>
               <version>${project.version}</version>
             </dependency>
-            <dependency><!-- TODO remove when prerequisite is Java 7 -->
-              <groupId>org.apache.maven.doxia</groupId>
-              <artifactId>doxia-module-markdown</artifactId>
-              <version>1.7</version>
-            </dependency>
           </dependencies>
         </plugin>
       </plugins>
diff --git a/src/it/projects/doxia-formats/src/site/apt/index.apt b/src/it/projects/doxia-formats/src/site/apt/index.apt
index 9d199ed..eefc226 100644
--- a/src/it/projects/doxia-formats/src/site/apt/index.apt
+++ b/src/it/projects/doxia-formats/src/site/apt/index.apt
@@ -57,3 +57,16 @@ Velocity
   See {{{./velocity-context.html} Doxia Site Renderer Velocity Context demo}}.
 
   See also {{{./velocity-include-parse.html} Velocity #parse and #include demo}}.
+
+Reference output
+
+  <<<Monospaced>>>
+
++--------+
+code block
+Apache Maven 3.6.3 (cecedd343002696d0abb50b32b541b8a6ba2883f)
+Maven home: D:\apache-maven-3.6.3\apache-maven\bin\..
+Java version: 1.8.0_232, vendor: AdoptOpenJDK, runtime: C:\Program Files\AdoptOpenJDK\jdk-8.0.232.09-hotspot\jre
+Default locale: en_US, platform encoding: Cp1250
+OS name: "windows 10", version: "10.0", arch: "amd64", family: "windows"
++--------+
\ No newline at end of file
diff --git a/src/it/projects/doxia-formats/src/site/markdown/markdown.md b/src/it/projects/doxia-formats/src/site/markdown/markdown.md
index 7f25ec4..a40978c 100644
--- a/src/it/projects/doxia-formats/src/site/markdown/markdown.md
+++ b/src/it/projects/doxia-formats/src/site/markdown/markdown.md
@@ -27,3 +27,16 @@ see [DOXIA-473](https://issues.apache.org/jira/browse/DOXIA-473).
 <!-- MACRO{toc|fromDepth=1|toDepth=2} -->
 
 ### Subsection
+
+Missing `monospaced` support [DOXIA-597](https://issues.apache.org/jira/browse/DOXIA-597)
+
+Missing code block color [DOXIA-571](https://issues.apache.org/jira/browse/DOXIA-571):
+
+```
+code block
+Apache Maven 3.6.3 (cecedd343002696d0abb50b32b541b8a6ba2883f)
+Maven home: D:\apache-maven-3.6.3\apache-maven\bin\..
+Java version: 1.8.0_232, vendor: AdoptOpenJDK, runtime: C:\Program Files\AdoptOpenJDK\jdk-8.0.232.09-hotspot\jre
+Default locale: en_US, platform encoding: Cp1250
+OS name: "windows 10", version: "10.0", arch: "amd64", family: "windows"
+```
diff --git a/src/it/projects/doxia-formats/src/site/site.xml b/src/it/projects/doxia-formats/src/site/site.xml
index 18b5e38..d8acbe2 100644
--- a/src/it/projects/doxia-formats/src/site/site.xml
+++ b/src/it/projects/doxia-formats/src/site/site.xml
@@ -25,6 +25,12 @@ under the License.
   <skin>
     <groupId>org.apache.maven.skins</groupId>
     <artifactId>maven-fluido-skin</artifactId>
-    <version>1.4</version>
+    <version>1.8</version>
   </skin>
+
+  <custom>
+    <fluidoSkin>
+      <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled>
+    </fluidoSkin>
+  </custom>
 </project>
diff --git a/src/it/projects/doxia-formats/verify.groovy b/src/it/projects/doxia-formats/verify.groovy
index ebe0c14..92b12dc 100644
--- a/src/it/projects/doxia-formats/verify.groovy
+++ b/src/it/projects/doxia-formats/verify.groovy
@@ -22,7 +22,9 @@ content = new File( basedir, 'target/site/markdown.html' ).text;
 
 assert content.contains( 'Markdown Format works' );
 
-assert !content.contains( ' quotes and double quotes were stripped' );
+assert !content.contains( ' quotes and double quotes were stripped' ); // DOXIA-473
+//assert content.contains( '<code>monospaced</code> support' ); // DOXIA-597
+//assert content.contains( '<div class="source"><pre class="prettyprint linenums">code block' ); // DOXIA-571
 
 assert !content.contains( 'MACRO' );
 assert content.contains( 'href="#Subsection"' );