Skip to content

Commit

Permalink
Merge pull request #1495 from dzhw/release
Browse files Browse the repository at this point in the history
Release v1.0.60
  • Loading branch information
rreitmann authored Jan 9, 2018
2 parents 6c382f7 + 913f4d5 commit f517b18
Show file tree
Hide file tree
Showing 54 changed files with 1,127 additions and 8,515 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ before_install:
- sudo apt-get install cf-cli -y
# 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 8.9.2
- 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 8.9.3
- npm install -g bower
- npm install -g grunt-cli
- alias grunt="node --max-old-space-size=2048 `which grunt`"
Expand Down
6 changes: 3 additions & 3 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"jszip-utils": "~0.0.2",
"angular-translate-handler-log": "2.16.0",
"angular-nvd3": "^1.0.9",
"js-xlsx": "^0.11.12",
"js-xlsx": "^0.11.14",
"cheet.js": "^0.3.3",
"angular-material": "^1.1.5",
"angular-block-ui": "^0.2.2",
Expand All @@ -40,13 +40,13 @@
"angular-katex": "^0.10.0",
"angular-animate": "1.6.6",
"angular-messages": "1.6.6",
"bowser": "^1.8.1",
"bowser": "^1.9.0",
"angular-file-saver": "^1.1.3",
"clientjs": "^0.1.5",
"angular-scroll": "^1.0.2",
"sockjs-client": "^1.1.4",
"stomp-websocket": "^2.3.4",
"es5-shim": "^4.5.9",
"es5-shim": "^4.5.10",
"es6-shim": "^0.35.3",
"hyphenator": "Hyphenator#^5.3.0",
"ng-shortcut": "^0.1.4"
Expand Down
129 changes: 34 additions & 95 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"private": true,
"dependencies": {},
"devDependencies": {
"browser-sync": "^2.18.13",
"browser-sync": "^2.19.0",
"event-stream": "3.3.4",
"grunt": "1.0.1",
"grunt-angular-templates": "1.1.0",
Expand All @@ -18,7 +18,7 @@
"grunt-contrib-cssmin": "2.2.1",
"grunt-contrib-htmlmin": "2.4.0",
"grunt-contrib-jshint": "1.1.0",
"grunt-contrib-uglify": "git://github.com/gruntjs/grunt-contrib-uglify.git#harmony",
"grunt-contrib-uglify": "3.2.1",
"grunt-contrib-watch": "1.0.0",
"grunt-html-angular-validate": "^0.5.9",
"grunt-jscs": "3.0.1",
Expand All @@ -44,7 +44,7 @@
"load-grunt-tasks": "3.5.2",
"lodash": "4.17.4",
"phantomjs-prebuilt": "2.1.16",
"protractor": "5.2.1",
"protractor": "5.2.2",
"requirejs": "2.3",
"time-grunt": "1.4.0",
"wiredep": "4.0.0",
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<groupId>eu.dzhw.fdz.metadatamanagement</groupId>
<artifactId>metadatamanagement</artifactId>
<version>1.0.59</version>
<version>1.0.60</version>
<packaging>war</packaging>
<name>metadatamanagement</name>

Expand Down Expand Up @@ -132,7 +132,7 @@
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
<version>1.16</version>
<version>1.17</version>
</dependency>
<dependency>
<groupId>org.elasticsearch</groupId>
Expand Down
Loading

0 comments on commit f517b18

Please sign in to comment.