Merge pull request #1978 from dzhw/release

Release v1.0.77
dzhw · Jan 21, 2019 · dd29bcc · dd29bcc
2 parents 2b8363e + 13a8051
commit dd29bcc
Show file tree

Hide file tree

Showing 226 changed files with 10,191 additions and 5,327 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -17,31 +17,94 @@ addons:
       - ubuntu-toolchain-r-test
     packages:
       - g++-4.9
-      - parallel
-before_install:
-  - export CXX=g++-4.9
-  - export NODE_OPTIONS=--max-old-space-size=4096
-  - export MAVEN_OPTS=-Dorg.slf4j.simpleLogger.log.pl.project13.maven.git=WARN
-  - sudo rm -vf /etc/apt/sources.list.d/*riak*
-  - wget -q -O - https://packages.cloudfoundry.org/debian/cli.cloudfoundry.org.key | sudo apt-key add -
-  - echo "deb http://packages.cloudfoundry.org/debian stable main" | sudo tee /etc/apt/sources.list.d/cloudfoundry-cli.list
-  - sudo apt-get update -qq
-  - sudo apt-get install cf-cli -y --allow-unauthenticated
-  - sudo apt-get -y install python-pip python-dev --allow-unauthenticated
-  - pip install urllib3[secure] --user -I
-  - pip install robotframework --user
-  - pip install robotframework-extendedselenium2library --user
-  - pip install pyyaml --user
-  - pip install six --user
-  - pip install git+https://github.com/dzhw/javasphinx.git --user
-# turn off travis default mvn install call and install a recent node version instead
-install:
-  - 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 10.12.0
-  - npm install -g bower
-  - npm install -g grunt-cli
-# do not install into local maven repo to avoid polluting the cache
-script:
-  - ./deploy/build-and-deploy.sh unused $CI_DEPLOY_USERNAME $CI_DEPLOY_PASSWORD $TRAVIS_BRANCH $COVERALLS_TOKEN $TRAVIS_EVENT_TYPE
+stages:
+    - name: build
+      if: NOT (branch =~ /^saikotitis.*$/ || branch =~ /^(development|master)$/)
+    - name: build and deploy
+      if: branch =~ /^(development|master)$/
+    - name: e2e smoketests
+      if: branch = development || branch =~ /^saikotitis.*$/
+    - name: nightly e2e tests
+      if: type = cron || branch =~ /^saikotitis.*$/
+jobs:
+  include:
+    - stage: build
+      name: "Client & Server Build"
+      install:
+        - export CXX=g++-4.9
+        - export NODE_OPTIONS=--max-old-space-size=4096
+        - export MAVEN_OPTS=-Dorg.slf4j.simpleLogger.log.pl.project13.maven.git=WARN
+        - sudo apt-get -y install python-pip python-dev --allow-unauthenticated
+        - 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 11.6.0
+        - npm install -g bower
+        - npm install -g grunt-cli
+      script:
+        - ./deploy/build.sh unused $TRAVIS_BRANCH $COVERALLS_TOKEN
+    - stage: build and deploy
+      name: "Build and Deploy to PWS"
+      install:
+        - export CXX=g++-4.9
+        - export NODE_OPTIONS=--max-old-space-size=4096
+        - export MAVEN_OPTS=-Dorg.slf4j.simpleLogger.log.pl.project13.maven.git=WARN
+        - sudo apt-get -y install python-pip python-dev --allow-unauthenticated
+        - 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 11.6.0
+        - npm install -g bower
+        - npm install -g grunt-cli
+        - wget -q -O - https://packages.cloudfoundry.org/debian/cli.cloudfoundry.org.key | sudo apt-key add -
+        - echo "deb http://packages.cloudfoundry.org/debian stable main" | sudo tee /etc/apt/sources.list.d/cloudfoundry-cli.list
+        - sudo apt-get update -qq
+        - sudo apt-get install cf-cli -y --allow-unauthenticated
+        - sudo netstat -pelnut
+      script:
+        - ./deploy/build-and-deploy.sh unused $CI_DEPLOY_USERNAME $CI_DEPLOY_PASSWORD $TRAVIS_BRANCH $COVERALLS_TOKEN $TRAVIS_EVENT_TYPE
+    - stage: e2e smoketests
+      name: "Chrome Smoketest"
+      install:
+        - ./src/test/robotframework/setup.sh
+      script:
+        - 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:
+        - 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:
+        - 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:
+        - 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
+    - stage: nightly e2e tests
+      name: "Nightly Chrome Tests"
+      install:
+        - ./src/test/robotframework/setup.sh
+      script:
+        - export PYTHONWARNINGS="ignore"
+        - robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/chrome -v USE_SAUCELABS:TRUE -v BROWSER:chrome --exclude smoketest --exclude firefoxonly ./src/test/robotframework
+    - name: "Nightly Firefox Tests"
+      install:
+        - ./src/test/robotframework/setup.sh
+      script:
+        - export PYTHONWARNINGS="ignore"
+        - robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/firefox -v USE_SAUCELABS:TRUE -v BROWSER:firefox --exclude smoketest --exclude chromeonly ./src/test/robotframework
+    - name: "Nightly IE11 Tests"
+      install:
+        - ./src/test/robotframework/setup.sh
+      script:
+        - export PYTHONWARNINGS="ignore"
+        - robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/ie11 -v USE_SAUCELABS:TRUE -v BROWSER:ie --exclude smoketest --exclude firefoxonly --exclude chromeonly ./src/test/robotframework
+    - name: "Nightly Edge Tests"
+      install:
+        - ./src/test/robotframework/setup.sh
+      script:
+        - export PYTHONWARNINGS="ignore"
+        - robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/edge -v USE_SAUCELABS:TRUE -v BROWSER:edge --exclude smoketest --exclude firefoxonly --exclude chromeonly --exclude noslowpoke ./src/test/robotframework
 notifications:
   email:
     recipients:

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
-[![Build Status](https://travis-ci.org/dzhw/metadatamanagement.svg?branch=development)](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)
+[![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 Vulnerabilities](https://snyk.io/test/github/dzhw/metadatamanagement/badge.svg?targetFile=pom.xml)](https://snyk.io/test/github/dzhw/metadatamanagement?targetFile=pom.xml
-)[![Coverage Status](https://coveralls.io/repos/dzhw/metadatamanagement/badge.svg?branch=development&service=github)](https://coveralls.io/github/dzhw/metadatamanagement?branch=development) 
+)[![Coverage Status](https://coveralls.io/repos/dzhw/metadatamanagement/badge.svg?branch=master&service=github)](https://coveralls.io/github/dzhw/metadatamanagement?branch=master) 
 [![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)
@@ -81,7 +81,7 @@ To make the build runnable with an enabled dev profile, you'll need to install t
 Once Python is installed, run:
 
     pip install git+https://github.com/dzhw/javasphinx.git --user
-    
+
 Note that the `--user` flag installs the dependency somewhere in your user directory (e.g. /home/{user}/local/bin on Linux). Make sure that the installed binaries/scripts are on your path.
 
 Before deploying the `{dev|test|prod}` system you need to [install the cloudfoundry cli](https://docs.cloudfoundry.org/cf-cli/install-go-cli.html#-linux-installation).

diff --git a/bower.json b/bower.json
@@ -5,31 +5,31 @@
   "testPath": "src/test/javascript/spec",
   "dependencies": {
     "jquery": "^3.3.1",
-    "angular": "1.7.5",
-    "angular-aria": "1.7.5",
+    "angular": "1.7.6",
+    "angular-aria": "1.7.6",
     "angular-bootstrap": "2.5.0",
-    "angular-cookies": "1.7.5",
+    "angular-cookies": "1.7.6",
     "angular-dynamic-locale": "0.1.37",
-    "angular-i18n": "1.7.5",
+    "angular-i18n": "1.7.6",
     "angular-local-storage": "0.7.1",
-    "angular-resource": "1.7.5",
-    "angular-sanitize": "1.7.5",
+    "angular-resource": "1.7.6",
+    "angular-sanitize": "1.7.6",
     "angular-translate": "2.18.1",
     "angular-translate-interpolation-messageformat": "^2.18.1",
     "angular-translate-storage-cookie": "2.18.1",
     "angular-ui-router": "1.0.20",
     "bootstrap-sass": "3.4.0",
     "json3": "3.3.2",
     "ng-file-upload": "12.2.13",
-    "elasticsearch": "15.2.0",
+    "elasticsearch": "15.3.0",
     "jszip": "3.1.5",
     "file-saver.js": "~1.20150507.2",
     "jszip-utils": "~0.0.2",
     "angular-translate-handler-log": "2.18.1",
     "angular-nvd3": "^1.0.9",
     "js-xlsx": "^0.14.0",
     "cheet.js": "^0.3.3",
-    "angular-material": "^1.1.10",
+    "angular-material": "1.1.10",
     "angular-block-ui": "^0.2.2",
     "lodash": "^4.17.11",
     "plotly.js": "1.42.5",
@@ -38,8 +38,8 @@
     "js-beautify": "^1.8.9",
     "ngclipboard": "^2.0.0",
     "angular-katex": "^0.10.0",
-    "angular-animate": "^1.7.5",
-    "angular-messages": "1.7.5",
+    "angular-animate": "^1.7.6",
+    "angular-messages": "1.7.6",
     "bowser": "^1.9.4",
     "angular-file-saver": "^1.1.3",
     "clientjs": "0.1.5",
@@ -92,7 +92,7 @@
     }
   },
   "devDependencies": {
-    "angular-mocks": "1.7.5",
-    "angular-scenario": "1.7.5"
+    "angular-mocks": "1.7.6",
+    "angular-scenario": "1.7.6"
   }
 }
diff --git a/deploy/build-and-deploy.sh b/deploy/build-and-deploy.sh
@@ -10,23 +10,6 @@ USERNAME="$2"
 PASSWORD="$3"
 TRAVIS_BRANCH="$4"
 COVERALLS_TOKEN="$5"
-TRAVIS_EVENT_TYPE="$6"
-if [ "${TRAVIS_EVENT_TYPE}" = "cron" ]; then
-  echo "Skipping build and deploy steps..."
-  export PYTHONWARNINGS="ignore"
-  echo "Testing E2E in parallel on all browsers:"
-  ROBOT_CHROME="robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/chrome -v USE_SAUCELABS:TRUE -v BROWSER:chrome --exclude smoketest --exclude firefoxonly ./src/test/robotframework"
-  ROBOT_FIREFOX="robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/firefox -v USE_SAUCELABS:TRUE -v BROWSER:firefox --exclude smoketest --exclude chromeonly ./src/test/robotframework"
-  ROBOT_IE11="robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/ie11 -v USE_SAUCELABS:TRUE -v BROWSER:ie --exclude smoketest --exclude firefoxonly --exclude chromeonly ./src/test/robotframework"
-  ROBOT_EDGE="robot -P ./src/test/robotframework/libs -d target/test/robotframework/logs/edge -v USE_SAUCELABS:TRUE -v BROWSER:edge --exclude smoketest --exclude firefoxonly --exclude chromeonly --exclude noslowpoke ./src/test/robotframework"
-  parallel --progress ::: "${ROBOT_CHROME}" "${ROBOT_FIREFOX}" "${ROBOT_IE11}" "${ROBOT_EDGE}"
-  if [ $? -ne 0 ]; then
-      echo "At least one E2E test failed!"
-      exit -1
-  fi
-  echo "All E2E Tests passed."
-  exit 0
-fi
 if [ -n "${TRAVIS_BRANCH}" ]; then
   PROFILE="dev"
 fi
@@ -61,30 +44,3 @@ if [ $? -ne 0 ]; then
     echo "cf push failed!"
     exit -1
 fi
-if [ "${PROFILE}" = "dev" ]; then
-  export PYTHONWARNINGS="ignore"
-  echo "Smoke Testing E2E with Chrome:"
-  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
-  if [ $? -ne 0 ]; then
-      echo "E2E test with Chrome failed!"
-      exit -1
-  fi
-  echo "Smoke Testing E2E with Firefox:"
-  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
-  if [ $? -ne 0 ]; then
-      echo "E2E test with Firefox failed!"
-      exit -1
-  fi
-  echo "Smoke Testing E2E with IE11:"
-  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
-  if [ $? -ne 0 ]; then
-      echo "E2E test with IE11 failed!"
-      exit -1
-  fi
-  echo "Smoke Testing E2E with Edge:"
-  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
-  if [ $? -ne 0 ]; then
-      echo "E2E test with Edge failed!"
-      exit -1
-  fi
-fi
diff --git a/deploy/build.sh b/deploy/build.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+# this script builds the project with a given profile
+if [[ $0 != ./deploy/* ]]; then
+  echo "Please run this script from the root of our repository!"
+  exit -1
+fi
+PROFILE="$1"
+TRAVIS_BRANCH="$4"
+COVERALLS_TOKEN="$5"
+if [ -n "${TRAVIS_BRANCH}" ]; then
+  PROFILE="dev"
+fi
+if [ "${TRAVIS_BRANCH}" = "master" ]; then
+  PROFILE="prod"
+fi
+if [ -z ${PROFILE} ]; then
+  echo "Please provide a valid profile e.g.: $0 dev"
+  exit -1
+fi
+echo "Going to run maven build with profile: ${PROFILE}"
+if [ -z ${COVERALLS_TOKEN} ]; then
+  mvn -P${PROFILE} clean package
+else
+  mvn -P${PROFILE} clean -DrepoToken=$COVERALLS_TOKEN package coveralls:report
+fi
+if [ $? -ne 0 ]; then
+    echo "Maven build failed!"
+    exit -1
+fi
diff --git a/deploy/deploy.sh b/deploy/deploy.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+# this script deploys the project with a given profile to the correct space in
+# cloudfoundry
+if [[ $0 != ./deploy/* ]]; then
+  echo "Please run this script from the root of our repository!"
+  exit -1
+fi
+PROFILE="$1"
+USERNAME="$2"
+PASSWORD="$3"
+TRAVIS_BRANCH="$4"
+if [ -n "${TRAVIS_BRANCH}" ]; then
+  PROFILE="dev"
+fi
+if [ "${TRAVIS_BRANCH}" = "master" ]; then
+  PROFILE="prod"
+fi
+if [ -z ${PROFILE} ]; then
+  echo "Please provide a valid profile e.g.: $0 dev"
+  exit -1
+fi
+if [ -z ${USERNAME} ] || [ -z ${PASSWORD} ]; then
+  cf login -o DZHW -s ${PROFILE} -a https://api.run.pivotal.io
+else
+  cf login -o DZHW -s ${PROFILE} -u ${USERNAME} -p ${PASSWORD} -a https://api.run.pivotal.io
+fi
+if [ $? -ne 0 ]; then
+    echo "cf login failed!"
+    exit -1
+fi
+cf push -f ./deploy/manifest-${PROFILE}.yml
+if [ $? -ne 0 ]; then
+    echo "cf push failed!"
+    exit -1
+fi
diff --git a/deploy/manifest-dev.yml b/deploy/manifest-dev.yml
@@ -6,7 +6,8 @@ applications:
   memory: 1024M
   disk_quota: 1024M
   instances: 2
-  buildpack: https://github.com/cloudfoundry/java-buildpack
+  buildpacks:
+  - https://github.com/cloudfoundry/java-buildpack#v4.16.1
   env:
     SPRING_PROFILES_ACTIVE: dev
     JBP_CONFIG_SPRING_AUTO_RECONFIGURATION: '{ enabled: false }'

diff --git a/deploy/manifest-prod.yml b/deploy/manifest-prod.yml
@@ -6,7 +6,8 @@ applications:
   memory: 1024M
   disk_quota: 1024M
   instances: 3
-  buildpack: https://github.com/cloudfoundry/java-buildpack
+  buildpacks:
+  - https://github.com/cloudfoundry/java-buildpack#v4.16.1
   env:
     SPRING_PROFILES_ACTIVE: prod
     JBP_CONFIG_SPRING_AUTO_RECONFIGURATION: '{ enabled: false }'

diff --git a/deploy/manifest-test.yml b/deploy/manifest-test.yml
@@ -6,7 +6,8 @@ applications:
   memory: 1024M
   disk_quota: 1024M
   instances: 3
-  buildpack: https://github.com/cloudfoundry/java-buildpack
+  buildpacks:
+  - https://github.com/cloudfoundry/java-buildpack#v4.16.1
   env:
     SPRING_PROFILES_ACTIVE: test
     JBP_CONFIG_SPRING_AUTO_RECONFIGURATION: '{ enabled: false }'