diff --git a/build.gradle b/build.gradle index 04e3b0b..420b1e4 100644 --- a/build.gradle +++ b/build.gradle @@ -10,11 +10,6 @@ buildscript { classpath("org.openjfx:javafx-plugin:0.0.7") } } -//plugins { -// id "org.openjfx.javafxplugin" version "0.0.7" -//} - - apply plugin: 'java' apply plugin: 'eclipse' @@ -26,12 +21,9 @@ apply plugin: 'checkstyle' apply plugin: 'application' application { - mainClassName = 'gogreen.client.Application' + mainClassName = 'greenify.client.Application' } - - - //apply plugin: 'org.openjfx.javafxplugin' tasks.withType(Checkstyle) { @@ -43,6 +35,7 @@ tasks.withType(Checkstyle) { repositories { mavenCentral() } + //client bootjar bootJar { baseName = 'gs-consuming-rest' @@ -69,7 +62,6 @@ dependencies { compile("org.springframework.boot:spring-boot-starter-web") testCompile('org.springframework.boot:spring-boot-starter-test') testCompile("junit:junit") -// compile project('src:Common') compileOnly 'org.projectlombok:lombok:1.18.6' compile("org.springframework.boot:spring-boot-starter-data-jpa") compile("com.h2database:h2") @@ -97,12 +89,6 @@ jacocoTestReport { } } -//bootJar { -// mainClassName = 'Client.Application' -//} - - - task application(type: JavaExec, dependsOn: classes) { main = 'Cient.Application' } diff --git a/doc/reports/sprint-reviews/20190225_sprint_review.md b/doc/reports/sprint-reviews/20190225_sprint_review.md new file mode 100644 index 0000000..6adcb33 --- /dev/null +++ b/doc/reports/sprint-reviews/20190225_sprint_review.md @@ -0,0 +1,12 @@ + +# Sprint Review + +## Main problems Encountered + +We have no problems so far. Everyone arrives on time and does the tasks assigned to them. + +## Adjustments from previous sprints +Since this is the first review, there are no previous sprints yet + +## Adjustments for next sprint + - Keep up the good work! diff --git a/doc/reports/sprint-reviews/20190311_sprint_review.md b/doc/reports/sprint-reviews/20190311_sprint_review.md new file mode 100644 index 0000000..d4d255b --- /dev/null +++ b/doc/reports/sprint-reviews/20190311_sprint_review.md @@ -0,0 +1,14 @@ + +# Sprint Review + +## Main problems Encountered + +### Problem 1: Kristin left the group +Kristin does not continue CSE and left our group. We'll work with five people from now on. + +## Adjustments from previous sprints +We created the backlog before the sprint, which helps making clear what we're working on. + +## Adjustments for next sprint + - Group made out of five + - Backlogs ready on time diff --git a/doc/sprints/sprint1/20190403_scrumboard.png b/doc/sprints/sprint1/20190225_scrumboard.png similarity index 100% rename from doc/sprints/sprint1/20190403_scrumboard.png rename to doc/sprints/sprint1/20190225_scrumboard.png diff --git a/doc/sprints/sprint2/20191003_scrumboard.png b/doc/sprints/sprint2/20190311_scrumboard.png similarity index 100% rename from doc/sprints/sprint2/20191003_scrumboard.png rename to doc/sprints/sprint2/20190311_scrumboard.png diff --git a/src/Common/build.gradle b/src/Common/build.gradle index f603c91..9f4c6c0 100644 --- a/src/Common/build.gradle +++ b/src/Common/build.gradle @@ -2,34 +2,15 @@ buildscript { repositories { mavenCentral() } + dependencies { + classpath("org.springframework.boot:spring-boot-gradle-plugin:2.0.5.RELEASE") + } } apply plugin: 'java' apply plugin: 'eclipse' apply plugin: 'idea' apply plugin: 'jacoco' -//apply plugin: 'checkstyle' -// -//checkstyle { -// version = '7.8.1' -// config = 'checkstyle/checkstyle.xml' as File -//} -// -//checkstyleMain { -// source ='src/main/java' -//} -// -//checkstyleTest { -// source ='src/test/java' -//} -// -//tasks.withType(Checkstyle) { -// reports { -// xml.enabled false -// html.enabled true -// html.stylesheet resources.text.fromFile('config/xsl/checkstyle-custom.xsl') -// } -//} sourceCompatibility = 1.8 targetCompatibility = 1.8 @@ -39,6 +20,15 @@ repositories { } dependencies { + testCompile("junit:junit") + testCompile( + 'junit:junit:4.12', + 'org.junit.jupiter:junit-jupiter-api:5.4.0' + ) + testRuntime( + 'org.junit.jupiter:junit-jupiter-engine:5.4.0', + 'org.junit.vintage:junit-vintage-engine:5.4.0' + ) } jacoco {