Merge branch 'master' into fb_email-encryption

.gitignore

@@ -31,6 +31,8 @@ out/
 !src/main/resources/example-properties.properties
 !gradle-wrapper.properties
 
+application.yml
+
 .gradle/
 config/
 !src/main/java/ch/wisv/config/

.travis.yml

@@ -1,9 +1,8 @@
-sudo: required
-services:
-- docker
 language: java
+services:
+  - docker
 jdk:
-- oraclejdk8
+- openjdk11
 before_cache:
 - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
 - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
@@ -12,14 +11,17 @@ cache:
   - "$HOME/.gradle/caches/"
   - "$HOME/.gradle/wrapper/"
 script:
-- "./gradlew build"
-- if [ "${TRAVIS_PULL_REQUEST_BRANCH:-$TRAVIS_BRANCH}" == "master" ]; then docker
-  build --no-cache --pull -t quay.io/wisvch/feedback-tool:$TRAVIS_BUILD_NUMBER .;
-  fi
-after_success:
-- if [ "${TRAVIS_PULL_REQUEST_BRANCH:-$TRAVIS_BRANCH}" == "master" ]; then docker
-  login -u="$QUAY_USERNAME" -p="$QUAY_PASSWORD" quay.io; docker push quay.io/wisvch/feedback-tool:$TRAVIS_BUILD_NUMBER;
-  fi
+- "./gradlew check"
+deploy:
+  provider: script
+  script: >-
+    sh -c '
+    docker build --no-cache --pull -t quay.io/wisvch/feedback-tool:$TRAVIS_BUILD_NUMBER .;
+    docker login -u "$QUAY_USERNAME" -p "$QUAY_PASSWORD" quay.io;
+    docker push quay.io/wisvch/feedback-tool:$TRAVIS_BUILD_NUMBER;
+    '
+  on:
+    branch: master
 notifications:
   email: false
   slack:

Dockerfile

@@ -1,8 +1,8 @@
-FROM wisvch/openjdk:8-jdk AS builder
+FROM wisvch/openjdk:11-jdk AS builder
 COPY . /src
 WORKDIR /src
 RUN ./gradlew build
 
-FROM wisvch/spring-boot-base:1
+FROM wisvch/spring-boot-base:2.1
 COPY --from=builder /src/build/libs/feedback-tool.jar /srv/feedback-tool.jar
 CMD ["/srv/feedback-tool.jar"]

build.gradle

@@ -1,6 +1,6 @@
 buildscript {
     ext {
-        springBootVersion = '1.5.17.RELEASE'
+        springBootVersion = '2.1.3.RELEASE'
     }
     repositories {
         mavenCentral()
@@ -14,6 +14,7 @@ apply plugin: 'java'
 apply plugin: 'eclipse'
 apply plugin: 'idea'
 apply plugin: 'org.springframework.boot'
+apply plugin: 'io.spring.dependency-management'
 apply plugin: 'jacoco'
 
 jar {
@@ -22,8 +23,8 @@ jar {
     archiveName = "${baseName}.${extension}"
 }
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+sourceCompatibility = 11
+targetCompatibility = 11
 
 repositories {
     mavenCentral()
@@ -34,25 +35,22 @@ dependencies {
     compile 'org.springframework.boot:spring-boot-starter-data-jpa'
     compile 'org.springframework.boot:spring-boot-starter-security'
     compile 'org.springframework.boot:spring-boot-starter-web'
-    compile 'org.springframework.boot:spring-boot-starter-integration'
     compile 'org.springframework.boot:spring-boot-starter-mail'
+    compile 'org.springframework.boot:spring-boot-starter-json'
+    compile 'org.springframework.boot:spring-boot-starter-oauth2-client'
+    compile 'org.springframework.boot:spring-boot-starter-actuator'
     compile 'org.springframework.boot:spring-boot-configuration-processor'
 
-    compile 'org.flywaydb:flyway-core:5.2.1'
+    compile 'org.flywaydb:flyway-core'
 
-    compile 'org.thymeleaf:thymeleaf-spring4'
     compile 'org.thymeleaf:thymeleaf'
-    compile 'nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect:1.2'
-    compile 'org.thymeleaf.extras:thymeleaf-extras-springsecurity4'
-
-    compile 'ch.wisv:wisvch-connect-client:1.3.2.2'
-
-    compileOnly 'org.springframework.boot:spring-boot-configuration-processor'
+    compile 'org.thymeleaf:thymeleaf-spring5'
+    compile 'org.thymeleaf.extras:thymeleaf-extras-springsecurity5'
+    compile 'nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect:2.3.0'
 
     compile 'com.zaxxer:HikariCP'
-    compile 'org.projectlombok:lombok:1.16.10'
-    compile 'com.fasterxml.jackson.core:jackson-databind'
-    compile 'org.json:json'
+    compile 'org.projectlombok:lombok'
+    compile 'org.json:json:20180813'
 
     compile 'org.apache.commons:commons-lang3:3.7'
     runtime 'org.postgresql:postgresql'
@@ -64,8 +62,10 @@ dependencies {
     compile 'org.webjars.bower:wisvch-bootstrap-theme:4.0.0'
     compile 'org.webjars:font-awesome:5.4.1'
     compile 'org.webjars:jquery:3.3.1-1'
-    compile 'org.webjars:awesomplete:6328816'
+    compile 'org.webjars:awesomplete:1.1.4'
     compile 'org.webjars:datatables:1.10.19'
+
+    compile 'com.google.guava:guava:27.1-jre'
 }
 
 eclipse {

gradle/wrapper/gradle-wrapper.properties

@@ -2,5 +2,5 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
-distributionSha256Sum=b7aedd369a26b177147bcb715f8b1fc4fe32b0a6ade0d7fd8ee5ed0c6f731f2c
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-all.zip
+distributionSha256Sum=336b6898b491f6334502d8074a6b8c2d73ed83b92123106bd4bf837f04111043

src/main/java/ch/wisv/TestDataRunner.java

@@ -10,12 +10,13 @@
 import ch.wisv.repository.CourseRepository;
 import ch.wisv.repository.EducationFeedbackRepository;
 import ch.wisv.repository.InstructorRepository;
-import com.google.common.collect.ImmutableList;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Component;
 
+import java.util.Collections;
+
 @Component
 @Profile("dev")
 public class TestDataRunner implements CommandLineRunner {
@@ -46,15 +47,14 @@ public TestDataRunner(
      * Callback used to run the bean.
      *
      * @param args incoming main method arguments
-     *
      * @throws Exception on error
      */
     @Override
     public void run(String... args) throws Exception {
         Instructor instructor = new Instructor("Prof. T Esting", "[email protected]");
         instructorRepository.save(instructor);
 
-        Course course = new Course("TI1206", "Test course", ImmutableList.of(instructor), ProgramEnum.BScTI);
+        Course course = new Course("TI1206", "Test course", Collections.singletonList(instructor), ProgramEnum.BScTI);
         courseRepository.save(course);
 
         EducationFeedback educationFeedback = new EducationFeedback(