Author: tchemit Date: 2012-05-10 10:18:19 +0200 (Thu, 10 May 2012) New Revision: 2469 Url: http://nuiton.org/repositories/revision/topia/2469 Log: improve pom dependencies Modified: trunk/pom.xml 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 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-05-10 08:10:58 UTC (rev 2468) +++ trunk/pom.xml 2012-05-10 08:18:19 UTC (rev 2469) @@ -77,6 +77,7 @@ <hibernateVersion>4.1.3.Final</hibernateVersion> <sl4jVersion>1.6.4</sl4jVersion> <h2Version>1.3.165</h2Version> + <geronimoJpaSpecVersion>1.1</geronimoJpaSpecVersion> <!-- i18n configuration --> <i18n.bundles>fr_FR,en_GB,es_ES</i18n.bundles> @@ -147,8 +148,8 @@ <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-jpa_2.0_spec</artifactId> - <version>1.1</version> - <scope>compile</scope> + <version>${geronimoJpaSpecVersion}</version> + <scope>provided</scope> </dependency> <dependency> Modified: trunk/topia-persistence/pom.xml =================================================================== --- trunk/topia-persistence/pom.xml 2012-05-10 08:10:58 UTC (rev 2468) +++ trunk/topia-persistence/pom.xml 2012-05-10 08:18:19 UTC (rev 2469) @@ -85,39 +85,20 @@ <artifactId>guava</artifactId> </dependency> - <dependency> + <!--dependency> <groupId>dom4j</groupId> <artifactId>dom4j</artifactId> - </dependency> + </dependency--> <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-entitymanager</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-ehcache</artifactId> - <scope>test</scope> - </dependency> - - <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-jpa_2.0_spec</artifactId> - <scope>provided</scope> </dependency> - <dependency> + <!--dependency> <groupId>javassist</groupId> <artifactId>javassist</artifactId> - </dependency> + </dependency--> <dependency> <groupId>org.slf4j</groupId> @@ -152,32 +133,6 @@ <artifactId>maven-processor-plugin</artifactId> </plugin> - <plugin> - <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>parserJava</goal> - <goal>gen</goal> - </goals> - <!-- restrict parsing beacause this is expensive --> - <!-- if you want to parse more, add your package in includes --> - <configuration> - <treateDefaultEntry>false</treateDefaultEntry> - <entries> - <entry> - <basedir>${maven.src.dir}/main/java</basedir> - <includes> - <include>org/nuiton/topia/framework/*.java</include> - </includes> - </entry> - </entries> - </configuration> - </execution> - </executions> - </plugin> - <!-- expose new plexus components --> <plugin> <groupId>org.codehaus.plexus</groupId> Modified: trunk/topia-persistence-hibernate/pom.xml =================================================================== --- trunk/topia-persistence-hibernate/pom.xml 2012-05-10 08:10:58 UTC (rev 2468) +++ trunk/topia-persistence-hibernate/pom.xml 2012-05-10 08:18:19 UTC (rev 2469) @@ -26,12 +26,6 @@ <groupId>${project.groupId}</groupId> <artifactId>topia-persistence</artifactId> <version>${project.version}</version> - <!--exclusions> - <exclusion> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jpa_2.0_spec</artifactId> - </exclusion> - </exclusions--> </dependency> <dependency> @@ -53,7 +47,6 @@ <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-05-10 08:10:58 UTC (rev 2468) +++ trunk/topia-persistence-tck/pom.xml 2012-05-10 08:18:19 UTC (rev 2469) @@ -28,10 +28,28 @@ </dependency> <dependency> - <groupId>org.hibernate.javax.persistence</groupId> - <artifactId>hibernate-jpa-2.0-api</artifactId> + <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.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> + <!-- BD H2 for testing --> <dependency> <groupId>com.h2database</groupId> @@ -137,6 +155,13 @@ </goals> </execution> </executions> + <dependencies> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jpa_2.0_spec</artifactId> + <version>${geronimoJpaSpecVersion}</version> + </dependency> + </dependencies> </plugin> </plugins> </build> Modified: trunk/topia-service-migration/pom.xml =================================================================== --- trunk/topia-service-migration/pom.xml 2012-05-10 08:10:58 UTC (rev 2468) +++ trunk/topia-service-migration/pom.xml 2012-05-10 08:18:19 UTC (rev 2469) @@ -99,19 +99,9 @@ </dependencies> - <!-- ************************************************************* --> - <!-- *** Project Information ************************************* --> - <!-- ************************************************************* --> - <name>ToPIA :: Service Migration</name> - <description>Hibernate based migration service</description> + <description>ToPIA based migration service</description> - <!-- ************************************************************* --> - <!-- *** Build Settings ****************************************** --> - <!-- ************************************************************* --> - - <packaging>jar</packaging> - <build> <resources> Modified: trunk/topia-service-replication/pom.xml =================================================================== --- trunk/topia-service-replication/pom.xml 2012-05-10 08:10:58 UTC (rev 2468) +++ trunk/topia-service-replication/pom.xml 2012-05-10 08:18:19 UTC (rev 2469) @@ -117,7 +117,7 @@ <build> <plugins> - <plugin> + <!--plugin> <groupId>org.nuiton.i18n</groupId> <artifactId>maven-i18n-plugin</artifactId> <executions> @@ -128,7 +128,7 @@ </goals> </execution> </executions> - </plugin> + </plugin--> <plugin> <artifactId>maven-jar-plugin</artifactId> @@ -206,7 +206,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>cobertura-maven-plugin</artifactId> - <version>2.4</version> + <version>${coberturaPluginVersion}</version> </plugin> </plugins> </reporting>