Merge branch 'jhipster_upgrade' into develop

# Conflicts: # .yo-rc.json # README.md
wenzelt · Apr 28, 2018 · a8bb8c7 · a8bb8c7
2 parents 378ab3c + bdf4bdd
commit a8bb8c7
Show file tree

Hide file tree

Showing 9 changed files with 162 additions and 160 deletions.
diff --git a/.idea/modules/ArTEMiS_gatling.iml b/.idea/modules/ArTEMiS_gatling.iml
diff --git a/.idea/modules/ArTEMiS_main.iml b/.idea/modules/ArTEMiS_main.iml
diff --git a/.idea/modules/ArTEMiS_test.iml b/.idea/modules/ArTEMiS_test.iml
diff --git a/.yo-rc.json b/.yo-rc.json
@@ -4,7 +4,7 @@
       "packageName": "de.tum.in.www1.artemis",
       "nativeLanguage": "en"
     },
-    "jhipsterVersion": "4.14.0",
+    "jhipsterVersion": "4.14.3",
     "baseName": "ArTEMiS",
     "packageName": "de.tum.in.www1.artemis",
     "packageFolder": "de/tum/in/www1/artemis",

diff --git a/README.md b/README.md
@@ -1,4 +1,5 @@
 # ArTEMiS: AuTomated assEssment Management System 
+This application was generated using JHipster 4.14.3, you can find documentation and help at [http://www.jhipster.tech/documentation-archive/v4.14.3](http://www.jhipster.tech/documentation-archive/v4.14.3).
 
 **Curent version:** 1.4.6
 

diff --git a/gradle.properties b/gradle.properties
@@ -7,10 +7,10 @@ npm_version=5.6.0
 yarn_version=1.3.2
 
 # Dependency versions
-jhipster_dependencies_version=0.1.7
+jhipster_dependencies_version=0.1.11
 # 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=1.5.9.RELEASE
+spring_boot_version=1.5.12.RELEASE
 # The hibernate version should match the one managed by
 # https://mvnrepository.com/artifact/io.github.jhipster/jhipster-dependencies/${jhipster_dependencies_version}
 hibernate_version=5.2.12.Final

diff --git a/gulpfile.js b/gulpfile.js
@@ -1,4 +1,4 @@
-// Generated on 2018-02-01 using generator-jhipster 4.14.0
+// Generated on 2018-04-28 using generator-jhipster 4.14.3
 'use strict';
 
 var gulp = require('gulp'),

diff --git a/package.json b/package.json
@@ -15,7 +15,7 @@
     "eslint-config-angular": "0.5.0",
     "eslint-plugin-angular": "2.2.1",
     "event-stream": "3.3.4",
-    "generator-jhipster": "4.14.0",
+    "generator-jhipster": "4.14.3",
     "gulp": "3.9.1",
     "gulp-angular-filesort": "1.1.1",
     "gulp-angular-templatecache": "2.0.0",

diff --git a/yarn.lock b/yarn.lock
@@ -563,9 +563,9 @@ boom@5.x.x:
   dependencies:
     hoek "4.x.x"
 
-bower@1.7.9:
-  version "1.7.9"
-  resolved "https://registry.yarnpkg.com/bower/-/bower-1.7.9.tgz#b7296c2393e0d75edaa6ca39648132dd255812b0"
+bower@1.8.4:
+  version "1.8.4"
+  resolved "https://registry.yarnpkg.com/bower/-/bower-1.8.4.tgz#e7876a076deb8137f7d06525dc5e8c66db82f28a"
 
 brace-expansion@^1.0.0, brace-expansion@^1.1.7:
   version "1.1.8"
@@ -2556,9 +2556,9 @@ generate-object-property@^1.1.0:
   dependencies:
     is-property "^1.0.0"
 
-generator-jhipster@4.14.0:
-  version "4.14.0"
-  resolved "https://registry.yarnpkg.com/generator-jhipster/-/generator-jhipster-4.14.0.tgz#c38a99e1a3668274859fec2f551b011a2cae90f8"
+generator-jhipster@4.14.3:
+  version "4.14.3"
+  resolved "https://registry.yarnpkg.com/generator-jhipster/-/generator-jhipster-4.14.3.tgz#f99f8b1cd590b1fdc2908a43d66249daff8baac0"
   dependencies:
     chalk "2.3.0"
     cheerio "0.22.0"