Skip to content

Commit

Permalink
Merge branch 'develop' into pulathisi-ui-feature
Browse files Browse the repository at this point in the history
  • Loading branch information
SudharakaP authored Oct 14, 2019
2 parents c1c1d52 + d9b05a1 commit 202d1f4
Show file tree
Hide file tree
Showing 4 changed files with 498 additions and 372 deletions.
4 changes: 1 addition & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
os:
- linux
- bionic
services:
- docker
language: node_js
Expand All @@ -22,8 +22,6 @@ env:
- NG_CLI_ANALYTICS="false"
- secure: zmmc/J8/HwIx6iCcK0+t5sZkJN0YMbHbjJawZ+AT3A+gtDtLOSx042pHOnXZmnXc7WRo2sieqB7SXtvMCv2vONW/DR7+x2QwxrS8Y/yG6On7FfTk5NjIe34wpqG8Httfmggc5LLOi8jkiGka8KEGHx32ngnerutt4FbTT5P0gWc6B8NsjJNMlL5ED1elL46xU7q2YebrZH4WfDEOANI6CsojtmU1O1Te3OX2divFpOHq2khZuZPwY1RbP3lyBrQjQbPnBxDaG2+/dtO4yEtbUH0MYu/mBZPKomvhj5mDyOvd1NXy9yCv1tChet4lYm/yzHVSh//gPwqSl4D7zM2F/F++hdF/PjaNl2CB0SnkPRpwFImlTxV/KVd1vPg1mlIvRlQ5/NhVtCHcRamXf2rmHEeNsjFOg9gyOyr2AvTkI3qz1N4r5MqOtFr+JcSk6NpeaRX2IKSMMM4QvoVRXvKToBG8yeDnqB8WPWITJDN70TeGExafp2BALXXYbry65nPPWFmG1gabyHSqz6tY7a/fzPUnzDBKwuzmN1IEf+rL9NWQ6M1PviADrHsRf5OdD58AFd6fVwz/Isa2rO+AWl4mjrtHumxlk4T/YMlK/+guUyuQWkMvS0Ul36NkmN9mq/lOBjbQ4vuW1M2QjQokw3pe9oUzrAd7s8JPsPaVumoAjfo=
before_install:
- wget https://github.com/sormuras/bach/raw/master/install-jdk.sh
- source install-jdk.sh --feature 11
- java -version
- sudo /etc/init.d/mysql stop
- sudo /etc/init.d/postgresql stop
Expand Down
36 changes: 18 additions & 18 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@
"@angular/platform-browser-dynamic": "8.0.0",
"@angular/router": "8.0.0",
"@fortawesome/angular-fontawesome": "0.4.0",
"@fortawesome/fontawesome-svg-core": "1.2.18",
"@fortawesome/fontawesome-svg-core": "1.2.25",
"@fortawesome/free-solid-svg-icons": "5.8.2",
"@ng-bootstrap/ng-bootstrap": "4.2.0",
"@ngx-translate/core": "11.0.1",
"@ngx-translate/http-loader": "4.0.0",
"bootstrap": "4.3.1",
"core-js": "3.1.3",
"core-js": "3.2.1",
"moment": "2.24.0",
"ng-jhipster": "0.10.1",
"ngx-cookie": "4.0.2",
Expand All @@ -35,22 +35,22 @@
"rxjs": "6.5.3",
"stripe-angular": "0.5.0",
"swagger-ui": "2.2.10",
"tslib": "1.9.3",
"tslib": "1.10.0",
"zone.js": "0.9.1"
},
"devDependencies": {
"@angular/cli": "8.0.0",
"@angular/cli": "8.3.8",
"@angular/compiler-cli": "8.0.0",
"@ngtools/webpack": "8.0.0",
"@ngtools/webpack": "8.3.7",
"@types/chai": "4.2.3",
"@types/chai-string": "1.4.2",
"@types/jest": "24.0.13",
"@types/mocha": "5.2.6",
"@types/node": "10.12.27",
"@types/selenium-webdriver": "4.0.0",
"@types/selenium-webdriver": "4.0.3",
"angular-router-loader": "0.8.5",
"angular2-template-loader": "0.6.2",
"autoprefixer": "9.5.1",
"autoprefixer": "9.6.4",
"base-href-webpack-plugin": "2.0.0",
"browser-sync": "2.26.5",
"browser-sync-webpack-plugin": "2.2.2",
Expand All @@ -59,10 +59,10 @@
"chai-as-promised": "7.1.1",
"chai-string": "1.5.0",
"codelyzer": "5.0.1",
"copy-webpack-plugin": "5.0.3",
"copy-webpack-plugin": "5.0.4",
"css-loader": "2.1.1",
"file-loader": "3.0.1",
"fork-ts-checker-webpack-plugin": "1.3.4",
"fork-ts-checker-webpack-plugin": "1.5.0",
"friendly-errors-webpack-plugin": "1.7.0",
"generator-jhipster": "6.3.1",
"html-loader": "0.5.5",
Expand All @@ -74,33 +74,33 @@
"jest-sonar-reporter": "2.0.0",
"lint-staged": "8.1.7",
"mini-css-extract-plugin": "0.8.0",
"mocha": "6.1.4",
"moment-locales-webpack-plugin": "1.0.7",
"optimize-css-assets-webpack-plugin": "5.0.1",
"mocha": "6.2.1",
"moment-locales-webpack-plugin": "1.1.0",
"optimize-css-assets-webpack-plugin": "5.0.3",
"postcss-loader": "3.0.0",
"prettier": "1.17.1",
"prettier": "1.18.2",
"protractor": "5.4.2",
"reflect-metadata": "0.1.13",
"rimraf": "2.6.3",
"sass": "1.20.1",
"sass": "1.23.0",
"sass-loader": "7.1.0",
"simple-progress-webpack-plugin": "1.1.2",
"style-loader": "0.23.1",
"terser-webpack-plugin": "1.3.0",
"thread-loader": "2.1.2",
"thread-loader": "2.1.3",
"to-string-loader": "1.1.5",
"ts-loader": "6.0.1",
"ts-loader": "6.2.0",
"ts-node": "8.2.0",
"tslint": "5.20.0",
"tslint-config-prettier": "1.18.0",
"tslint-loader": "3.5.4",
"typescript": "3.4.5",
"webdriver-manager": "12.1.4",
"webpack": "4.41.0",
"webpack-cli": "3.3.2",
"webpack-cli": "3.3.9",
"webpack-dev-server": "3.4.1",
"webpack-merge": "4.2.1",
"webpack-notifier": "1.7.0",
"webpack-notifier": "1.8.0",
"webpack-visualizer-plugin": "0.1.11",
"workbox-webpack-plugin": "4.3.1",
"write-file-webpack-plugin": "4.5.1",
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<profile.tls />

<!-- Dependency versions -->
<jhipster-dependencies.version>3.0.5</jhipster-dependencies.version>
<jhipster-dependencies.version>3.0.6</jhipster-dependencies.version>
<!-- 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>2.1.9.RELEASE</spring-boot.version>
Expand All @@ -61,7 +61,7 @@
<frontend-maven-plugin.version>1.8.0</frontend-maven-plugin.version>
<git-commit-id-plugin.version>2.2.6</git-commit-id-plugin.version>
<jacoco-maven-plugin.version>0.8.4</jacoco-maven-plugin.version>
<jib-maven-plugin.version>1.3.0</jib-maven-plugin.version>
<jib-maven-plugin.version>1.6.1</jib-maven-plugin.version>
<lifecycle-mapping.version>1.0.0</lifecycle-mapping.version>
<properties-maven-plugin.version>1.0.0</properties-maven-plugin.version>
<sonar-maven-plugin.version>3.7.0.1746</sonar-maven-plugin.version>
Expand Down
Loading

0 comments on commit 202d1f4

Please sign in to comment.