Author: tchemit Date: 2013-12-23 14:44:06 +0100 (Mon, 23 Dec 2013) New Revision: 3859 Url: http://chorem.org/projects/pollen/repository/revisions/3859 Log: fixes #965: Updates mavenpom to 4.4 Modified: branches/pollen-1.5.x/pollen-services/src/main/java/org/chorem/pollen/services/impl/EmailService.java branches/pollen-1.5.x/pollen-ui-struts2/pom.xml branches/pollen-1.5.x/pom.xml branches/pollen-1.5.x/src/site/site_en.xml branches/pollen-1.5.x/src/site/site_fr.xml Modified: branches/pollen-1.5.x/pollen-services/src/main/java/org/chorem/pollen/services/impl/EmailService.java =================================================================== --- branches/pollen-1.5.x/pollen-services/src/main/java/org/chorem/pollen/services/impl/EmailService.java 2013-12-07 08:00:40 UTC (rev 3858) +++ branches/pollen-1.5.x/pollen-services/src/main/java/org/chorem/pollen/services/impl/EmailService.java 2013-12-23 13:44:06 UTC (rev 3859) @@ -39,6 +39,7 @@ import org.chorem.pollen.services.PollenServiceSupport; import org.nuiton.util.StringUtil; +import java.util.Comparator; import java.util.List; import java.util.Locale; @@ -325,7 +326,7 @@ return new PollenEmail(to, subject, content); } - public static class PollenEmail { + public static class PollenEmail implements Comparable<PollenEmail>{ protected String subject; @@ -351,5 +352,10 @@ public String getTo() { return to; } + + @Override + public int compareTo(PollenEmail o) { + return toString().compareTo(o.toString()); + } } } Modified: branches/pollen-1.5.x/pollen-ui-struts2/pom.xml =================================================================== --- branches/pollen-1.5.x/pollen-ui-struts2/pom.xml 2013-12-07 08:00:40 UTC (rev 3858) +++ branches/pollen-1.5.x/pollen-ui-struts2/pom.xml 2013-12-23 13:44:06 UTC (rev 3859) @@ -32,6 +32,9 @@ http://localhost:8080/${defaultWebContextPath} </defaultSiteUrl> <defaultLogDir>${basedir}/target</defaultLogDir> + + <!-- Post Release configuration --> + <skipPostRelease>false</skipPostRelease> </properties> <dependencies> Modified: branches/pollen-1.5.x/pom.xml =================================================================== --- branches/pollen-1.5.x/pom.xml 2013-12-07 08:00:40 UTC (rev 3858) +++ branches/pollen-1.5.x/pom.xml 2013-12-23 13:44:06 UTC (rev 3859) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.4.11</version> + <version>4.4</version> </parent> <groupId>org.chorem</groupId> @@ -166,6 +166,8 @@ <seleniumVersion>2.33.0</seleniumVersion> <mockitoVersion>1.9.5</mockitoVersion> + <httpCommonsHttpclientVersion>4.3</httpCommonsHttpclientVersion> + <pollenI18nBundle>pollen-i18n</pollenI18nBundle> <!-- license to use --> <license.licenseName>agpl_v3</license.licenseName> Modified: branches/pollen-1.5.x/src/site/site_en.xml =================================================================== --- branches/pollen-1.5.x/src/site/site_en.xml 2013-12-07 08:00:40 UTC (rev 3858) +++ branches/pollen-1.5.x/src/site/site_en.xml 2013-12-23 13:44:06 UTC (rev 3859) @@ -38,7 +38,7 @@ <skin> <groupId>org.apache.maven.skins</groupId> <artifactId>maven-fluido-skin</artifactId> - <version>1.3.0</version> + <version>1.3.1</version> </skin> <custom> @@ -56,34 +56,34 @@ <poweredBy> <logo href="http://maven.apache.org" name="Maven" - img="http://maven-site.nuiton.org/public/images/logos/logos/maven-feather.png"/> + img="http://maven-site.chorem.org/common/0.2/images/logos/logos/maven-feather.png"/> <logo href="http://struts.apache.org/" name="Struts 2" - img="http://maven-site.nuiton.org/public/images/logos/struts2-logo.png"/> + img="http://maven-site.chorem.org/common/0.2/images/logos/struts2-logo.png"/> <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" - img="http://maven-site.nuiton.org/public/images/logos/restructuredtext-logo.png"/> + img="http://maven-site.chorem.org/common/0.2/images/logos/restructuredtext-logo.png"/> <logo href="http://maven-site.nuiton.org/jrst" name="JRst" - img="http://maven-site.nuiton.org/public/images/logos/jrst-logo.png"/> + img="http://maven-site.chorem.org/common/0.2/images/logos/jrst-logo.png"/> <logo href="http://maven-site.nuiton.org/topia" name="ToPIA" - img="http://maven-site.nuiton.org/public/images/logos/topia-logo.png"/> + img="http://maven-site.chorem.org/common/0.2/images/logos/topia-logo.png"/> <logo href="http://argouml.tigris.org/" name="ArgoUML" - img="http://maven-site.nuiton.org/public/images/logos/argouml-logo.png"/> + img="http://maven-site.chorem.org/common/0.2/images/logos/argouml-logo.png"/> </poweredBy> <body> <head> <script type="text/javascript" - src="http://maven-site.chorem.org/public/js/mavenpom-site.js"> + src="http://maven-site.chorem.org/common/0.2/js/mavenpom-site.js"> </script> <link rel="stylesheet" type="text/css" - href="http://maven-site.chorem.org/public/css/mavenpom-site.css"/> + href="http://maven-site.chorem.org/common/0.2/css/mavenpom-site.css"/> </head> <breadcrumbs> @@ -134,7 +134,9 @@ scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}'> + piwikId='${project.piwikId}' + scmwebeditor_vmFiles=",install.html," + scmwebeditor_skipDefaultFiles="true"> </div> </footer> Modified: branches/pollen-1.5.x/src/site/site_fr.xml =================================================================== --- branches/pollen-1.5.x/src/site/site_fr.xml 2013-12-07 08:00:40 UTC (rev 3858) +++ branches/pollen-1.5.x/src/site/site_fr.xml 2013-12-23 13:44:06 UTC (rev 3859) @@ -38,7 +38,7 @@ <skin> <groupId>org.apache.maven.skins</groupId> <artifactId>maven-fluido-skin</artifactId> - <version>1.3.0</version> + <version>1.3.1</version> </skin> <custom> @@ -59,31 +59,31 @@ img="${project.url}/images/logos/maven-feather.png"/> <logo href="http://struts.apache.org/" name="Struts 2" - img="http://maven-site.nuiton.org/public/images/logos/struts2-logo.png"/> + img="http://maven-site.chorem.org/common/0.2/images/logos/struts2-logo.png"/> <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" - img="http://maven-site.nuiton.org/public/images/logos/restructuredtext-logo.png"/> + img="http://maven-site.chorem.org/common/0.2/images/logos/restructuredtext-logo.png"/> <logo href="http://maven-site.nuiton.org/jrst" name="JRst" - img="http://maven-site.nuiton.org/public/images/logos/jrst-logo.png"/> + img="http://maven-site.chorem.org/common/0.2/images/logos/jrst-logo.png"/> <logo href="http://maven-site.nuiton.org/topia" name="ToPIA" - img="http://maven-site.nuiton.org/public/images/logos/topia-logo.png"/> + img="http://maven-site.chorem.org/common/0.2/images/logos/topia-logo.png"/> <logo href="http://argouml.tigris.org/" name="ArgoUML" - img="http://maven-site.nuiton.org/public/images/logos/argouml-logo.png"/> + img="http://maven-site.chorem.org/common/0.2/images/logos/argouml-logo.png"/> </poweredBy> <body> <head> <script type="text/javascript" - src="http://maven-site.nuiton.org/public/js/mavenpom-site.js"> + src="http://maven-site.chorem.org/common/0.2/js/mavenpom-site.js"> </script> <link rel="stylesheet" type="text/css" - href="http://maven-site.nuiton.org/public/css/mavenpom-site.css"/> + href="http://maven-site.chorem.org/common/0.2/css/mavenpom-site.css"/> </head> <breadcrumbs> @@ -130,7 +130,9 @@ scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}'> + piwikId='${project.piwikId}' + scmwebeditor_vmFiles=",install.html," + scmwebeditor_skipDefaultFiles="true"> </div> </footer>