branch develop updated (78fca29 -> 547b98a)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See http://git.codelutin.com/echobase.git from 78fca29 Move to last codelutinpom snapshot new 547b98a Utilisation de codelutinpom 3 + ajout de la configuration pour l'édition des sources via scmwebeditor The 1 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 547b98a4a60165d9177b202a8dc7f3dacce2f942 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Nov 3 21:38:20 2015 +0100 Utilisation de codelutinpom 3 + ajout de la configuration pour l'édition des sources via scmwebeditor Summary of changes: pom.xml | 25 +++++++------------------ src/site/site_en.xml | 18 ++++++++++++++++++ src/site/site_fr.xml | 18 ++++++++++++++++++ 3 files changed, 43 insertions(+), 18 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See http://git.codelutin.com/echobase.git commit 547b98a4a60165d9177b202a8dc7f3dacce2f942 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Nov 3 21:38:20 2015 +0100 Utilisation de codelutinpom 3 + ajout de la configuration pour l'édition des sources via scmwebeditor --- pom.xml | 25 +++++++------------------ src/site/site_en.xml | 18 ++++++++++++++++++ src/site/site_fr.xml | 18 ++++++++++++++++++ 3 files changed, 43 insertions(+), 18 deletions(-) diff --git a/pom.xml b/pom.xml index 85f165e..16f6e19 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>codelutinpom</artifactId> - <version>2.4-SNAPSHOT</version> + <version>3</version> </parent> <groupId>fr.ifremer</groupId> @@ -126,15 +126,6 @@ <projectId>echobase</projectId> - <!-- Java version --> - <javaVersion>1.7</javaVersion> - <!--TODO remove this when idea won't ask to change jdk level at each pom modification--> - <maven.compiler.source>${javaVersion}</maven.compiler.source> - <!--TODO remove this when idea won't ask to change jdk level at each pom modification--> - <maven.compiler.target>${javaVersion}</maven.compiler.target> - <signatureArtifactId>java17</signatureArtifactId> - <signatureVersion>1.0</signatureVersion> - <!-- libraries version --> <topiaVersion>3.0-beta-3</topiaVersion> @@ -171,7 +162,8 @@ <echobaseI18nBundle>echobase-i18n</echobaseI18nBundle> <!--Site configuration --> - <locales>fr,en</locales> + <!--<locales>fr,en</locales>--> + <locales>fr</locales> <!-- name of embedded war file basename --> <embeddedWarName>echobase-embedded-${project.version}</embeddedWarName> @@ -180,6 +172,10 @@ <lizmapVersion>2.9.4</lizmapVersion> <qgisMapServerVersion>2.8.4</qgisMapServerVersion> + <scmwebeditorenabled>true</scmwebeditorenabled> + <scmwebeditorUrl>http://demo.codelutin.com/scmwebeditor-staging/edit.action</scmwebeditorUrl> + <siteSourcesType>rst</siteSourcesType> + </properties> <dependencyManagement> @@ -497,13 +493,6 @@ <version>${nuitonI18nVersion}</version> </plugin> - <!-- FIXME Move to codelutinpom project --> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>1.9.1</version> - </plugin> - </plugins> </pluginManagement> diff --git a/src/site/site_en.xml b/src/site/site_en.xml index 928e142..8074879 100644 --- a/src/site/site_en.xml +++ b/src/site/site_en.xml @@ -53,6 +53,11 @@ <body> + <head> + <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> + <links> <item name="Forge" href="https://forge.codelutin.com"/> <item name="CodeLutin" href="http://codelutin.com"/> @@ -104,5 +109,18 @@ <menu ref="reports"/> + <footer> + <div id='projectMetas' + projectversion='${project.version}' + scm='${project.scm.developerConnection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + scmwebeditor_skipDefaultFiles="true" + scmwebeditor_vmFiles=",install,update,usage,configure," + locale='en'> + </div> + </footer> + </body> </project> diff --git a/src/site/site_fr.xml b/src/site/site_fr.xml index e371461..183afc5 100644 --- a/src/site/site_fr.xml +++ b/src/site/site_fr.xml @@ -54,6 +54,11 @@ <body> + <head> + <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> + <links> <item name="Forge" href="https://forge.codelutin.com"/> <item name="CodeLutin" href="http://codelutin.com"/> @@ -106,5 +111,18 @@ <menu ref="reports"/> + <footer> + <div id='projectMetas' + projectversion='${project.version}' + scm='${project.scm.developerConnection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + scmwebeditor_skipDefaultFiles="true" + scmwebeditor_vmFiles=",install,update,usage,configure," + locale='fr'> + </div> + </footer> + </body> </project> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm