Skip to content

HHH-10923 Version updates #1464

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

HHH-10923 Version updates #1464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f3824c
HHH-10923 Upgrading CDI and related dependency versions
gunnarmorling Jul 4, 2016
6877231
HHH-10923 Upgrading Shrinkwrap version
gunnarmorling Jul 4, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions hibernate-core/hibernate-core.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
Expand All @@ -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
}
Expand All @@ -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' )
Expand Down
10 changes: 5 additions & 5 deletions hibernate-core/src/test/java/org/hibernate/jpa/test/cdi/DelayedCdiTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 );
}

Expand Down
6 changes: 3 additions & 3 deletions hibernate-core/src/test/java/org/hibernate/jpa/test/cdi/ExtendedBeanManagerCdiTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" );
}

Expand All @@ -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" );
}

Expand Down
17 changes: 10 additions & 7 deletions libraries.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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}"
]
Expand Down