branch develop updated (3ebd2ad -> 801549f)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository jaxx. See http://git.nuiton.org/jaxx.git from 3ebd2ad fixes #3678: Authorize component by their type in BlockingLayerUI Merge branch 'feature/3678' into develop new 801549f Migration vers gitlab + utilisation nuitonpom 5 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 801549f6298ad3773ace06b68c2278616e82a396 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Dec 19 08:57:21 2015 +0100 Migration vers gitlab + utilisation nuitonpom 5 Summary of changes: jaxx-maven-plugin/pom.xml | 3 +-- pom.xml | 26 +++++++++----------------- src/site/site.xml | 7 +++++++ 3 files changed, 17 insertions(+), 19 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 jaxx. See http://git.nuiton.org/jaxx.git commit 801549f6298ad3773ace06b68c2278616e82a396 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Dec 19 08:57:21 2015 +0100 Migration vers gitlab + utilisation nuitonpom 5 --- jaxx-maven-plugin/pom.xml | 3 +-- pom.xml | 26 +++++++++----------------- src/site/site.xml | 7 +++++++ 3 files changed, 17 insertions(+), 19 deletions(-) diff --git a/jaxx-maven-plugin/pom.xml b/jaxx-maven-plugin/pom.xml index e1cb6af..15bd791 100644 --- a/jaxx-maven-plugin/pom.xml +++ b/jaxx-maven-plugin/pom.xml @@ -159,8 +159,7 @@ <dependency> <groupId>org.nuiton</groupId> - <artifactId>helper-maven-plugin-api</artifactId> - <classifier>tests</classifier> + <artifactId>helper-maven-plugin-test-api</artifactId> </dependency> <!-- FIXME si on ne le rajoute pas, on se retrouve avec la version 1.1 qui ne convient pas --> diff --git a/pom.xml b/pom.xml index 3f9f5d0..58d5f81 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuitonpom</artifactId> - <version>1.8.2</version> + <version>5</version> </parent> <artifactId>jaxx</artifactId> @@ -133,15 +133,6 @@ <!-- pour un muli module on doit fixer le projectId --> <projectId>jaxx</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> - <mavenVersion>2.2.1</mavenVersion> <nuitonValidatorVersion>3.0</nuitonValidatorVersion> <nuitonI18nVersion>3.3</nuitonI18nVersion> @@ -155,8 +146,11 @@ <jnlpFileName>jaxx-demo.jnlp</jnlpFileName> <jnlpCodebase>http://jaxx.nuiton.org/v/${siteDeployClassifier}/jaxx-demo/jnlp</jnlpCodebase> + <locales>fr</locales> + <siteSourcesType>rst</siteSourcesType> + <!-- FIXME-tchemit-2014-12-05 Can't generate widgets with more recent versions --> - <javadocPluginVersion>2.9.1</javadocPluginVersion> + <!--<javadocPluginVersion>2.9.1</javadocPluginVersion>--> <!-- FIXME-tchemit-2012-07-02 Still not working, normalize all rst docs --> <!--pdfGenerationEnabled>true</pdfGenerationEnabled--> </properties> @@ -164,9 +158,9 @@ <!-- Source control management. --> <scm> - <connection>scm:git:http://git.nuiton.org/jaxx.git</connection> - <developerConnection>scm:git:https://git.nuiton.org/jaxx.git</developerConnection> - <url>https://gitweb.nuiton.org/jaxx.git</url> + <connection>scm:git:git@gitlab.nuiton.org:nuiton/jaxx.git</connection> + <developerConnection>scm:git:git@gitlab.nuiton.org:nuiton/jaxx.git</developerConnection> + <url>https://gitlab.nuiton.org/nuiton/jaxx</url> </scm> <distributionManagement> @@ -348,10 +342,8 @@ <dependency> <groupId>org.nuiton</groupId> - <artifactId>helper-maven-plugin-api</artifactId> + <artifactId>helper-maven-plugin-test-api</artifactId> <version>${helperPluginVersion}</version> - <scope>test</scope> - <classifier>tests</classifier> <exclusions> <exclusion> diff --git a/src/site/site.xml b/src/site/site.xml index 8cf8f97..a3d53a8 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -104,5 +104,12 @@ <menu ref="reports"/> + <footer> + <div id='mavenProjectProperties' locale='fr' + projectId='${project.projectId}' + version='${project.siteDeployClassifier}' + sourcesType='${project.siteSourcesType}'/> + </footer> + </body> </project> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm