Author: michaelo
Date: Thu Feb 11 20:12:42 2016
New Revision: 1729884
URL: http://svn.apache.org/viewvc?rev=1729884&view=rev
Log:
[MSKINS-120] Clean up skins for Doxia Sitetools 1.7
Revert r1729051 and r1729239 since their make this skin unusable with Site
Plugin 3.4 and 3.5. Else it will be impossible to pass ITs and build the site
due to MSKINS-124. We have to render always with the previous version because
has to run with the supported Site Plugin version only.
Modified:
maven/skins/trunk/maven-fluido-skin/pom.xml
maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
maven/skins/trunk/maven-fluido-skin/src/site/site.xml
Modified: maven/skins/trunk/maven-fluido-skin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/pom.xml?rev=1729884&r1=1729883&r2=1729884&view=diff
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/pom.xml (original)
+++ maven/skins/trunk/maven-fluido-skin/pom.xml Thu Feb 11 20:12:42 2016
@@ -95,7 +95,6 @@ under the License.
<properties>
<bootstrap.version>2.3.2</bootstrap.version>
<jquery.version>1.11.2</jquery.version>
- <sitePluginVersion>3.5-SNAPSHOT</sitePluginVersion>
</properties>
<build>
@@ -155,11 +154,6 @@ under the License.
<artifactId>maven-invoker-plugin</artifactId>
<version>1.10</version>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>${sitePluginVersion}</version>
- </plugin>
</plugins>
</pluginManagement>
<plugins>
Modified:
maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
URL:
http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm?rev=1729884&r1=1729883&r2=1729884&view=diff
==============================================================================
---
maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
(original)
+++
maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
Thu Feb 11 20:12:42 2016
@@ -1121,7 +1121,7 @@
#set ( $sourceStyle = "prettyprint" )
#end
- $bodyContent.replaceAll( "<div class=""source"">(\r?\n)?<pre>",
"<div class=""source""><pre class=""$sourceStyle"">" ).replaceAll(
"class=""bodyTable""", "class=""table table-striped""" )
+ $bodyContent.replaceAll( "<div
class=${esc.q}source${esc.q}>(\r?\n)?<pre>", "<div
class=${esc.q}source${esc.q}><pre class=${esc.q}$sourceStyle${esc.q}>"
).replaceAll( "class=${esc.q}bodyTable${esc.q}", "class=${esc.q}table
table-striped${esc.q}" )
#end
</div>
#if ( $sideBarEnabled )
Modified: maven/skins/trunk/maven-fluido-skin/src/site/site.xml
URL:
http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/site/site.xml?rev=1729884&r1=1729883&r2=1729884&view=diff
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/src/site/site.xml (original)
+++ maven/skins/trunk/maven-fluido-skin/src/site/site.xml Thu Feb 11 20:12:42
2016
@@ -29,7 +29,7 @@ under the License.
<skin>
<groupId>${project.groupId}</groupId>
<artifactId>${project.artifactId}</artifactId>
- <version>${project.version}</version>
+ <version>1.4</version>
</skin>
<custom>
