Skip to content

Commit 3cbc5d6

Browse files
jduboisjdubois
committed
update to the latest JHipster dependencies
1 parent 911f93b commit 3cbc5d6

4 files changed

Lines changed: 1568 additions & 1361 deletions

File tree

‎package.json‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -70,27 +70,26 @@
7070
"lint-staged": "7.0.0",
7171
"lodash": "4.17.4",
7272
"map-stream": "0.0.7",
73+
"node-sass": "4.5.3",
7374
"phantomjs-prebuilt": "2.1.16",
75+
"postcss-loader": "2.0.9",
7476
"prettier": "1.11.1",
7577
"proxy-middleware": "0.15.0",
7678
"rimraf": "2.6.1",
7779
"run-sequence": "1.2.2",
80+
"sass-loader": "6.0.6",
7881
"source-map": "0.6.1",
7982
"sourcemap-istanbul-instrumenter-loader": "0.2.0",
8083
"string-replace-webpack-plugin": "0.1.3",
8184
"style-loader": "0.20.3",
8285
"tapable": "1.0.0",
86+
"thread-loader": "1.1.5",
8387
"to-string-loader": "1.1.5",
8488
"ts-loader": "4.0.1",
8589
"tslint": "5.9.1",
8690
"tslint-config-prettier": "1.9.0",
8791
"tslint-loader": "3.6.0",
8892
"typescript": "2.7.2",
89-
"thread-loader": "1.1.5",
90-
"sass-loader": "6.0.6",
91-
"node-sass": "4.5.3",
92-
"postcss-loader": "2.0.9",
93-
"xml2js": "0.4.17",
9493
"uglifyjs-webpack-plugin": "1.2.3",
9594
"webpack": "4.1.1",
9695
"webpack-cli": "2.0.11",
@@ -100,17 +99,21 @@
10099
"webpack-visualizer-plugin": "0.1.11",
101100
"workbox-webpack-plugin": "3.0.0-beta.1",
102101
"write-file-webpack-plugin": "4.2.0",
102+
"xml2js": "0.4.17",
103103
"yargs": "6.6.0"
104104
},
105105
"engines": {
106-
"node": ">=8.9.0"
106+
"node": ">=10.0.0"
107107
},
108108
"lint-staged": {
109-
"*.ts": ["prettier --write", "git add"]
109+
"*.ts": [
110+
"prettier --write",
111+
"git add"
112+
]
110113
},
111114
"scripts": {
112115
"precommit": "lint-staged",
113-
"prettier:format":"yarn prettier --write **/*.ts",
116+
"prettier:format": "yarn prettier --write **/*.ts",
114117
"lint": "tslint --project tsconfig.json -e 'node_modules/**'",
115118
"lint:fix": "yarn run lint -- --fix",
116119
"ngc": "ngc -p tsconfig-aot.json",

‎pom.xml‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
<maven.version>3.0.0</maven.version>
1515
<java.version>1.8</java.version>
1616
<scala.version>2.12.6</scala.version>
17-
<node.version>v8.11.3</node.version>
17+
<node.version>v10.13.0</node.version>
18+
<npm.version>6.4.1</npm.version>
1819
<yarn.version>v1.9.2</yarn.version>
1920
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2021
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -30,10 +31,10 @@
3031
<profile.swagger />
3132

3233
<!-- Dependency versions -->
33-
<jhipster-dependencies.version>2.0.19</jhipster-dependencies.version>
34+
<jhipster-dependencies.version>2.0.28</jhipster-dependencies.version>
3435
<!-- The spring-boot version should match the one managed by
3536
https://mvnrepository.com/artifact/io.github.jhipster/jhipster-dependencies/${jhipster-dependencies.version} -->
36-
<spring-boot.version>2.0.4.RELEASE</spring-boot.version>
37+
<spring-boot.version>2.0.5.RELEASE</spring-boot.version>
3738
<!-- The hibernate version should match the one managed by
3839
https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-dependencies/${spring-boot.version} -->
3940
<hibernate.version>5.2.17.Final</hibernate.version>
@@ -49,17 +50,20 @@
4950

5051
<!-- Plugin versions -->
5152
<maven-clean-plugin.version>3.1.0</maven-clean-plugin.version>
52-
<maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
53+
<maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
5354
<maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
54-
<maven-enforcer-plugin.version>3.0.0-M1</maven-enforcer-plugin.version>
55+
<maven-enforcer-plugin.version>3.0.0-M2</maven-enforcer-plugin.version>
5556
<maven-resources-plugin.version>3.1.0</maven-resources-plugin.version>
56-
<maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
57-
<maven-war-plugin.version>3.2.0</maven-war-plugin.version>
57+
<maven-surefire-plugin.version>2.22.1</maven-surefire-plugin.version>
58+
<maven-war-plugin.version>3.2.2</maven-war-plugin.version>
59+
<jib-maven-plugin.version>0.9.11</jib-maven-plugin.version>
5860
<frontend-maven-plugin.version>1.6</frontend-maven-plugin.version>
5961
<dockerfile-maven-plugin.version>1.4.3</dockerfile-maven-plugin.version>
60-
<jacoco-maven-plugin.version>0.8.1</jacoco-maven-plugin.version>
61-
<scala-maven-plugin.version>3.3.2</scala-maven-plugin.version>
62-
<sonar-maven-plugin.version>3.4.0.905</sonar-maven-plugin.version>
62+
<jacoco-maven-plugin.version>0.8.2</jacoco-maven-plugin.version>
63+
<lifecycle-mapping.version>1.0.0</lifecycle-mapping.version>
64+
<scala-maven-plugin.version>3.4.2</scala-maven-plugin.version>
65+
<sonar-maven-plugin.version>3.5.0.1254</sonar-maven-plugin.version>
66+
<git-commit-id-plugin.version>2.2.5</git-commit-id-plugin.version>
6367

6468
<!-- Sonar properties -->
6569
<sonar.exclusions>src/main/webapp/content/**/*.*, src/main/webapp/i18n/*.js, target/www/**/*.*</sonar.exclusions>

‎src/main/webapp/app/admin/logfile/logfile.component.ts‎

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -5,64 +5,64 @@ import { JhiLogfileService } from './logfile.service';
55
import { JhiRoutesService, Route } from 'app/shared';
66

77
@Component({
8-
selector: 'jhi-logfile',
9-
templateUrl: './logfile.component.html',
10-
styleUrls: ['logfile.scss']
8+
selector: 'jhi-logfile',
9+
templateUrl: './logfile.component.html',
10+
styleUrls: ['logfile.scss']
1111
})
1212
export class JhiLogfileComponent implements OnInit, OnDestroy {
13-
activeRoute: Route;
14-
updatingLogfile: boolean;
15-
logtxt: string;
16-
subscription: Subscription;
13+
activeRoute: Route;
14+
updatingLogfile: boolean;
15+
logtxt: string;
16+
subscription: Subscription;
1717

18-
@ViewChild('logfile') private logFileViewer: ElementRef;
18+
@ViewChild('logfile') private logFileViewer: ElementRef;
1919

20-
constructor(private jhiLogfileService: JhiLogfileService, private routesService: JhiRoutesService) {}
20+
constructor(private jhiLogfileService: JhiLogfileService, private routesService: JhiRoutesService) {}
2121

22-
ngOnInit() {
23-
this.subscription = this.routesService.routeChanged$.subscribe(route => {
24-
this.activeRoute = route;
25-
this.displayActiveRouteLog();
26-
});
27-
}
22+
ngOnInit() {
23+
this.subscription = this.routesService.routeChanged$.subscribe((route) => {
24+
this.activeRoute = route;
25+
this.displayActiveRouteLog();
26+
});
27+
}
2828

29-
displayActiveRouteLog() {
30-
this.updatingLogfile = true;
31-
if (this.activeRoute && this.activeRoute.status !== 'DOWN') {
32-
this.jhiLogfileService.getInstanceLogfile(this.activeRoute).subscribe(
33-
logtxt => {
34-
this.logtxt = logtxt;
35-
this.updatingLogfile = false;
36-
},
37-
error => {
38-
if (error.status === 503 || error.status === 500 || error.status === 404) {
39-
this.logtxt =
40-
'No available logfile. Please note that it is not available by default, you need to set up the Spring Boot properties below! \n' +
41-
'Please check:\n ' +
42-
'- if the microservice is up\n ' +
43-
'- if these properties are set: \n ' +
44-
' - logging.path\n ' +
45-
' - logging.file (to avoid using the same spring.log)\n\n' +
46-
'See:\n ' +
47-
'- https://docs.spring.io/spring-boot/docs/current/reference/html/production-ready-endpoints.html\n ' +
48-
'- https://docs.spring.io/spring-boot/docs/current/reference/html/howto-logging.html';
49-
this.updatingLogfile = false;
50-
}
29+
displayActiveRouteLog() {
30+
this.updatingLogfile = true;
31+
if (this.activeRoute && this.activeRoute.status !== 'DOWN') {
32+
this.jhiLogfileService.getInstanceLogfile(this.activeRoute).subscribe(
33+
(logtxt) => {
34+
this.logtxt = logtxt;
35+
this.updatingLogfile = false;
36+
},
37+
(error) => {
38+
if (error.status === 503 || error.status === 500 || error.status === 404) {
39+
this.logtxt =
40+
'No available logfile. Please note that it is not available by default, you need to set up the Spring Boot properties below! \n' +
41+
'Please check:\n ' +
42+
'- if the microservice is up\n ' +
43+
'- if these properties are set: \n ' +
44+
' - logging.path\n ' +
45+
' - logging.file (to avoid using the same spring.log)\n\n' +
46+
'See:\n ' +
47+
'- https://docs.spring.io/spring-boot/docs/current/reference/html/production-ready-endpoints.html\n ' +
48+
'- https://docs.spring.io/spring-boot/docs/current/reference/html/howto-logging.html';
49+
this.updatingLogfile = false;
50+
}
51+
}
52+
);
5153
}
52-
);
5354
}
54-
}
5555

56-
scrollToBottom() {
57-
this.logFileViewer.nativeElement.scrollTop = this.logFileViewer.nativeElement.scrollHeight;
58-
}
56+
scrollToBottom() {
57+
this.logFileViewer.nativeElement.scrollTop = this.logFileViewer.nativeElement.scrollHeight;
58+
}
5959

60-
scrollToTop() {
61-
this.logFileViewer.nativeElement.scrollTop = this.logFileViewer.nativeElement.scrolledUp;
62-
}
60+
scrollToTop() {
61+
this.logFileViewer.nativeElement.scrollTop = this.logFileViewer.nativeElement.scrolledUp;
62+
}
6363

64-
ngOnDestroy() {
65-
// prevent memory leak when component destroyed
66-
this.subscription.unsubscribe();
67-
}
64+
ngOnDestroy() {
65+
// prevent memory leak when component destroyed
66+
this.subscription.unsubscribe();
67+
}
6868
}

0 commit comments

Comments
 (0)