This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository nuiton-web. See https://gitlab.nuiton.org/nuiton/nuiton-web.git commit f9dc1e979f87b4c3c3125564dbbf5ed6d5aae64d Author: CHRE <CHATELLIER@codelutin.com> Date: Mon Oct 17 17:03:52 2016 +0200 refs #3954: Update libs --- nuiton-rss/pom.xml | 6 ++--- .../src/main/java/org/nuiton/rss/RSSHelper.java | 7 +++--- nuiton-security/pom.xml | 2 +- nuiton-tapestry/pom.xml | 6 ++--- .../data/AbstractMappedGridDataSource.java | 4 ++-- pom.xml | 26 +++++++++++----------- 6 files changed, 26 insertions(+), 25 deletions(-) diff --git a/nuiton-rss/pom.xml b/nuiton-rss/pom.xml index c4935d2..1b27742 100644 --- a/nuiton-rss/pom.xml +++ b/nuiton-rss/pom.xml @@ -3,7 +3,7 @@ #%L Nuiton Web :: Nuiton RSS %% - Copyright (C) 2008 - 2014 CodeLutin, Tony Chemit + Copyright (C) 2008 - 2016 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -53,8 +53,8 @@ </dependency> <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-collections4</artifactId> </dependency> <dependency> diff --git a/nuiton-rss/src/main/java/org/nuiton/rss/RSSHelper.java b/nuiton-rss/src/main/java/org/nuiton/rss/RSSHelper.java index 1765d3d..02270c5 100644 --- a/nuiton-rss/src/main/java/org/nuiton/rss/RSSHelper.java +++ b/nuiton-rss/src/main/java/org/nuiton/rss/RSSHelper.java @@ -2,7 +2,7 @@ * #%L * Nuiton Web :: Nuiton RSS * %% - * Copyright (C) 2008 - 2010 CodeLutin, Tony Chemit, Benjamin Poussin + * Copyright (C) 2008 - 2016 CodeLutin, Tony Chemit, Benjamin Poussin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -23,7 +23,8 @@ package org.nuiton.rss; import com.sun.syndication.feed.synd.SyndEntry; import com.sun.syndication.feed.synd.SyndFeed; -import org.apache.commons.collections.map.ReferenceMap; +import org.apache.commons.collections4.map.AbstractReferenceMap.ReferenceStrength; +import org.apache.commons.collections4.map.ReferenceMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -60,7 +61,7 @@ public class RSSHelper { * on utilise des soft reference pour eviter de trop utiliser la memoire * key: String, value: FeedData */ - protected ReferenceMap feeds = new ReferenceMap(ReferenceMap.HARD, ReferenceMap.SOFT); + protected ReferenceMap feeds = new ReferenceMap(ReferenceStrength.HARD, ReferenceStrength.SOFT); protected FeedRenderer renderer; /** diff --git a/nuiton-security/pom.xml b/nuiton-security/pom.xml index 0fcd46b..ae904d5 100644 --- a/nuiton-security/pom.xml +++ b/nuiton-security/pom.xml @@ -3,7 +3,7 @@ #%L Nuiton Web :: Nuiton Security %% - Copyright (C) 2008 - 2014 CodeLutin, Tony Chemit + Copyright (C) 2008 - 2016 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as diff --git a/nuiton-tapestry/pom.xml b/nuiton-tapestry/pom.xml index 8209eeb..2bce4b1 100644 --- a/nuiton-tapestry/pom.xml +++ b/nuiton-tapestry/pom.xml @@ -3,7 +3,7 @@ #%L Nuiton Web :: Nuiton Tapestry %% - Copyright (C) 2008 - 2014 CodeLutin, Tony Chemit + Copyright (C) 2008 - 2016 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -42,8 +42,8 @@ </dependency> <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-collections4</artifactId> </dependency> <dependency> diff --git a/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/data/AbstractMappedGridDataSource.java b/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/data/AbstractMappedGridDataSource.java index bbfbc99..9e22614 100644 --- a/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/data/AbstractMappedGridDataSource.java +++ b/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/data/AbstractMappedGridDataSource.java @@ -2,7 +2,7 @@ * #%L * Nuiton Web :: Nuiton Tapestry * %% - * Copyright (C) 2010 - 2011 CodeLutin + * Copyright (C) 2010 - 2016 CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -21,7 +21,7 @@ */ package org.nuiton.web.tapestry5.data; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.tapestry5.beaneditor.PropertyModel; import org.apache.tapestry5.grid.ColumnSort; import org.apache.tapestry5.grid.GridDataSource; diff --git a/pom.xml b/pom.xml index 4ea03f1..6c212f2 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ #%L Nuiton Web %% -Copyright (C) 2008 - 2015 CodeLutin, Tony Chemit +Copyright (C) 2008 - 2016 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -118,14 +118,14 @@ License along with this program. If not, see <signatureArtifactId>java17</signatureArtifactId> <signatureVersion>1.0</signatureVersion> - <eugeneVersion>3.0-alpha-5</eugeneVersion> + <eugeneVersion>3.0-alpha-8</eugeneVersion> - <nuitonConfigVersion>3.0-rc-4</nuitonConfigVersion> - <nuitonI18nVersion>3.5</nuitonI18nVersion> - <nuitonUtilsVersion>3.0-rc-12</nuitonUtilsVersion> + <nuitonConfigVersion>3.1</nuitonConfigVersion> + <nuitonI18nVersion>3.6.2</nuitonI18nVersion> + <nuitonUtilsVersion>3.0-rc-15</nuitonUtilsVersion> <nuitonI18nPluginVersion>${nuitonI18nVersion}</nuitonI18nPluginVersion> - <topiaVersion>3.1.1</topiaVersion> + <topiaVersion>3.1.3.1</topiaVersion> <!-- Tapestry --> <tapestryVersion>5.2.4</tapestryVersion> @@ -139,9 +139,9 @@ License along with this program. If not, see <!-- Strust 2 --> <struts2Version>2.5.2</struts2Version> - <shiroVersion>1.2.5</shiroVersion> + <shiroVersion>1.3.2</shiroVersion> <servletApiVersion>3.0.1</servletApiVersion> - <jettyVersion>9.2.18.v20160721</jettyVersion> + <jettyVersion>9.3.12.v20160915</jettyVersion> <!--Multilanguage maven-site --> <locales>fr</locales> @@ -178,13 +178,13 @@ License along with this program. If not, see <dependency> <groupId>commons-beanutils</groupId> <artifactId>commons-beanutils</artifactId> - <version>1.9.2</version> + <version>1.9.3</version> </dependency> <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>3.2.1</version> + <groupId>org.apache.commons</groupId> + <artifactId>commons-collections4</artifactId> + <version>4.1</version> </dependency> <dependency> @@ -310,7 +310,7 @@ License along with this program. If not, see <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> - <version>3.6.10.Final</version> + <version>4.3.11.Final</version> <scope>provided</scope> </dependency> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.