Author: tchemit Date: 2012-05-28 11:19:29 +0200 (Mon, 28 May 2012) New Revision: 1148 Url: http://nuiton.org/repositories/revision/eugene/1148 Log: fix logos links fix scmwebeditor urls reformat pom move exclusions to parent pom Modified: trunk/ant-eugene-task/src/site/site_en.xml trunk/ant-eugene-task/src/site/site_fr.xml trunk/eugene/pom.xml trunk/eugene/src/site/site_en.xml trunk/eugene/src/site/site_fr.xml trunk/maven-eugene-plugin/src/site/site_en.xml trunk/maven-eugene-plugin/src/site/site_fr.xml trunk/pom.xml trunk/src/site/site_en.xml trunk/src/site/site_fr.xml Modified: trunk/ant-eugene-task/src/site/site_en.xml =================================================================== --- trunk/ant-eugene-task/src/site/site_en.xml 2012-05-28 09:05:31 UTC (rev 1147) +++ trunk/ant-eugene-task/src/site/site_en.xml 2012-05-28 09:19:29 UTC (rev 1148) @@ -80,7 +80,7 @@ projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.url}' + scm='${project.scm.connection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' Modified: trunk/ant-eugene-task/src/site/site_fr.xml =================================================================== --- trunk/ant-eugene-task/src/site/site_fr.xml 2012-05-28 09:05:31 UTC (rev 1147) +++ trunk/ant-eugene-task/src/site/site_fr.xml 2012-05-28 09:19:29 UTC (rev 1148) @@ -84,7 +84,7 @@ projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.url}' + scm='${project.scm.connection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' Modified: trunk/eugene/pom.xml =================================================================== --- trunk/eugene/pom.xml 2012-05-28 09:05:31 UTC (rev 1147) +++ trunk/eugene/pom.xml 2012-05-28 09:19:29 UTC (rev 1148) @@ -98,16 +98,6 @@ <dependency> <groupId>jaxen</groupId> <artifactId>jaxen</artifactId> - <exclusions> - <exclusion> - <groupId>maven-plugins</groupId> - <artifactId>maven-cobertura-plugin</artifactId> - </exclusion> - <exclusion> - <groupId>maven-plugins</groupId> - <artifactId>maven-findbugs-plugin</artifactId> - </exclusion> - </exclusions> </dependency> <!-- Meta model uml d'eclipse --> Modified: trunk/eugene/src/site/site_en.xml =================================================================== --- trunk/eugene/src/site/site_en.xml 2012-05-28 09:05:31 UTC (rev 1147) +++ trunk/eugene/src/site/site_en.xml 2012-05-28 09:19:29 UTC (rev 1148) @@ -81,7 +81,7 @@ projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.url}' + scm='${project.scm.connection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' Modified: trunk/eugene/src/site/site_fr.xml =================================================================== --- trunk/eugene/src/site/site_fr.xml 2012-05-28 09:05:31 UTC (rev 1147) +++ trunk/eugene/src/site/site_fr.xml 2012-05-28 09:19:29 UTC (rev 1148) @@ -93,7 +93,7 @@ projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.url}' + scm='${project.scm.connection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' Modified: trunk/maven-eugene-plugin/src/site/site_en.xml =================================================================== --- trunk/maven-eugene-plugin/src/site/site_en.xml 2012-05-28 09:05:31 UTC (rev 1147) +++ trunk/maven-eugene-plugin/src/site/site_en.xml 2012-05-28 09:19:29 UTC (rev 1148) @@ -80,7 +80,7 @@ projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.url}' + scm='${project.scm.connection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' Modified: trunk/maven-eugene-plugin/src/site/site_fr.xml =================================================================== --- trunk/maven-eugene-plugin/src/site/site_fr.xml 2012-05-28 09:05:31 UTC (rev 1147) +++ trunk/maven-eugene-plugin/src/site/site_fr.xml 2012-05-28 09:19:29 UTC (rev 1148) @@ -84,7 +84,7 @@ projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.url}' + scm='${project.scm.connection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-05-28 09:05:31 UTC (rev 1147) +++ trunk/pom.xml 2012-05-28 09:19:29 UTC (rev 1148) @@ -22,7 +22,9 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -133,6 +135,14 @@ <groupId>xalan</groupId> <artifactId>xalan</artifactId> </exclusion> + <exclusion> + <groupId>maven-plugins</groupId> + <artifactId>maven-cobertura-plugin</artifactId> + </exclusion> + <exclusion> + <groupId>maven-plugins</groupId> + <artifactId>maven-findbugs-plugin</artifactId> + </exclusion> </exclusions> </dependency> @@ -392,10 +402,10 @@ <extensions> <extension> <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-ssh-external</artifactId> - <version>1.0</version> + <artifactId>wagon-ssh-external</artifactId> + <version>1.0</version> </extension> - + </extensions> <pluginManagement> <plugins> @@ -510,12 +520,14 @@ <phase>pre-site</phase> <configuration> <tasks> - <copy todir="target/site/xsd/v1" verbose="${maven.verbose}" failonerror="false" overwrite="true"> + <copy todir="target/site/xsd/v1" verbose="${maven.verbose}" + failonerror="false" overwrite="true"> <fileset dir="${basedir}/eugene/src/main/resources/xsd"> <include name="**/*.xsd"/> </fileset> </copy> - <copy todir="target/site/dtd/v1" verbose="${maven.verbose}" failonerror="false" overwrite="true"> + <copy todir="target/site/dtd/v1" verbose="${maven.verbose}" + failonerror="false" overwrite="true"> <fileset dir="${basedir}/eugene/src/main/resources/dtd"> <include name="**/*.dtd"/> </fileset> Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2012-05-28 09:05:31 UTC (rev 1147) +++ trunk/src/site/site_en.xml 2012-05-28 09:19:29 UTC (rev 1148) @@ -57,8 +57,8 @@ <poweredBy> <logo href="http://maven.apache.org" name="Maven" img="${project.url}/images/logos/maven-feather.png"/> - <logo href="http://maven-site.nuiton.org/jrst/" name="JRst" img="${project.url}/images/jrst-logo.png"/> - <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" img="${project.url}/images/restructuredtext-logo.png"/> + <logo href="http://maven-site.nuiton.org/jrst/" name="JRst" img="${project.url}/images/logos/jrst-logo.png"/> + <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" img="${project.url}/images/logos/restructuredtext-logo.png"/> </poweredBy> <body> @@ -112,7 +112,7 @@ projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.url}' + scm='${project.scm.connection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2012-05-28 09:05:31 UTC (rev 1147) +++ trunk/src/site/site_fr.xml 2012-05-28 09:19:29 UTC (rev 1148) @@ -57,8 +57,8 @@ <poweredBy> <logo href="http://maven.apache.org" name="Maven" img="${project.url}/images/logos/maven-feather.png"/> - <logo href="http://maven-site.nuiton.org/jrst/" name="JRst" img="${project.url}/images/jrst-logo.png"/> - <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" img="${project.url}/images/restructuredtext-logo.png"/> + <logo href="http://maven-site.nuiton.org/jrst/" name="JRst" img="${project.url}/images/logos/jrst-logo.png"/> + <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" img="${project.url}/images/logos/restructuredtext-logo.png"/> </poweredBy> <body> @@ -118,7 +118,7 @@ projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.url}' + scm='${project.scm.connection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}'