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

Fix jakarta tests

This commit is contained in:
Christian Beikov 2021-05-25 18:11:29 +02:00
parent c631f3924d
commit 8c9330a8ff
3 changed files with 65 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
hibernate-core-jakarta/hibernate-core-jakarta.gradle
View File

@ -19,26 +19,26 @@ configurations {
}
dependencies {
compile( libraries.jakarta_jpa )
api libraries.jakarta_jpa
// This can now be made provided
// Could be made optional?
compile( libraries.byteBuddy )
compile( libraries.antlr )
compile( libraries.jakarta_jta )
compile( libraries.jandex )
compile( libraries.classmate )
compile( libraries.jakarta_activation )
api libraries.byteBuddy
api libraries.antlr
api libraries.jakarta_jta
api libraries.jandex
api libraries.classmate
api libraries.jakarta_activation
provided( libraries.jakarta_jacc )
provided( libraries.jakarta_validation )
provided( libraries.ant )
provided( libraries.jakarta_cdi )
compileOnly libraries.jakarta_jacc
compileOnly libraries.jakarta_validation
compileOnly libraries.ant
compileOnly libraries.jakarta_cdi
compile( libraries.dom4j )
compile( libraries.commons_annotations )
api libraries.dom4j
api libraries.commons_annotations
compile( libraries.jakarta_jaxb_api )
compile( libraries.jakarta_jaxb_runtime )
api libraries.jakarta_jaxb_api
api libraries.jakarta_jaxb_runtime
jakartaeeTransformJars 'biz.aQute.bnd:biz.aQute.bnd.transform:5.1.1',
'commons-cli:commons-cli:1.4',
@ -47,48 +47,48 @@ dependencies {
'org.eclipse.transformer:org.eclipse.transformer:0.2.0',
'org.eclipse.transformer:org.eclipse.transformer.cli:0.2.0'
testCompile( project(':hibernate-testing-jakarta') )
testCompile fileTree(dir: 'libs', include: '*.jar')
testImplementation project(':hibernate-testing-jakarta')
testImplementation fileTree(dir: 'libs', include: '*.jar')
testCompile( libraries.shrinkwrap_api )
testCompile( libraries.shrinkwrap )
testCompile( libraries.jakarta_jacc )
testCompile( libraries.jakarta_validation )
testCompile( libraries.jandex )
testCompile( libraries.classmate )
testCompile( libraries.mockito )
testCompile( libraries.mockito_inline )
testCompile( libraries.jodaTime )
testCompile( libraries.assertj )
testImplementation libraries.shrinkwrap_api
testImplementation libraries.shrinkwrap
testImplementation libraries.jakarta_jacc
testImplementation libraries.jakarta_validation
testImplementation libraries.jandex
testImplementation libraries.classmate
testImplementation libraries.mockito
testImplementation libraries.mockito_inline
testImplementation libraries.jodaTime
testImplementation libraries.assertj
testCompile( libraries.jakarta_cdi )
testImplementation libraries.jakarta_cdi
testCompile( libraries.jakarta_validator ) {
testImplementation( libraries.jakarta_validator ) {
// for test runtime
transitive = true
}
// for testing stored procedure support
testCompile( libraries.derby )
testImplementation libraries.derby
testRuntime( 'org.hamcrest:hamcrest-all:1.3' )
testRuntime( "org.jboss.spec.javax.ejb:jboss-ejb-api_3.2_spec:1.0.0.Final" )
testRuntime( libraries.jakarta_el )
testRuntime( 'jaxen:jaxen:1.1' )
testRuntime( libraries.javassist )
testRuntime( libraries.byteBuddy )
testRuntime( libraries.jakarta_weld )
testRuntime( libraries.atomikos )
testRuntime( libraries.atomikos_jta )
testRuntimeOnly 'org.hamcrest:hamcrest-all:1.3'
testRuntimeOnly "org.jboss.spec.javax.ejb:jboss-ejb-api_3.2_spec:1.0.0.Final"
testRuntimeOnly libraries.jakarta_el
testRuntimeOnly 'jaxen:jaxen:1.1'
testRuntimeOnly libraries.javassist
testRuntimeOnly libraries.byteBuddy
testRuntimeOnly libraries.jakarta_weld
testRuntimeOnly libraries.atomikos
testRuntimeOnly libraries.atomikos_jta
// todo (jakarta): replace this when the jakarta artifact is released
testRuntime( project(':hibernate-transaction-client') )
// testRuntime( libraries.wildfly_transaction_client_jakarta )
testRuntimeOnly project(':hibernate-transaction-client')
// testRuntimeOnly libraries.wildfly_transaction_client_jakarta
testCompile libraries.shrinkwrap_descriptors_api_javaee
testCompile libraries.shrinkwrap_descriptors_impl_javaee
testImplementation libraries.shrinkwrap_descriptors_api_javaee
testImplementation libraries.shrinkwrap_descriptors_impl_javaee
testCompile libraries.jboss_ejb_spec_jar
testCompile libraries.jboss_annotation_spec_jar
testImplementation libraries.jboss_ejb_spec_jar
testImplementation libraries.jboss_annotation_spec_jar
}
jar {

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

@ -178,7 +178,7 @@ sourceSets.main {
// resources inherently exclude sources
sourceSets.test.resources {
setSrcDirs( ['src/test/java','src/test/resources'] )
setSrcDirs( ['src/test/java','src/test/resources','src/test/bundles'] )
}
idea {
@ -228,7 +228,9 @@ task copyBundleResources (type: Copy) {
ext.bundlesTargetDir.mkdirs()
}
}
processTestResources.dependsOn copyBundleResources
// Not sure if this is a proper fix, but if we use dependsOn instead of finalizedBy,
// we will end up a test JAR with bundle files that where variables are replaced
processTestResources.finalizedBy copyBundleResources
task testJar(type: Jar, dependsOn: testClasses) {
duplicatesStrategy = DuplicatesStrategy.EXCLUDE

26
hibernate-testing-jakarta/hibernate-testing-jakarta.gradle
View File

@ -14,21 +14,27 @@ configurations {
}
dependencies {
compile project( ':hibernate-core-jakarta' )
compile( libraries.jakarta_jta )
compile( libraries.junit )
compile( libraries.byteman )
compile( libraries.byteman_install )
compile( libraries.byteman_bmunit )
compile( libraries.xapool )
compile( libraries.log4j )
compile( libraries.jboss_tx_spi_jakarta ) {
api project( ':hibernate-core-jakarta' )
api libraries.junit
api libraries.junit5_api
api libraries.junit5_params
api 'org.hamcrest:hamcrest-all:1.3'
api libraries.byteman
api libraries.byteman_install
api libraries.byteman_bmunit
api libraries.xapool
api( libraries.jboss_tx_spi_jakarta ) {
transitive=false;
}
compile ( libraries.jboss_jta_jakarta ) {
api( libraries.jboss_jta_jakarta ) {
transitive=false;
}
api 'javax.money:money-api:1.0.1'
api 'org.javamoney:moneta:1.1'
jakartaeeTransformJars 'biz.aQute.bnd:biz.aQute.bnd.transform:5.1.1',
'commons-cli:commons-cli:1.4',
'org.slf4j:slf4j-simple:1.7.30',