Author: tchemit Date: 2013-07-01 08:44:16 +0200 (Mon, 01 Jul 2013) New Revision: 3845 Url: http://chorem.org/projects/pollen/repository/revisions/3845 Log: fix deps after upgrade of hibernate Modified: trunk/pollen-persistence/pom.xml trunk/pollen-rest-api/pom.xml trunk/pollen-services/pom.xml trunk/pom.xml Modified: trunk/pollen-persistence/pom.xml =================================================================== --- trunk/pollen-persistence/pom.xml 2013-07-01 06:33:05 UTC (rev 3844) +++ trunk/pollen-persistence/pom.xml 2013-07-01 06:44:16 UTC (rev 3845) @@ -29,14 +29,14 @@ <artifactId>guava</artifactId> </dependency> - <dependency> + <!--dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> - </dependency> - <dependency> + </dependency--> + <!--dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> - </dependency> + </dependency--> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> @@ -66,17 +66,22 @@ <dependency> <groupId>org.hibernate.javax.persistence</groupId> - <artifactId>hibernate-jpa-2.0-api</artifactId> + <artifactId>hibernate-jpa-2.1-api</artifactId> </dependency> + <!--dependency> + <groupId>org.hibernate.javax.persistence</groupId> + <artifactId>hibernate-jpa-2.0-api</artifactId> + </dependency--> + <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> </dependency> - <dependency> + <!--dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - </dependency> + </dependency--> <dependency> <groupId>junit</groupId> Modified: trunk/pollen-rest-api/pom.xml =================================================================== --- trunk/pollen-rest-api/pom.xml 2013-07-01 06:33:05 UTC (rev 3844) +++ trunk/pollen-rest-api/pom.xml 2013-07-01 06:44:16 UTC (rev 3845) @@ -43,9 +43,14 @@ <dependency> <groupId>org.hibernate.javax.persistence</groupId> - <artifactId>hibernate-jpa-2.0-api</artifactId> + <artifactId>hibernate-jpa-2.1-api</artifactId> </dependency> + <!--dependency> + <groupId>org.hibernate.javax.persistence</groupId> + <artifactId>hibernate-jpa-2.0-api</artifactId> + </dependency--> + <dependency> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web</artifactId> Modified: trunk/pollen-services/pom.xml =================================================================== --- trunk/pollen-services/pom.xml 2013-07-01 06:33:05 UTC (rev 3844) +++ trunk/pollen-services/pom.xml 2013-07-01 06:44:16 UTC (rev 3845) @@ -24,9 +24,14 @@ <dependency> <groupId>org.hibernate.javax.persistence</groupId> - <artifactId>hibernate-jpa-2.0-api</artifactId> + <artifactId>hibernate-jpa-2.1-api</artifactId> </dependency> + <!--dependency> + <groupId>org.hibernate.javax.persistence</groupId> + <artifactId>hibernate-jpa-2.0-api</artifactId> + </dependency--> + <dependency> <groupId>${project.groupId}</groupId> <artifactId>pollen-persistence</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-07-01 06:33:05 UTC (rev 3844) +++ trunk/pom.xml 2013-07-01 06:44:16 UTC (rev 3845) @@ -232,8 +232,8 @@ <dependency> <groupId>org.hibernate.javax.persistence</groupId> - <artifactId>hibernate-jpa-2.0-api</artifactId> - <version>1.0.1.Final</version> + <artifactId>hibernate-jpa-2.1-api</artifactId> + <version>1.0.0.Draft-16</version> </dependency> <dependency> @@ -254,6 +254,12 @@ <groupId>org.nuiton.jpa</groupId> <artifactId>nuiton-jpa-api</artifactId> <version>${nuitonJpaVersion}</version> + <exclusions> + <exclusion> + <groupId>org.hibernate.javax.persistence</groupId> + <artifactId>hibernate-jpa-2.0-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency>