[pollen] branch develop updated (620e946 -> 1ff97ad)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See http://git.chorem.org/pollen.git from 620e946 translate home page new 1ff97ad use chorempom 1.2 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 1ff97ad01783bfbeee122aaccf3bde5a01652c3c Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 4 10:40:21 2014 +0200 use chorempom 1.2 Summary of changes: .../org/chorem/pollen/services/bean/PollBean.java | 2 +- pom.xml | 137 +++++++++++++++------ 2 files changed, 103 insertions(+), 36 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See http://git.chorem.org/pollen.git commit 1ff97ad01783bfbeee122aaccf3bde5a01652c3c Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 4 10:40:21 2014 +0200 use chorempom 1.2 --- .../org/chorem/pollen/services/bean/PollBean.java | 2 +- pom.xml | 137 +++++++++++++++------ 2 files changed, 103 insertions(+), 36 deletions(-) diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/bean/PollBean.java b/pollen-services/src/main/java/org/chorem/pollen/services/bean/PollBean.java index 80a52ed..66d0115 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/bean/PollBean.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/bean/PollBean.java @@ -138,7 +138,7 @@ public class PollBean extends PollenBean<Poll> { setVoteVisibility(entity.getVoteVisibility()); setCommentVisibility(entity.getCommentVisibility()); setResultVisibility(entity.getResultVisibility()); - setClosed(entity.getClosed()); + setClosed(entity.isClosed()); } diff --git a/pom.xml b/pom.xml index cdead1e..4dd24b2 100644 --- a/pom.xml +++ b/pom.xml @@ -4,8 +4,8 @@ <parent> <groupId>org.nuiton</groupId> - <artifactId>mavenpom4redmine</artifactId> - <version>5.0.9</version> + <artifactId>chorempom</artifactId> + <version>1.2</version> </parent> <groupId>org.chorem</groupId> @@ -29,7 +29,7 @@ <developer> <id>echatellier</id> <name>Éric Chatellier</name> - <email>chatellier at codelutin.com</email> + <email>chatellier@codelutin.com</email> <organization>CodeLutin</organization> <organizationUrl>http://www.codelutin.com/</organizationUrl> <timezone>Europe/Paris</timezone> @@ -40,7 +40,7 @@ <developer> <id>tchemit</id> <name>Tony Chemit</name> - <email>chemit at codelutin dot com</email> + <email>chemit@codelutin.com</email> <organization>Code Lutin</organization> <organizationUrl>http://www.codelutin.com/</organizationUrl> <timezone>Europe/Paris</timezone> @@ -52,7 +52,7 @@ <developer> <id>jcouteau</id> <name>Jean Couteau</name> - <email>couteau at codelutin dot com</email> + <email>couteau@codelutin.com</email> <organization>Code Lutin</organization> <organizationUrl>http://www.codelutin.com/</organizationUrl> <timezone>Europe/Paris</timezone> @@ -62,20 +62,9 @@ </roles> </developer> <developer> - <id>fdesbois</id> - <name>Florian Desbois</name> - <email>desbois at codelutin dot com</email> - <organization>Code Lutin</organization> - <organizationUrl>http://www.codelutin.com/</organizationUrl> - <timezone>Europe/Paris</timezone> - <roles> - <role>developer</role> - </roles> - </developer> - <developer> <id>kmorin</id> <name>Kevin Morin</name> - <email>morin at codelutin dot com</email> + <email>morin@codelutin.com</email> <organization>Code Lutin</organization> <organizationUrl>http://www.codelutin.com/</organizationUrl> <timezone>Europe/Paris</timezone> @@ -86,6 +75,10 @@ </developers> <contributors> <contributor> + <name>Florian Desbois</name> + <timezone>Europe/Paris</timezone> + </contributor> + <contributor> <name>Erwan NEMA</name> <email>nemawan@hotmail.com</email> <organization>ALMA - Code Lutin</organization> @@ -122,7 +115,7 @@ </contributor> <contributor> <name>Nolwenn RANNOU</name> - <email>rannou at codelutin.com</email> + <email>rannou@codelutin.com</email> <organization>Code Lutin</organization> <organizationUrl>http://www.codelutin.com/</organizationUrl> <timezone>Europe/Paris</timezone> @@ -148,29 +141,27 @@ </scm> <distributionManagement> <site> - <id>doc.${platform}</id> - <url>${our.site.repository}/${projectId}/v2</url> + <id>${site.server}</id> + <url>${site.url}</url> </site> </distributionManagement> <properties> - <!-- redmine configuration --> - <platform>chorem.org</platform> <projectId>pollen</projectId> <!-- customized versions --> <webmotionVersion>2.4.1-SNAPSHOT</webmotionVersion> - <nuitonI18nVersion>3.1</nuitonI18nVersion> - <eugenePluginVersion>2.12-SNAPSHOT</eugenePluginVersion> + <nuitonI18nVersion>3.3</nuitonI18nVersion> + <eugenePluginVersion>3.0-SNAPSHOT</eugenePluginVersion> <topiaVersion>3.0-SNAPSHOT</topiaVersion> <nuitonWebVersion>1.17-SNAPSHOT</nuitonWebVersion> - <nuitonUtilsVersion>3.0-SNAPSHOT</nuitonUtilsVersion> - <nuitonConfigVersion>3.0-alpha-2</nuitonConfigVersion> + <nuitonUtilsVersion>3.0-rc-5</nuitonUtilsVersion> + <nuitonConfigVersion>3.0-alpha-3</nuitonConfigVersion> <nuitonCsvVersion>3.0-alpha-3</nuitonCsvVersion> - <nuitonValidatorVersion>3.0-alpha-1</nuitonValidatorVersion> + <nuitonValidatorVersion>3.0-rc-1</nuitonValidatorVersion> <h2Version>1.4.178</h2Version> <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> <shiroVersion>1.2.3</shiroVersion> @@ -180,7 +171,6 @@ <!--tomcatEmbedVersion>8.0.5</tomcatEmbedVersion--> <hibernateVersion>4.3.5.Final</hibernateVersion> <seleniumVersion>2.33.0</seleniumVersion> - <mockitoVersion>1.9.5</mockitoVersion> <httpCommonsHttpclientVersion>4.3.3</httpCommonsHttpclientVersion> <pollenI18nBundle>pollen-i18n</pollenI18nBundle> @@ -237,6 +227,50 @@ <dependencyManagement> <dependencies> + <!-- Commons --> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-collections4</artifactId> + <version>4.0</version> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>3.3.2</version> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.2</version> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>2.4</version> + </dependency> + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <version>1.9.2</version> + </dependency> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>1.9</version> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-email</artifactId> + <version>1.3.2</version> + </dependency> + + <!-- Guava --> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>17.0</version> + </dependency> + <!-- persistence module dependencies --> <dependency> @@ -412,6 +446,18 @@ </dependency> <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore</artifactId> + <version>4.3.2</version> + </dependency> + + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + <version>${httpCommonsHttpclientVersion}</version> + </dependency> + + <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> <version>2.2.4</version> @@ -465,13 +511,6 @@ <version>1.1.1</version> </dependency--> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <version>${mockitoVersion}</version> - <scope>test</scope> - </dependency> - <!-- Selenium --> <!--dependency> <groupId>org.seleniumhq.selenium</groupId> @@ -528,6 +567,34 @@ <scope>test</scope> </dependency--> + <!-- Logging --> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.17</version> + </dependency> + + <!-- Test --> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <version>1.9.5</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-validator</artifactId> + <version>${nuitonValidatorVersion}</version> + <scope>test</scope> + <classifier>tests</classifier> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.11</version> + <scope>test</scope> + </dependency> + </dependencies> </dependencyManagement> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm