HHH-12950 Use the Annotation Processor specific scopes of Gradle
This commit is contained in:
parent
293acd048c
commit
4eb726ef4c
|
@ -40,7 +40,7 @@ dependencies {
|
||||||
|
|
||||||
compile( libraries.jpa )
|
compile( libraries.jpa )
|
||||||
compile( project( ':hibernate-core' ) )
|
compile( project( ':hibernate-core' ) )
|
||||||
compile( project( ':hibernate-jpamodelgen' ) )
|
annotationProcessor( project( ':hibernate-jpamodelgen' ) )
|
||||||
|
|
||||||
testCompile( 'org.apache.commons:commons-lang3:3.4' )
|
testCompile( 'org.apache.commons:commons-lang3:3.4' )
|
||||||
|
|
||||||
|
|
|
@ -56,9 +56,6 @@ configurations {
|
||||||
provided {
|
provided {
|
||||||
description = 'Non-exported compile-time dependencies.'
|
description = 'Non-exported compile-time dependencies.'
|
||||||
}
|
}
|
||||||
jbossLoggingTool {
|
|
||||||
description = 'Dependencies for running the jboss-logging tooling.'
|
|
||||||
}
|
|
||||||
asciidoclet {
|
asciidoclet {
|
||||||
description = "Dependencies for Asciidoctor Javadoc taglet"
|
description = "Dependencies for Asciidoctor Javadoc taglet"
|
||||||
}
|
}
|
||||||
|
@ -72,7 +69,9 @@ dependencies {
|
||||||
|
|
||||||
provided libraries.logging_annotations
|
provided libraries.logging_annotations
|
||||||
|
|
||||||
jbossLoggingTool( libraries.logging_processor )
|
annotationProcessor( libraries.logging_processor )
|
||||||
|
annotationProcessor( libraries.logging )
|
||||||
|
annotationProcessor( libraries.logging_annotations )
|
||||||
|
|
||||||
testCompile( libraries.junit )
|
testCompile( libraries.junit )
|
||||||
testCompile( libraries.byteman )
|
testCompile( libraries.byteman )
|
||||||
|
@ -153,7 +152,6 @@ task compile(dependsOn: [compileJava, processResources, compileTestJava, process
|
||||||
|
|
||||||
sourceSets.main {
|
sourceSets.main {
|
||||||
compileClasspath += configurations.provided
|
compileClasspath += configurations.provided
|
||||||
compileClasspath += configurations.jbossLoggingTool
|
|
||||||
}
|
}
|
||||||
|
|
||||||
convention.findPlugin( JavaPluginConvention.class ).sourceSets.each { sourceSet ->
|
convention.findPlugin( JavaPluginConvention.class ).sourceSets.each { sourceSet ->
|
||||||
|
|
|
@ -14,9 +14,6 @@ apply plugin: 'org.hibernate.build.gradle.xjc'
|
||||||
description = 'Hibernate\'s core ORM functionality'
|
description = 'Hibernate\'s core ORM functionality'
|
||||||
|
|
||||||
configurations {
|
configurations {
|
||||||
hibernateJpaModelGenTool {
|
|
||||||
description = "Dependencies for running the Hibernate JPA Metamodel Generator AnnotationProcessor tool"
|
|
||||||
}
|
|
||||||
tests {
|
tests {
|
||||||
description = 'Configuration for the produced test jar'
|
description = 'Configuration for the produced test jar'
|
||||||
}
|
}
|
||||||
|
@ -94,7 +91,7 @@ dependencies {
|
||||||
testRuntime( libraries.atomikos_jta )
|
testRuntime( libraries.atomikos_jta )
|
||||||
testRuntime(libraries.wildfly_transaction_client)
|
testRuntime(libraries.wildfly_transaction_client)
|
||||||
|
|
||||||
testCompile( project( ':hibernate-jpamodelgen' ) )
|
testAnnotationProcessor( project( ':hibernate-jpamodelgen' ) )
|
||||||
|
|
||||||
testCompile libraries.arquillian_junit_container
|
testCompile libraries.arquillian_junit_container
|
||||||
testCompile libraries.arquillian_protocol_servlet
|
testCompile libraries.arquillian_protocol_servlet
|
||||||
|
|
|
@ -17,7 +17,7 @@ dependencies {
|
||||||
}
|
}
|
||||||
|
|
||||||
provided( libraries.ant )
|
provided( libraries.ant )
|
||||||
provided( project( ':hibernate-jpamodelgen' ) )
|
annotationProcessor( project( ':hibernate-jpamodelgen' ) )
|
||||||
|
|
||||||
testCompile( project( ':hibernate-testing' ) )
|
testCompile( project( ':hibernate-testing' ) )
|
||||||
testCompile( project( path: ':hibernate-core', configuration: 'tests' ) )
|
testCompile( project( path: ':hibernate-core', configuration: 'tests' ) )
|
||||||
|
|
Loading…
Reference in New Issue