This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pom. See http://git.nuiton.org/pom.git commit 536ede8626a80633810d2d106f6811a254330cda Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Feb 28 08:15:46 2016 +0100 Upgrade to m-site-p 3.5 (and jrst 2.2-SNAPSHOT) + can't use anylonger variables to defined urls in site descriptors (See #3886) --- pom.xml | 7 ++----- src/site/site.xml | 14 +++++++------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index b75a0f5..c100762 100644 --- a/pom.xml +++ b/pom.xml @@ -234,7 +234,7 @@ <!-- our plugins --> <helperPluginVersion>2.3.1</helperPluginVersion> <jredminePluginVersion>1.9</jredminePluginVersion> - <jrstPluginVersion>2.1</jrstPluginVersion> + <jrstPluginVersion>2.2-SNAPSHOT</jrstPluginVersion> <!-- apache maven plugins version --> <antRunPluginVersion>1.8</antRunPluginVersion> @@ -257,7 +257,7 @@ <releasePluginVersion>2.5.3</releasePluginVersion> <remoteResourcesPluginVersion>1.5</remoteResourcesPluginVersion> <resourcesPluginVersion>2.7</resourcesPluginVersion> - <sitePluginVersion>3.4</sitePluginVersion> + <sitePluginVersion>3.5</sitePluginVersion> <sourcePluginVersion>3.0.0</sourcePluginVersion> <surefirePluginVersion>2.19.1</surefirePluginVersion> <warPluginVersion>2.6</warPluginVersion> @@ -342,9 +342,6 @@ <!-- fluido skin version --> <fluidoSkinVersion>1.5</fluidoSkinVersion> - <!-- where to get common site resources --> - <siteCommonResourcesUrl>http://common.nuiton.org/dev</siteCommonResourcesUrl> - <!-- to generate sitemap --> <generateSitemap>true</generateSitemap> diff --git a/src/site/site.xml b/src/site/site.xml index e7ad5a4..d630162 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -22,9 +22,9 @@ --> -<project name="${project.name}" xmlns="http://maven.apache.org/DECORATION/1.4.0" +<project name="${project.name}" xmlns="http://maven.apache.org/DECORATION/1.7.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd"> + xsi:schemaLocation="http://maven.apache.org/DECORATION/1.7.0 http://maven.apache.org/xsd/decoration-1.7.0.xsd"> <skin> <groupId>org.apache.maven.skins</groupId> @@ -51,17 +51,17 @@ <poweredBy> - <logo href="http://maven.apache.org" name="Maven" img="${siteCommonResourcesUrl}/images/logos/maven-feather.png"/> + <logo href="http://maven.apache.org" name="Maven" img="http://common.nuiton.org/dev/images/logos/maven-feather.png"/> </poweredBy> <body> <head> - <script type="text/javascript" src="${siteCommonResourcesUrl}/js/pom-site.js"> - - </script> - <link rel="stylesheet" type="text/css" href="${siteCommonResourcesUrl}/css/mavenpom-site.css"/> + <![CDATA[ + <script type="text/javascript" src="http://common.nuiton.org/dev/js/pom-site.js"></script> + <link rel="stylesheet" type="text/css" href="http://common.nuiton.org/dev/css/mavenpom-site.css"/> + ]]> </head> </body> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.