update client and server dependencies, update to jhipster 6.3.0

ls1intum · Sep 16, 2019 · ff9f0ea · ff9f0ea
1 parent 852b3ed
commit ff9f0ea
Show file tree

Hide file tree

Showing 23 changed files with 731 additions and 356 deletions.
diff --git a/.yo-rc.json b/.yo-rc.json
@@ -4,7 +4,7 @@
       "packageName": "de.tum.in.www1.artemis",
       "nativeLanguage": "en"
     },
-    "jhipsterVersion": "6.2.0",
+    "jhipsterVersion": "6.3.0",
     "baseName": "Artemis",
     "packageName": "de.tum.in.www1.artemis",
     "packageFolder": "de/tum/in/www1/artemis",

diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 ![Travis Develop Status](https://img.shields.io/travis/com/ls1intum/Artemis/develop.svg?style=flat-square)
 ![Dependencies status](https://img.shields.io/david/dev/ls1intum/Artemis.svg?style=flat-square)
 
-This application was generated using JHipster 6.2.0, you can find documentation and help at [http://www.jhipster.tech/documentation-archive/v6.2.0](http://www.jhipster.tech/documentation-archive/v6.2.0).
+This application was generated using JHipster 6.3.0, you can find documentation and help at [http://www.jhipster.tech/documentation-archive/v6.3.0](http://www.jhipster.tech/documentation-archive/v6.3.0).
 
 **Current version:** 3.6.0
 

diff --git a/build.gradle b/build.gradle
@@ -14,7 +14,7 @@ buildscript {
         classpath "org.springframework.boot:spring-boot-gradle-plugin:${spring_boot_version}"
         classpath "io.spring.gradle:propdeps-plugin:0.0.10.RELEASE"
         // this allows us to find outdated dependencies via ./gradlew dependencyUpdates
-        classpath "com.github.ben-manes:gradle-versions-plugin:0.22.0"
+        classpath "com.github.ben-manes:gradle-versions-plugin:0.25.0"
         //jhipster-needle-gradle-buildscript-dependency - JHipster will add additional gradle build script plugins here
     }
 }
@@ -25,24 +25,21 @@ plugins {
     id "maven"
     id "idea"
     id "jacoco"
-    id "com.google.cloud.tools.jib" version "1.5.0"
-    id "com.gorylenko.gradle-git-properties" version "2.1.0"
-    id "com.github.node-gradle.node" version "2.0.0"
-    id "net.ltgt.apt-eclipse" version "0.21"
-    id "net.ltgt.apt-idea" version "0.21"
-    id "net.ltgt.apt" version "0.21"
-    id "com.moowork.node" version "1.3.1"
-//    id "org.liquibase.gradle" version "2.0.1"
-    id "com.github.ben-manes.versions" version "0.22.0"
+    id "org.springframework.boot"
+    id "com.google.cloud.tools.jib" version "1.6.1"
+    id "com.gorylenko.gradle-git-properties"
+    id "com.github.node-gradle.node"
+    id "net.ltgt.apt-eclipse"
+    id "net.ltgt.apt-idea"
+    id "net.ltgt.apt"
+//    id "org.liquibase.gradle"
     //jhipster-needle-gradle-plugins - JHipster will add additional gradle plugins here
-    id "com.diffplug.gradle.spotless" version "3.24.1"
+    id "com.diffplug.gradle.spotless" version "3.24.2"
 }
 
 sourceCompatibility=12
 targetCompatibility=12
 
-apply plugin: "org.springframework.boot"
-apply plugin: "propdeps"
 apply plugin: "com.github.ben-manes.versions"
 
 apply from: "gradle/docker.gradle"
@@ -168,25 +165,25 @@ dependencies {
 
     implementation fileTree(dir: "libs", include: "*.jar")
     // https://mvnrepository.com/artifact/org.eclipse.jgit/org.eclipse.jgit
-    implementation group: "org.eclipse.jgit", name: "org.eclipse.jgit", version: "5.4.0.201906121030-r"
+    implementation "org.eclipse.jgit:org.eclipse.jgit:5.5.0.201909110433-r"
     // https://mvnrepository.com/artifact/net.sourceforge.plantuml/plantuml
-    implementation group: "net.sourceforge.plantuml", name: "plantuml", version: "8059"
+    implementation "net.sourceforge.plantuml:plantuml:8059"
     implementation "org.imsglobal:basiclti-util:1.2.0"
     implementation "org.jasypt:jasypt:1.9.3"
     implementation "me.xdrop:fuzzywuzzy:1.2.0"
-    implementation group: "com.atlassian.bamboo", name: "bamboo-specs", version: "6.8.1"
-    implementation group: "com.thoughtworks.qdox", name: "qdox", version: "2.0-M10"
-    implementation "io.sentry:sentry-spring:1.7.26"
+    implementation "com.atlassian.bamboo:bamboo-specs:6.8.1"
+    implementation "com.thoughtworks.qdox:qdox:2.0-M10"
+    implementation "io.sentry:sentry-spring:1.7.27"
 
     // import JHipster dependencies BOM
     implementation platform("io.github.jhipster:jhipster-dependencies:${jhipster_dependencies_version}" )
 
     // Use ", version: jhipster_dependencies_version, changing: true" if you want
     // to use a SNAPSHOT release instead of a stable release
-    implementation group: "io.github.jhipster", name: "jhipster-framework"
+    implementation "io.github.jhipster:jhipster-framework"
     implementation "org.springframework.boot:spring-boot-starter-cache"
-    implementation "io.micrometer:micrometer-registry-prometheus:1.2.0"
-    implementation "net.logstash.logback:logstash-logback-encoder:5.3"
+    implementation "io.micrometer:micrometer-registry-prometheus:1.2.1"
+    implementation "net.logstash.logback:logstash-logback-encoder:6.2"
     implementation "com.fasterxml.jackson.datatype:jackson-datatype-hppc:2.9.9"
     implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.9"
     implementation "com.fasterxml.jackson.datatype:jackson-datatype-hibernate5:2.9.9"
@@ -197,7 +194,7 @@ dependencies {
     implementation "org.hibernate:hibernate-core"
     implementation "com.zaxxer:HikariCP"
     implementation "org.apache.commons:commons-lang3:3.9"
-    implementation group: "org.apache.commons", name: "commons-text", version: "1.7"
+    implementation "org.apache.commons:commons-text:1.8"
     implementation "commons-io:commons-io"
     implementation "javax.transaction:javax.transaction-api:1.3"
     implementation "org.ehcache:ehcache"
@@ -241,7 +238,7 @@ dependencies {
 //    liquibaseRuntime "mysql:mysql-connector-java"
     implementation "org.mapstruct:mapstruct:${mapstruct_version}"
 
-    implementation "org.zalando:problem-spring-web:0.24.0-RC.0"
+    implementation "org.zalando:problem-spring-web:0.25.0"
 
     annotationProcessor "org.mapstruct:mapstruct-processor:${mapstruct_version}"
     annotationProcessor "org.hibernate:hibernate-jpamodelgen:${hibernate_version}"
@@ -256,13 +253,15 @@ dependencies {
     testImplementation "org.springframework.security:spring-security-test"
     testImplementation "org.springframework.boot:spring-boot-test"
     testImplementation "org.assertj:assertj-core:3.13.2"
-    testImplementation "org.junit.jupiter:junit-jupiter-api:5.5.1"
-    testImplementation "org.junit.jupiter:junit-jupiter-params:5.5.1"
-    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.5.1"
+    testImplementation "org.junit.jupiter:junit-jupiter-api:5.5.2"
+    testImplementation "org.junit.jupiter:junit-jupiter-params:5.5.2"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.5.2"
+    testImplementation 'com.tngtech.archunit:archunit-junit5-api:0.11.0'
+    testRuntime 'com.tngtech.archunit:archunit-junit5-engine:0.11.0'
     testImplementation "org.mockito:mockito-core:3.0.0"
     testImplementation "org.hamcrest:hamcrest-library"
     testImplementation "com.h2database:h2"
-    testImplementation "org.awaitility:awaitility:3.1.6"
+    testImplementation "org.awaitility:awaitility:4.0.1"
     //jhipster-needle-gradle-dependency - JHipster will add additional dependencies here
 }
 
@@ -311,7 +310,7 @@ tasks.withType(Test) {
 }
 
 wrapper {
-    gradleVersion = "5.6"
+    gradleVersion = "5.6.2"
 }
 
 task stage(dependsOn: "bootWar") {

diff --git a/gradle.properties b/gradle.properties
@@ -7,20 +7,28 @@ npm_version=6.10.3
 yarn_version=1.17.3
 
 # Dependency versions
-jhipster_dependencies_version=3.0.4
+jhipster_dependencies_version=3.0.5
 # The spring-boot version should match the one managed by
 # https://mvnrepository.com/artifact/io.github.jhipster/jhipster-dependencies/${jhipster_dependencies_version}
-spring_boot_version=2.1.6.RELEASE
+spring_boot_version=2.1.8.RELEASE
 # The hibernate version should match the one managed by
 # https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-dependencies/${spring-boot.version} -->
-hibernate_version=5.3.10.Final
+hibernate_version=5.3.11.Final
 mapstruct_version=1.3.0.Final
 
-liquibase_hibernate5_version=3.6
+liquibase_hibernate5_version=3.7
 liquibaseTaskPrefix=liquibase
 
 jaxb_runtime_version=2.3.2
 
+# gradle plugin version
+jib_plugin_version=1.5.1
+git_properties_plugin_version=2.1.0
+gradle_node_plugin_version=2.0.0
+apt_plugin_version=0.21
+liquibase_plugin_version=2.0.1
+sonarqube_plugin_version=2.7.1
+
 ## below are some of the gradle performance improvement settings that can be used as required, these are not enabled by default
 
 ## The Gradle daemon aims to improve the startup and execution time of Gradle.

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Sun Feb 24 14:04:22 CET 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/package.json b/package.json
@@ -13,14 +13,14 @@
         }
     },
     "dependencies": {
-        "@angular/animations": "8.2.5",
-        "@angular/common": "8.2.5",
-        "@angular/compiler": "8.2.5",
-        "@angular/core": "8.2.5",
-        "@angular/forms": "8.2.5",
-        "@angular/platform-browser": "8.2.5",
-        "@angular/platform-browser-dynamic": "8.2.5",
-        "@angular/router": "8.2.5",
+        "@angular/animations": "8.2.6",
+        "@angular/common": "8.2.6",
+        "@angular/compiler": "8.2.6",
+        "@angular/core": "8.2.6",
+        "@angular/forms": "8.2.6",
+        "@angular/platform-browser": "8.2.6",
+        "@angular/platform-browser-dynamic": "8.2.6",
+        "@angular/router": "8.2.6",
         "@fortawesome/angular-fontawesome": "0.5.0",
         "@fortawesome/fontawesome-svg-core": "1.2.22",
         "@fortawesome/free-regular-svg-icons": "5.10.2",
@@ -34,14 +34,14 @@
         "@swimlane/ngx-datatable": "16.0.2",
         "ace-builds": "1.4.6",
         "angular-fittext": "2.1.1",
-        "angulartics2": "8.0.0",
+        "angulartics2": "8.1.0",
         "blob-util": "2.0.2",
         "bootstrap": "4.3.1",
         "chart.js": "2.8.0",
         "core-js": "3.2.1",
-        "dompurify": "1.0.11",
+        "dompurify": "2.0.0",
         "franc-min": "4.1.0",
-        "interactjs": "1.6.1",
+        "interactjs": "1.6.2",
         "jest": "24.9.0",
         "jest-preset-angular": "7.1.1",
         "jquery": "3.4.1",
@@ -74,19 +74,19 @@
         "smoothscroll-polyfill": "0.4.4",
         "sockjs-client": "1.4.0",
         "sugar": "2.0.6",
-        "ts-jest": "24.0.2",
+        "ts-jest": "24.1.0",
         "tslib": "1.10.0",
         "webstomp-client": "1.2.6",
         "yarn": "1.17.3",
         "zone.js": "0.10.2"
     },
     "devDependencies": {
-        "@angular-devkit/build-angular": "0.803.3",
+        "@angular-devkit/build-angular": "0.803.4",
         "@angular/cdk": "8.2.0",
-        "@angular/cli": "8.3.3",
-        "@angular/compiler-cli": "8.2.5",
-        "@angular/language-service": "8.2.5",
-        "@ngtools/webpack": "8.3.3",
+        "@angular/cli": "8.3.4",
+        "@angular/compiler-cli": "8.2.6",
+        "@angular/language-service": "8.2.6",
+        "@ngtools/webpack": "8.3.4",
         "@types/ace": "0.0.42",
         "@types/angular": "1.6.56",
         "@types/chai": "4.2.2",
@@ -99,14 +99,12 @@
         "@types/jquery": "3.3.31",
         "@types/lodash": "4.14.138",
         "@types/mocha": "5.2.7",
-        "@types/node": "12.7.4",
+        "@types/node": "12.7.5",
         "@types/showdown": "1.9.3",
         "@types/sinon": "7.0.13",
         "@types/sinon-chai": "3.2.3",
         "@types/smoothscroll-polyfill": "0.3.1",
         "@types/sockjs-client": "1.1.1",
-        "acorn": "7.0.0",
-        "angular-router-loader": "0.8.5",
         "angular2-template-loader": "0.6.2",
         "autoprefixer": "9.6.1",
         "awesome-typescript-loader": "5.2.1",
@@ -124,7 +122,7 @@
         "file-loader": "4.2.0",
         "fork-ts-checker-webpack-plugin": "1.5.0",
         "friendly-errors-webpack-plugin": "1.7.0",
-        "generator-jhipster": "6.2.0",
+        "generator-jhipster": "6.3.0",
         "html-loader": "0.5.5",
         "html-webpack-plugin": "3.2.0",
         "husky": "3.0.5",
@@ -138,32 +136,32 @@
         "moment-locales-webpack-plugin": "1.1.0",
         "node-sass": "4.12.0",
         "optimize-css-assets-webpack-plugin": "5.0.3",
-        "patch-package": "6.1.4",
+        "patch-package": "6.2.0",
         "phantomjs-prebuilt": "2.1.16",
         "postcss-loader": "3.0.0",
         "postinstall-prepare": "1.0.1",
         "prettier": "1.18.2",
         "protractor": "6.0.0",
         "reflect-metadata": "0.1.13",
         "rimraf": "3.0.0",
-        "sass": "1.22.10",
+        "sass": "1.22.12",
         "sass-loader": "8.0.0",
         "simple-progress-webpack-plugin": "1.1.2",
         "sourcemap-istanbul-instrumenter-loader": "0.2.0",
         "style-loader": "1.0.0",
-        "terser-webpack-plugin": "2.0.1",
+        "terser-webpack-plugin": "2.1.0",
         "thread-loader": "2.1.3",
         "to-string-loader": "1.1.5",
-        "ts-loader": "6.0.4",
-        "ts-node": "8.3.0",
+        "ts-loader": "6.1.0",
+        "ts-node": "8.4.1",
         "tslint": "5.20.0",
         "tslint-config-prettier": "1.18.0",
         "tslint-loader": "3.6.0",
-        "typescript": "3.5.3",
-        "webpack": "4.39.3",
+        "webpack": "4.40.2",
         "webpack-cli": "3.3.8",
-        "webpack-dev-server": "3.8.0",
+        "webpack-dev-server": "3.8.1",
         "webpack-merge": "4.2.2",
+        "typescript": "3.5.3",
         "webpack-notifier": "1.8.0",
         "workbox-webpack-plugin": "4.3.1",
         "write-file-webpack-plugin": "4.5.1"

diff --git a/settings.gradle b/settings.gradle
@@ -1 +1,15 @@
+pluginManagement {
+    plugins {
+        id 'org.springframework.boot' version "${spring_boot_version}"
+        id 'com.google.cloud.tools.jib' version "${jib_plugin_version}"
+        id 'com.gorylenko.gradle-git-properties' version "${git_properties_plugin_version}"
+        id 'com.github.node-gradle.node' version "${gradle_node_plugin_version}"
+        id 'org.liquibase.gradle' version "${liquibase_plugin_version}"
+        id 'org.sonarqube' version "${sonarqube_plugin_version}"
+        id 'net.ltgt.apt-eclipse' version "${apt_plugin_version}"
+        id 'net.ltgt.apt-idea' version "${apt_plugin_version}"
+        id 'net.ltgt.apt' version "${apt_plugin_version}"
+    }
+}
+
 rootProject.name = 'Artemis'
diff --git a/src/main/docker/mysql.yml b/src/main/docker/mysql.yml
@@ -1,7 +1,7 @@
 version: '2'
 services:
     artemis-mysql:
-        image: mysql:8.0.16
+        image: mysql:8.0.17
         # volumes:
         #     - ~/volumes/jhipster/Artemis/mysql/:/var/lib/mysql/
         environment:

diff --git a/src/main/java/de/tum/in/www1/artemis/config/LiquibaseConfiguration.java b/src/main/java/de/tum/in/www1/artemis/config/LiquibaseConfiguration.java
@@ -6,13 +6,17 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.ObjectProvider;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties;
+import org.springframework.boot.autoconfigure.liquibase.LiquibaseDataSource;
 import org.springframework.boot.autoconfigure.liquibase.LiquibaseProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.env.Environment;
 import org.springframework.core.env.Profiles;
 
 import io.github.jhipster.config.JHipsterConstants;
+import io.github.jhipster.config.liquibase.SpringLiquibaseUtil;
 
 @Configuration
 public class LiquibaseConfiguration {
@@ -26,14 +30,22 @@ public LiquibaseConfiguration(Environment env) {
     }
 
     @Bean
-    public SpringLiquibase liquibase(DataSource dataSource, LiquibaseProperties liquibaseProperties) {
-        SpringLiquibase liquibase = new SpringLiquibase();
-        liquibase.setDataSource(dataSource);
+    public SpringLiquibase liquibase(@LiquibaseDataSource ObjectProvider<DataSource> liquibaseDataSource, LiquibaseProperties liquibaseProperties,
+            ObjectProvider<DataSource> dataSource, DataSourceProperties dataSourceProperties) {
+        SpringLiquibase liquibase = SpringLiquibaseUtil.createSpringLiquibase(liquibaseDataSource.getIfAvailable(), liquibaseProperties, dataSource.getIfUnique(),
+                dataSourceProperties);
         liquibase.setChangeLog("classpath:config/liquibase/master.xml");
         liquibase.setContexts(liquibaseProperties.getContexts());
         liquibase.setDefaultSchema(liquibaseProperties.getDefaultSchema());
+        liquibase.setLiquibaseSchema(liquibaseProperties.getLiquibaseSchema());
+        liquibase.setLiquibaseTablespace(liquibaseProperties.getLiquibaseTablespace());
+        liquibase.setDatabaseChangeLogLockTable(liquibaseProperties.getDatabaseChangeLogLockTable());
+        liquibase.setDatabaseChangeLogTable(liquibaseProperties.getDatabaseChangeLogTable());
         liquibase.setDropFirst(liquibaseProperties.isDropFirst());
+        liquibase.setLabels(liquibaseProperties.getLabels());
         liquibase.setChangeLogParameters(liquibaseProperties.getParameters());
+        liquibase.setRollbackFile(liquibaseProperties.getRollbackFile());
+        liquibase.setTestRollbackOnUpdate(liquibaseProperties.isTestRollbackOnUpdate());
         if (env.acceptsProfiles(Profiles.of(JHipsterConstants.SPRING_PROFILE_NO_LIQUIBASE))) {
             liquibase.setShouldRun(false);
         }

diff --git a/src/main/java/de/tum/in/www1/artemis/exception/EmailAlreadyUsedException.java b/src/main/java/de/tum/in/www1/artemis/exception/EmailAlreadyUsedException.java
@@ -0,0 +1,9 @@
+package de.tum.in.www1.artemis.exception;
+
+public class EmailAlreadyUsedException extends RuntimeException {
+
+    public EmailAlreadyUsedException() {
+        super("Email is already in use!");
+    }
+
+}