Echobase-commits

Download

echobase-commits@list.forge.codelutin.com

May 2012

1 participants
1 discussions

r546 - in trunk: . echobase-entities echobase-tools/src echobase-ui echobase-ui/src/site src/site
by tchemit＠users.forge.codelutin.com 28 May '12

28 May '12

Author: tchemit Date: 2012-05-28 13:36:27 +0200 (Mon, 28 May 2012) New Revision: 546 Url: http://forge.codelutin.com/repositories/revision/echobase/546 Log: updates dependencies improve site Removed: trunk/echobase-tools/src/site/ Modified: trunk/echobase-entities/pom.xml trunk/echobase-ui/pom.xml trunk/echobase-ui/src/site/site_fr.xml trunk/pom.xml trunk/src/site/site_fr.xml Modified: trunk/echobase-entities/pom.xml =================================================================== --- trunk/echobase-entities/pom.xml 2012-04-18 09:06:28 UTC (rev 545) +++ trunk/echobase-entities/pom.xml 2012-05-28 11:36:27 UTC (rev 546) @@ -135,7 +135,7 @@ <plugin> <groupId>org.nuiton.eugene</groupId> - <artifactId>maven-eugene-plugin</artifactId> + <artifactId>eugene-maven-plugin</artifactId> <configuration> <defaultPackage>fr.ifremer.echobase.entities</defaultPackage> <fullPackagePath>fr.ifremer.echobase.entities</fullPackagePath> Modified: trunk/echobase-ui/pom.xml =================================================================== --- trunk/echobase-ui/pom.xml 2012-04-18 09:06:28 UTC (rev 545) +++ trunk/echobase-ui/pom.xml 2012-05-28 11:36:27 UTC (rev 546) @@ -340,6 +340,60 @@ <profiles> <profile> + <id>reporting</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + + <reporting> + <plugins> + +  + <plugin> + <artifactId>maven-project-info-reports-plugin</artifactId> + <version>${projectInfoReportsPluginVersion}</version> + <reportSets> + <reportSet> + <reports> + <report>project-team</report> + <report>mailing-list</report> + <report>cim</report> + <report>issue-tracking</report> + <report>license</report> + <report>scm</report> + <report>dependency-convergence</report> + <report>dependency-management</report> + </reports> + </reportSet> + </reportSets> + </plugin> + + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils-maven-report-plugin</artifactId> + <version>${nuitonUtilsVersion}</version> + <reportSets> + <reportSet> + <reports> + <report>application-config-report</report> + </reports> + </reportSet> + </reportSets> + <configuration> + <i18nBundleName>${i18n.bundleOutputName}</i18nBundleName> + </configuration> + </plugin> + </plugins> + </reporting> + </profile> + + <profile> <id>selenium</id> <activation> <property> @@ -429,50 +483,5 @@ </profile> - <profile> - <id>deploy-to-demo</id> - <build> - - <defaultGoal>verify</defaultGoal> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>wagon-maven-plugin</artifactId> - <executions> - <execution> - <phase>verify</phase> - <goals> - <goal>upload-single</goal> - </goals> - <configuration> - <serverId>demo.codelutin.com</serverId> - <fromFile>target/${project.build.finalName}.war</fromFile> - <url>scpexe://demo.codelutin.com/var/local/echobase/war</url> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.nuiton</groupId> - <artifactId>helper-maven-plugin</artifactId> - <executions> - <execution> - <phase>verify</phase> - <goals> - <goal>execute-remote-command</goal> - </goals> - <configuration> - <repositoryId>demo.codelutin.com</repositoryId> - <repositoryUrl>scpexe://demo.codelutin.com</repositoryUrl> - <command>( cd /var/local/echobase ; ./deploy.sh ${project.version} )</command> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> </project> Modified: trunk/echobase-ui/src/site/site_fr.xml =================================================================== --- trunk/echobase-ui/src/site/site_fr.xml 2012-04-18 09:06:28 UTC (rev 545) +++ trunk/echobase-ui/src/site/site_fr.xml 2012-05-28 11:36:27 UTC (rev 546) @@ -35,10 +35,30 @@ </breadcrumbs> <menu name="Utilisateur"> - <item name="Accueil" href="index.html"/> + <item name="A propos" href="./index.html"/> + <item name="Configuration" href="./application-config-report.html"/> </menu> <menu ref="reports"/> + <footer> + + <script type="text/javascript" + src="http://maven-site.forge.codelutin.com/public/js/maven-site-forge.codelutin.…"> + </script> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.connection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + </body> </project> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-04-18 09:06:28 UTC (rev 545) +++ trunk/pom.xml 2012-05-28 11:36:27 UTC (rev 546) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.2.1</version> + <version>3.3.2</version> </parent> <groupId>fr.ifremer</groupId> @@ -123,19 +123,19 @@  - <eugenePluginVersion>2.4.2</eugenePluginVersion> - <topiaVersion>2.6.9</topiaVersion> - <nuitonUtilsVersion>2.4.7</nuitonUtilsVersion> + <eugenePluginVersion>2.4.3-SNAPSHOT</eugenePluginVersion> + <topiaVersion>2.6.10</topiaVersion> + <nuitonUtilsVersion>2.4.8</nuitonUtilsVersion> <nuitonI18nVersion>2.4.1</nuitonI18nVersion> - <nuitonWebVersion>1.10</nuitonWebVersion> + <nuitonWebVersion>1.11</nuitonWebVersion> <msaccessImporterVersion>1.4.1</msaccessImporterVersion> - <struts2Version>2.3.1.2</struts2Version> - <jqueryPluginVersion>3.3.0</jqueryPluginVersion> - <seleniumVersion>2.20.0</seleniumVersion> - <h2Version>1.3.165</h2Version> + <struts2Version>2.3.4</struts2Version> + <jqueryPluginVersion>3.3.1</jqueryPluginVersion> + <seleniumVersion>2.21.0</seleniumVersion> + <h2Version>1.3.167</h2Version> <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> <slf4jVersion>1.6.4</slf4jVersion> - <jackcessVersion>1.2.6</jackcessVersion> + <jackcessVersion>1.2.7</jackcessVersion> <hibernateVersion>3.6.10.Final</hibernateVersion> @@ -409,7 +409,7 @@ <plugin> <groupId>org.nuiton.eugene</groupId> - <artifactId>maven-eugene-plugin</artifactId> + <artifactId>eugene-maven-plugin</artifactId> <version>${eugenePluginVersion}</version> </plugin> @@ -487,6 +487,46 @@ </build> </profile> + <profile> + <id>reporting</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + + <reporting> + <plugins> + + <plugin> + <artifactId>maven-project-info-reports-plugin</artifactId> + <version>${projectInfoReportsPluginVersion}</version> + <reportSets> + <reportSet> + <reports> + <report>project-team</report> + <report>mailing-list</report> + <report>cim</report> + <report>issue-tracking</report> + <report>license</report> + <report>scm</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> + + </plugins> + </reporting> + + </profile> + </profiles> </project> Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2012-04-18 09:06:28 UTC (rev 545) +++ trunk/src/site/site_fr.xml 2012-05-28 11:36:27 UTC (rev 546) @@ -51,23 +51,23 @@ <version position="right" /> <poweredBy> <logo href="http://maven.apache.org" name="Maven" - img="images/logos/maven-feather.png"/> + img="${project.url}/images/logos/maven-feather.png"/> <logo href="http://struts.apache.org/" name="Struts 2" - img="images/struts2-logo.png"/> + img="${project.url}/images/struts2-logo.png"/> <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" - img="images/restructuredtext-logo.png"/> + img="${project.url}/images/restructuredtext-logo.png"/> <logo href="http://maven-site.nuiton.org/jrst" name="JRst" - img="images/jrst-logo.png"/> + img="${project.url}/images/jrst-logo.png"/> <logo href="http://maven-site.nuiton.org/topia" name="ToPIA" - img="images/topia-logo.png"/> + img="${project.url}/images/topia-logo.png"/> <logo href="http://argouml.tigris.org/" name="ArgoUML" - img="images/argouml-logo.png"/> + img="${project.url}/images/argouml-logo.png"/> </poweredBy> @@ -113,7 +113,7 @@ projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.url}' + scm='${project.scm.connection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}'

1 0