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

HHH-13685 Remove uses of deprecated classesDir

This commit is contained in:
Yoann Rodière 2019-10-21 18:29:06 +02:00 committed by gbadner
parent a62d92cd64
commit af44c7903f
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gradle/published-java-module.gradle
View File

@ -25,7 +25,7 @@ jar {
classesDir = sourceSets.main.groovy.outputDir classesDir = sourceSets.main.groovy.outputDir
} }
else { else {
classesDir = sourceSets.main.output.classesDir classesDir = sourceSets.main.java.outputDir
} }
classpath = configurations.runtime classpath = configurations.runtime
@ -115,7 +115,7 @@ javadoc {
doFirst { doFirst {
// ordering problems if we try to do this during config phase :( // ordering problems if we try to do this during config phase :(
classpath += project.sourceSets.main.output + project.sourceSets.main.compileClasspath + project.configurations.provided classpath += project.sourceSets.main.output.classesDirs + project.sourceSets.main.compileClasspath + project.configurations.provided
} }
} }
} }

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

@ -44,8 +44,8 @@ sourceSets {
test { test {
// send javac output and resource copying to the same output directory for test // send javac output and resource copying to the same output directory for test
// so Pax Exam can more easily find it without explicit TinyBundle hooks // so Pax Exam can more easily find it without explicit TinyBundle hooks
output.classesDir = "${buildDir}/classes/test" java.outputDir = file( "${buildDir}/classes/test" )
output.resourcesDir = output.classesDir output.resourcesDir = java.outputDir
} }
} }
@ -230,7 +230,7 @@ task generatePaxExamEnvironmentFile {
properties.setProperty( 'org.ops4j.pax.exam.container.karaf.distroUrl', karafDistroFile.toURI().toURL().toExternalForm() ) properties.setProperty( 'org.ops4j.pax.exam.container.karaf.distroUrl', karafDistroFile.toURI().toURL().toExternalForm() )
properties.setProperty( 'org.ops4j.pax.exam.container.karaf.unpackDir', karafUnpackDirectory.absolutePath ) properties.setProperty( 'org.ops4j.pax.exam.container.karaf.unpackDir', karafUnpackDirectory.absolutePath )
properties.setProperty( 'org.ops4j.pax.exam.container.karaf.version', karafVersion as String ) properties.setProperty( 'org.ops4j.pax.exam.container.karaf.version', karafVersion as String )
properties.setProperty( 'org.ops4j.pax.exam.container.karaf.probe.classesDir', sourceSets.test.output.classesDir.absolutePath ) properties.setProperty( 'org.ops4j.pax.exam.container.karaf.probe.classesDir', sourceSets.test.java.outputDir.absolutePath )
properties.setProperty( 'org.ops4j.pax.exam.container.karaf.probe.resourcesDir', sourceSets.test.output.resourcesDir.absolutePath ) properties.setProperty( 'org.ops4j.pax.exam.container.karaf.probe.resourcesDir', sourceSets.test.output.resourcesDir.absolutePath )
properties.setProperty( 'org.hibernate.osgi.test.karafFeatureFile', karaf.features.outputFile.absolutePath ) properties.setProperty( 'org.hibernate.osgi.test.karafFeatureFile', karaf.features.outputFile.absolutePath )