Commit ee764cdb authored by PECQUOT's avatar PECQUOT

update site

Signed-off-by: PECQUOT's avatarlp1ee9d <ludovic.pecquot@e-is.pro>
parent 9879fc59
......@@ -5,7 +5,7 @@
<parent>
<groupId>fr.ifremer.common</groupId>
<artifactId>common-parent</artifactId>
<version>3.0.6</version>
<version>3.0.9</version>
</parent>
<groupId>fr.ifremer.reefdb</groupId>
......@@ -171,7 +171,7 @@
<maven.compiler.debug>true</maven.compiler.debug>
<!-- Quadrige3 Core version -->
<quadrige3-core.version>3.6.3</quadrige3-core.version>
<quadrige3-core.version>3.6.4</quadrige3-core.version>
<!-- Last ReefDb launcher version -->
<launcherVersion>3.0.3</launcherVersion>
......@@ -200,17 +200,15 @@
<nuitonVersionVersion>1.0-rc-2</nuitonVersionVersion>
<nuitonConfigVersion>3.0</nuitonConfigVersion> <!-- TODO LP: essayer en 3.3, et voir si le format .properties est toujours supporté -->
<jrstPluginVersion>2.1</jrstPluginVersion>
<jmock.version>2.8.2</jmock.version>
<dbunit.version>2.5.3</dbunit.version>
<junit.version>4.12</junit.version>
<!-- gitflow release plugin -->
<gitflowPluginVersion>1.12.0-EIS</gitflowPluginVersion>
<!-- to deploy with scpexe for maven 3 -->
<wagonSshVersion>3.3.3</wagonSshVersion>
<!-- 2.0.0 failed on Third Parties report -->
<licensePluginVersion>1.20</licensePluginVersion>
<!--license-maven-plugin config -->
<maven.license.file>${project.basedir}/LICENSE.txt</maven.license.file>
<license.useMissingFile>true</license.useMissingFile>
......@@ -218,6 +216,10 @@
<license.organizationName>Ifremer</license.organizationName>
<license.licenseName>agpl_v3</license.licenseName>
<!-- Site plugin -->
<fluidoSkinVersion>1.8</fluidoSkinVersion>
<sitePluginVersion>3.8.2</sitePluginVersion>
<locales>en,fr</locales>
<!-- I18n configuration -->
......@@ -396,18 +398,7 @@
<!-- plugin site -->
<plugin>
<artifactId>maven-site-plugin</artifactId>
<version>3.4</version> <!-- 3.6 dans le pom parent -->
<dependencies>
<dependency>
<groupId>org.nuiton.jrst</groupId>
<artifactId>doxia-module-jrst</artifactId>
<version>${jrstPluginVersion}</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-velocity</artifactId>
<version>1.2</version>
</dependency>
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
......@@ -786,15 +777,20 @@
<plugins>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
<!-- <version>${projectInfoReportsPluginVersion}</version>-->
<version>2.9</version>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>3.0.0</version>
<reportSets>
<reportSet>
<reports>
<report>project-team</report>
<report>mailing-list</report>
<report>issue-tracking</report>
<report>license</report>
<report>team</report>
<report>mailing-lists</report>
<report>issue-management</report>
<report>licenses</report>
<report>scm</report>
<report>dependencies</report>
<report>dependency-convergence</report>
......@@ -1103,7 +1099,6 @@
<includes>
<include>site/**</include>
<include>generated-site/**</include>
<include>generated-jrst/**</include>
<include>staging/**</include>
</includes>
</fileset>
......
......@@ -43,8 +43,10 @@
# Please fill the missing licenses for dependencies :
#
#
#Tue Jan 02 18:06:11 CET 2018
#Tue Jan 21 15:10:29 CET 2020
com.oracle--ojdbc7--12.1.0.2.0=OTN license
commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0
dom4j--dom4j--1.6.1=BSD License
fr.ifremer.reefdb--reefdb-ui-swing-launcher--3.0.3=
org.hibernate--hibernate-spatial--4.3-20140213=Lesser General Public License (LGPL)
org.liquibase--liquibase-core--3.7.1-pg11=
......@@ -27,7 +27,7 @@
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
<version>1.3.0</version>
<version>${fluidoSkinVersion}</version>
</skin>
<custom>
......@@ -72,12 +72,7 @@
<body>
<head>
<!-- favicon -->
<link rel="icon" type="image/png" href="./images/favicon-32x32.png" sizes="32x32"/>
<link rel="icon" type="image/png" href="./images/favicon-64x64.png" sizes="64x64"/>
<link rel="icon shortcut" type="image/png" href="./images/favicon-64x64.png" sizes="64x64"/>
</head>
<head/>
<links>
<item name="Forge" href="https://forge.ifremer.fr/projects/reefdb"/>
......@@ -120,19 +115,6 @@
<menu ref="reports"/>
<footer>
<div id='projectMetas' locale='fr'
projectversion='${project.version}'
platform='${project.platform}'
projectid='${project.projectId}'
scm='${project.scm.developerConnection}'
scmwebeditorenabled='${project.scmwebeditorEnabled}'
scmwebeditorurl='${project.scmwebeditorUrl}'
siteSourcesType='${project.siteSourcesType}'
piwikEnabled='${project.piwikEnabled}'
piwikId='${project.piwikId}'>
</div>
</footer>
</body>
</project>
......@@ -29,7 +29,7 @@
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
<version>1.3.0</version>
<version>${fluidoSkinVersion}</version>
</skin>
<custom>
......@@ -68,16 +68,7 @@
<body>
<head>
<link rel="stylesheet" type="text/css"
href="../css/site.css"/>
<!-- favicon -->
<link rel="icon" type="image/png" href="../images/favicon-32x32.png" sizes="32x32"/>
<link rel="icon" type="image/png" href="../images/favicon-64x64.png" sizes="64x64"/>
<link rel="icon shortcut" type="image/png" href="../images/favicon-64x64.png" sizes="64x64"/>
</head>
<head/>
<links>
<item name="Forge" href="https://forge.ifremer.fr/projects/reefdb"/>
......@@ -119,18 +110,5 @@
<menu ref="reports"/>
<footer>
<div id='projectMetas' locale='fr'
projectversion='${project.version}'
platform='${project.platform}'
projectid='${project.projectId}'
scm='${project.scm.developerConnection}'
scmwebeditorenabled='${project.scmwebeditorEnabled}'
scmwebeditorurl='${project.scmwebeditorUrl}'
siteSourcesType='${project.siteSourcesType}'
piwikEnabled='${project.piwikEnabled}'
piwikId='${project.piwikId}'>
</div>
</footer>
</body>
</project>
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment