diff --git a/build.gradle b/build.gradle index 420b1e4..b4623d9 100644 --- a/build.gradle +++ b/build.gradle @@ -20,11 +20,9 @@ apply plugin: 'jacoco' apply plugin: 'checkstyle' apply plugin: 'application' -application { - mainClassName = 'greenify.client.Application' -} - -//apply plugin: 'org.openjfx.javafxplugin' +//application { +// mainClassName = 'greenify.server.Application' +//} tasks.withType(Checkstyle) { reports { @@ -36,16 +34,32 @@ repositories { mavenCentral() } -//client bootjar -bootJar { - baseName = 'gs-consuming-rest' - version = '0.1.0' +allprojects { + task hello { + doLast { task -> + println "I'm $task.project.name" + } + } } -//server bootjar +////client bootjar +//bootJar { +// baseName = 'gs-consuming-rest' +// version = '0.1.0' +//} +// +////server bootjar +//bootJar { +// baseName = 'gs-rest-service' +// version = '0.1.0' +//} + bootJar { - baseName = 'gs-rest-service' - version = '0.1.0' + enabled = false +} + +jar { + enabled = true } sourceCompatibility = 1.8 diff --git a/src/Common/build.gradle b/src/Common/build.gradle index 9f4c6c0..a903381 100644 --- a/src/Common/build.gradle +++ b/src/Common/build.gradle @@ -42,4 +42,4 @@ jacocoTestReport { csv.enabled false html.destination file("${buildDir}/jacocoHtml") } -} \ No newline at end of file +} diff --git a/src/Server/build.gradle b/src/Server/build.gradle index 50aeedd..42771dc 100644 --- a/src/Server/build.gradle +++ b/src/Server/build.gradle @@ -13,14 +13,6 @@ apply plugin: 'idea' apply plugin: 'org.springframework.boot' apply plugin: 'io.spring.dependency-management' apply plugin: 'jacoco' -apply plugin: 'checkstyle' - - -tasks.withType(Checkstyle) { - reports { - html.destination rootProject.file("build/reports/checkstyle.html") - } -} bootJar { baseName = 'gs-rest-service' @@ -47,6 +39,7 @@ dependencies { annotationProcessor 'org.projectlombok:lombok:1.18.6' compile("org.springframework.boot:spring-boot-starter-data-jpa") compile("com.h2database:h2") + compile("org.springframework.boot:spring-boot-starter-actuator") testCompile( 'junit:junit:4.12', 'org.junit.jupiter:junit-jupiter-api:5.4.0' @@ -55,6 +48,7 @@ dependencies { 'org.junit.jupiter:junit-jupiter-engine:5.4.0', 'org.junit.vintage:junit-vintage-engine:5.4.0' ) + compile 'javax.xml.bind:jaxb-api:2.3.0' } jacoco { @@ -70,8 +64,3 @@ jacocoTestReport { } } -checkstyle { - toolVersion = "7.6.1" -} - -