Author: tchemit Date: 2012-12-30 22:31:56 +0100 (Sun, 30 Dec 2012) New Revision: 2702 Url: http://nuiton.org/projects/topia/repository/revisions/2702 Log: optimize dependencies Modified: trunk/topia-persistence-hibernate/pom.xml trunk/topia-persistence-tck/pom.xml trunk/topia-persistence/pom.xml trunk/topia-service-migration/pom.xml trunk/topia-service-replication/pom.xml trunk/topia-service-security/pom.xml Modified: trunk/topia-persistence/pom.xml =================================================================== --- trunk/topia-persistence/pom.xml 2012-12-30 20:18:25 UTC (rev 2701) +++ trunk/topia-persistence/pom.xml 2012-12-30 21:31:56 UTC (rev 2702) @@ -60,10 +60,10 @@ <artifactId>eugene</artifactId> </dependency> - <dependency> + <!--dependency> <groupId>org.nuiton.eugene</groupId> <artifactId>eugene-java-templates</artifactId> - </dependency> + </dependency--> <dependency> <groupId>commons-collections</groupId> Modified: trunk/topia-persistence-hibernate/pom.xml =================================================================== --- trunk/topia-persistence-hibernate/pom.xml 2012-12-30 20:18:25 UTC (rev 2701) +++ trunk/topia-persistence-hibernate/pom.xml 2012-12-30 21:31:56 UTC (rev 2702) @@ -43,6 +43,31 @@ </dependency> <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + + <dependency> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + </dependency> + + <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> </dependency> @@ -54,6 +79,7 @@ <groupId>org.hibernate</groupId> <artifactId>hibernate-ehcache</artifactId> </dependency> + <dependency> <groupId>org.hibernate.javax.persistence</groupId> <artifactId>hibernate-jpa-2.0-api</artifactId> Modified: trunk/topia-persistence-tck/pom.xml =================================================================== --- trunk/topia-persistence-tck/pom.xml 2012-12-30 20:18:25 UTC (rev 2701) +++ trunk/topia-persistence-tck/pom.xml 2012-12-30 21:31:56 UTC (rev 2702) @@ -42,6 +42,7 @@ <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> </dependency> + <dependency> <groupId>org.nuiton.i18n</groupId> <artifactId>nuiton-i18n</artifactId> @@ -51,11 +52,17 @@ <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> </dependency> + <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + <!-- BD H2 for testing --> <dependency> <groupId>com.h2database</groupId> Modified: trunk/topia-service-migration/pom.xml =================================================================== --- trunk/topia-service-migration/pom.xml 2012-12-30 20:18:25 UTC (rev 2701) +++ trunk/topia-service-migration/pom.xml 2012-12-30 21:31:56 UTC (rev 2702) @@ -76,15 +76,27 @@ <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.hibernate.javax.persistence</groupId> + <artifactId>hibernate-jpa-2.0-api</artifactId> + </dependency> + + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + <!-- Depencies for test--> <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> </dependency> + <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> Modified: trunk/topia-service-replication/pom.xml =================================================================== --- trunk/topia-service-replication/pom.xml 2012-12-30 20:18:25 UTC (rev 2701) +++ trunk/topia-service-replication/pom.xml 2012-12-30 21:31:56 UTC (rev 2702) @@ -50,8 +50,8 @@ </dependency> <dependency> - <groupId>org.nuiton.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jpa_2.0_spec</artifactId> </dependency> <dependency> @@ -65,11 +65,6 @@ </dependency> <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - </dependency> - - <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> </dependency> Modified: trunk/topia-service-security/pom.xml =================================================================== --- trunk/topia-service-security/pom.xml 2012-12-30 20:18:25 UTC (rev 2701) +++ trunk/topia-service-security/pom.xml 2012-12-30 21:31:56 UTC (rev 2702) @@ -45,30 +45,23 @@ <!-- Sibling dependencies --> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>topia-persistence-hibernate</artifactId> + <artifactId>topia-persistence</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>topia-persistence-tck</artifactId> - <version>${project.version}</version> - <!--<classifier>tests</classifier>--> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jpa_2.0_spec</artifactId> </dependency> <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - </dependency> - - <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> </dependency> <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> </dependency> <dependency> @@ -76,11 +69,6 @@ <artifactId>commons-logging</artifactId> </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - </dependency> - <!-- Depencies for test--> <dependency> <groupId>com.h2database</groupId>