diff --git a/hibernate-core/hibernate-core.gradle b/hibernate-core/hibernate-core.gradle
index c41b2f1dce..76e550f76b 100644
--- a/hibernate-core/hibernate-core.gradle
+++ b/hibernate-core/hibernate-core.gradle
@@ -65,7 +65,7 @@ dependencies {
     provided( libraries.jacc )
     provided( libraries.validation )
     provided( libraries.ant )
-    provided( "javax.enterprise:cdi-api:1.1-PFD" )
+    provided( "javax.enterprise:cdi-api:${cdiVersion}" )
 
     testCompile( project(':hibernate-testing') )
     testCompile( libraries.shrinkwrap_api )
@@ -75,9 +75,9 @@ dependencies {
     testCompile( libraries.classmate )
     testCompile( libraries.mockito )
     testCompile( 'joda-time:joda-time:2.3' )
-    testCompile( "org.jboss.weld:weld-core:2.0.0.Beta6" )
-    testCompile( "org.jboss.weld.arquillian.container:arquillian-weld-ee-embedded-1.1:1.1.2.Final" )
-    compile( "javax.enterprise:cdi-api:1.1-PFD" ) {
+    testCompile( "org.jboss.weld:weld-core:2.3.4.Final" )
+    testCompile( "org.jboss.arquillian.container:arquillian-weld-ee-embedded-1.1:1.0.0.CR9" )
+    compile( "javax.enterprise:cdi-api:${cdiVersion}" ) {
         // we need to force it to make sure we influence the one coming from arquillian
         force=true
     }
@@ -90,7 +90,7 @@ dependencies {
     // for testing stored procedure support
     testCompile( libraries.derby )
 
-    testRuntime( "org.jboss.spec.javax.ejb:jboss-ejb-api_3.2_spec:1.0.0.Alpha2" )
+    testRuntime( "org.jboss.spec.javax.ejb:jboss-ejb-api_3.2_spec:1.0.0.Final" )
     testRuntime( libraries.expression_language_api )
     testRuntime( libraries.expression_language_impl )
     testRuntime( 'jaxen:jaxen:1.1' )
diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/cdi/DelayedCdiTest.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/cdi/DelayedCdiTest.java
index bd845567de..6ab78a6bca 100644
--- a/hibernate-core/src/test/java/org/hibernate/jpa/test/cdi/DelayedCdiTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/cdi/DelayedCdiTest.java
@@ -356,13 +356,13 @@ public <T> InjectionTargetFactory<T> getInjectionTargetFactory(AnnotatedType<T>
 		}
 
 		@Override
-		public <X> ProducerFactory<X> getProducerFactory(AnnotatedField<? super X> field) {
-			return getDelegate().getProducerFactory( field );
+		public <X> ProducerFactory<X> getProducerFactory(AnnotatedField<? super X> field, Bean<X> declaringBean) {
+			return getDelegate().getProducerFactory( field, declaringBean );
 		}
 
 		@Override
-		public <X> ProducerFactory<X> getProducerFactory(AnnotatedMethod<? super X> method) {
-			return getDelegate().getProducerFactory( method );
+		public <X> ProducerFactory<X> getProducerFactory(AnnotatedMethod<? super X> method, Bean<X> declaringBean) {
+			return getDelegate().getProducerFactory( method, declaringBean );
 		}
 
 		@Override
@@ -381,7 +381,7 @@ public <T> Bean<T> createBean(BeanAttributes<T> attributes, Class<T> beanClass,
 		}
 
 		@Override
-		public <T> Bean<T> createBean(BeanAttributes<T> attributes, Class<?> beanClass, ProducerFactory<T> producerFactory) {
+		public <T, X> Bean<T> createBean(BeanAttributes<T> attributes, Class<X> beanClass, ProducerFactory<X> producerFactory) {
 			return getDelegate().createBean( attributes, beanClass, producerFactory );
 		}
 
diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/cdi/ExtendedBeanManagerCdiTest.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/cdi/ExtendedBeanManagerCdiTest.java
index 7e193bea0e..2939336e56 100644
--- a/hibernate-core/src/test/java/org/hibernate/jpa/test/cdi/ExtendedBeanManagerCdiTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/cdi/ExtendedBeanManagerCdiTest.java
@@ -358,12 +358,12 @@ public <T> InjectionTargetFactory<T> getInjectionTargetFactory(AnnotatedType<T>
 		}
 
 		@Override
-		public <X> ProducerFactory<X> getProducerFactory(AnnotatedField<? super X> field) {
+		public <X> ProducerFactory<X> getProducerFactory(AnnotatedField<? super X> field, Bean<X> declaringBean) {
 			throw new UnsupportedOperationException( "ExtendedBeanManagerImpl here just to gainn access to BeanManager lazily" );
 		}
 
 		@Override
-		public <X> ProducerFactory<X> getProducerFactory(AnnotatedMethod<? super X> method) {
+		public <X> ProducerFactory<X> getProducerFactory(AnnotatedMethod<? super X> method, Bean<X> declaringBean) {
 			throw new UnsupportedOperationException( "ExtendedBeanManagerImpl here just to gainn access to BeanManager lazily" );
 		}
 
@@ -383,7 +383,7 @@ public <T> Bean<T> createBean(BeanAttributes<T> attributes, Class<T> beanClass,
 		}
 
 		@Override
-		public <T> Bean<T> createBean(BeanAttributes<T> attributes, Class<?> beanClass, ProducerFactory<T> producerFactory) {
+		public <T, X> Bean<T> createBean(BeanAttributes<T> attributes, Class<X> beanClass, ProducerFactory<X> producerFactory) {
 			throw new UnsupportedOperationException( "ExtendedBeanManagerImpl here just to gainn access to BeanManager lazily" );
 		}
 
diff --git a/libraries.gradle b/libraries.gradle
index aa96c11438..3a85819bb6 100644
--- a/libraries.gradle
+++ b/libraries.gradle
@@ -16,6 +16,7 @@ ext {
     infinispanVersion = '8.1.0.Final'
     jnpVersion = '5.0.6.CR1'
     elVersion = '2.2.4'
+    cdiVersion = '1.1'
 
     // Wildfly version targeted by module ZIP; Arquillian/Shrinkwrap versions used for testing the module ZIP
     wildflyVersion = '10.0.0.Final'