upgrade to junit 4.10
exclude xml-api which is part of JDK 6/7 change jboss-logging to make it JDK7 compatibile
This commit is contained in:
parent
dceda48ff1
commit
3a5bb1f571
12
build.gradle
12
build.gradle
|
@ -47,7 +47,7 @@ idea {
|
|||
// build a map of the dependency artifacts to use. Allows centralized definition of the version of artifacts to
|
||||
// use. In that respect it serves a role similar to <dependencyManagement> in Maven
|
||||
slf4jVersion = '1.6.1'
|
||||
junitVersion = '4.8.2'
|
||||
junitVersion = '4.10'
|
||||
h2Version = '1.2.145'
|
||||
|
||||
libraries = [
|
||||
|
@ -135,6 +135,10 @@ subprojects { subProject ->
|
|||
jaxb {
|
||||
description = 'Dependencies for running ant xjc (jaxb class generation)'
|
||||
}
|
||||
configurations {
|
||||
all*.exclude group: 'xml-apis', module: 'xml-apis'
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// appropriately inject the common dependencies into each sub-project
|
||||
|
@ -179,7 +183,11 @@ subprojects { subProject ->
|
|||
"-encoding", "UTF-8",
|
||||
"-processor", "org.jboss.logging.processor.apt.LoggingToolsProcessor",
|
||||
"-s", "$sourceSets.main.generatedLoggingSrcDir.absolutePath",
|
||||
"-AloggingVersion=3.0"
|
||||
"-AloggingVersion=3.0",
|
||||
"-source", "1.6",
|
||||
"-target", "1.6",
|
||||
"-AtranslationFilesPath=${project.rootDir}/src/main/resources"
|
||||
|
||||
]
|
||||
);
|
||||
outputs.dir sourceSets.main.generatedLoggingSrcDir;
|
||||
|
|
Loading…
Reference in New Issue