HHH-13685 Remove uses of deprecated classesDir
This commit is contained in:
parent
47f02f2e6e
commit
ae4bc5e55d
|
@ -25,7 +25,7 @@ jar {
|
|||
classesDir = sourceSets.main.groovy.outputDir
|
||||
}
|
||||
else {
|
||||
classesDir = sourceSets.main.output.classesDir
|
||||
classesDir = sourceSets.main.java.outputDir
|
||||
}
|
||||
classpath = configurations.runtime
|
||||
|
||||
|
@ -116,7 +116,7 @@ javadoc {
|
|||
|
||||
doFirst {
|
||||
// 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
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -44,8 +44,8 @@ sourceSets {
|
|||
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
|
||||
output.classesDir = "${buildDir}/classes/test"
|
||||
output.resourcesDir = output.classesDir
|
||||
java.outputDir = file( "${buildDir}/classes/test" )
|
||||
output.resourcesDir = java.outputDir
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -218,7 +218,7 @@ task generatePaxExamEnvironmentFile {
|
|||
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.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.hibernate.osgi.test.karafFeatureFile', karaf.features.outputFile.absolutePath )
|
||||
|
||||
|
|
Loading…
Reference in New Issue