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
index 5c6f625415..9ea0435d83 100755
--- a/documentation/src/main/docbook/quickstart/tutorials/osgi/managed-jpa/features.xml
+++ b/documentation/src/main/docbook/quickstart/tutorials/osgi/managed-jpa/features.xml
@@ -46,7 +46,7 @@
 
 		<!-- These do not natively support OSGi, so using 3rd party bundles. -->
 		<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/2.7.7_5</bundle>
-		<bundle>mvn:org.jboss.javassist/com.springsource.javassist/3.15.0.GA</bundle>
+		<bundle>wrap:mvn:org.javassist/javassist/3.18.0-GA</bundle>
 		<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr303-api-1.0.0/2.2.0</bundle>
 		<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/1.8.2_2</bundle>
 		<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dom4j/1.6.1_5</bundle>
@@ -55,11 +55,11 @@
 		<bundle>wrap:mvn:org.jboss/jandex/1.1.0.Alpha1</bundle>
 		
         <bundle>wrap:mvn:org.hibernate.common/hibernate-commons-annotations/4.0.2.Final</bundle>
-        <bundle>mvn:com.fasterxml/classmate/0.5.4</bundle>
-        <bundle>mvn:org.jboss.logging/jboss-logging/3.1.0.GA</bundle>
+        <bundle>mvn:com.fasterxml/classmate/0.8.0</bundle>
+        <bundle>mvn:org.jboss.logging/jboss-logging/3.1.1.GA</bundle>
         
-        <bundle>mvn:org.hibernate/hibernate-core/4.3.0-SNAPSHOT</bundle>
-        <bundle>mvn:org.hibernate/hibernate-entitymanager/4.3.0-SNAPSHOT</bundle>
+        <bundle>mvn:org.hibernate/hibernate-core/5.0.0-SNAPSHOT</bundle>
+        <bundle>mvn:org.hibernate/hibernate-entitymanager/5.0.0-SNAPSHOT</bundle>
         
         <!-- TODO: It seems that the persistence unit bundle needs to be started
         before hibernate-osgi.  When the BundleActivator is started,
@@ -69,6 +69,6 @@
         watch for bundles with PUs before registering the persistence provider? -->
         <bundle>mvn:org.hibernate.osgi/managed-jpa/1.0.0</bundle>
         
-        <bundle>mvn:org.hibernate/hibernate-osgi/4.3.0-SNAPSHOT</bundle>
+        <bundle>mvn:org.hibernate/hibernate-osgi/5.0.0-SNAPSHOT</bundle>
 	</feature>
 </features>
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
index 9e31bed850..94fdfa3539 100644
--- a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa/features.xml
+++ b/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa/features.xml
@@ -21,7 +21,7 @@
 
 		<!-- These do not natively support OSGi, so using 3rd party bundles. -->
 		<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/2.7.7_5</bundle>
-		<bundle>mvn:org.jboss.javassist/com.springsource.javassist/3.15.0.GA</bundle>
+		<bundle>wrap:mvn:org.javassist/javassist/3.18.0-GA</bundle>
 		<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr303-api-1.0.0/2.2.0</bundle>
 		<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/1.8.2_2</bundle>
 		<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dom4j/1.6.1_5</bundle>
@@ -30,12 +30,12 @@
         <bundle>wrap:mvn:org.hibernate.common/hibernate-commons-annotations/4.0.2.Final</bundle>
 		<bundle>wrap:mvn:org.jboss/jandex/1.1.0.Alpha1</bundle>
 		
-        <bundle>mvn:com.fasterxml/classmate/0.5.4</bundle>
-        <bundle>mvn:org.jboss.logging/jboss-logging/3.1.0.GA</bundle>
+        <bundle>mvn:com.fasterxml/classmate/0.8.0</bundle>
+        <bundle>mvn:org.jboss.logging/jboss-logging/3.1.1.GA</bundle>
         
-        <bundle>mvn:org.hibernate/hibernate-core/4.3.0-SNAPSHOT</bundle>
-        <bundle>mvn:org.hibernate/hibernate-entitymanager/4.3.0-SNAPSHOT</bundle>
-        <bundle>mvn:org.hibernate/hibernate-osgi/4.3.0-SNAPSHOT</bundle>
+        <bundle>mvn:org.hibernate/hibernate-core/5.0.0-SNAPSHOT</bundle>
+        <bundle>mvn:org.hibernate/hibernate-entitymanager/5.0.0-SNAPSHOT</bundle>
+        <bundle>mvn:org.hibernate/hibernate-osgi/5.0.0-SNAPSHOT</bundle>
         
         <bundle>mvn:org.hibernate.osgi/unmanaged-jpa/1.0.0</bundle>
 	</feature>
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
index e505b7c5a9..4cc5e31230 100644
--- a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/features.xml
+++ b/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/features.xml
@@ -21,7 +21,7 @@
 
 		<!-- These do not natively support OSGi, so using 3rd party bundles. -->
 		<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/2.7.7_5</bundle>
-		<bundle>mvn:org.jboss.javassist/com.springsource.javassist/3.15.0.GA</bundle>
+		<bundle>wrap:mvn:org.javassist/javassist/3.18.0-GA</bundle>
 		<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr303-api-1.0.0/2.2.0</bundle>
 		<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/1.8.2_2</bundle>
 		<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dom4j/1.6.1_5</bundle>
@@ -36,8 +36,8 @@
 		<!-- Optional.  Needed to test ehcache 2lc. -->
 		<!-- <bundle>wrap:mvn:net.sf.ehcache/ehcache-core/2.4.3</bundle> -->
 		
-        <bundle>mvn:com.fasterxml/classmate/0.5.4</bundle>
-        <bundle>mvn:org.jboss.logging/jboss-logging/3.1.0.GA</bundle>
+        <bundle>mvn:com.fasterxml/classmate/0.8.0</bundle>
+        <bundle>mvn:org.jboss.logging/jboss-logging/3.1.1.GA</bundle>
         
         <!-- JACC is optional. -->
         <!--<bundle>mvn:javax.servlet/javax.servlet-api/3.0.1</bundle>
@@ -57,15 +57,15 @@
 		<bundle>mvn:org.jgroups/jgroups/3.2.8.Final</bundle>
 		<bundle>mvn:org.infinispan/infinispan-core/5.2.0.Beta3</bundle> -->
 
-        <bundle>mvn:org.hibernate/hibernate-core/4.3.0-SNAPSHOT</bundle>
+        <bundle>mvn:org.hibernate/hibernate-core/5.0.0-SNAPSHOT</bundle>
         <!-- TODO: Shouldn't need this, but hibernate-osgi's activator is a catch-all for SF and EMF. -->
-        <bundle>mvn:org.hibernate/hibernate-entitymanager/4.3.0-SNAPSHOT</bundle>
-        <bundle>mvn:org.hibernate/hibernate-envers/4.3.0-SNAPSHOT</bundle>
-        <!-- <bundle>mvn:org.hibernate/hibernate-c3p0/4.3.0-SNAPSHOT</bundle> -->
-        <!-- <bundle>mvn:org.hibernate/hibernate-proxool/4.3.0-SNAPSHOT</bundle> -->
-        <!-- <bundle>mvn:org.hibernate/hibernate-ehcache/4.3.0-SNAPSHOT</bundle> -->
-        <!-- <bundle>mvn:org.hibernate/hibernate-infinispan/4.3.0-SNAPSHOT</bundle> -->
-        <bundle>mvn:org.hibernate/hibernate-osgi/4.3.0-SNAPSHOT</bundle>
+        <bundle>mvn:org.hibernate/hibernate-entitymanager/5.0.0-SNAPSHOT</bundle>
+        <bundle>mvn:org.hibernate/hibernate-envers/5.0.0-SNAPSHOT</bundle>
+        <!-- <bundle>mvn:org.hibernate/hibernate-c3p0/5.0.0-SNAPSHOT</bundle> -->
+        <!-- <bundle>mvn:org.hibernate/hibernate-proxool/5.0.0-SNAPSHOT</bundle> -->
+        <!-- <bundle>mvn:org.hibernate/hibernate-ehcache/5.0.0-SNAPSHOT</bundle> -->
+        <!-- <bundle>mvn:org.hibernate/hibernate-infinispan/5.0.0-SNAPSHOT</bundle> -->
+        <bundle>mvn:org.hibernate/hibernate-osgi/5.0.0-SNAPSHOT</bundle>
         
         <bundle>mvn:org.hibernate.osgi/unmanaged-native/1.0.0</bundle>
 	</feature>
diff --git a/hibernate-core/hibernate-core.gradle b/hibernate-core/hibernate-core.gradle
index 432fc8a25d..deb1b99e26 100644
--- a/hibernate-core/hibernate-core.gradle
+++ b/hibernate-core/hibernate-core.gradle
@@ -61,6 +61,7 @@ jar {
             // TODO: Shouldn't have to explicitly list this, but the plugin
             // generates it with a [1.0,2) version.
             'javax.persistence;version="2.1.0"',
+            'javax.persistence.metamodel;version="2.1.0"',
             // Temporarily support JTA 1.1 -- Karaf and other frameworks still
             // use it.  Without this, the plugin generates [1.2,2).
             // build.gradle adds javax.transaction for all modules