Author: tchemit Date: 2014-04-05 20:19:28 +0200 (Sat, 05 Apr 2014) New Revision: 3873 Url: http://forge.chorem.org/projects/pollen/repository/revisions/3873 Log: udpate licenses, mavenpom Modified: branches/pollen-1.5.x/LICENSE.txt branches/pollen-1.5.x/pollen-persistence/LICENSE.txt branches/pollen-1.5.x/pollen-persistence/pom.xml branches/pollen-1.5.x/pollen-persistence/src/main/java/org/chorem/pollen/PollenTopiaRootContextFactory.java branches/pollen-1.5.x/pom.xml Modified: branches/pollen-1.5.x/LICENSE.txt =================================================================== --- branches/pollen-1.5.x/LICENSE.txt 2014-04-05 18:17:16 UTC (rev 3872) +++ branches/pollen-1.5.x/LICENSE.txt 2014-04-05 18:19:28 UTC (rev 3873) @@ -658,4 +658,4 @@ You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU AGPL, see -<http://www.gnu.org/licenses/>. \ No newline at end of file +<http://www.gnu.org/licenses/>. Modified: branches/pollen-1.5.x/pollen-persistence/LICENSE.txt =================================================================== --- branches/pollen-1.5.x/pollen-persistence/LICENSE.txt 2014-04-05 18:17:16 UTC (rev 3872) +++ branches/pollen-1.5.x/pollen-persistence/LICENSE.txt 2014-04-05 18:19:28 UTC (rev 3873) @@ -658,4 +658,4 @@ You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU AGPL, see -<http://www.gnu.org/licenses/>. \ No newline at end of file +<http://www.gnu.org/licenses/>. Modified: branches/pollen-1.5.x/pollen-persistence/pom.xml =================================================================== --- branches/pollen-1.5.x/pollen-persistence/pom.xml 2014-04-05 18:17:16 UTC (rev 3872) +++ branches/pollen-1.5.x/pollen-persistence/pom.xml 2014-04-05 18:19:28 UTC (rev 3873) @@ -40,6 +40,10 @@ <artifactId>commons-collections</artifactId> </dependency> <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> + <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> </dependency> Modified: branches/pollen-1.5.x/pollen-persistence/src/main/java/org/chorem/pollen/PollenTopiaRootContextFactory.java =================================================================== --- branches/pollen-1.5.x/pollen-persistence/src/main/java/org/chorem/pollen/PollenTopiaRootContextFactory.java 2014-04-05 18:17:16 UTC (rev 3872) +++ branches/pollen-1.5.x/pollen-persistence/src/main/java/org/chorem/pollen/PollenTopiaRootContextFactory.java 2014-04-05 18:19:28 UTC (rev 3873) @@ -23,7 +23,7 @@ package org.chorem.pollen; import com.google.common.collect.Sets; -import com.google.common.io.Closeables; +import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.pollen.entities.PollenDAOHelper; @@ -64,7 +64,7 @@ } catch (IOException e) { throw new PollenTechnicalException(e); } finally { - Closeables.closeQuietly(input); + IOUtils.closeQuietly(input); } properties.setProperty( TopiaContextFactory.CONFIG_URL, Modified: branches/pollen-1.5.x/pom.xml =================================================================== --- branches/pollen-1.5.x/pom.xml 2014-04-05 18:17:16 UTC (rev 3872) +++ branches/pollen-1.5.x/pom.xml 2014-04-05 18:19:28 UTC (rev 3873) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>4.4</version> + <version>5.0.4</version> </parent> <groupId>org.chorem</groupId> @@ -24,7 +24,7 @@ <name>Pollen</name> <description>Application de vote Pollen</description> <inceptionYear>2009</inceptionYear> - <url>http://maven-site.chorem.org/pollen</url> + <url>http://doc.chorem.org/pollen</url> <licenses> <license> @@ -540,19 +540,19 @@ <scm> <connection> - scm:svn:http://svn.chorem.org/svn/pollen/branches/pollen-1.5.x + scm:svn:http://svn.chorem.org/pollen/branches/pollen-1.5.x </connection> <developerConnection> - scm:svn:http://svn.chorem.org/svn/pollen/branches/pollen-1.5.x + scm:svn:https://svn.chorem.org/pollen/branches/pollen-1.5.x </developerConnection> <url> - http://chorem.org/projects/pollen/repository/show/branches/pollen-1.5.x + http://forge.chorem.org/projects/pollen/repository/show/branches/pollen-1.5.... </url> </scm> <distributionManagement> <site> - <id>${platform}</id> + <id>doc.${platform}</id> <url>${our.site.repository}/${projectId}</url> </site> </distributionManagement>