Cantharella-commits

Download

cantharella-commits@list.forge.codelutin.com

April 2014

1 participants
2 discussions

r265 - trunk
by echatellier＠users.forge.codelutin.com April 29, 2014

April 29, 2014

Author: echatellier Date: 2014-04-29 15:58:50 +0200 (Tue, 29 Apr 2014) New Revision: 265 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/265 Log: Update to wicket 6.15.0 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-04-18 15:34:37 UTC (rev 264) +++ trunk/pom.xml 2014-04-29 13:58:50 UTC (rev 265) @@ -117,7 +117,7 @@ <version.commons-collections>3.2.1</version.commons-collections> <version.commons-codec>1.9</version.commons-codec> <version.postgresql>9.3-1101-jdbc41</version.postgresql> - <version.h2>1.3.175</version.h2> + <version.h2>1.3.176</version.h2> <version.validation-api>1.1.0.Final</version.validation-api> <version.hibernate-jpa-2.1-api>1.0.0.Final</version.hibernate-jpa-2.1-api> <version.hibernate>4.3.5.Final</version.hibernate> @@ -134,7 +134,7 @@ <version.poi>3.10-FINAL</version.poi> <version.nuiton-utils>3.0-alpha-2</version.nuiton-utils> <version.servlet-api>2.5</version.servlet-api> - <version.wicket>6.14.0</version.wicket> + <version.wicket>6.15.0</version.wicket> <!-- FIXME echatellier Probleme de parallelisation des tests unitaire, cause org.hibernate.HibernateException: Don't change the reference to a collection

1 0

r264 - in trunk: . cantharella.data cantharella.data/src/main/java/nc/ird/cantharella/data/config cantharella.service/src/main/java/nc/ird/cantharella/service/config cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl cantharella.utils/src/main/java/nc/ird/cantharella/utils cantharella.web/src/main/java/nc/ird/cantharella/web/config cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document cantharella.web/src/main/java/nc/ird/cantharella/web/page
by echatellier＠users.forge.codelutin.com April 18, 2014

April 18, 2014

Author: echatellier Date: 2014-04-18 17:34:37 +0200 (Fri, 18 Apr 2014) New Revision: 264 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/264 Log: fixes #4976: Update libs Modified: trunk/cantharella.data/pom.xml trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/config/DataContext.java trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/config/ServiceContext.java trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/SearchServiceImpl.java trunk/cantharella.utils/src/main/java/nc/ird/cantharella/utils/CantharellaConfig.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/config/WebApplicationImpl.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/config/WebContext.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/DocumentTooltipColumn.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/personne/ListPersonnesPage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/search/SearchPage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/specimen/ListSpecimensPage.java trunk/pom.xml Modified: trunk/cantharella.data/pom.xml =================================================================== --- trunk/cantharella.data/pom.xml 2014-03-04 15:36:28 UTC (rev 263) +++ trunk/cantharella.data/pom.xml 2014-04-18 15:34:37 UTC (rev 264) @@ -85,7 +85,7 @@ <artifactId>nuiton-config</artifactId> </dependency> <dependency> - <groupId>postgresql</groupId> + <groupId>org.postgresql</groupId> <artifactId>postgresql</artifactId> </dependency> <dependency> @@ -99,7 +99,7 @@ </dependency> <dependency> <groupId>org.hibernate.javax.persistence</groupId> - <artifactId>hibernate-jpa-2.0-api</artifactId> + <artifactId>hibernate-jpa-2.1-api</artifactId> </dependency> <dependency> <groupId>org.hibernate</groupId> @@ -126,7 +126,7 @@ <artifactId>lucene-analyzers</artifactId> </dependency> <dependency> - <groupId>c3p0</groupId> + <groupId>com.mchange</groupId> <artifactId>c3p0</artifactId> </dependency> <dependency> Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/config/DataContext.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/config/DataContext.java 2014-03-04 15:36:28 UTC (rev 263) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/config/DataContext.java 2014-04-18 15:34:37 UTC (rev 264) @@ -47,7 +47,7 @@ import org.hibernate.cache.ehcache.SingletonEhCacheRegionFactory; import org.hibernate.cfg.Environment; import org.hibernate.dialect.PostgreSQL82Dialect; -import org.nuiton.util.config.ArgumentsParserException; +import org.nuiton.config.ArgumentsParserException; import org.postgresql.Driver; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/config/ServiceContext.java =================================================================== --- trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/config/ServiceContext.java 2014-03-04 15:36:28 UTC (rev 263) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/config/ServiceContext.java 2014-04-18 15:34:37 UTC (rev 264) @@ -33,7 +33,7 @@ import nc.ird.cantharella.utils.CantharellaConfig; import nc.ird.cantharella.utils.PasswordTools; -import org.nuiton.util.config.ArgumentsParserException; +import org.nuiton.config.ArgumentsParserException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; Modified: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/SearchServiceImpl.java =================================================================== --- trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/SearchServiceImpl.java 2014-03-04 15:36:28 UTC (rev 263) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/SearchServiceImpl.java 2014-04-18 15:34:37 UTC (rev 264) @@ -41,7 +41,6 @@ import nc.ird.cantharella.data.model.Specimen; import nc.ird.cantharella.data.model.Station; import nc.ird.cantharella.data.model.Utilisateur; -import nc.ird.cantharella.data.model.Utilisateur.TypeDroit; import nc.ird.cantharella.service.model.SearchBean; import nc.ird.cantharella.service.model.SearchResult; import nc.ird.cantharella.service.services.LotService; @@ -138,9 +137,9 @@ // passer les tests pour que les indexes lucene contiennent des données // nécéssaire car il ne sont écrits que lorsque Spring commmit la // transaction (c'est à dire jamais dans les tests) - //fullTextSession.flushToIndexes(); - //fullTextSession.setFlushMode(FlushMode.MANUAL); - //fullTextSession.setCacheMode(CacheMode.IGNORE); + // fullTextSession.flushToIndexes(); + // fullTextSession.setFlushMode(FlushMode.MANUAL); + // fullTextSession.setCacheMode(CacheMode.IGNORE); try { @@ -201,19 +200,23 @@ throw new UnexpectedException("Can't parse query", ex); } - //tx.commit(); - //session.close(); + // tx.commit(); + // session.close(); return result; } /** - * Prepare hibernate query with lucene query implementation to - * search for query string on specified single type. + * Prepare hibernate query with lucene query implementation to search for + * query string on specified single type. * - * @param fullTextSession search session - * @param clazz type - * @param strQuery query string - * @param utilisateur user + * @param fullTextSession + * search session + * @param clazz + * type + * @param strQuery + * query string + * @param utilisateur + * user * @return hibernate query implemented by lucene query * @throws ParseException */ @@ -231,13 +234,22 @@ String fieldName = fieldInfos.fieldName(i); // il semble impossible de ne pas recuperer l'id du document // on l'exclut donc manuellement - if (!fieldName.startsWith("id") && !fieldName.contains(".id") /*&& !fieldName.endsWith(".pk2")*/) { + if (!fieldName.startsWith("id") && !fieldName.contains(".id") /* + * && + * ! + * fieldName + * . + * endsWith + * ( + * ".pk2" + * ) + */) { fieldList.add(fieldName); } } Analyzer analyzer = searchFactory.getAnalyzer(clazz); - QueryParser parser = new MultiFieldQueryParser(Version.LUCENE_36, fieldList.toArray(new String[fieldList.size()]), - analyzer); + QueryParser parser = new MultiFieldQueryParser(Version.LUCENE_36, + fieldList.toArray(new String[fieldList.size()]), analyzer); searchFactory.getIndexReaderAccessor().close(reader); // autorisation de "*" en premier caractere @@ -254,7 +266,8 @@ } /** - * Iterate over all results and remove those that user is not allowed to see. + * Iterate over all results and remove those that user is not allowed to + * see. * * @see Utilisateur#getLotsDroits() * @see Utilisateur#getCampagnesDroits() Modified: trunk/cantharella.utils/src/main/java/nc/ird/cantharella/utils/CantharellaConfig.java =================================================================== --- trunk/cantharella.utils/src/main/java/nc/ird/cantharella/utils/CantharellaConfig.java 2014-03-04 15:36:28 UTC (rev 263) +++ trunk/cantharella.utils/src/main/java/nc/ird/cantharella/utils/CantharellaConfig.java 2014-04-18 15:34:37 UTC (rev 264) @@ -24,9 +24,10 @@ */ import java.util.Properties; -import org.nuiton.util.config.ApplicationConfig; -import org.nuiton.util.config.ArgumentsParserException; +import org.nuiton.config.ApplicationConfig; +import org.nuiton.config.ArgumentsParserException; + /** * Used as factory in spring configuration to get configuration file as properties * this class use internaly {@link ApplicationConfig}. Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/config/WebApplicationImpl.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/config/WebApplicationImpl.java 2014-03-04 15:36:28 UTC (rev 263) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/config/WebApplicationImpl.java 2014-04-18 15:34:37 UTC (rev 264) @@ -22,6 +22,7 @@ */ package nc.ird.cantharella.web.config; +import java.io.File; import java.math.BigDecimal; import nc.ird.cantharella.data.config.DataContext; @@ -76,6 +77,7 @@ import nc.ird.cantharella.web.utils.security.AuthStrategy; import org.apache.wicket.ConverterLocator; +import org.apache.wicket.DefaultPageManagerProvider; import org.apache.wicket.IConverterLocator; import org.apache.wicket.RuntimeConfigurationType; import org.apache.wicket.Session; @@ -85,6 +87,8 @@ import org.apache.wicket.core.request.mapper.PackageMapper; import org.apache.wicket.injection.Injector; import org.apache.wicket.javascript.DefaultJavaScriptCompressor; +import org.apache.wicket.pageStore.DiskDataStore; +import org.apache.wicket.pageStore.IDataStore; import org.apache.wicket.protocol.http.WebApplication; import org.apache.wicket.request.Request; import org.apache.wicket.request.Response; @@ -96,6 +100,7 @@ import org.apache.wicket.spring.injection.annot.SpringBean; import org.apache.wicket.spring.injection.annot.SpringComponentInjector; import org.apache.wicket.util.cookies.CookieUtils; +import org.apache.wicket.util.lang.Bytes; import org.apache.wicket.util.lang.PackageName; import org.apache.wicket.util.time.Duration; import org.slf4j.Logger; @@ -104,6 +109,7 @@ /** * Web application + * * @author Mickael Tricot * @author Adrien Cheype */ @@ -113,8 +119,11 @@ private static final Logger LOG = LoggerFactory.getLogger(WebApplicationImpl.class); /** - * SpringBeans injector (some objects such as Pages are automatically injected, by not all of them) - * @param object Object to be injected + * SpringBeans injector (some objects such as Pages are automatically + * injected, by not all of them) + * + * @param object + * Object to be injected */ public static void injectSpringBeans(Object object) { Injector.get().inject(object); @@ -146,10 +155,15 @@ /** * Constructor - * @param debug Debug mode - * @param optimize Optimize mode - * @param wicketConfiguration Wicket configuration (DEVELOPMENT or DEPLOYMENT) - * @param messages Internationalization messages + * + * @param debug + * Debug mode + * @param optimize + * Optimize mode + * @param wicketConfiguration + * Wicket configuration (DEVELOPMENT or DEPLOYMENT) + * @param messages + * Internationalization messages */ public WebApplicationImpl(boolean debug, boolean optimize, RuntimeConfigurationType wicketConfiguration, IStringResourceLoader... messages) { @@ -194,6 +208,15 @@ setRequestLoggerSettings(); setResourceSettings(); setSecuritySettings(); + + setPageManagerProvider(new DefaultPageManagerProvider(this) { + protected IDataStore newDataStore() { + // return new HttpSessionDataStore(getPageManagerContext(), new + // PageNumberEvictionStrategy(10)); + return new DiskDataStore("cantharella", new File("/tmp/test1"), Bytes.megabytes(50)); + } + }); + mountUrls(); } Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/config/WebContext.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/config/WebContext.java 2014-03-04 15:36:28 UTC (rev 263) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/config/WebContext.java 2014-04-18 15:34:37 UTC (rev 264) @@ -41,16 +41,16 @@ import nc.ird.cantharella.data.validation.utils.ModelValidator; import nc.ird.cantharella.data.validation.utils.ModelValidatorImpl; import nc.ird.cantharella.service.config.ServiceContext; -import nc.ird.cantharella.web.utils.resources.WebMessages; import nc.ird.cantharella.utils.CantharellaConfig; import nc.ird.cantharella.utils.Pair; import nc.ird.cantharella.utils.StringTools; +import nc.ird.cantharella.web.utils.resources.WebMessages; import org.apache.wicket.RuntimeConfigurationType; import org.apache.wicket.protocol.http.WebApplication; import org.apache.wicket.util.lang.Bytes; import org.apache.wicket.util.time.Duration; -import org.nuiton.util.config.ArgumentsParserException; +import org.nuiton.config.ArgumentsParserException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/DocumentTooltipColumn.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/DocumentTooltipColumn.java 2014-03-04 15:36:28 UTC (rev 263) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/DocumentTooltipColumn.java 2014-04-18 15:34:37 UTC (rev 264) @@ -32,27 +32,29 @@ import org.apache.wicket.Component; import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator; import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn; -import org.apache.wicket.markup.html.WebComponent; import org.apache.wicket.markup.html.image.ContextImage; -import org.apache.wicket.markup.html.image.Image; import org.apache.wicket.markup.html.link.Link; import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.markup.repeater.Item; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; -import org.apache.wicket.request.resource.ContextRelativeResource; /** * Column displaying an image and model as tooltip. + * * @author Eric Chatellier - * @param <T> Generic type - * @param <S> the type of the sort property + * @param <T> + * Generic type + * @param <S> + * the type of the sort property */ public abstract class DocumentTooltipColumn<T extends DocumentAttachable, S> extends AbstractColumn<T, S> { /** * Constructor. - * @param displayModel header display model + * + * @param displayModel + * header display model */ public DocumentTooltipColumn(IModel<String> displayModel) { super(displayModel); @@ -86,20 +88,27 @@ /** * Called when link is clicked. - * @param model current model + * + * @param model + * current model */ public abstract void onClick(IModel<T> model); /** - * Panel which include a linkable image. Used with the LinkableImagePropertyColumn$LinkablePanel.html file + * Panel which include a linkable image. Used with the + * LinkableImagePropertyColumn$LinkablePanel.html file */ public class DocumentTooltipPanel extends Panel { /** * Constructor - * @param id Component id - * @param model model - * @param messageModel Message Model displayed over the image + * + * @param id + * Component id + * @param model + * model + * @param messageModel + * Message Model displayed over the image */ public DocumentTooltipPanel(String id, final IModel<T> model, IModel<?> messageModel) { super(id); @@ -127,8 +136,11 @@ /** * Constructor - * @param componentId component id - * @param imageSrc image src + * + * @param componentId + * component id + * @param imageSrc + * image src */ public ImagePanel(String componentId, final Model<String> imageSrc) { super(componentId); Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/personne/ListPersonnesPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/personne/ListPersonnesPage.java 2014-03-04 15:36:28 UTC (rev 263) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/personne/ListPersonnesPage.java 2014-04-18 15:34:37 UTC (rev 264) @@ -46,7 +46,6 @@ import org.apache.wicket.MarkupContainer; import org.apache.wicket.extensions.ajax.markup.html.repeater.data.table.AjaxFallbackDefaultDataTable; import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator; -import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn; import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable; import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn; import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn; @@ -59,14 +58,16 @@ /** * Page de consultation des personnes & utilisateurs, par un administrateur + * * @author Mickael Tricot * @author Adrien Cheype */ -@AuthRoles( { AuthRole.ADMIN, AuthRole.USER }) +@AuthRoles({ AuthRole.ADMIN, AuthRole.USER }) public final class ListPersonnesPage extends TemplatePage { /** Logger */ - //private static final Logger LOG = LoggerFactory.getLogger(ListPersonnesPage.class); + // private static final Logger LOG = + // LoggerFactory.getLogger(ListPersonnesPage.class); /** Service : personne */ @SpringBean private PersonneService personneService; @@ -88,7 +89,8 @@ }); - // On englobe le "DataView" dans un composant neutre que l'on pourra rafraichir quand la liste évoluera + // On englobe le "DataView" dans un composant neutre que l'on pourra + // rafraichir quand la liste évoluera final MarkupContainer personnesRefresh = new WebMarkupContainer(getResource() + ".Personnes.Refresh"); personnesRefresh.setOutputMarkupId(true); add(personnesRefresh); @@ -163,11 +165,13 @@ @Override public void onClick(Item<ICellPopulator<Personne>> item, String componentId, IModel<Personne> model) { if (model.getObject() instanceof Utilisateur) { - // Si l'utilisateur est l'utilisateur "courant", alors on le redirige vers la page de mise à - // jour de son profil sinon vers la page de gestion d'un utilisateur - setResponsePage(model.getObject().getIdPersonne().equals( - getSession().getUtilisateur().getIdPersonne()) ? new UpdateUtilisateurPage(currentPage) - : new ManageUtilisateurPage(model.getObject().getIdPersonne(), currentPage)); + // Si l'utilisateur est l'utilisateur "courant", alors on le + // redirige vers la page de mise à + // jour de son profil sinon vers la page de gestion d'un + // utilisateur + setResponsePage(model.getObject().getIdPersonne() + .equals(getSession().getUtilisateur().getIdPersonne()) ? new UpdateUtilisateurPage( + currentPage) : new ManageUtilisateurPage(model.getObject().getIdPersonne(), currentPage)); } else { // sinon c'est une "Personne" assert (model.getObject() instanceof Personne); setResponsePage(new ManagePersonnePage(model.getObject().getIdPersonne(), currentPage)); Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/search/SearchPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/search/SearchPage.java 2014-03-04 15:36:28 UTC (rev 263) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/search/SearchPage.java 2014-04-18 15:34:37 UTC (rev 264) @@ -22,7 +22,6 @@ */ package nc.ird.cantharella.web.pages.domain.search; -import java.util.Iterator; import java.util.List; import nc.ird.cantharella.data.model.Extraction; @@ -30,7 +29,6 @@ import nc.ird.cantharella.data.model.Molecule; import nc.ird.cantharella.data.model.Purification; import nc.ird.cantharella.data.model.ResultatTestBio; -import nc.ird.cantharella.data.model.ResultatTestBio.TypeResultat; import nc.ird.cantharella.data.model.Specimen; import nc.ird.cantharella.data.model.Station; import nc.ird.cantharella.data.model.Utilisateur; @@ -74,7 +72,7 @@ * * @author echatellier */ -@AuthRoles( { AuthRole.ADMIN, AuthRole.USER }) +@AuthRoles({ AuthRole.ADMIN, AuthRole.USER }) public class SearchPage extends TemplatePage { /** Form query bean. */ @@ -122,7 +120,8 @@ /** * Constructor. * - * @param queryBean form query bean + * @param queryBean + * form query bean */ public SearchPage(SearchBean queryBean) { super(SearchPage.class); Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/specimen/ListSpecimensPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/specimen/ListSpecimensPage.java 2014-03-04 15:36:28 UTC (rev 263) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/specimen/ListSpecimensPage.java 2014-04-18 15:34:37 UTC (rev 264) @@ -110,7 +110,7 @@ final String componentId, final CallerPage callerPage, List<Specimen> specimens, final SpecimenService specimenService) { - LoadableDetachableSortableListDataProvider<Specimen> specimensDataProvider = new LoadableDetachableSortableListDataProvider<Specimen>( + final LoadableDetachableSortableListDataProvider<Specimen> specimensDataProvider = new LoadableDetachableSortableListDataProvider<Specimen>( specimens, templatePage.getSession().getLocale()); List<IColumn<Specimen, String>> columns = new ArrayList<IColumn<Specimen, String>>(); Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-03-04 15:36:28 UTC (rev 263) +++ trunk/pom.xml 2014-04-18 15:34:37 UTC (rev 264) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>5.0</version> + <version>5.0.6</version> </parent> <groupId>nc.ird</groupId> @@ -102,39 +102,39 @@  <version.maven-compiler-plugin>3.1</version.maven-compiler-plugin> <version.hibernate3-maven-plugin>3.0</version.hibernate3-maven-plugin> - <version.maven-surefire-plugin>2.14.1</version.maven-surefire-plugin> + <version.maven-surefire-plugin>2.17</version.maven-surefire-plugin> <version.animal-sniffer-maven-plugin>1.10</version.animal-sniffer-maven-plugin> <version.maven-dependency-plugin>2.7</version.maven-dependency-plugin> - <version.maven-java-formatter-plugin>0.3.1</version.maven-java-formatter-plugin> + <version.maven-java-formatter-plugin>0.4</version.maven-java-formatter-plugin> <version.maven-assembly-plugin>2.4</version.maven-assembly-plugin>  <version.junit>4.11</version.junit> - <version.slf4j>1.7.5</version.slf4j> - <version.commons-lang3>3.1</version.commons-lang3> - <version.commons-beanutils>1.8.3</version.commons-beanutils> + <version.slf4j>1.7.7</version.slf4j> + <version.commons-lang3>3.3.2</version.commons-lang3> + <version.commons-beanutils>1.9.1</version.commons-beanutils> <version.commons-io>2.4</version.commons-io> <version.commons-collections>3.2.1</version.commons-collections> - <version.commons-codec>1.8</version.commons-codec> - <version.postgresql>9.1-901-1.jdbc4</version.postgresql> - <version.h2>1.3.172</version.h2> + <version.commons-codec>1.9</version.commons-codec> + <version.postgresql>9.3-1101-jdbc41</version.postgresql> + <version.h2>1.3.175</version.h2> <version.validation-api>1.1.0.Final</version.validation-api> - <version.hibernate-jpa-2.0-api>1.0.1.Final</version.hibernate-jpa-2.0-api> - <version.hibernate>4.2.2.Final</version.hibernate> - <version.hibernate-validator>5.0.1.Final</version.hibernate-validator> - <version.hibernate-search>4.2.0.Final</version.hibernate-search> + <version.hibernate-jpa-2.1-api>1.0.0.Final</version.hibernate-jpa-2.1-api> + <version.hibernate>4.3.5.Final</version.hibernate> + <version.hibernate-validator>5.1.0.Final</version.hibernate-validator> + <version.hibernate-search>4.5.1.Final</version.hibernate-search> <version.lucene>3.6.2</version.lucene> - <version.c3p0>0.9.1</version.c3p0> - <version.aspectj>1.7.2</version.aspectj> - <version.spring>3.2.3.RELEASE</version.spring> + <version.c3p0>0.9.5-pre8</version.c3p0> + <version.aspectj>1.8.0</version.aspectj> + <version.spring>4.0.3.RELEASE</version.spring> <version.mail>1.4.7</version.mail> <version.backport-util-concurrent>3.1</version.backport-util-concurrent> <version.cglib>2.2.2</version.cglib> <version.opencsv>2.3</version.opencsv> - <version.poi>3.9</version.poi> - <version.nuiton-utils>2.6.12</version.nuiton-utils> + <version.poi>3.10-FINAL</version.poi> + <version.nuiton-utils>3.0-alpha-2</version.nuiton-utils> <version.servlet-api>2.5</version.servlet-api> - <version.wicket>6.8.0</version.wicket> + <version.wicket>6.14.0</version.wicket> <!-- FIXME echatellier Probleme de parallelisation des tests unitaire, cause org.hibernate.HibernateException: Don't change the reference to a collection @@ -283,7 +283,7 @@ <version>${version.commons-codec}</version> </dependency> <dependency> - <groupId>postgresql</groupId> + <groupId>org.postgresql</groupId> <artifactId>postgresql</artifactId> <version>${version.postgresql}</version> </dependency> @@ -299,8 +299,8 @@ </dependency> <dependency> <groupId>org.hibernate.javax.persistence</groupId> - <artifactId>hibernate-jpa-2.0-api</artifactId> - <version>${version.hibernate-jpa-2.0-api}</version> + <artifactId>hibernate-jpa-2.1-api</artifactId> + <version>${version.hibernate-jpa-2.1-api}</version> </dependency> <dependency> <groupId>org.hibernate</groupId> @@ -345,7 +345,7 @@ <version>${version.lucene}</version> </dependency> <dependency> - <groupId>c3p0</groupId> + <groupId>com.mchange</groupId> <artifactId>c3p0</artifactId> <version>${version.c3p0}</version> </dependency>

1 0