Generated with JHipster 4.14.0

wenzelt · Feb 1, 2018 · c31fcf5 · c31fcf5
1 parent 722a7f0
commit c31fcf5
Show file tree

Hide file tree

Showing 18 changed files with 31 additions and 29 deletions.
diff --git a/.yo-rc.json b/.yo-rc.json
@@ -1,6 +1,6 @@
 {
   "generator-jhipster": {
-    "jhipsterVersion": "4.13.3",
+    "jhipsterVersion": "4.14.0",
     "baseName": "ExerciseApplication",
     "packageName": "de.tum.in.www1.exerciseapp",
     "packageFolder": "de/tum/in/www1/exerciseapp",

diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 # ExerciseApplication
-This application was generated using JHipster 4.13.3, you can find documentation and help at [http://www.jhipster.tech/documentation-archive/v4.13.3](http://www.jhipster.tech/documentation-archive/v4.13.3).
+This application was generated using JHipster 4.14.0, you can find documentation and help at [http://www.jhipster.tech/documentation-archive/v4.14.0](http://www.jhipster.tech/documentation-archive/v4.14.0).
 
 ## Development
 
@@ -98,13 +98,13 @@ For more information refer to [Using Docker and Docker-Compose][], this page als
 To configure CI for your project, run the ci-cd sub-generator (`jhipster ci-cd`), this will let you generate configuration files for a number of Continuous Integration systems. Consult the [Setting up Continuous Integration][] page for more information.
 
 [JHipster Homepage and latest documentation]: http://www.jhipster.tech
-[JHipster 4.13.3 archive]: http://www.jhipster.tech/documentation-archive/v4.13.3
+[JHipster 4.14.0 archive]: http://www.jhipster.tech/documentation-archive/v4.14.0
 
-[Using JHipster in development]: http://www.jhipster.tech/documentation-archive/v4.13.3/development/
-[Using Docker and Docker-Compose]: http://www.jhipster.tech/documentation-archive/v4.13.3/docker-compose
-[Using JHipster in production]: http://www.jhipster.tech/documentation-archive/v4.13.3/production/
-[Running tests page]: http://www.jhipster.tech/documentation-archive/v4.13.3/running-tests/
-[Setting up Continuous Integration]: http://www.jhipster.tech/documentation-archive/v4.13.3/setting-up-ci/
+[Using JHipster in development]: http://www.jhipster.tech/documentation-archive/v4.14.0/development/
+[Using Docker and Docker-Compose]: http://www.jhipster.tech/documentation-archive/v4.14.0/docker-compose
+[Using JHipster in production]: http://www.jhipster.tech/documentation-archive/v4.14.0/production/
+[Running tests page]: http://www.jhipster.tech/documentation-archive/v4.14.0/running-tests/
+[Setting up Continuous Integration]: http://www.jhipster.tech/documentation-archive/v4.14.0/setting-up-ci/
 
 [Gatling]: http://gatling.io/
 [Node.js]: https://nodejs.org/

diff --git a/build.gradle b/build.gradle
@@ -17,6 +17,8 @@ buildscript {
 
 plugins {
     id "org.sonarqube" version "2.5"
+    id "net.ltgt.apt-eclipse" version "0.13"
+    id "net.ltgt.apt-idea" version "0.13"
     id "net.ltgt.apt" version "0.13"
     id "io.spring.dependency-management" version "1.0.3.RELEASE"
     id "com.github.lkishalmi.gatling" version "0.7.1"
@@ -240,7 +242,7 @@ task cleanResources(type: Delete) {
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '4.2.1'
+    gradleVersion = '4.4'
 }
 
 task stage(dependsOn: 'bootRepackage') {

diff --git a/gradle.properties b/gradle.properties
@@ -2,12 +2,12 @@ rootProject.name=exercise-application
 profile=dev
 
 # Build properties
-node_version=8.9.3
+node_version=8.9.4
 npm_version=5.6.0
 yarn_version=1.3.2
 
 # Dependency versions
-jhipster_dependencies_version=0.1.6
+jhipster_dependencies_version=0.1.7
 # 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

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-bin.zip
diff --git a/gulpfile.js b/gulpfile.js
@@ -1,4 +1,4 @@
-// Generated on 2018-02-01 using generator-jhipster 4.13.3
+// Generated on 2018-02-01 using generator-jhipster 4.14.0
 '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.13.3",
+    "generator-jhipster": "4.14.0",
     "gulp": "3.9.1",
     "gulp-angular-filesort": "1.1.1",
     "gulp-angular-templatecache": "2.0.0",

diff --git a/src/main/webapp/app/components/util/data-util.service.js b/src/main/webapp/app/components/util/data-util.service.js
@@ -59,7 +59,13 @@
         }
 
         function openFile (type, data) {
-            $window.open('data:' + type + ';base64,' + data, '_blank', 'height=300,width=400');
+            var fileURL = 'data:' + type +';base64,' + data;
+            var win = $window.open('', '_blank');
+            win.document.write(
+                '<iframe src="' +
+                fileURL +
+                '" frameborder="0" style="border:0; top:0px; left:0px; bottom:0px; right:0px; width:100%; height:100%;" allowfullscreen></iframe>'
+            );
         }
 
         function toBase64 (file, cb) {

diff --git a/src/main/webapp/i18n/de/course.json b/src/main/webapp/i18n/de/course.json
@@ -1,3 +1,4 @@
+
 {
     "exerciseApplicationApp": {
         "course" : {

diff --git a/src/main/webapp/i18n/de/exercise.json b/src/main/webapp/i18n/de/exercise.json
@@ -1,3 +1,4 @@
+
 {
     "exerciseApplicationApp": {
         "exercise" : {

diff --git a/src/main/webapp/i18n/de/participation.json b/src/main/webapp/i18n/de/participation.json
@@ -1,3 +1,4 @@
+
 {
     "exerciseApplicationApp": {
         "participation" : {

diff --git a/src/main/webapp/i18n/de/result.json b/src/main/webapp/i18n/de/result.json
@@ -1,3 +1,4 @@
+
 {
     "exerciseApplicationApp": {
         "result" : {

diff --git a/src/main/webapp/i18n/en/course.json b/src/main/webapp/i18n/en/course.json
@@ -1,3 +1,4 @@
+
 {
     "exerciseApplicationApp": {
         "course" : {

diff --git a/src/main/webapp/i18n/en/exercise.json b/src/main/webapp/i18n/en/exercise.json
@@ -1,3 +1,4 @@
+
 {
     "exerciseApplicationApp": {
         "exercise" : {

diff --git a/src/main/webapp/i18n/en/participation.json b/src/main/webapp/i18n/en/participation.json
@@ -1,3 +1,4 @@
+
 {
     "exerciseApplicationApp": {
         "participation" : {

diff --git a/src/main/webapp/i18n/en/result.json b/src/main/webapp/i18n/en/result.json
@@ -1,3 +1,4 @@
+
 {
     "exerciseApplicationApp": {
         "result" : {

diff --git a/src/test/javascript/protractor.conf.js b/src/test/javascript/protractor.conf.js
@@ -1,21 +1,7 @@
-const os = require('os');
-
 const HtmlScreenshotReporter = require("protractor-jasmine2-screenshot-reporter");
 const JasmineReporters = require('jasmine-reporters');
 
-const prefix = 'src/test/javascript/'.replace(/[^/]+/g,'..');
-const seleniumFolder = 'node_modules/webdriver-manager/selenium/';
-
-var webbrowserDriver= '';
-if (os.platform() === 'win32') {
-    webbrowserDriver = prefix + seleniumFolder + 'chromedriver_2.34.exe';
-} else {
-    webbrowserDriver = prefix + seleniumFolder + 'chromedriver_2.34';
-}
-
 exports.config = {
-    seleniumServerJar: prefix + seleniumFolder + 'selenium-server-standalone-3.8.1.jar',
-    chromeDriver: webbrowserDriver,
     allScriptsTimeout: 20000,
 
     suites: {