diff --git a/Jenkinsfile b/Jenkinsfile index 13136ca..6d2ec8f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -40,7 +40,7 @@ pipeline { stage('Package') { steps { - sh "./gradlew -Pversion='${REVISION}' bootJar -x test" + sh "./gradlew -Pversion='${REVISION}' jar -x test" } } } diff --git a/build.gradle b/build.gradle index fc39fec..f65fcce 100644 --- a/build.gradle +++ b/build.gradle @@ -11,6 +11,7 @@ repositories { } subprojects { + apply plugin: 'java' compileJava {options.encoding = "UTF-8"} compileTestJava {options.encoding = "UTF-8"} @@ -20,19 +21,19 @@ subprojects { jcenter() } - test { - useJUnitPlatform() - } - dependencies { compileOnly 'org.projectlombok:lombok:1.18.16' annotationProcessor 'org.projectlombok:lombok:1.18.16' - testCompileOnly 'org.projectlombok:lombok:1.18.16' - testAnnotationProcessor 'org.projectlombok:lombok:1.18.16' - testImplementation('org.junit.jupiter:junit-jupiter:5.7.0') testImplementation('org.mockito:mockito-core:3.7.0') testImplementation('org.hamcrest:hamcrest-core:2.2') + + testCompileOnly 'org.projectlombok:lombok:1.18.16' + testAnnotationProcessor 'org.projectlombok:lombok:1.18.16' + } + + test { + useJUnitPlatform() } } diff --git a/fh.fd.ci.client/build.gradle b/fh.fd.ci.client/build.gradle index e2d7f57..2e0dd87 100644 --- a/fh.fd.ci.client/build.gradle +++ b/fh.fd.ci.client/build.gradle @@ -1,6 +1,6 @@ plugins { id 'application' - id 'org.openjfx.javafxplugin' version '0.0.9' + id 'org.openjfx.javafxplugin' version '0.0.8' } mainClassName = 'de.fd.fh.ClientApp'