diff --git a/hibernate-core/hibernate-core.gradle b/hibernate-core/hibernate-core.gradle index c41b2f1dceed..76e550f76b9f 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 bd845567deaf..6ab78a6bcac5 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 InjectionTargetFactory getInjectionTargetFactory(AnnotatedType } @Override - public ProducerFactory getProducerFactory(AnnotatedField field) { - return getDelegate().getProducerFactory( field ); + public ProducerFactory getProducerFactory(AnnotatedField field, Bean declaringBean) { + return getDelegate().getProducerFactory( field, declaringBean ); } @Override - public ProducerFactory getProducerFactory(AnnotatedMethod method) { - return getDelegate().getProducerFactory( method ); + public ProducerFactory getProducerFactory(AnnotatedMethod method, Bean declaringBean) { + return getDelegate().getProducerFactory( method, declaringBean ); } @Override @@ -381,7 +381,7 @@ public Bean createBean(BeanAttributes attributes, Class beanClass, } @Override - public Bean createBean(BeanAttributes attributes, Class beanClass, ProducerFactory producerFactory) { + public Bean createBean(BeanAttributes attributes, Class beanClass, ProducerFactory 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 7e193bea0efa..2939336e5658 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 InjectionTargetFactory getInjectionTargetFactory(AnnotatedType } @Override - public ProducerFactory getProducerFactory(AnnotatedField field) { + public ProducerFactory getProducerFactory(AnnotatedField field, Bean declaringBean) { throw new UnsupportedOperationException( "ExtendedBeanManagerImpl here just to gainn access to BeanManager lazily" ); } @Override - public ProducerFactory getProducerFactory(AnnotatedMethod method) { + public ProducerFactory getProducerFactory(AnnotatedMethod method, Bean declaringBean) { throw new UnsupportedOperationException( "ExtendedBeanManagerImpl here just to gainn access to BeanManager lazily" ); } @@ -383,7 +383,7 @@ public Bean createBean(BeanAttributes attributes, Class beanClass, } @Override - public Bean createBean(BeanAttributes attributes, Class beanClass, ProducerFactory producerFactory) { + public Bean createBean(BeanAttributes attributes, Class beanClass, ProducerFactory producerFactory) { throw new UnsupportedOperationException( "ExtendedBeanManagerImpl here just to gainn access to BeanManager lazily" ); } diff --git a/libraries.gradle b/libraries.gradle index e493024bf580..0118c7e38c74 100644 --- a/libraries.gradle +++ b/libraries.gradle @@ -16,11 +16,13 @@ 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 + // Wildfly version targeted by module ZIP; Arquillian/Shrinkwrap versions used for CDI testing and testing the module ZIP wildflyVersion = '10.0.0.Final' arquillianVersion = '1.1.10.Final' - shrinkwrapVersion = '2.0.0-alpha-8' + shrinkwrapVersion = '1.2.6' + shrinkwrapDescriptorsVersion = '2.0.0-alpha-8' wildflyArquillianContainerVersion = '2.0.0.Final' libraries = [ @@ -83,8 +85,6 @@ ext { byteman: "org.jboss.byteman:byteman:${bytemanVersion}", byteman_install: "org.jboss.byteman:byteman-install:${bytemanVersion}", byteman_bmunit: "org.jboss.byteman:byteman-bmunit:${bytemanVersion}", - shrinkwrap_api: 'org.jboss.shrinkwrap:shrinkwrap-api:1.0.0-beta-6', - shrinkwrap: 'org.jboss.shrinkwrap:shrinkwrap-impl-base:1.0.0-beta-6', h2: "com.h2database:h2:${h2Version}", hsqldb: "org.hsqldb:hsqldb:2.3.2", derby: "org.apache.derby:derby:10.11.1.1", @@ -122,12 +122,15 @@ ext { proxool: "proxool:proxool:0.8.3", hikaricp: "com.zaxxer:HikariCP-java6:2.3.9", - // Arquillian etc. + // Arquillian/Shrinkwrap arquillian_junit_container: "org.jboss.arquillian.junit:arquillian-junit-container:${arquillianVersion}", arquillian_protocol_servlet: "org.jboss.arquillian.protocol:arquillian-protocol-servlet:${arquillianVersion}", - shrinkwrap_descriptors_api_javaee: "org.jboss.shrinkwrap.descriptors:shrinkwrap-descriptors-api-javaee:${shrinkwrapVersion}", - shrinkwrap_descriptors_impl_javaee: "org.jboss.shrinkwrap.descriptors:shrinkwrap-descriptors-impl-javaee:${shrinkwrapVersion}", + shrinkwrap_api: "org.jboss.shrinkwrap:shrinkwrap-api:${shrinkwrapVersion}", + shrinkwrap: "org.jboss.shrinkwrap:shrinkwrap-impl-base:${shrinkwrapVersion}", + + shrinkwrap_descriptors_api_javaee: "org.jboss.shrinkwrap.descriptors:shrinkwrap-descriptors-api-javaee:${shrinkwrapDescriptorsVersion}", + shrinkwrap_descriptors_impl_javaee: "org.jboss.shrinkwrap.descriptors:shrinkwrap-descriptors-impl-javaee:${shrinkwrapDescriptorsVersion}", wildfly_arquillian_container_managed: "org.wildfly.arquillian:wildfly-arquillian-container-managed:${wildflyArquillianContainerVersion}" ]