More test fixes

Signed-off-by: brian <brian@brutex.de>
master
Brian Rosenberger 2022-10-12 11:01:57 +02:00
parent a279242459
commit efbb341742
5 changed files with 19 additions and 5 deletions

View File

@ -63,6 +63,11 @@ allprojects { Project proj ->
plugins.withType(JavaPlugin) { plugins.withType(JavaPlugin) {
sourceCompatibility = 11
targetCompatibility = 1.8
tasks.withType(JavaCompile) {
options.release = 8
}
dependencies { dependencies {
implementation platform(project(":cavis-common-platform")) implementation platform(project(":cavis-common-platform"))

View File

@ -126,4 +126,7 @@ sudo sh cmake-3.20.4-linux-x86_64.sh --skip-license
echo "supersede domain-name-servers 172.31.0.2, 8.8.8.8" | sudo tee -a /etc/dhcp/dhclient.conf echo "supersede domain-name-servers 172.31.0.2, 8.8.8.8" | sudo tee -a /etc/dhcp/dhclient.conf
echo "nameserver 8.8.8.8" | sudo tee -a /etc/resolv.conf echo "nameserver 8.8.8.8" | sudo tee -a /etc/resolv.conf
# Buildparameter: #
-P\<xxx>\
CAVIS_AVX_EXTENSION = {avx2 | avx512}, default is avx2

View File

@ -64,8 +64,8 @@ dependencies {
api "org.projectlombok:lombok:1.18.24" api "org.projectlombok:lombok:1.18.24"
/*Logging*/ /*Logging*/
api 'org.slf4j:slf4j-api:1.7.30' api 'org.slf4j:slf4j-api:2.0.3'
api 'org.slf4j:slf4j-simple:1.7.25' api 'org.slf4j:slf4j-simple:2.0.3'
api "org.apache.logging.log4j:log4j-core:2.17.0" api "org.apache.logging.log4j:log4j-core:2.17.0"
api "ch.qos.logback:logback-classic:1.2.3" api "ch.qos.logback:logback-classic:1.2.3"

View File

@ -25,6 +25,9 @@ dependencies {
implementation 'org.slf4j:slf4j-api' implementation 'org.slf4j:slf4j-api'
implementation "com.google.guava:guava" implementation "com.google.guava:guava"
implementation "com.fasterxml.jackson.core:jackson-annotations"
implementation "com.fasterxml.jackson.core:jackson-core"
implementation projects.cavisNd4j.cavisNd4jParameterServer.cavisNd4jParameterServerCore implementation projects.cavisNd4j.cavisNd4jParameterServer.cavisNd4jParameterServerCore
implementation projects.cavisNd4j.cavisNd4jParameterServer.cavisNd4jParameterServerClient implementation projects.cavisNd4j.cavisNd4jParameterServer.cavisNd4jParameterServerClient
implementation projects.cavisDnn.cavisDnnCore implementation projects.cavisDnn.cavisDnnCore
@ -36,7 +39,6 @@ dependencies {
testImplementation projects.cavisUi.cavisUiStandalone testImplementation projects.cavisUi.cavisUiStandalone
testImplementation projects.cavisDnn.cavisDnnCommonTests testImplementation projects.cavisDnn.cavisDnnCommonTests
testImplementation projects.cavisUi.cavisUiModel testImplementation projects.cavisUi.cavisUiModel
testImplementation projects.cavisUi.cavisUiVertx testImplementation projects.cavisUi.cavisUiVertx

View File

@ -12,8 +12,10 @@ configurations.archives.artifacts.with { archives ->
dependencies { dependencies {
//Todo clean this //Todo clean this
api platform(project(":cavis-common-platform")) api platform(project(":cavis-common-platform"))
api "org.bytedeco:javacpp" api "org.bytedeco:javacpp:1.5.7" //for some reason we needed to apply version numbers here, they do not end up in POM otherwise
api "com.fasterxml.jackson.datatype:jackson-datatype-joda:2.10.5" api "com.fasterxml.jackson.datatype:jackson-datatype-joda:2.10.5"
api 'org.slf4j:slf4j-simple:2.0.3'
api 'org.slf4j:slf4j-api:2.0.3'
//api group: "org.bytedeco", name: "javacpp", classifier: "linux-x64_86" //api group: "org.bytedeco", name: "javacpp", classifier: "linux-x64_86"
rootProject.getAllprojects().each { Project sproj -> rootProject.getAllprojects().each { Project sproj ->
@ -85,3 +87,5 @@ publishing {
} }
} }
} }