Author: tchemit Date: 2014-05-30 09:51:16 +0200 (Fri, 30 May 2014) New Revision: 1820 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1820 Log: fix adagio dependencies and spring conf Modified: trunk/pom.xml trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/TuttiPersistenceServiceLocator.java trunk/tutti-ui-swing/src/license/THIRD-PARTY.properties Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-05-29 05:13:18 UTC (rev 1819) +++ trunk/pom.xml 2014-05-30 07:51:16 UTC (rev 1820) @@ -142,7 +142,7 @@ <!-- libraries version --> <nuitonI18nVersion>3.0</nuitonI18nVersion> <nuitonValidatorVersion>3.0-rc-1</nuitonValidatorVersion> - <eugenePluginVersion>2.9-SNAPSHOT</eugenePluginVersion> + <eugenePluginVersion>2.10-SNAPSHOT</eugenePluginVersion> <jaxxVersion>2.8.5</jaxxVersion> <swingXVersion>1.6.4</swingXVersion> <slf4jVersion>1.7.5</slf4jVersion> @@ -214,6 +214,16 @@ <groupId>fr.ifremer.adagio</groupId> <artifactId>adagio-core-allegro</artifactId> <version>${adagioVersion}</version> + <exclusions> + <exclusion> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-spatial</artifactId> + </exclusion> + <exclusion> + <groupId>com.vividsolutions</groupId> + <artifactId>jts</artifactId> + </exclusion> + </exclusions> </dependency> <!-- Nuiton --> Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/TuttiPersistenceServiceLocator.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/TuttiPersistenceServiceLocator.java 2014-05-29 05:13:18 UTC (rev 1819) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/TuttiPersistenceServiceLocator.java 2014-05-30 07:51:16 UTC (rev 1820) @@ -117,7 +117,7 @@ //TODO Move this to adagio public static ReferentialSynchroService getReferentialSynchroService() { ReferentialSynchroService service = instance().getService( - "referentialSynchroService", ReferentialSynchroService.class); + "deprecatedReferentialSynchroService", ReferentialSynchroService.class); return service; } Modified: trunk/tutti-ui-swing/src/license/THIRD-PARTY.properties =================================================================== --- trunk/tutti-ui-swing/src/license/THIRD-PARTY.properties 2014-05-29 05:13:18 UTC (rev 1819) +++ trunk/tutti-ui-swing/src/license/THIRD-PARTY.properties 2014-05-30 07:51:16 UTC (rev 1820) @@ -39,7 +39,7 @@ # Please fill the missing licenses for dependencies : # # -#Tue May 27 17:05:30 CEST 2014 +#Fri May 30 09:08:49 CEST 2014 batik--batik-awt-util--1.6=The Apache Software License, Version 2.0 batik--batik-bridge--1.6=The Apache Software License, Version 2.0 batik--batik-css--1.6=The Apache Software License, Version 2.0 @@ -55,4 +55,3 @@ batik--batik-xml--1.6=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 -org.hibernate--hibernate-spatial--4.3-20140213=Lesser General Public License (LGPL)