Author: tchemit Date: 2008-07-28 20:40:52 +0000 (Mon, 28 Jul 2008) New Revision: 1263 Modified: branches/maven2_multimodule/isis-fish/isis-fish-entities/pom.xml branches/maven2_multimodule/isis-fish/isis-fish-main/pom.xml branches/maven2_multimodule/isis-fish/isis-fish-ui/pom.xml Log: move libraries dependencies to right modules Modified: branches/maven2_multimodule/isis-fish/isis-fish-entities/pom.xml =================================================================== --- branches/maven2_multimodule/isis-fish/isis-fish-entities/pom.xml 2008-07-28 20:28:12 UTC (rev 1262) +++ branches/maven2_multimodule/isis-fish/isis-fish-entities/pom.xml 2008-07-28 20:40:52 UTC (rev 1263) @@ -60,6 +60,49 @@ <scope>compile</scope> </dependency> + <!-- Change this dependence if you change database --> + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <scope>compile</scope> + </dependency> + <!-- + <dependency> + <groupId>hsqldb</groupId> + <artifactId>hsqldb</artifactId> + <version>2.0</version> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>mckoi</groupId> + <artifactId>mckoi</artifactId> + <version>1.0.2</version> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>postgresql</groupId> + <artifactId>postgresql</artifactId> + <version>7.4.1-jdbc3</version> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.apache.derby</groupId> + <artifactId>derby</artifactId> + <version>10.1.2.1</version> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.apache.derby</groupId> + <artifactId>derbyLocale_fr</artifactId> + <version>10.1.2.1</version> + <scope>runtime</scope> + </dependency> + --> + </dependencies> Modified: branches/maven2_multimodule/isis-fish/isis-fish-main/pom.xml =================================================================== --- branches/maven2_multimodule/isis-fish/isis-fish-main/pom.xml 2008-07-28 20:28:12 UTC (rev 1262) +++ branches/maven2_multimodule/isis-fish/isis-fish-main/pom.xml 2008-07-28 20:40:52 UTC (rev 1263) @@ -89,20 +89,9 @@ </dependency> --> - <!--SwiXat--> - <dependency> - <groupId>swixat</groupId> - <artifactId>swixat</artifactId> - <scope>compile</scope> - </dependency> + - <dependency> - <groupId>org.swixml</groupId> - <artifactId>swixml</artifactId> - <scope>compile</scope> - </dependency> - <!--Commons--> <dependency> <groupId>commons-jxpath</groupId> @@ -206,49 +195,6 @@ <scope>compile</scope> </dependency> - <!-- Change this dependence if you change database --> - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - <scope>compile</scope> - </dependency> - <!-- - <dependency> - <groupId>hsqldb</groupId> - <artifactId>hsqldb</artifactId> - <version>2.0</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>mckoi</groupId> - <artifactId>mckoi</artifactId> - <version>1.0.2</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>postgresql</groupId> - <artifactId>postgresql</artifactId> - <version>7.4.1-jdbc3</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.derby</groupId> - <artifactId>derby</artifactId> - <version>10.1.2.1</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.derby</groupId> - <artifactId>derbyLocale_fr</artifactId> - <version>10.1.2.1</version> - <scope>runtime</scope> - </dependency> - --> - <!-- aspectj --> <!-- on utilise aspectwerkz <dependency> @@ -435,7 +381,7 @@ <plugin> <artifactId>maven-antrun-plugin</artifactId> <executions> - <execution> + <!--execution> <id>CopyGenJavaVersSrcBuild</id> <phase>process-sources</phase> <configuration> @@ -452,7 +398,7 @@ <goals> <goal>run</goal> </goals> - </execution> + </execution--> <!-- Ajout des libs signe par Sun dans un fichier jnlp separe --> <execution> Modified: branches/maven2_multimodule/isis-fish/isis-fish-ui/pom.xml =================================================================== --- branches/maven2_multimodule/isis-fish/isis-fish-ui/pom.xml 2008-07-28 20:28:12 UTC (rev 1262) +++ branches/maven2_multimodule/isis-fish/isis-fish-ui/pom.xml 2008-07-28 20:40:52 UTC (rev 1263) @@ -24,11 +24,25 @@ <artifactId>lutinwidget</artifactId> </dependency> + <!-- Jaxx --> <dependency> <groupId>org.codelutin.jaxx</groupId> <artifactId>jaxx-swing</artifactId> </dependency> + <!-- SwiXat --> + <dependency> + <groupId>swixat</groupId> + <artifactId>swixat</artifactId> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.swixml</groupId> + <artifactId>swixml</artifactId> + <scope>compile</scope> + </dependency> + </dependencies> <!-- ************************************************************* -->