branch develop updated (9f65cda -> d957714)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository jaxx. See https://gitlab.nuiton.org/nuiton/jaxx.git from 9f65cda use pom 10.5 (fixes #4136) new e49da83 use mop-nuiton + adapt site new d957714 fix build (add webstart plugin version in pom) 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 d957714244b689ae5873b6c93332131b3a13ee83 Author: Tony CHEMIT <dev@tchemit.fr> Date: Wed Mar 8 12:18:23 2017 +0100 fix build (add webstart plugin version in pom) commit e49da837d10ede82e18de35eb2b732fd4ff46262 Author: Tony CHEMIT <dev@tchemit.fr> Date: Wed Mar 8 12:05:56 2017 +0100 use mop-nuiton + adapt site Summary of changes: pom.xml | 163 +++++++++++++++++++++++++++++++++++++++--------------- src/site/site.xml | 36 ++++++++---- 2 files changed, 144 insertions(+), 55 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 https://gitlab.nuiton.org/nuiton/jaxx.git commit e49da837d10ede82e18de35eb2b732fd4ff46262 Author: Tony CHEMIT <dev@tchemit.fr> Date: Wed Mar 8 12:05:56 2017 +0100 use mop-nuiton + adapt site --- pom.xml | 161 +++++++++++++++++++++++++++++++++++++++--------------- src/site/site.xml | 36 ++++++++---- 2 files changed, 143 insertions(+), 54 deletions(-) diff --git a/pom.xml b/pom.xml index 5f11879..d81d3d3 100644 --- a/pom.xml +++ b/pom.xml @@ -26,8 +26,8 @@ <parent> <groupId>org.nuiton</groupId> - <artifactId>nuitonpom</artifactId> - <version>10.5</version> + <artifactId>mop-nuiton</artifactId> + <version>3</version> </parent> <artifactId>jaxx</artifactId> @@ -65,6 +65,8 @@ <name>Tony Chemit</name> <id>tchemit</id> <email>dev@tchemit.fr</email> + <organization>Ultreia.io</organization> + <organizationUrl>http://ultreia.io</organizationUrl> <timezone>Europe/Paris</timezone> <roles> <role>Developer</role> @@ -135,9 +137,7 @@ <properties> - <!-- pour un muli module on doit fixer le projectId --> <projectId>jaxx</projectId> - <ciViewId>Jaxx</ciViewId> <javaVersion>1.8</javaVersion> <signatureArtifactId>java18</signatureArtifactId> @@ -171,7 +171,7 @@ <!-- Source control management. --> <scm> <connection>scm:git:git@gitlab.nuiton.org:nuiton/jaxx.git</connection> - <developerConnection>scm:git:git@gitlab.nuiton.org:nuiton/jaxx.git</developerConnection> + <developerConnection>scm:git:ssh://git@gitlab.nuiton.org/nuiton/jaxx.git</developerConnection> <url>https://gitlab.nuiton.org/nuiton/jaxx</url> </scm> @@ -638,12 +638,8 @@ </profile> - <!-- This profile is here just to make more automatic release. - This profile will be use to do a releasse:prepare, this modules are not - in default build but need to be release - --> <profile> - <id>extra-modules</id> + <id>release-profile</id> <activation> <property> <name>performRelease</name> @@ -673,72 +669,149 @@ <artifactId>maven-plugin-plugin</artifactId> <version>${pluginPluginVersion}</version> </plugin> - <plugin> <artifactId>maven-project-info-reports-plugin</artifactId> <version>${projectInfoReportsPluginVersion}</version> <reportSets> <reportSet> <reports> - <report>index</report> + <report>project-team</report> + <report>mailing-list</report> + <report>cim</report> + <report>issue-tracking</report> + <report>license</report> + <report>scm</report> + <report>dependency-info</report> + <report>dependencies</report> + <report>dependency-convergence</report> + <report>plugin-management</report> + <report>plugins</report> + <report>dependency-management</report> + <report>summary</report> + </reports> + </reportSet> + </reportSets> + </plugin> + + <plugin> + <artifactId>maven-changes-plugin</artifactId> + <version>${changesPluginVersion}</version> + <configuration> + <issueLinkTemplatePerSystem> + <gitlab>https://gitlab.nuiton.org/nuiton/${projectId}/issues/%ISSUE%</gitlab> + </issueLinkTemplatePerSystem> + <xmlPath>${project.build.directory}/generated-site/changes.xml</xmlPath> + </configuration> + </plugin> + + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <version>${javadocPluginVersion}</version> + <configuration> + <quiet>${maven.javadoc.quiet}</quiet> + <charset>${project.reporting.outputEncoding}</charset> + <links> + <link>http://docs.oracle.com/javase/${javadocJreApiVersion}/docs/api/</link> + </links> + <tagletArtifacts> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>${mavenPluginToolsJavadocVersion}</version> + </tagletArtifact> + <tagletArtifact> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-component-javadoc</artifactId> + <version>${plexusComponentJavadocVersion}</version> + </tagletArtifact> + </tagletArtifacts> + </configuration> + <reportSets> + <reportSet> + <reports> + <report>javadoc</report> + <report>test-javadoc</report> + </reports> + </reportSet> + </reportSets> + </plugin> + + <plugin> + <artifactId>maven-changelog-plugin</artifactId> + <version>${changelogPluginVersion}</version> + </plugin> + + <plugin> + <artifactId>maven-jxr-plugin</artifactId> + <version>${jrxPluginVersion}</version> + </plugin> + + <plugin> + <artifactId>maven-surefire-report-plugin</artifactId> + <version>${surefirePluginVersion}</version> + </plugin> + + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>license-maven-plugin</artifactId> + <version>${licensePluginVersion}</version> + </plugin> + + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>versions-maven-plugin</artifactId> + <version>${versionsPluginVersion}</version> + <reportSets> + <reportSet> + <reports> + <report>dependency-updates-report</report> + <report>plugin-updates-report</report> + <report>property-updates-report</report> </reports> </reportSet> </reportSets> </plugin> + </plugins> </reporting> - </profile> - <profile> - <id>generate-changelog</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - - <properties> - <jredminePluginVersion>1.10</jredminePluginVersion> - <redmine.xmlPath>${project.build.directory}/changes/changes.xml</redmine.xmlPath> - </properties> <build> - <defaultGoal>process-classes</defaultGoal> + <plugins> - <!-- Generate changelog.txt and attach it to project --> <plugin> - <groupId>org.nuiton.jredmine</groupId> - <artifactId>jredmine-maven-plugin</artifactId> + <groupId>io.ultreia.maven</groupId> + <artifactId>gitlab-maven-plugin</artifactId> + <inherited>false</inherited> <executions> <execution> - <id>generate-changes</id> + <inherited>false</inherited> <goals> <goal>generate-changes</goal> </goals> - <phase>process-classes</phase> - <configuration> - <generateOnce>true</generateOnce> - <actionMapping>fix:1, add:2, update:4</actionMapping> - <url>https://forge.nuiton.org</url> - </configuration> + <phase>pre-site</phase> </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>helper-maven-plugin</artifactId> + <executions> <execution> - <id>generate-changelog</id> - <inherited>false</inherited> + <id>compute-distribution-site-url</id> <goals> - <goal>generate-changelog</goal> + <goal>compute-distribution-site-url</goal> </goals> - <phase>process-classes</phase> - <configuration> - <attach>true</attach> - </configuration> + <phase>pre-site</phase> </execution> </executions> </plugin> </plugins> + </build> + </profile> </profiles> diff --git a/src/site/site.xml b/src/site/site.xml index 231bfc7..56c75fa 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -26,6 +26,26 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd"> + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>1.4</version> + </skin> + + <custom> + <fluidoSkin> + <topBarEnabled>false</topBarEnabled> + <googleSearch/> + <sideBarEnabled>true</sideBarEnabled> + <searchEnabled>true</searchEnabled> + <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> + <breadcrumbDivider>»</breadcrumbDivider> + </fluidoSkin> + </custom> + + <publishDate position="right"/> + <version position="right"/> + <bannerLeft> <name>${project.name}</name> <src>${siteCommonResourcesUrl}/images/logos/jaxx-logo.png</src> @@ -49,8 +69,13 @@ <body> + <head> + <script type="text/javascript" src="http://common.nuiton.org/dev/js/mavenpom-site.js"> </script> + <link rel="stylesheet" type="text/css" href="http://common.nuiton.org/dev/css/mavenpom-site.css"/> + </head> + <links> - <item name="nuiton.org" href="https://forge.nuiton.org"/> + <item name="nuiton.org" href="https://gitlab.nuiton.org/nuiton"/> <item name="CodeLutin" href="http://codelutin.com"/> <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/> <!--<item name="original JAXX" href="http://buix.labs.libre-entreprise.org/original-jaxx"/>--> @@ -89,15 +114,6 @@ <!--item name="Widgets" href=""/--> </menu> - <!--menu name="Démo et Tutoriels"> - <item name="Démo" href="demo.html"/> - <item name="Hello World" href="tutos/helloworld.html"/> - <item name="Hello World 2" href="tutos/helloworld2.html"/> - <item name="Feuilles de style" href="tutos/css.html"/> - <item name="Data-binding" href="tutos/data-binding.html"/> - <item name="ConfigUI" href="tutos/config.html"/> - </menu--> - <menu name="Ancienne documentation"> <item name="Migration JAXX 2.0" href="migration.html"/> </menu> -- 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 https://gitlab.nuiton.org/nuiton/jaxx.git commit d957714244b689ae5873b6c93332131b3a13ee83 Author: Tony CHEMIT <dev@tchemit.fr> Date: Wed Mar 8 12:18:23 2017 +0100 fix build (add webstart plugin version in pom) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d81d3d3..2d9a402 100644 --- a/pom.xml +++ b/pom.xml @@ -149,7 +149,7 @@ <nuitonI18nVersion>3.6.2</nuitonI18nVersion> <eugeneVersion>3.0-alpha-10</eugeneVersion> <swingXVersion>1.6.5-1</swingXVersion> - + <webstartPluginVersion>1.0-beta-7</webstartPluginVersion> <!-- i18n configuration --> <i18n.bundles>fr_FR,en_GB,es_ES</i18n.bundles> <i18n.failsIfWarning>true</i18n.failsIfWarning> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm