diff --git a/.travis.yml b/.travis.yml
index cc29d0fa0..0bd3e2f69 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,7 @@ cache:
- node_modules
- $HOME/.m2
env:
- - NODE_VERSION=4.4.5
+ - NODE_VERSION=4.4.7
before_install:
- nvm install $NODE_VERSION
- npm install -g npm
diff --git a/.yo-rc.json b/.yo-rc.json
index df52fda14..88520c63d 100644
--- a/.yo-rc.json
+++ b/.yo-rc.json
@@ -24,7 +24,7 @@
"en"
],
"serverPort": 8080,
- "jhipsterVersion": "3.5.0",
+ "jhipsterVersion": "3.5.1",
"enableSocialSignIn": false,
"useSass": false,
"jhiPrefix": "jhi"
diff --git a/Jenkinsfile b/Jenkinsfile
index c30632c3f..516df2167 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,6 +1,6 @@
node {
- // uncomment these 2 lines and edit the name 'node-4.4.5' according to what you choose in configuration
- // def nodeHome = tool name: 'node-4.4.5', type: 'jenkins.plugins.nodejs.tools.NodeJSInstallation'
+ // uncomment these 2 lines and edit the name 'node-4.4.7' according to what you choose in configuration
+ // def nodeHome = tool name: 'node-4.4.7', type: 'jenkins.plugins.nodejs.tools.NodeJSInstallation'
// env.PATH = "${nodeHome}/bin:${env.PATH}"
stage 'check tools'
diff --git a/gulpfile.js b/gulpfile.js
index 09f71d0b1..426c84aa2 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -1,4 +1,4 @@
-// Generated on 2016-07-20 using generator-jhipster 3.5.0
+// Generated on 2016-07-22 using generator-jhipster 3.5.1
'use strict';
var gulp = require('gulp'),
@@ -182,7 +182,7 @@ gulp.task('swagger-ui', function () {
.pipe(gulp.dest(config.dist + 'swagger-ui/')),
gulp.src(config.bower + 'swagger-ui/dist/swagger-ui.min.js')
.pipe(gulp.dest(config.dist + 'swagger-ui/lib/'))
- )
+ );
});
gulp.task('ngconstant:dev', function () {
diff --git a/package.json b/package.json
index 9e0b67480..61f12e2c4 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,7 @@
"eslint-config-angular": "0.5.0",
"eslint-plugin-angular": "1.0.1",
"event-stream": "3.3.2",
- "generator-jhipster": "3.5.0",
+ "generator-jhipster": "3.5.1",
"gulp": "3.9.1",
"gulp-angular-filesort": "1.1.1",
"gulp-angular-templatecache": "1.9.0",
diff --git a/pom.xml b/pom.xml
index 09d4fa61e..ee65faf8f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -754,8 +754,8 @@
install-node-and-npm
- v4.4.3
- 3.8.3
+ v4.4.7
+ 3.10.5
diff --git a/src/main/docker/mysql.yml b/src/main/docker/mysql.yml
index e86bb5c8e..4f01f733d 100644
--- a/src/main/docker/mysql.yml
+++ b/src/main/docker/mysql.yml
@@ -2,7 +2,7 @@ version: '2'
services:
jhipstersampleapplication-mysql:
container_name: jhipstersampleapplication-mysql
- image: mysql:5.7.12
+ image: mysql:5.7.13
# volumes:
# - ~/volumes/jhipster/jhipsterSampleApplication/mysql/:/var/lib/mysql/
environment:
diff --git a/src/main/docker/sonar.yml b/src/main/docker/sonar.yml
index b4e6c40f5..2159b0d96 100644
--- a/src/main/docker/sonar.yml
+++ b/src/main/docker/sonar.yml
@@ -2,7 +2,7 @@ version: '2'
services:
jhipstersampleapplication-sonar:
container_name: jhipstersampleapplication-sonar
- image: sonarqube:5.5-alpine
+ image: sonarqube:5.6-alpine
ports:
- 9000:9000
- 9092:9092
diff --git a/src/main/webapp/app/entities/bank-account/bank-account.state.js b/src/main/webapp/app/entities/bank-account/bank-account.state.js
index 788f75dba..45873244c 100644
--- a/src/main/webapp/app/entities/bank-account/bank-account.state.js
+++ b/src/main/webapp/app/entities/bank-account/bank-account.state.js
@@ -64,30 +64,30 @@
}
})
.state('bank-account-detail.edit', {
- parent: 'bank-account-detail',
- url: '/detail/edit',
- data: {
- authorities: ['ROLE_USER']
- },
- onEnter: ['$stateParams', '$state', '$uibModal', function($stateParams, $state, $uibModal) {
- $uibModal.open({
- templateUrl: 'app/entities/bank-account/bank-account-dialog.html',
- controller: 'BankAccountDialogController',
- controllerAs: 'vm',
- backdrop: 'static',
- size: 'lg',
- resolve: {
- entity: ['BankAccount', function(BankAccount) {
- return BankAccount.get({id : $stateParams.id}).$promise;
- }]
- }
- }).result.then(function() {
- $state.go('^', {}, { reload: false });
- }, function() {
- $state.go('^');
- });
- }]
- })
+ parent: 'bank-account-detail',
+ url: '/detail/edit',
+ data: {
+ authorities: ['ROLE_USER']
+ },
+ onEnter: ['$stateParams', '$state', '$uibModal', function($stateParams, $state, $uibModal) {
+ $uibModal.open({
+ templateUrl: 'app/entities/bank-account/bank-account-dialog.html',
+ controller: 'BankAccountDialogController',
+ controllerAs: 'vm',
+ backdrop: 'static',
+ size: 'lg',
+ resolve: {
+ entity: ['BankAccount', function(BankAccount) {
+ return BankAccount.get({id : $stateParams.id}).$promise;
+ }]
+ }
+ }).result.then(function() {
+ $state.go('^', {}, { reload: false });
+ }, function() {
+ $state.go('^');
+ });
+ }]
+ })
.state('bank-account.new', {
parent: 'bank-account',
url: '/new',
diff --git a/src/main/webapp/app/entities/label/label.state.js b/src/main/webapp/app/entities/label/label.state.js
index 3837f31de..b5a7002c1 100644
--- a/src/main/webapp/app/entities/label/label.state.js
+++ b/src/main/webapp/app/entities/label/label.state.js
@@ -64,30 +64,30 @@
}
})
.state('label-detail.edit', {
- parent: 'label-detail',
- url: '/detail/edit',
- data: {
- authorities: ['ROLE_USER']
- },
- onEnter: ['$stateParams', '$state', '$uibModal', function($stateParams, $state, $uibModal) {
- $uibModal.open({
- templateUrl: 'app/entities/label/label-dialog.html',
- controller: 'LabelDialogController',
- controllerAs: 'vm',
- backdrop: 'static',
- size: 'lg',
- resolve: {
- entity: ['Label', function(Label) {
- return Label.get({id : $stateParams.id}).$promise;
- }]
- }
- }).result.then(function() {
- $state.go('^', {}, { reload: false });
- }, function() {
- $state.go('^');
- });
- }]
- })
+ parent: 'label-detail',
+ url: '/detail/edit',
+ data: {
+ authorities: ['ROLE_USER']
+ },
+ onEnter: ['$stateParams', '$state', '$uibModal', function($stateParams, $state, $uibModal) {
+ $uibModal.open({
+ templateUrl: 'app/entities/label/label-dialog.html',
+ controller: 'LabelDialogController',
+ controllerAs: 'vm',
+ backdrop: 'static',
+ size: 'lg',
+ resolve: {
+ entity: ['Label', function(Label) {
+ return Label.get({id : $stateParams.id}).$promise;
+ }]
+ }
+ }).result.then(function() {
+ $state.go('^', {}, { reload: false });
+ }, function() {
+ $state.go('^');
+ });
+ }]
+ })
.state('label.new', {
parent: 'label',
url: '/new',
diff --git a/src/main/webapp/app/entities/operation/operation-detail.html b/src/main/webapp/app/entities/operation/operation-detail.html
index d86edd08e..334c12efb 100644
--- a/src/main/webapp/app/entities/operation/operation-detail.html
+++ b/src/main/webapp/app/entities/operation/operation-detail.html
@@ -23,7 +23,7 @@ Operat
Label
- {{label.label}}{{$last ? '' : ', '}}
+ {{label.label}}{{$last ? '' : ', '}}
diff --git a/src/main/webapp/app/entities/operation/operation.state.js b/src/main/webapp/app/entities/operation/operation.state.js
index f84b5c714..cd91adf7f 100644
--- a/src/main/webapp/app/entities/operation/operation.state.js
+++ b/src/main/webapp/app/entities/operation/operation.state.js
@@ -64,30 +64,30 @@
}
})
.state('operation-detail.edit', {
- parent: 'operation-detail',
- url: '/detail/edit',
- data: {
- authorities: ['ROLE_USER']
- },
- onEnter: ['$stateParams', '$state', '$uibModal', function($stateParams, $state, $uibModal) {
- $uibModal.open({
- templateUrl: 'app/entities/operation/operation-dialog.html',
- controller: 'OperationDialogController',
- controllerAs: 'vm',
- backdrop: 'static',
- size: 'lg',
- resolve: {
- entity: ['Operation', function(Operation) {
- return Operation.get({id : $stateParams.id}).$promise;
- }]
- }
- }).result.then(function() {
- $state.go('^', {}, { reload: false });
- }, function() {
- $state.go('^');
- });
- }]
- })
+ parent: 'operation-detail',
+ url: '/detail/edit',
+ data: {
+ authorities: ['ROLE_USER']
+ },
+ onEnter: ['$stateParams', '$state', '$uibModal', function($stateParams, $state, $uibModal) {
+ $uibModal.open({
+ templateUrl: 'app/entities/operation/operation-dialog.html',
+ controller: 'OperationDialogController',
+ controllerAs: 'vm',
+ backdrop: 'static',
+ size: 'lg',
+ resolve: {
+ entity: ['Operation', function(Operation) {
+ return Operation.get({id : $stateParams.id}).$promise;
+ }]
+ }
+ }).result.then(function() {
+ $state.go('^', {}, { reload: false });
+ }, function() {
+ $state.go('^');
+ });
+ }]
+ })
.state('operation.new', {
parent: 'operation',
url: '/new',