branch develop updated (0081f80 -> 8fbff82)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository i18n. See http://git.nuiton.org/i18n.git from 0081f80 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new ca2d8f0 Update to nuitpom 9 (Fixes #3915) new 8fbff82 Fix site descriptors 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 8fbff82de27945bc0d4f0957d7f6a8b7410ff5ac Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Mar 3 15:57:42 2016 +0100 Fix site descriptors commit ca2d8f0622f666adabe1cef14dfd8d436b7f40ca Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Mar 3 15:56:22 2016 +0100 Update to nuitpom 9 (Fixes #3915) Summary of changes: i18n-maven-plugin/pom.xml | 4 ++++ i18n-maven-plugin/src/site/site_en.xml | 10 +++------- i18n-maven-plugin/src/site/site_fr.xml | 10 +++------- nuiton-i18n/src/site/site_en.xml | 4 +++- nuiton-i18n/src/site/site_fr.xml | 4 +++- pom.xml | 17 +++++++---------- src/site/site_en.xml | 21 +++++++++++++-------- src/site/site_fr.xml | 21 +++++++++++++-------- 8 files changed, 49 insertions(+), 42 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 i18n. See http://git.nuiton.org/i18n.git commit ca2d8f0622f666adabe1cef14dfd8d436b7f40ca Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Mar 3 15:56:22 2016 +0100 Update to nuitpom 9 (Fixes #3915) --- i18n-maven-plugin/pom.xml | 4 ++++ pom.xml | 17 +++++++---------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/i18n-maven-plugin/pom.xml b/i18n-maven-plugin/pom.xml index cc9dce8..841a9db 100644 --- a/i18n-maven-plugin/pom.xml +++ b/i18n-maven-plugin/pom.xml @@ -40,6 +40,10 @@ <properties> + <javaVersion>1.7</javaVersion> + <signatureArtifactId>java17</signatureArtifactId> + <signatureVersion>1.0</signatureVersion> + <!-- Post Release configuration --> <skipPostRelease>false</skipPostRelease> </properties> diff --git a/pom.xml b/pom.xml index 25383b3..1650382 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuitonpom</artifactId> - <version>7</version> + <version>9</version> </parent> <artifactId>i18n</artifactId> @@ -51,24 +51,21 @@ <url>https://gitlab.nuiton.org/nuiton/i18n</url> </scm> - <distributionManagement> - <site> - <id>${site.server}</id> - <url>${site.url}</url> - </site> - </distributionManagement> - <properties> <projectId>i18n</projectId> <ciViewId>I18n</ciViewId> - + <!--Multilanguage maven-site --> <locales>fr,en</locales> <mavenVersion>3.3.9</mavenVersion> - <helperPluginVersion>2.3.1</helperPluginVersion> <antlr4Version>4.5</antlr4Version> + + <javaVersion>1.6</javaVersion> + <signatureArtifactId>java16</signatureArtifactId> + <signatureVersion>1.0</signatureVersion> + </properties> <dependencyManagement> -- 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 i18n. See http://git.nuiton.org/i18n.git commit 8fbff82de27945bc0d4f0957d7f6a8b7410ff5ac Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Mar 3 15:57:42 2016 +0100 Fix site descriptors --- i18n-maven-plugin/src/site/site_en.xml | 10 +++------- i18n-maven-plugin/src/site/site_fr.xml | 10 +++------- nuiton-i18n/src/site/site_en.xml | 4 +++- nuiton-i18n/src/site/site_fr.xml | 4 +++- src/site/site_en.xml | 21 +++++++++++++-------- src/site/site_fr.xml | 21 +++++++++++++-------- 6 files changed, 38 insertions(+), 32 deletions(-) diff --git a/i18n-maven-plugin/src/site/site_en.xml b/i18n-maven-plugin/src/site/site_en.xml index 33673b2..eca982f 100644 --- a/i18n-maven-plugin/src/site/site_en.xml +++ b/i18n-maven-plugin/src/site/site_en.xml @@ -24,7 +24,9 @@ #L% --> -<project name="${project.name}"> +<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.6.0 http://maven.apache.org/xsd/decoration-1.6.0.xsd"> <bannerLeft> <name>${project.name}</name> @@ -33,12 +35,6 @@ <body> - <head> - - <link rel="stylesheet" type="text/css" - href="${siteCommonResourcesUrl}/public/css/mavenpom-site.css"/> - </head> - <breadcrumbs> <item name="${project.name}" href="./index.html"/> </breadcrumbs> diff --git a/i18n-maven-plugin/src/site/site_fr.xml b/i18n-maven-plugin/src/site/site_fr.xml index 4d7314c..c0a8205 100644 --- a/i18n-maven-plugin/src/site/site_fr.xml +++ b/i18n-maven-plugin/src/site/site_fr.xml @@ -24,7 +24,9 @@ #L% --> -<project name="${project.name}"> +<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.6.0 http://maven.apache.org/xsd/decoration-1.6.0.xsd"> <bannerLeft> <name>${project.name}</name> @@ -33,12 +35,6 @@ <body> - <head> - - <link rel="stylesheet" type="text/css" - href="${siteCommonResourcesUrl}/public/css/mavenpom-site.css"/> - </head> - <breadcrumbs> <item name="${project.name}" href="./index.html"/> </breadcrumbs> diff --git a/nuiton-i18n/src/site/site_en.xml b/nuiton-i18n/src/site/site_en.xml index ed9db42..e71f9e1 100644 --- a/nuiton-i18n/src/site/site_en.xml +++ b/nuiton-i18n/src/site/site_en.xml @@ -24,7 +24,9 @@ #L% --> -<project name="${project.name}"> +<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.6.0 http://maven.apache.org/xsd/decoration-1.6.0.xsd"> <bannerLeft> <name>${project.name}</name> diff --git a/nuiton-i18n/src/site/site_fr.xml b/nuiton-i18n/src/site/site_fr.xml index e2e8773..e4d9b79 100644 --- a/nuiton-i18n/src/site/site_fr.xml +++ b/nuiton-i18n/src/site/site_fr.xml @@ -24,7 +24,9 @@ #L% --> -<project name="${project.name}"> +<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.6.0 http://maven.apache.org/xsd/decoration-1.6.0.xsd"> <bannerLeft> <name>${project.name}</name> diff --git a/src/site/site_en.xml b/src/site/site_en.xml index 542bd04..3d69e73 100644 --- a/src/site/site_en.xml +++ b/src/site/site_en.xml @@ -24,7 +24,9 @@ #L% --> -<project name="${project.name}"> +<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.6.0 http://maven.apache.org/xsd/decoration-1.6.0.xsd"> <bannerLeft> <name>${project.name}</name> @@ -38,6 +40,12 @@ <body> + <links> + <item name="nuiton.org" href="https://forge.nuiton.org"/> + <item name="CodeLutin" href="http://codelutin.com"/> + <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/> + </links> + <breadcrumbs> <item name="${project.name}" href="${project.url}/index.html"/> <item name="${project.version}" href="${project.url}/${siteDeployClassifier}/en/index.html"/> @@ -47,12 +55,6 @@ <item name="Version Française" href="../index.html"/> </menu> - <links> - <item name="nuiton.org" href="https://forge.nuiton.org"/> - <item name="CodeLutin" href="http://codelutin.com"/> - <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/> - </links> - <menu name="User"> <item name="Presentation" href="presentation.html"/> <item name="History" href="history.html"/> @@ -71,7 +73,10 @@ <item name="Extend Initializer" href="extendInitializer.html"/> </menu> - <menu ref="modules"/> + <menu name="Modules"> + <item name="I18n :: Api" href="./nuiton-i18n/index.html"/> + <item name="I18n :: Maven Plugin" href="./i18n-maven-plugin/index.html"/> + </menu> <menu ref="reports"/> diff --git a/src/site/site_fr.xml b/src/site/site_fr.xml index 3190c34..8a558f3 100644 --- a/src/site/site_fr.xml +++ b/src/site/site_fr.xml @@ -24,7 +24,9 @@ #L% --> -<project name="${project.name}"> +<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.6.0 http://maven.apache.org/xsd/decoration-1.6.0.xsd"> <bannerLeft> <name>${project.name}</name> @@ -38,18 +40,18 @@ <body> - <breadcrumbs> - <item name="${project.name}" href="${project.url}/index.html"/> - <item name="${project.version}" - href="${project.url}/${siteDeployClassifier}/index.html"/> - </breadcrumbs> - <links> <item name="nuiton.org" href="https://forge.nuiton.org"/> <item name="CodeLutin" href="http://codelutin.com"/> <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/> </links> + <breadcrumbs> + <item name="${project.name}" href="${project.url}/index.html"/> + <item name="${project.version}" + href="${project.url}/${siteDeployClassifier}/index.html"/> + </breadcrumbs> + <menu name="Langue"> <item name="English Version" href="./en/index.html"/> </menu> @@ -72,7 +74,10 @@ <item name="Etendre Initializer" href="extendInitializer.html"/> </menu> - <menu ref="modules"/> + <menu name="Modules"> + <item name="I18n :: Api" href="./nuiton-i18n/index.html"/> + <item name="I18n :: Maven Plugin" href="./i18n-maven-plugin/index.html"/> + </menu> <menu ref="reports"/> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm