Merge pull request #2510 from dzhw/release

Release v1.0.98

.travis.yml

@@ -21,8 +21,6 @@ stages:
   if: NOT branch =~ /^(development|master|test)$/
 - name: build and deploy
   if: branch =~ /^(development|master|test)$/
-- name: e2e smoketests
-  if: type = cron
 - name: nightly e2e tests publicuser
   if: type = cron
 - name: nightly e2e tests dataprovider
@@ -45,8 +43,7 @@ jobs:
     - pip install git+https://github.com/dzhw/javasphinx.git --user
     - rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd
       ~/.nvm && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh
-      && nvm install 12.11.0
-    - npm install -g bower
+      && nvm install 13.9.0
     - npm install -g grunt-cli
     script:
     - "./deploy/build.sh unused $TRAVIS_BRANCH"
@@ -66,8 +63,7 @@ jobs:
     - pip install git+https://github.com/dzhw/javasphinx.git --user
     - rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd
       ~/.nvm && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh
-      && nvm install 12.11.0
-    - npm install -g bower
+      && nvm install 13.9.0
     - npm install -g grunt-cli
     - wget -q -O - https://packages.cloudfoundry.org/debian/cli.cloudfoundry.org.key
       | sudo apt-key add -
@@ -80,170 +76,99 @@ jobs:
       $TRAVIS_BRANCH $TRAVIS_EVENT_TYPE"
     after_success:
     - bash <(curl -s https://codecov.io/bash)
-  - stage: e2e smoketests
-    name: Chrome Smoketest
-    install:
-    - "./src/test/robotframework/setup.sh"
-    script:
-    - export PYTHONWARNINGS="ignore"
-    - robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs -v
-      USE_SAUCELABS:TRUE -v BROWSER:chrome --include smoketest --exclude firefoxonly
-      ./src/test/robotframework
-  - name: Firefox Smoketest
-    install:
-    - "./src/test/robotframework/setup.sh"
-    script:
-    - export PYTHONWARNINGS="ignore"
-    - robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs -v
-      USE_SAUCELABS:TRUE -v BROWSER:firefox --include smoketest --exclude chromeonly
-      ./src/test/robotframework
-  - name: Edge Smoketest
-    install:
-    - "./src/test/robotframework/setup.sh"
-    script:
-    - export PYTHONWARNINGS="ignore"
-    - robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs -v
-      USE_SAUCELABS:TRUE -v BROWSER:edge --include smoketest --exclude firefoxonly
-      --exclude chromeonly --exclude noslowpoke ./src/test/robotframework
-  - name: IE11 Smoketest
-    install:
-    - "./src/test/robotframework/setup.sh"
-    script:
-    - export PYTHONWARNINGS="ignore"
-    - robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs -v
-      USE_SAUCELABS:TRUE -v BROWSER:ie --include smoketest --exclude firefoxonly --exclude
-      chromeonly --exclude noslowpoke ./src/test/robotframework
-  - name: Safari Smoketest
-    install:
-    - "./src/test/robotframework/setup.sh"
-    script:
-    - export PYTHONWARNINGS="ignore"
-    - robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs -v
-      USE_SAUCELABS:TRUE -v BROWSER:safari --include smoketest --exclude firefoxonly
-      --exclude chromeonly ./src/test/robotframework
   - stage: nightly e2e tests publicuser
     name: Nightly Chrome Tests (Public User)
     install:
     - "./src/test/robotframework/setup.sh"
     script:
     - export PYTHONWARNINGS="ignore"
-    - travis_wait 50 robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/chrome
-      -v USE_SAUCELABS:TRUE -v BROWSER:chrome --include publicuserNOTsmoketestNOTfirefoxonlyNOTlocalonly
-      ./src/test/robotframework
+    - travis_wait 50 robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/chrome -v USE_SAUCELABS:TRUE -v BROWSER:chrome --include publicuserNOTfirefoxonlyNOTlocalonly ./src/test/robotframework
   - name: Nightly Firefox Tests (Public User)
     install:
     - "./src/test/robotframework/setup.sh"
     script:
     - export PYTHONWARNINGS="ignore"
-    - travis_wait 50 robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/firefox
-      -v USE_SAUCELABS:TRUE -v BROWSER:firefox --include publicuserNOTsmoketestNOTchromeonlyNOTlocalonly
-      ./src/test/robotframework
+    - travis_wait 50 robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/firefox -v USE_SAUCELABS:TRUE -v BROWSER:firefox --include publicuserNOTchromeonlyNOTlocalonly ./src/test/robotframework
   - name: Nightly IE11 Tests (Public User)
     install:
     - "./src/test/robotframework/setup.sh"
     script:
     - export PYTHONWARNINGS="ignore"
-    - travis_wait 50 robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/ie11
-      -v USE_SAUCELABS:TRUE -v BROWSER:ie --include publicuserNOTsmoketestNOTfirefoxonlyNOTchromeonlyNOTnoslowpokeNOTlocalonly
-      ./src/test/robotframework
+    - travis_wait 50 robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/ie11 -v USE_SAUCELABS:TRUE -v BROWSER:ie --include publicuserNOTfirefoxonlyNOTchromeonlyNOTnoslowpokeNOTlocalonly ./src/test/robotframework
   - name: Nightly Edge Tests (Public User)
     install:
     - "./src/test/robotframework/setup.sh"
     script:
     - export PYTHONWARNINGS="ignore"
-    - travis_wait 50 robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/edge
-      -v USE_SAUCELABS:TRUE -v BROWSER:edge --include publicuserNOTsmoketestNOTfirefoxonlyNOTchromeonlyNOTnoslowpokeNOTlocalonly
-      ./src/test/robotframework
+    - travis_wait 50 robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/edge -v USE_SAUCELABS:TRUE -v BROWSER:edge --include publicuserNOTfirefoxonlyNOTchromeonlyNOTnoslowpokeNOTlocalonly ./src/test/robotframework
   - name: Nightly Safari Tests (Public User)
     install:
     - "./src/test/robotframework/setup.sh"
     script:
     - export PYTHONWARNINGS="ignore"
-    - travis_wait 50 robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/safari
-      -v USE_SAUCELABS:TRUE -v BROWSER:safari --include publicuserNOTsmoketestNOTfirefoxonlyNOTchromeonlyNOTnoslowpokeNOTlocalonly
-      ./src/test/robotframework
+    - travis_wait 50 robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/safari -v USE_SAUCELABS:TRUE -v BROWSER:safari --include publicuserNOTfirefoxonlyNOTchromeonlyNOTnoslowpokeNOTlocalonly ./src/test/robotframework
   - stage: nightly e2e tests dataprovider
     name: Nightly Chrome Tests (Dataprovider)
     install:
     - "./src/test/robotframework/setup.sh"
     script:
     - export PYTHONWARNINGS="ignore"
-    - travis_wait 50 robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/chrome
-      -v USE_SAUCELABS:TRUE -v BROWSER:chrome --include dataproviderNOTsmoketestNOTfirefoxonlyNOTlocalonly
-      ./src/test/robotframework
+    - travis_wait 50 robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/chrome -v USE_SAUCELABS:TRUE -v BROWSER:chrome --include dataproviderNOTfirefoxonlyNOTlocalonly ./src/test/robotframework
   - name: Nightly Firefox Tests (Dataprovider)
     install:
     - "./src/test/robotframework/setup.sh"
     script:
     - export PYTHONWARNINGS="ignore"
-    - travis_wait 50 robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/firefox
-      -v USE_SAUCELABS:TRUE -v BROWSER:firefox --include dataproviderNOTsmoketestNOTchromeonlyNOTlocalonly
-      ./src/test/robotframework
+    - travis_wait 50 robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/firefox -v USE_SAUCELABS:TRUE -v BROWSER:firefox --include dataproviderNOTchromeonlyNOTlocalonly ./src/test/robotframework
   - name: Nightly IE11 Tests (Dataprovider)
     install:
     - "./src/test/robotframework/setup.sh"
     script:
     - export PYTHONWARNINGS="ignore"
-    - travis_wait 50 robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/ie11
-      -v USE_SAUCELABS:TRUE -v BROWSER:ie --include dataproviderNOTsmoketestNOTfirefoxonlyNOTchromeonlyNOTnoslowpokeNOTlocalonly
-      ./src/test/robotframework
+    - travis_wait 50 robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/ie11 -v USE_SAUCELABS:TRUE -v BROWSER:ie --include dataproviderNOTfirefoxonlyNOTchromeonlyNOTnoslowpokeNOTlocalonly ./src/test/robotframework
   - name: Nightly Edge Tests (Dataprovider)
     install:
     - "./src/test/robotframework/setup.sh"
     script:
     - export PYTHONWARNINGS="ignore"
-    - travis_wait 50 robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/edge
-      -v USE_SAUCELABS:TRUE -v BROWSER:edge --include dataproviderNOTsmoketestNOTfirefoxonlyNOTchromeonlyNOTnoslowpokeNOTlocalonly
-      ./src/test/robotframework
+    - travis_wait 50 robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/edge -v USE_SAUCELABS:TRUE -v BROWSER:edge --include dataproviderNOTfirefoxonlyNOTchromeonlyNOTnoslowpokeNOTlocalonly ./src/test/robotframework
   - name: Nightly Safari Tests (Dataprovider)
     install:
     - "./src/test/robotframework/setup.sh"
     script:
     - export PYTHONWARNINGS="ignore"
-    - travis_wait 50 robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/safari
-      -v USE_SAUCELABS:TRUE -v BROWSER:safari --include dataproviderNOTsmoketestNOTfirefoxonlyNOTchromeonlyNOTlocalonly
-      ./src/test/robotframework
+    - travis_wait 50 robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/safari -v USE_SAUCELABS:TRUE -v BROWSER:safari --include dataproviderNOTfirefoxonlyNOTchromeonlyNOTlocalonly ./src/test/robotframework
   - stage: nightly e2e tests publisher
     name: Nightly Chrome Tests (Publisher)
     install:
     - "./src/test/robotframework/setup.sh"
     script:
     - export PYTHONWARNINGS="ignore"
-    - travis_wait 50 robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/chrome
-      -v USE_SAUCELABS:TRUE -v BROWSER:chrome --include publisherNOTsmoketestNOTfirefoxonlyNOTlocalonly
-      ./src/test/robotframework
+    - travis_wait 50 robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/chrome -v USE_SAUCELABS:TRUE -v BROWSER:chrome --include publisherNOTfirefoxonlyNOTlocalonly ./src/test/robotframework
   - name: Nightly Firefox Tests (Publisher)
     install:
     - "./src/test/robotframework/setup.sh"
     script:
     - export PYTHONWARNINGS="ignore"
-    - travis_wait 50 robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/firefox
-      -v USE_SAUCELABS:TRUE -v BROWSER:firefox --include publisherNOTsmoketestNOTchromeonlyNOTlocalonly
-      ./src/test/robotframework
+    - travis_wait 50 robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/firefox -v USE_SAUCELABS:TRUE -v BROWSER:firefox --include publisherNOTchromeonlyNOTlocalonly ./src/test/robotframework
   - name: Nightly IE11 Tests (Publisher)
     install:
     - "./src/test/robotframework/setup.sh"
     script:
     - export PYTHONWARNINGS="ignore"
-    - travis_wait 50 robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/ie11
-      -v USE_SAUCELABS:TRUE -v BROWSER:ie --include publisherNOTsmoketestNOTfirefoxonlyNOTchromeonlyNOTnoslowpokeNOTlocalonly
-      ./src/test/robotframework
+    - travis_wait 50 robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/ie11 -v USE_SAUCELABS:TRUE -v BROWSER:ie --include publisherNOTfirefoxonlyNOTchromeonlyNOTnoslowpokeNOTlocalonly ./src/test/robotframework
   - name: Nightly Edge Tests (Publisher)
     install:
     - "./src/test/robotframework/setup.sh"
     script:
     - export PYTHONWARNINGS="ignore"
-    - travis_wait 50 robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/edge
-      -v USE_SAUCELABS:TRUE -v BROWSER:edge --include publisherNOTsmoketestNOTfirefoxonlyNOTchromeonlyNOTnoslowpokeNOTlocalonly
-      ./src/test/robotframework
+    - travis_wait 50 robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/edge -v USE_SAUCELABS:TRUE -v BROWSER:edge --include publisherNOTfirefoxonlyNOTchromeonlyNOTnoslowpokeNOTlocalonly ./src/test/robotframework
   - name: Nightly Safari Tests (Publisher)
     install:
     - "./src/test/robotframework/setup.sh"
     script:
     - export PYTHONWARNINGS="ignore"
-    - travis_wait 50 robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/safari
-      -v USE_SAUCELABS:TRUE -v BROWSER:safari --include publisherNOTsmoketestNOTfirefoxonlyNOTchromeonlyNOTlocalonly
-      ./src/test/robotframework
+    - travis_wait 50 robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/safari -v USE_SAUCELABS:TRUE -v BROWSER:safari --include publisherNOTfirefoxonlyNOTchromeonlyNOTlocalonly ./src/test/robotframework
 notifications:
   slack:
     secure: ZKX6G3hY9XvrgDpgpZ5DuKaJ77EvS6bzyd0yROE1rliezY9u66CpAkPO0B3eN+bcXEVMILv2Ye581JjysSUntBFKn0hZnxXedioeAeIRADlhuPpbVI2hP6Lwi6ZsdZ2wbsXpP3Fc0deQVRSuLxlInC+Zwf+ui3uEnSfAWbvwHZWpx72+a8P2xC22Z9S40vyvm0XcyBPGqwYVoqwnRMBtUvxdTJzKuU9t5Sx+PFuRIt/xvoe8CQyn/50Pn9IgFkqdD/sDgpwK9QYy3xVJpIPZGM2YPh2NaRWu2YnJhOfLt8ZFvEnzwBmGJfTS7udZgXLMZdvW91Mh0RYPZTctYXLz0tpEe6xFYy7fpSMQ80NWL5hoib3ElCqc/+qMibTD1P+A4ZXGlt0DcENc2MNPDaBlQSorNuelsXGj2DhMBDJiiBYZJs9vi9k5+AJbcxEufTgngLV+YU5N/8btG2d0dHLROCa+e7atS0lErnM+Eb9yujuXBW/KbJzeorEZWOIISkbRY8YIpMgwB+GlSFjPSprruUAaHO+aTtIMSYMA7zAivCW+/xZiT2gjw+YCJfYPrgYZ36/CINZnX40Oe4g29+IOnUaCJt+3Bm4OTGCgYv8SpAAxoWpP260UyAI61BFS3gFQNP6trIkkuap9HWGdbfxsz0NgODT28M81KW0ixP9Gtl4=

Gruntfile.js

@@ -781,8 +781,7 @@ module.exports = function(grunt) {
       }
     });
 
-  grunt.registerTask('serve', ['createJavaSourceCodeFromTranslations',
-    'clean:server', 'ngconstant:local',
+  grunt.registerTask('serve', ['clean:server', 'ngconstant:local',
     'sass:server', 'copy:localfonts', 'browserSync', 'watch'
   ]);
 
@@ -797,7 +796,7 @@ module.exports = function(grunt) {
     'jshint', 'jscs'
   ]);
 
-  grunt.registerTask('builddev', ['createJavaSourceCodeFromTranslations',
+  grunt.registerTask('builddev', [
     'test', /*'htmlangular:default',
     'htmlangular:index',*/ 'clean:dist',
     'ngconstant:dev',
@@ -806,7 +805,7 @@ module.exports = function(grunt) {
     'autoprefixer', 'uglify', 'rev', 'usemin', 'htmlmin'
   ]);
 
-  grunt.registerTask('buildtest', ['createJavaSourceCodeFromTranslations',
+  grunt.registerTask('buildtest', [
     'test', /*'htmlangular:default',
     'htmlangular:index',*/ 'clean:dist',
     'ngconstant:test',
@@ -815,7 +814,7 @@ module.exports = function(grunt) {
     'autoprefixer', 'uglify', 'rev', 'usemin', 'htmlmin'
   ]);
 
-  grunt.registerTask('buildprod', ['createJavaSourceCodeFromTranslations',
+  grunt.registerTask('buildprod', [
     'test', /*'htmlangular:default',
     'htmlangular:index',*/ 'clean:dist',
     'ngconstant:prod',
@@ -825,7 +824,6 @@ module.exports = function(grunt) {
   ]);
 
   grunt.registerTask('buildlocalminified', [
-    'createJavaSourceCodeFromTranslations',
     'test', /*'htmlangular:default',
     'htmlangular:index',*/ 'clean:dist',
     'test', 'clean:dist',
@@ -835,7 +833,7 @@ module.exports = function(grunt) {
     'autoprefixer', 'uglify', 'rev', 'usemin', 'htmlmin'
   ]);
 
-  grunt.registerTask('buildlocal', ['createJavaSourceCodeFromTranslations',
+  grunt.registerTask('buildlocal', [
     'test', 'clean:dist', 'copy:localfonts',
     'ngconstant:local', 'ngAnnotate'
   ]);

README.md

@@ -1,12 +1,14 @@
 [![Build Status](https://travis-ci.org/dzhw/metadatamanagement.svg?branch=master)](https://travis-ci.org/dzhw/metadatamanagement) [![Documentation Status](https://readthedocs.org/projects/metadatamanagement/badge/?version=latest)](https://metadatamanagement.readthedocs.io/de/latest/?badge=latest)
+[![Sauce Test Status](https://saucelabs.com/buildstatus/rreitmann)](https://saucelabs.com/u/rreitmann)
 [![Known Backend Vulnerabilities](https://snyk.io/test/github/dzhw/metadatamanagement/badge.svg?targetFile=pom.xml)](https://snyk.io/test/github/dzhw/metadatamanagement?targetFile=pom.xml
 )[![Known Frontend Vulnerabilities](https://snyk.io/test/github/dzhw/metadatamanagement/badge.svg?targetFile=package.json)](https://snyk.io/test/github/dzhw/metadatamanagement?targetFile=package.json
 )[![codecov](https://codecov.io/gh/dzhw/metadatamanagement/branch/development/graph/badge.svg)](https://codecov.io/gh/dzhw/metadatamanagement)[![Mergify Status](https://gh.mergify.io/badges/dzhw/metadatamanagement.png?style=cut)](https://mergify.io)
 [![DOI](https://zenodo.org/badge/39431147.svg)](https://zenodo.org/badge/latestdoi/39431147)
 
+[![Sauce Build Matrix](https://saucelabs.com/browser-matrix/rreitmann.svg)](https://saucelabs.com/u/rreitmann)
 # Metadatamanagement (MDM)
 
-The MDM holds the metadata of the studies which are available as data products in our Research Data Center [FDZ](https://fdz.dzhw.eu). It enables researchers to browse our data products before signing a contract for using the data.
+The MDM holds the metadata of the data packages which are available in our Research Data Center [FDZ](https://fdz.dzhw.eu). It enables researchers to browse our data packages before signing a contract for using the data.
 
 # Developing the MDM system
 
@@ -25,10 +27,6 @@ We use [Grunt][] as our client build system. Install the grunt command-line tool
 
     npm install -g grunt-cli
 
-You need to install [Bower][] globally as well:
-
-    npm install -g bower
-
 On Windows, `patch.exe` has to exist in the PATH. It is distributed as part of git bash, or can be downloaded manually from [GnuWin32][].
 
 ## Running on your local machine
@@ -47,7 +45,7 @@ Make sure that you have read-write-access on the ***data*** directory (in your p
 
 to start all services the metadatamanagement depends on. Mongodb and Elasticsearch will be listening on its default ports.
 
-In order to have all java dependencies for the server and  all bower dependencies for the client and in order to build everything, simply run (and lean back for a while):
+In order to have all java dependencies for the server and  all nodejs dependencies for the client and in order to build everything, simply run (and lean back for a while):
 
     mvn clean install
 
@@ -104,7 +102,6 @@ Continuous Integration Platform provided by [Travis CI][TravisCI]
 [saucelabs]: https://saucelabs.com
 [JHipster]: https://jhipster.github.io/
 [Node.js]: https://nodejs.org/
-[Bower]: http://bower.io/
 [Grunt]: http://gruntjs.com/
 [BrowserSync]: http://www.browsersync.io/
 [Karma]: http://karma-runner.github.io/