CLOUDSTACK-69 Hibernate jars should be removed

Mice Xia · Mice Xia · commit 0d02e33d3154 · 2012-09-10T21:15:35.000+08:00
diff --git a/awsapi/pom.xml b/awsapi/pom.xml
@@ -43,21 +43,6 @@
       <artifactId>axiom-api</artifactId>
       <version>${cs.axiom.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.hibernate</groupId>
-      <artifactId>hibernate-core</artifactId>
-      <version>${cs.hibernate.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.hibernate</groupId>
-      <artifactId>hibernate-annotations</artifactId>
-      <version>${cs.hibernate.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.hibernate</groupId>
-      <artifactId>hibernate-entitymanager</artifactId>
-      <version>${cs.hibernate.version}</version>
-    </dependency>
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
diff --git a/cloud.spec b/cloud.spec
@@ -467,11 +467,6 @@ fi
 %{_javadir}/mail-1.4.jar
 %{_javadir}/activation-1.1.jar
 %{_javadir}/mysql-connector-java-5.1.21.jar
-%{_javadir}/hibernate-jpa-2.0-api-1.0.0.Final.jar
-%{_javadir}/hibernate-entitymanager-3.5.1-Final.jar
-%{_javadir}/hibernate-core-3.5.1-Final.jar
-%{_javadir}/hibernate-commons-annotations-3.2.0.Final.jar
-%{_javadir}/hibernate-annotations-3.5.1-Final.jar
 %{_javadir}/asm-3.1.jar
 %{_javadir}/xapi-5.6.100-1-SNAPSHOT.jar
 %{_javadir}/log4j-*.jar
@@ -490,7 +485,7 @@ fi
 %{_javadir}/axis2-1.5.1.jar
 %{_javadir}/commons-discovery-0.5.jar
 %{_javadir}/jstl-1.2.jar
-
+%{_javadir}/javax.persistence-2.0.0.jar
 
 %files core
 %defattr(0644,root,root,0755)
diff --git a/pom.xml b/pom.xml
@@ -60,7 +60,7 @@
     <cs.junit.version>4.10</cs.junit.version>
     <cs.bcprov.version>1.46</cs.bcprov.version>
     <cs.jsch.version>0.1.42</cs.jsch.version>
-    <cs.jpa.version>1.0.0.Final</cs.jpa.version>
+    <cs.jpa.version>2.0.0</cs.jpa.version>
     <cs.jasypt.version>1.9.0</cs.jasypt.version>
     <cs.trilead.version>build213-svnkit-1.3-patch</cs.trilead.version>
     <cs.ehcache.version>1.5.0</cs.ehcache.version>
@@ -75,7 +75,6 @@
     <cs.axis.version>1.4</cs.axis.version>
     <cs.axis2.version>1.5.1</cs.axis2.version>
     <cs.axiom.version>1.2.8</cs.axiom.version>
-    <cs.hibernate.version>3.5.1-Final</cs.hibernate.version>
     <cs.neethi.version>2.0.4</cs.neethi.version>
     <cs.servlet.version>2.4</cs.servlet.version>
     <cs.jstl.version>1.2</cs.jstl.version>
diff --git a/utils/pom.xml b/utils/pom.xml
@@ -89,8 +89,8 @@
       <version>${cs.jsch.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.hibernate.javax.persistence</groupId>
-      <artifactId>hibernate-jpa-2.0-api</artifactId>
+      <groupId>org.eclipse.persistence</groupId>
+      <artifactId>javax.persistence</artifactId>
       <version>${cs.jpa.version}</version>
     </dependency>
     <dependency>
