April 2013 - Pollen-commits - mailman.cloud.codelutin.com

r3791 - in trunk: . pollen-ui-struts2
by tchemit＠users.chorem.org April 30, 2013

April 30, 2013

Author: tchemit Date: 2013-04-30 16:21:17 +0200 (Tue, 30 Apr 2013) New Revision: 3791 Url: http://chorem.org/projects/pollen/repository/revisions/3791 Log: fixes #912: downgrades posgresql to 9.1-901-1.jdbc4 Modified: trunk/pollen-ui-struts2/pom.xml trunk/pom.xml Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2013-04-30 09:08:22 UTC (rev 3790) +++ trunk/pollen-ui-struts2/pom.xml 2013-04-30 14:21:17 UTC (rev 3791) @@ -204,7 +204,7 @@ </dependency> <dependency> - <groupId>org.postgresql</groupId> + <groupId>postgresql</groupId> <artifactId>postgresql</artifactId> <scope>runtime</scope> </dependency> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-04-30 09:08:22 UTC (rev 3790) +++ trunk/pom.xml 2013-04-30 14:21:17 UTC (rev 3791) @@ -155,7 +155,7 @@ <nuitonWebVersion>1.13</nuitonWebVersion> <nuitonUtilsVersion>2.6.12</nuitonUtilsVersion> <h2Version>1.3.171</h2Version> - <postgresqlVersion>9.2-1002-jdbc4</postgresqlVersion> + <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> <struts2Version>2.3.14</struts2Version> <jqueryPluginVersion>3.5.1</jqueryPluginVersion> <shiroVersion>1.2.1</shiroVersion> @@ -203,7 +203,7 @@ </dependency> <dependency> - <groupId>org.postgresql</groupId> + <groupId>postgresql</groupId> <artifactId>postgresql</artifactId> <version>${postgresqlVersion}</version> </dependency>

1 0

r3790 - trunk
by tchemit＠users.chorem.org April 30, 2013

April 30, 2013

Author: tchemit Date: 2013-04-30 11:08:22 +0200 (Tue, 30 Apr 2013) New Revision: 3790 Url: http://chorem.org/projects/pollen/repository/revisions/3790 Log: fixes #908: Updates nuiton-web to 1.13 fixes #911: Updates selenium to 2.32.0 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-04-30 08:08:10 UTC (rev 3789) +++ trunk/pom.xml 2013-04-30 09:08:22 UTC (rev 3790) @@ -149,10 +149,10 @@  <topiaVersion>2.8-rc-1</topiaVersion> - <eugenePluginVersion>2.6.1</eugenePluginVersion> + <eugenePluginVersion>2.6.2</eugenePluginVersion> <nuitonI18nVersion>2.5</nuitonI18nVersion> - <nuitonWebVersion>1.13-SNAPSHOT</nuitonWebVersion> + <nuitonWebVersion>1.13</nuitonWebVersion> <nuitonUtilsVersion>2.6.12</nuitonUtilsVersion> <h2Version>1.3.171</h2Version> <postgresqlVersion>9.2-1002-jdbc4</postgresqlVersion> @@ -162,7 +162,7 @@ <slf4jVersion>1.7.5</slf4jVersion> <jettyVersion>${jettyPluginVersion}</jettyVersion> <hibernateVersion>4.2.1.Final</hibernateVersion> - <seleniumVersion>2.28.0</seleniumVersion> + <seleniumVersion>2.32.0</seleniumVersion> <mockitoVersion>1.9.5</mockitoVersion> <pollenI18nBundle>pollen-i18n</pollenI18nBundle>

1 0

r3789 - trunk/pollen-ui-struts2
by tchemit＠users.chorem.org April 30, 2013

April 30, 2013

Author: tchemit Date: 2013-04-30 10:08:10 +0200 (Tue, 30 Apr 2013) New Revision: 3789 Url: http://chorem.org/projects/pollen/repository/revisions/3789 Log: fix #910: Can not starts Pollen using mvn tomcat7:run Modified: trunk/pollen-ui-struts2/pom.xml Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2013-04-30 08:06:33 UTC (rev 3788) +++ trunk/pollen-ui-struts2/pom.xml 2013-04-30 08:08:10 UTC (rev 3789) @@ -215,11 +215,11 @@ <scope>runtime</scope> </dependency> - <dependency> +  <dependency> <groupId>log4j</groupId> @@ -398,6 +398,27 @@ <profiles> <profile> + <id>do-release</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <properties> + <env>prod</env> + </properties> + + <dependencies> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-jcl</artifactId> + <scope>runtime</scope> + </dependency> + </dependencies> + </profile> + + <profile> <id>assembly</id> <activation> <property>

1 0

r3788 - trunk/src/site/rst
by tchemit＠users.chorem.org April 30, 2013

April 30, 2013

Author: tchemit Date: 2013-04-30 10:06:33 +0200 (Tue, 30 Apr 2013) New Revision: 3788 Url: http://chorem.org/projects/pollen/repository/revisions/3788 Log: refs #907: Pollen does not start well via the embedded version of it Modified: trunk/src/site/rst/install.rst.vm Modified: trunk/src/site/rst/install.rst.vm =================================================================== --- trunk/src/site/rst/install.rst.vm 2013-04-30 08:06:08 UTC (rev 3787) +++ trunk/src/site/rst/install.rst.vm 2013-04-30 08:06:33 UTC (rev 3788) @@ -96,7 +96,7 @@ :: - http://localhost:8888 + http://localhost:8888/home; Server mode installation

1 0

r3787 - trunk
by tchemit＠users.chorem.org April 30, 2013

April 30, 2013

Author: tchemit Date: 2013-04-30 10:06:08 +0200 (Tue, 30 Apr 2013) New Revision: 3787 Url: http://chorem.org/projects/pollen/repository/revisions/3787 Log: fixes #909: Updates struts2 to 2.3.14 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-04-29 19:01:09 UTC (rev 3786) +++ trunk/pom.xml 2013-04-30 08:06:08 UTC (rev 3787) @@ -156,7 +156,7 @@ <nuitonUtilsVersion>2.6.12</nuitonUtilsVersion> <h2Version>1.3.171</h2Version> <postgresqlVersion>9.2-1002-jdbc4</postgresqlVersion> - <struts2Version>2.3.12</struts2Version> + <struts2Version>2.3.14</struts2Version> <jqueryPluginVersion>3.5.1</jqueryPluginVersion> <shiroVersion>1.2.1</shiroVersion> <slf4jVersion>1.7.5</slf4jVersion>

1 0

r3786 - in trunk: . pollen-ui-struts2/src/main/assembly/dist
by tchemit＠users.chorem.org April 29, 2013

April 29, 2013

Author: tchemit Date: 2013-04-29 21:01:09 +0200 (Mon, 29 Apr 2013) New Revision: 3786 Url: http://chorem.org/projects/pollen/repository/revisions/3786 Log: refs #908: Updates nuiton-web to 1.13 fixes #907: Pollen does not start well via the embedded version of it Modified: trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.bat trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.sh trunk/pom.xml Modified: trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.bat =================================================================== --- trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.bat 2013-04-29 09:15:35 UTC (rev 3785) +++ trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.bat 2013-04-29 19:01:09 UTC (rev 3786) @@ -20,7 +20,7 @@ :launch set POLLEN_OPTS="-Xms512m -Xmx1024m -Dpollen.log.dir=./logs" -java.exe "%POLLEN_OPTS%" -jar pollen-${project.version}-embedded.war %1 %2 %3 %4 %5 %6 %7 %8 %9 +java.exe "%POLLEN_OPTS%" -jar pollen-${project.version}-embedded.war --path /home; %1 %2 %3 %4 %5 %6 %7 %8 %9 GOTO end :end Modified: trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.sh =================================================================== --- trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.sh 2013-04-29 09:15:35 UTC (rev 3785) +++ trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.sh 2013-04-29 19:01:09 UTC (rev 3786) @@ -13,5 +13,5 @@ cd `dirname $0` CURRENTPWD=`pwd` POLLEN_OPTS="$JAVA_OPTS -Xms512m -Xmx1024m -Dpollen.log.dir=$CURRENTPWD/logs" -java $POLLEN_OPTS -jar pollen-${project.version}-embedded.war $* +java $POLLEN_OPTS -jar pollen-${project.version}-embedded.war --path /home; $* cd "$OLDPWD" \ No newline at end of file Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-04-29 09:15:35 UTC (rev 3785) +++ trunk/pom.xml 2013-04-29 19:01:09 UTC (rev 3786) @@ -152,7 +152,7 @@ <eugenePluginVersion>2.6.1</eugenePluginVersion> <nuitonI18nVersion>2.5</nuitonI18nVersion> - <nuitonWebVersion>1.12-beta-1</nuitonWebVersion> + <nuitonWebVersion>1.13-SNAPSHOT</nuitonWebVersion> <nuitonUtilsVersion>2.6.12</nuitonUtilsVersion> <h2Version>1.3.171</h2Version> <postgresqlVersion>9.2-1002-jdbc4</postgresqlVersion>

1 0

r3785 - in trunk: . pollen-persistence pollen-services pollen-ui-struts2 pollen-votecounting-aggregator pollen-votecounting-api pollen-votecounting-borda pollen-votecounting-condorcet pollen-votecounting-coombs pollen-votecounting-instant-runoff pollen-votecounting-normal pollen-votecounting-number pollen-votecounting-percentage
by maven-release＠users.chorem.org April 29, 2013

April 29, 2013

Author: maven-release Date: 2013-04-29 11:15:35 +0200 (Mon, 29 Apr 2013) New Revision: 3785 Url: http://chorem.org/projects/pollen/repository/revisions/3785 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pollen-persistence/pom.xml trunk/pollen-services/pom.xml trunk/pollen-ui-struts2/pom.xml trunk/pollen-votecounting-aggregator/pom.xml trunk/pollen-votecounting-api/pom.xml trunk/pollen-votecounting-borda/pom.xml trunk/pollen-votecounting-condorcet/pom.xml trunk/pollen-votecounting-coombs/pom.xml trunk/pollen-votecounting-instant-runoff/pom.xml trunk/pollen-votecounting-normal/pom.xml trunk/pollen-votecounting-number/pom.xml trunk/pollen-votecounting-percentage/pom.xml trunk/pom.xml Modified: trunk/pollen-persistence/pom.xml =================================================================== --- trunk/pollen-persistence/pom.xml 2013-04-29 09:15:33 UTC (rev 3784) +++ trunk/pollen-persistence/pom.xml 2013-04-29 09:15:35 UTC (rev 3785) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.2</version> + <version>1.5.3-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-services/pom.xml =================================================================== --- trunk/pollen-services/pom.xml 2013-04-29 09:15:33 UTC (rev 3784) +++ trunk/pollen-services/pom.xml 2013-04-29 09:15:35 UTC (rev 3785) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.2</version> + <version>1.5.3-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2013-04-29 09:15:33 UTC (rev 3784) +++ trunk/pollen-ui-struts2/pom.xml 2013-04-29 09:15:35 UTC (rev 3785) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.2</version> + <version>1.5.3-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-aggregator/pom.xml =================================================================== --- trunk/pollen-votecounting-aggregator/pom.xml 2013-04-29 09:15:33 UTC (rev 3784) +++ trunk/pollen-votecounting-aggregator/pom.xml 2013-04-29 09:15:35 UTC (rev 3785) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.2</version> + <version>1.5.3-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-api/pom.xml =================================================================== --- trunk/pollen-votecounting-api/pom.xml 2013-04-29 09:15:33 UTC (rev 3784) +++ trunk/pollen-votecounting-api/pom.xml 2013-04-29 09:15:35 UTC (rev 3785) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.2</version> + <version>1.5.3-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-borda/pom.xml =================================================================== --- trunk/pollen-votecounting-borda/pom.xml 2013-04-29 09:15:33 UTC (rev 3784) +++ trunk/pollen-votecounting-borda/pom.xml 2013-04-29 09:15:35 UTC (rev 3785) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.2</version> + <version>1.5.3-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-condorcet/pom.xml =================================================================== --- trunk/pollen-votecounting-condorcet/pom.xml 2013-04-29 09:15:33 UTC (rev 3784) +++ trunk/pollen-votecounting-condorcet/pom.xml 2013-04-29 09:15:35 UTC (rev 3785) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.2</version> + <version>1.5.3-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-coombs/pom.xml =================================================================== --- trunk/pollen-votecounting-coombs/pom.xml 2013-04-29 09:15:33 UTC (rev 3784) +++ trunk/pollen-votecounting-coombs/pom.xml 2013-04-29 09:15:35 UTC (rev 3785) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.2</version> + <version>1.5.3-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-instant-runoff/pom.xml =================================================================== --- trunk/pollen-votecounting-instant-runoff/pom.xml 2013-04-29 09:15:33 UTC (rev 3784) +++ trunk/pollen-votecounting-instant-runoff/pom.xml 2013-04-29 09:15:35 UTC (rev 3785) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.2</version> + <version>1.5.3-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-normal/pom.xml =================================================================== --- trunk/pollen-votecounting-normal/pom.xml 2013-04-29 09:15:33 UTC (rev 3784) +++ trunk/pollen-votecounting-normal/pom.xml 2013-04-29 09:15:35 UTC (rev 3785) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.2</version> + <version>1.5.3-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-number/pom.xml =================================================================== --- trunk/pollen-votecounting-number/pom.xml 2013-04-29 09:15:33 UTC (rev 3784) +++ trunk/pollen-votecounting-number/pom.xml 2013-04-29 09:15:35 UTC (rev 3785) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.2</version> + <version>1.5.3-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-percentage/pom.xml =================================================================== --- trunk/pollen-votecounting-percentage/pom.xml 2013-04-29 09:15:33 UTC (rev 3784) +++ trunk/pollen-votecounting-percentage/pom.xml 2013-04-29 09:15:35 UTC (rev 3785) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.2</version> + <version>1.5.3-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-04-29 09:15:33 UTC (rev 3784) +++ trunk/pom.xml 2013-04-29 09:15:35 UTC (rev 3785) @@ -11,7 +11,7 @@ <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.2</version> + <version>1.5.3-SNAPSHOT</version> <modules> <module>pollen-votecounting-api</module> @@ -535,11 +535,11 @@ </build> <scm> - <connection>scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.5.2</connection> + <connection>scm:svn:http://svn.chorem.org/svn/pollen/trunk</connection> <developerConnection> - scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.5.2 + scm:svn:http://svn.chorem.org/svn/pollen/trunk </developerConnection> - <url>http://www.chorem.org/repositories/browse/pollen/tags/pollen-1.5.2</url> + <url>http://www.chorem.org/repositories/browse/pollen/trunk</url> </scm> <distributionManagement>

1 0

r3784 - in tags: . pollen-1.5.2
by maven-release＠users.chorem.org April 29, 2013

April 29, 2013

Author: maven-release Date: 2013-04-29 11:15:33 +0200 (Mon, 29 Apr 2013) New Revision: 3784 Url: http://chorem.org/projects/pollen/repository/revisions/3784 Log: [maven-release-plugin] copy for tag pollen-1.5.2 Added: tags/pollen-1.5.2/ Property changes on: tags/pollen-1.5.2 ___________________________________________________________________ Added: svn:ignore + target nbactions.xml .settings .classpath .project *.ipr *.iws *.iml .idea atlassian-ide-plugin.xml Added: svn:mergeinfo +

1 0

r3783 - in trunk: . pollen-persistence pollen-services pollen-ui-struts2 pollen-votecounting-aggregator pollen-votecounting-api pollen-votecounting-borda pollen-votecounting-condorcet pollen-votecounting-coombs pollen-votecounting-instant-runoff pollen-votecounting-normal pollen-votecounting-number pollen-votecounting-percentage
by maven-release＠users.chorem.org April 29, 2013

April 29, 2013

Author: maven-release Date: 2013-04-29 11:15:31 +0200 (Mon, 29 Apr 2013) New Revision: 3783 Url: http://chorem.org/projects/pollen/repository/revisions/3783 Log: [maven-release-plugin] prepare release pollen-1.5.2 Modified: trunk/pollen-persistence/pom.xml trunk/pollen-services/pom.xml trunk/pollen-ui-struts2/pom.xml trunk/pollen-votecounting-aggregator/pom.xml trunk/pollen-votecounting-api/pom.xml trunk/pollen-votecounting-borda/pom.xml trunk/pollen-votecounting-condorcet/pom.xml trunk/pollen-votecounting-coombs/pom.xml trunk/pollen-votecounting-instant-runoff/pom.xml trunk/pollen-votecounting-normal/pom.xml trunk/pollen-votecounting-number/pom.xml trunk/pollen-votecounting-percentage/pom.xml trunk/pom.xml Modified: trunk/pollen-persistence/pom.xml =================================================================== --- trunk/pollen-persistence/pom.xml 2013-04-29 09:05:08 UTC (rev 3782) +++ trunk/pollen-persistence/pom.xml 2013-04-29 09:15:31 UTC (rev 3783) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.2-SNAPSHOT</version> + <version>1.5.2</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-services/pom.xml =================================================================== --- trunk/pollen-services/pom.xml 2013-04-29 09:05:08 UTC (rev 3782) +++ trunk/pollen-services/pom.xml 2013-04-29 09:15:31 UTC (rev 3783) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.2-SNAPSHOT</version> + <version>1.5.2</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2013-04-29 09:05:08 UTC (rev 3782) +++ trunk/pollen-ui-struts2/pom.xml 2013-04-29 09:15:31 UTC (rev 3783) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.2-SNAPSHOT</version> + <version>1.5.2</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-aggregator/pom.xml =================================================================== --- trunk/pollen-votecounting-aggregator/pom.xml 2013-04-29 09:05:08 UTC (rev 3782) +++ trunk/pollen-votecounting-aggregator/pom.xml 2013-04-29 09:15:31 UTC (rev 3783) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.2-SNAPSHOT</version> + <version>1.5.2</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-api/pom.xml =================================================================== --- trunk/pollen-votecounting-api/pom.xml 2013-04-29 09:05:08 UTC (rev 3782) +++ trunk/pollen-votecounting-api/pom.xml 2013-04-29 09:15:31 UTC (rev 3783) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.2-SNAPSHOT</version> + <version>1.5.2</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-borda/pom.xml =================================================================== --- trunk/pollen-votecounting-borda/pom.xml 2013-04-29 09:05:08 UTC (rev 3782) +++ trunk/pollen-votecounting-borda/pom.xml 2013-04-29 09:15:31 UTC (rev 3783) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.2-SNAPSHOT</version> + <version>1.5.2</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-condorcet/pom.xml =================================================================== --- trunk/pollen-votecounting-condorcet/pom.xml 2013-04-29 09:05:08 UTC (rev 3782) +++ trunk/pollen-votecounting-condorcet/pom.xml 2013-04-29 09:15:31 UTC (rev 3783) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.2-SNAPSHOT</version> + <version>1.5.2</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-coombs/pom.xml =================================================================== --- trunk/pollen-votecounting-coombs/pom.xml 2013-04-29 09:05:08 UTC (rev 3782) +++ trunk/pollen-votecounting-coombs/pom.xml 2013-04-29 09:15:31 UTC (rev 3783) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.2-SNAPSHOT</version> + <version>1.5.2</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-instant-runoff/pom.xml =================================================================== --- trunk/pollen-votecounting-instant-runoff/pom.xml 2013-04-29 09:05:08 UTC (rev 3782) +++ trunk/pollen-votecounting-instant-runoff/pom.xml 2013-04-29 09:15:31 UTC (rev 3783) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.2-SNAPSHOT</version> + <version>1.5.2</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-normal/pom.xml =================================================================== --- trunk/pollen-votecounting-normal/pom.xml 2013-04-29 09:05:08 UTC (rev 3782) +++ trunk/pollen-votecounting-normal/pom.xml 2013-04-29 09:15:31 UTC (rev 3783) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.2-SNAPSHOT</version> + <version>1.5.2</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-number/pom.xml =================================================================== --- trunk/pollen-votecounting-number/pom.xml 2013-04-29 09:05:08 UTC (rev 3782) +++ trunk/pollen-votecounting-number/pom.xml 2013-04-29 09:15:31 UTC (rev 3783) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.2-SNAPSHOT</version> + <version>1.5.2</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-percentage/pom.xml =================================================================== --- trunk/pollen-votecounting-percentage/pom.xml 2013-04-29 09:05:08 UTC (rev 3782) +++ trunk/pollen-votecounting-percentage/pom.xml 2013-04-29 09:15:31 UTC (rev 3783) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.2-SNAPSHOT</version> + <version>1.5.2</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-04-29 09:05:08 UTC (rev 3782) +++ trunk/pom.xml 2013-04-29 09:15:31 UTC (rev 3783) @@ -11,7 +11,7 @@ <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.2-SNAPSHOT</version> + <version>1.5.2</version> <modules> <module>pollen-votecounting-api</module> @@ -535,11 +535,11 @@ </build> <scm> - <connection>scm:svn:http://svn.chorem.org/svn/pollen/trunk</connection> + <connection>scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.5.2</connection> <developerConnection> - scm:svn:http://svn.chorem.org/svn/pollen/trunk + scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.5.2 </developerConnection> - <url>http://www.chorem.org/repositories/browse/pollen/trunk</url> + <url>http://www.chorem.org/repositories/browse/pollen/tags/pollen-1.5.2</url> </scm> <distributionManagement>

1 0

r3782 - in trunk: pollen-persistence/src/license pollen-services/src/license pollen-ui-struts2/src/license
by tchemit＠users.chorem.org April 29, 2013

April 29, 2013

Author: tchemit Date: 2013-04-29 11:05:08 +0200 (Mon, 29 Apr 2013) New Revision: 3782 Url: http://chorem.org/projects/pollen/repository/revisions/3782 Log: update third parties Modified: trunk/pollen-persistence/src/license/THIRD-PARTY.properties trunk/pollen-services/src/license/THIRD-PARTY.properties trunk/pollen-ui-struts2/src/license/THIRD-PARTY.properties Modified: trunk/pollen-persistence/src/license/THIRD-PARTY.properties =================================================================== --- trunk/pollen-persistence/src/license/THIRD-PARTY.properties 2013-04-29 08:59:51 UTC (rev 3781) +++ trunk/pollen-persistence/src/license/THIRD-PARTY.properties 2013-04-29 09:05:08 UTC (rev 3782) @@ -1,27 +1,30 @@ # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : +# - Apache License 2.0 # - BSD License -# - BSD style # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Common Development and Distribution License # - Common Public License Version 1.0 # - GNU Affero General Public License version 3 +# - GNU General Public License, Version 2 with the Classpath Exception +# - GNU Lesser General Public License, version 2.1 +# - GNU Library or Lesser General Public License # - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - Lesser General Public License (LGPL) v 3.0 # - Lesser General Public License (LPGL) # - Lesser General Public License (LPGL) v 2.1 # - MIT License # - MPL 1.1 -# - Similar to Apache License but with the acknowledgment clause removed +# - New BSD License # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 +# - The MIT License # - license.txt #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Fri Apr 13 19:35:55 CEST 2012 -antlr--antlr--2.7.6=BSD License +#Mon Apr 29 11:02:34 CEST 2013 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License -javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 Modified: trunk/pollen-services/src/license/THIRD-PARTY.properties =================================================================== --- trunk/pollen-services/src/license/THIRD-PARTY.properties 2013-04-29 08:59:51 UTC (rev 3781) +++ trunk/pollen-services/src/license/THIRD-PARTY.properties 2013-04-29 09:05:08 UTC (rev 3782) @@ -1,12 +1,15 @@ # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : +# - Apache License 2.0 # - BSD License -# - BSD style # - CDDL # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Common Development and Distribution License # - Common Public License Version 1.0 # - GNU Affero General Public License version 3 +# - GNU General Public License, Version 2 with the Classpath Exception +# - GNU Lesser General Public License, version 2.1 # - GNU Library or Lesser General Public License # - GPLv2+CE # - Indiana University Extreme! Lab Software License, vesion 1.1.1 @@ -15,7 +18,7 @@ # - Lesser General Public License (LPGL) v 2.1 # - MIT License # - MPL 1.1 -# - Similar to Apache License but with the acknowledgment clause removed +# - New BSD License # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 # - license.txt @@ -23,11 +26,9 @@ # Please fill the missing licenses for dependencies : # # -#Wed Jun 06 13:16:20 CEST 2012 -antlr--antlr--2.7.6=BSD License +#Mon Apr 29 11:02:34 CEST 2013 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License javax.servlet--servlet-api--2.5=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 jdom--jdom--1.0=The Apache Software License, Version 2.0 rome--rome--1.0=The Apache Software License, Version 2.0 Modified: trunk/pollen-ui-struts2/src/license/THIRD-PARTY.properties =================================================================== --- trunk/pollen-ui-struts2/src/license/THIRD-PARTY.properties 2013-04-29 08:59:51 UTC (rev 3781) +++ trunk/pollen-ui-struts2/src/license/THIRD-PARTY.properties 2013-04-29 09:05:08 UTC (rev 3782) @@ -2,17 +2,20 @@ #------------------------------------------------------------------------------- # Already used licenses in project : # - Apache License +# - Apache License 2.0 # - Apache Software License - Version 2.0 # - BSD License -# - BSD style # - BSD-style license # - Bouncy Castle License # - CDDL # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Common Development and Distribution License # - Common Public License Version 1.0 # - Eclipse Public License - Version 1.0 # - GNU Affero General Public License version 3 +# - GNU General Public License, Version 2 with the Classpath Exception # - GNU Lesser General Public Licence +# - GNU Lesser General Public License, version 2.1 # - GNU Library or Lesser General Public License # - GPLv2+CE # - Indiana University Extreme! Lab Software License, vesion 1.1.1 @@ -23,8 +26,8 @@ # - MIT License # - MPL 1.1 # - Mozilla Public License -# - Mozilla Public License version 1.1 -# - Similar to Apache License but with the acknowledgment clause removed +# - Mozilla Public License version 2.0 +# - New BSD License # - The Apache Software License, Version 1.1 # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 @@ -35,13 +38,11 @@ # Please fill the missing licenses for dependencies : # # -#Tue Jun 19 18:14:05 CEST 2012 -antlr--antlr--2.7.6=BSD License +#Mon Apr 29 11:02:35 CEST 2013 cglib--cglib-nodep--2.1_3=The Apache Software License, Version 2.0 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License javax.servlet--servlet-api--2.5=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 jdom--jdom--1.0=The Apache Software License, Version 2.0 oro--oro--2.0.8=The Apache Software License, Version 2.0 rome--rome--1.0=The Apache Software License, Version 2.0

1 0