Author: tchemit Date: 2010-12-29 19:26:42 +0100 (Wed, 29 Dec 2010) New Revision: 3057 Url: http://chorem.org/repositories/revision/pollen/3057 Log: use last stable of eugene + last version of nuiton-utils (required by topia 2.5) Modified: trunk/pollen-business/pom.xml trunk/pollen-business/src/main/java/org/chorem/pollen/PollenContextImpl.java trunk/pom.xml Modified: trunk/pollen-business/pom.xml =================================================================== --- trunk/pollen-business/pom.xml 2010-12-17 09:25:02 UTC (rev 3056) +++ trunk/pollen-business/pom.xml 2010-12-29 18:26:42 UTC (rev 3057) @@ -140,6 +140,20 @@ </goals> </execution> </executions> + <dependencies> + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-persistence</artifactId> + <version>${topiaVersion}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + <version>${nuitonUtilsVersion}</version> + <scope>compile</scope> + </dependency> + </dependencies> </plugin> <plugin> <groupId>org.nuiton.i18n</groupId> Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/PollenContextImpl.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/PollenContextImpl.java 2010-12-17 09:25:02 UTC (rev 3056) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/PollenContextImpl.java 2010-12-29 18:26:42 UTC (rev 3057) @@ -390,12 +390,12 @@ @Override public String encodePassword(String password) { - try { - return StringUtil.encodeMD5(password); - } catch (NoSuchAlgorithmException eee) { - treateError(eee, n_("pollen.error.encodePassword")); - } - return null; +// try { + return StringUtil.encodeMD5(password); +// } catch (NoSuchAlgorithmException eee) { +// treateError(eee, n_("pollen.error.encodePassword")); +// } +// return null; } @Override Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-12-17 09:25:02 UTC (rev 3056) +++ trunk/pom.xml 2010-12-29 18:26:42 UTC (rev 3057) @@ -328,11 +328,11 @@ <!-- customized versions --> <!--javadoc.version>2.4</javadoc.version--> <topiaVersion>2.5-SNAPSHOT</topiaVersion> - <eugenePluginVersion>2.3-SNAPSHOT</eugenePluginVersion> + <eugenePluginVersion>2.3</eugenePluginVersion> <nuitonI18nVersion>1.2.2</nuitonI18nVersion> <tapestryVersion>5.1.0.5</tapestryVersion> <nuitonWebVersion>0.1</nuitonWebVersion> - <nuitonUtilsVersion>1.3.1</nuitonUtilsVersion> + <nuitonUtilsVersion>1.5.3-SNAPSHOT</nuitonUtilsVersion> <processorPluginVersion>1.0.2</processorPluginVersion> <slf4jVersion>1.5.10</slf4jVersion> <jFreeVersion>1.0.12</jFreeVersion>