branch develop updated (522c52d -> 6a11711)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pom. See http://git.nuiton.org/pom.git from 522c52d [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 26a43f6 Dowgrade m-site-p and jrst and redo the nice math around site descriptor (See #3901) new 6a11711 Fixes #3901 Merge branch 'feature/3901' into develop The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 6a117117ec260bd9a8a844d1c34e49f51294cb3d Merge: 522c52d 26a43f6 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Mar 1 09:50:42 2016 +0100 Fixes #3901 Merge branch 'feature/3901' into develop commit 26a43f690b081c1816cc4c72e942d9a6daa552f0 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Mar 1 09:50:35 2016 +0100 Dowgrade m-site-p and jrst and redo the nice math around site descriptor (See #3901) Summary of changes: pom.xml | 7 +++++-- src/site/site.xml | 13 +++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
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 26a43f690b081c1816cc4c72e942d9a6daa552f0 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Mar 1 09:50:35 2016 +0100 Dowgrade m-site-p and jrst and redo the nice math around site descriptor (See #3901) --- pom.xml | 7 +++++-- src/site/site.xml | 13 +++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index 7673ee5..c7df8f4 100644 --- a/pom.xml +++ b/pom.xml @@ -234,7 +234,7 @@ <!-- our plugins --> <helperPluginVersion>2.3.1</helperPluginVersion> <jredminePluginVersion>1.9</jredminePluginVersion> - <jrstPluginVersion>2.2</jrstPluginVersion> + <jrstPluginVersion>2.1</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.5</sitePluginVersion> + <sitePluginVersion>3.4</sitePluginVersion> <sourcePluginVersion>3.0.0</sourcePluginVersion> <surefirePluginVersion>2.19.1</surefirePluginVersion> <warPluginVersion>2.6</warPluginVersion> @@ -351,6 +351,9 @@ <!-- Documentation is in apt format (can use rst, md)--> <siteSourcesType>apt</siteSourcesType> + <!-- Shared resources for maven site --> + <siteCommonResourcesUrl>http://common.nuiton.org/dev</siteCommonResourcesUrl> + <!-- ////////////////////////////////////////////////////////////////// --> <!-- //// gitflow configuration //// --> <!-- ////////////////////////////////////////////////////////////////// --> diff --git a/src/site/site.xml b/src/site/site.xml index d630162..5893d0a 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -21,10 +21,9 @@ #L% --> - -<project name="${project.name}" xmlns="http://maven.apache.org/DECORATION/1.7.0" +<project name="${project.name}" xmlns="http://maven.apache.org/DECORATION/1.6.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/DECORATION/1.7.0 http://maven.apache.org/xsd/decoration-1.7.0.xsd"> + xsi:schemaLocation="http://maven.apache.org/DECORATION/1.6.0 http://maven.apache.org/xsd/decoration-1.6.0.xsd"> <skin> <groupId>org.apache.maven.skins</groupId> @@ -51,17 +50,15 @@ <poweredBy> - <logo href="http://maven.apache.org" name="Maven" img="http://common.nuiton.org/dev/images/logos/maven-feather.png"/> + <logo href="http://maven.apache.org" name="Maven" img="${siteCommonResourcesUrl}/images/logos/maven-feather.png"/> </poweredBy> <body> <head> - <![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"/> - ]]> + <script type="text/javascript" src="${siteCommonResourcesUrl}/js/pom-site.js"> </script> + <link rel="stylesheet" type="text/css" href="${siteCommonResourcesUrl}/css/mavenpom-site.css"/> </head> </body> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
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 6a117117ec260bd9a8a844d1c34e49f51294cb3d Merge: 522c52d 26a43f6 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Mar 1 09:50:42 2016 +0100 Fixes #3901 Merge branch 'feature/3901' into develop pom.xml | 7 +++++-- src/site/site.xml | 13 +++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm