Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-10923 Upgrading CDI and related dependency versions

This commit is contained in:
Gunnar Morling 2016-07-04 11:05:12 +02:00 committed by Vlad Mihalcea
parent 5e69823b79
commit 65bbf28d3c
4 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hibernate-core/hibernate-core.gradle
View File

@ -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' )

10
hibernate-core/src/test/java/org/hibernate/jpa/test/cdi/DelayedCdiTest.java
View File

@ -356,13 +356,13 @@ public class DelayedCdiTest extends BaseCdiIntegrationTest {
}
@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 class DelayedCdiTest extends BaseCdiIntegrationTest {
}
@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 );
}

6
hibernate-core/src/test/java/org/hibernate/jpa/test/cdi/ExtendedBeanManagerCdiTest.java
View File

@ -358,12 +358,12 @@ public class ExtendedBeanManagerCdiTest extends BaseCdiIntegrationTest {
}
@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 class ExtendedBeanManagerCdiTest extends BaseCdiIntegrationTest {
}
@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" );
}

1
libraries.gradle
View File

@ -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'