Author: tchemit Date: 2009-02-17 19:04:14 +0000 (Tue, 17 Feb 2009) New Revision: 1825 Modified: isis-fish/trunk/pom.xml Log: use lutinproject lib versions + zeroConf in jaxx and i18n (except specific conf) Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-02-17 17:09:35 UTC (rev 1824) +++ isis-fish/trunk/pom.xml 2009-02-17 19:04:14 UTC (rev 1825) @@ -40,7 +40,7 @@ <dependency> <groupId>org.codelutin</groupId> <artifactId>topia-service</artifactId> - <version>1.0.2-SNAPSHOT</version> + <version>${topia.service.version}</version> <scope>compile</scope> </dependency> @@ -73,6 +73,14 @@ <scope>compile</scope> </dependency> + <!-- Utilisé dans les scripts --> + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>lutinj2r</artifactId> + <version>${lutinj2r.version}</version> + <scope>runtime</scope> + </dependency> + <!--Commons--> <dependency> <groupId>commons-jxpath</groupId> @@ -203,14 +211,6 @@ <scope>compile</scope> </dependency> - <!-- Utilisé dans les scripts --> - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>lutinj2r</artifactId> - <version>0.2</version> - <scope>runtime</scope> - </dependency> - <!-- Utilisé lors de l'import xml v2 (entre autre) --> <dependency> <groupId>jaxen</groupId> @@ -344,11 +344,13 @@ <!-- Custom version --> <jaxx.version>1.1-SNAPSHOT</jaxx.version> <topia.version>2.1.3-SNAPSHOT</topia.version> + <topia.service.version>1.0.2-SNAPSHOT</topia.service.version> <lutinmatrix.version>1.2-SNAPSHOT</lutinmatrix.version> <lutinutil.version>1.0.3-SNAPSHOT</lutinutil.version> <i18n.version>0.9-SNAPSHOT</i18n.version> <lutinwidget.version>0.12</lutinwidget.version> <generator.version>0.64-SNAPSHOT</generator.version> + <lutinj2r.version>0.2</lutinj2r.version> <openmap.version>4.6.4</openmap.version> <aspectwerkz.version>2.0</aspectwerkz.version> @@ -428,7 +430,6 @@ <goal>generate</goal> </goals> <configuration> - <!--src>${project.basedir}/src/main/java</src--> <addSourcesToClassPath>true</addSourcesToClassPath> <addProjectClassPath>true</addProjectClassPath> </configuration> @@ -441,15 +442,6 @@ <artifactId>maven-i18n-plugin</artifactId> <version>${i18n.version}</version> <configuration> - <!--bundles> - <param>fr_FR</param> - <param>en_GB</param> - </bundles> - <encoding>${maven.compile.encoding}</encoding> - <src>${maven.src.dir}/main/resources/i18n</src> - <defaultBasedir>${maven.src.dir}/main/java</defaultBasedir> - <keysModifier>false</keysModifier> - <keepBackup>false</keepBackup--> <entries> <entry> <basedir>${maven.gen.dir}/java/</basedir>