You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2024/05/08 15:26:50 UTC
(maven-fluido-skin) 01/01: [MSKINS-246] Upgrade plugins and components (in ITs)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch MSKINS-246
in repository https://gitbox.apache.org/repos/asf/maven-fluido-skin.git
commit 437e53e00d553549b074cf952a94a2771bc253ed
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Wed May 8 17:25:53 2024 +0200
[MSKINS-246] Upgrade plugins and components (in ITs)
Co-authored-by: Konrad Windszus <kw...@apache.org>
---
pom.xml | 2 +-
src/it/mskins-107/verify.groovy | 2 +-
src/main/resources/META-INF/maven/site.vm | 2 +-
src/main/resources/META-INF/maven/skin.xml | 2 +-
src/main/resources/css/maven-base.css | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index 8c0bfcf..5e77ce9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -99,7 +99,7 @@ under the License.
<anchorjs.version>4.3.1</anchorjs.version>
<bootstrap.version>2.3.2</bootstrap.version>
<jquery.version>1.11.2</jquery.version>
- <version.maven-site-plugin>4.0.0-M10</version.maven-site-plugin>
+ <version.maven-site-plugin>4.0.0-M14</version.maven-site-plugin>
<project.build.outputTimestamp>2023-10-08T14:07:28Z</project.build.outputTimestamp>
<!-- the following properties are used in ITs (which do not inherit anything from a common parent) -->
<sitePluginVersion>${version.maven-site-plugin}</sitePluginVersion>
diff --git a/src/it/mskins-107/verify.groovy b/src/it/mskins-107/verify.groovy
index d80feaa..87d4e33 100644
--- a/src/it/mskins-107/verify.groovy
+++ b/src/it/mskins-107/verify.groovy
@@ -20,4 +20,4 @@
File index = new File( basedir, "target/site/index.html" )
assert index.exists()
-assert index.text.contains("<meta name=\"generator\" content=\"Apache Maven Doxia Site Renderer 2.0.0-M12\" />")
+assert index.text.contains("<meta name=\"generator\" content=\"Apache Maven Doxia Site Renderer 2.0.0-M18\" />")
diff --git a/src/main/resources/META-INF/maven/site.vm b/src/main/resources/META-INF/maven/site.vm
index 5e0604f..26bb876 100644
--- a/src/main/resources/META-INF/maven/site.vm
+++ b/src/main/resources/META-INF/maven/site.vm
@@ -239,7 +239,7 @@
#* *##set( $sourceStyle = "prettyprint" )
#* *##end
##
-#* *#$bodyContent.replaceAll( '<div class="verbatim source">(\r?\n)?<pre>', '<div class="verbatim source"><pre class="' + $sourceStyle + '">' ).replaceAll( 'class="bodyTable"', 'class="table table-striped"' ).replaceAll( 'class="bodyTable bodyTableBorder"', 'class="table table-bordered table-striped"' )
+#* *#$bodyContent.replace( '<pre><code>', '<pre class="' + $sourceStyle + '"><code>' ).replace( 'class="bodyTable"', 'class="table table-striped"' ).replace( 'class="bodyTable bodyTableBorder"', 'class="table table-bordered table-striped"' )
</main>
#* *##if( $sideBarEnabled )
</div>
diff --git a/src/main/resources/META-INF/maven/skin.xml b/src/main/resources/META-INF/maven/skin.xml
index f795867..4b326c0 100644
--- a/src/main/resources/META-INF/maven/skin.xml
+++ b/src/main/resources/META-INF/maven/skin.xml
@@ -22,6 +22,6 @@ under the License.
<skin xmlns="http://maven.apache.org/SKIN/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SKIN/2.0.0 http://maven.apache.org/xsd/skin-2.0.0.xsd">
<prerequisites>
- <doxia-sitetools>2.0.0-M12</doxia-sitetools>
+ <doxia-sitetools>2.0.0-M18</doxia-sitetools>
</prerequisites>
</skin>
diff --git a/src/main/resources/css/maven-base.css b/src/main/resources/css/maven-base.css
index 829ef71..5747cd6 100644
--- a/src/main/resources/css/maven-base.css
+++ b/src/main/resources/css/maven-base.css
@@ -30,7 +30,7 @@ section > p,
section > dt,
section > dl,
section > table.table,
-section > div.verbatim {
+section > pre {
margin-right: 7px;
margin-left: 7px;
}