HHH-8388 Updated OSGi quickstarts and unit test for JPA 1.0.0.Final

hibernate · Jul 30, 2013 · 33b7e9f · 33b7e9f
1 parent 033bf4a
commit 33b7e9f
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 11 deletions.
diff --git a/documentation/src/main/docbook/quickstart/tutorials/osgi/managed-jpa/features.xml b/documentation/src/main/docbook/quickstart/tutorials/osgi/managed-jpa/features.xml
@@ -17,7 +17,7 @@
         <bundle start-level="30">mvn:org.apache.aries.transaction/org.apache.aries.transaction.manager/1.0.1</bundle>
 
         <!-- JPA -->
-        <bundle start-level="30">mvn:org.hibernate.javax.persistence/hibernate-jpa-2.1-api/1.0.0-SNAPSHOT</bundle>
+        <bundle start-level="30">mvn:org.hibernate.javax.persistence/hibernate-jpa-2.1-api/1.0.0.Final</bundle>
         <!-- No container currently supports JPA 2.1.  Clone and build Aries JPA from the following fork (upgrades to
              JPA 2.1).  Aries should be upgrading as soon as the spec is out.
              https://github.com/brmeyer/aries/tree/jpa21 -->

diff --git a/documentation/src/main/docbook/quickstart/tutorials/osgi/managed-jpa/pom.xml b/documentation/src/main/docbook/quickstart/tutorials/osgi/managed-jpa/pom.xml
@@ -10,7 +10,7 @@
 		<dependency>
 			<groupId>org.hibernate.javax.persistence</groupId>
             <artifactId>hibernate-jpa-2.1-api</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>1.0.0.Final</version>
 		</dependency>
         <dependency>
             <groupId>org.osgi</groupId>

diff --git a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa/features.xml b/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa/features.xml
@@ -8,7 +8,7 @@
         <bundle start-level="30">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>
 
         <!-- JPA -->
-        <bundle start-level="30">mvn:org.hibernate.javax.persistence/hibernate-jpa-2.1-api/1.0.0-SNAPSHOT</bundle>
+        <bundle start-level="30">mvn:org.hibernate.javax.persistence/hibernate-jpa-2.1-api/1.0.0.Final</bundle>
 
         <!-- Taken from Karaf-Tutorial -->
         <bundle>mvn:commons-collections/commons-collections/3.2.1</bundle>

diff --git a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa/pom.xml b/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa/pom.xml
@@ -10,7 +10,7 @@
 		<dependency>
             <groupId>org.hibernate.javax.persistence</groupId>
             <artifactId>hibernate-jpa-2.1-api</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>1.0.0.Final</version>
         </dependency>
 		<dependency>
 			<groupId>org.osgi</groupId>

diff --git a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/features.xml b/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/features.xml
@@ -8,7 +8,7 @@
         <bundle start-level="30">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>
 
         <!-- JPA -->
-        <bundle start-level="30">mvn:org.hibernate.javax.persistence/hibernate-jpa-2.1-api/1.0.0-SNAPSHOT</bundle>
+        <bundle start-level="30">mvn:org.hibernate.javax.persistence/hibernate-jpa-2.1-api/1.0.0.Final</bundle>
 
         <!-- Taken from Karaf-Tutorial -->
         <bundle>mvn:commons-collections/commons-collections/3.2.1</bundle>

diff --git a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/pom.xml b/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/pom.xml
@@ -10,7 +10,7 @@
 		<dependency>
             <groupId>org.hibernate.javax.persistence</groupId>
             <artifactId>hibernate-jpa-2.1-api</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>1.0.0.Final</version>
         </dependency>
 		<dependency>
 			<groupId>org.osgi</groupId>

diff --git a/hibernate-osgi/hibernate-osgi.gradle b/hibernate-osgi/hibernate-osgi.gradle
@@ -36,8 +36,7 @@ dependencies {
 	// Local copies of all jars needed fur the OSGi runtime.
 	osgiRuntime( "org.jboss.arquillian.osgi:arquillian-osgi-bundle:1.0.3.Final" )
 	osgiRuntime( "org.ops4j.pax.url:pax-url-wrap:1.5.2" )
-	// TODO: Temporarily using a pre-built jar in src/test/resources.  It's needed for a recent manifest change.  Once this is available in Maven, use it.
-	//osgiRuntime( "org.hibernate.javax.persistence:hibernate-jpa-2.1-api:1.0.0-SNAPSHOT" )
+	osgiRuntime( "org.hibernate.javax.persistence:hibernate-jpa-2.1-api:1.0.0.Final" )
 	osgiRuntime( "javax.enterprise:cdi-api:1.1-PFD" )
 	osgiRuntime( "org.jboss.spec.javax.interceptor:jboss-interceptors-api_1.2_spec:1.0.0.Alpha1" )
 	osgiRuntime( "org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.0.0.Alpha1" )

diff --git a/hibernate-osgi/src/test/resources/felix-framework.properties b/hibernate-osgi/src/test/resources/felix-framework.properties
@@ -14,11 +14,9 @@ felix.log.level=4
 felix.auto.install.1=\
 	file:target/osgi-lib/testClientBundle.jar
 
-# TODO: Temporarily using a pre-built hibernate-jpa-2.1-api-1.0.0-SNAPSHOT.jar in src/test/resources.
-# It's needed for a recent manifest change.  Once this is available in Maven, use it.
 felix.auto.start.1=\
 	file:target/osgi-lib/arquillian-osgi-bundle-1.0.3.Final.jar \
-	file:src/test/resources/hibernate-jpa-2.1-api-1.0.0-SNAPSHOT.jar \
+	file:target/osgi-lib/hibernate-jpa-2.1-api-1.0.0.Final.jar \
 	file:target/osgi-lib/bnd/el-api-2.2.0.jar \
 	file:target/osgi-lib/bnd/cdi-api-1.1.0.jar \
 	file:target/osgi-lib/jboss-interceptors-api_1.2_spec-1.0.0.Alpha1.jar \

diff --git a/hibernate-osgi/src/test/resources/hibernate-jpa-2.1-api-1.0.0-SNAPSHOT.jar b/hibernate-osgi/src/test/resources/hibernate-jpa-2.1-api-1.0.0-SNAPSHOT.jar