Skip to content

Commit

Permalink
update to the latest JHipster dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@jdubois
jdubois committed Nov 2, 2018
1 parent 911f93b commit 3cbc5d6
Show file tree
Hide file tree
Showing 4 changed files with 1,568 additions and 1,361 deletions.
19 changes: 11 additions & 8 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,27 +70,26 @@
"lint-staged": "7.0.0",
"lodash": "4.17.4",
"map-stream": "0.0.7",
"node-sass": "4.5.3",
"phantomjs-prebuilt": "2.1.16",
"postcss-loader": "2.0.9",
"prettier": "1.11.1",
"proxy-middleware": "0.15.0",
"rimraf": "2.6.1",
"run-sequence": "1.2.2",
"sass-loader": "6.0.6",
"source-map": "0.6.1",
"sourcemap-istanbul-instrumenter-loader": "0.2.0",
"string-replace-webpack-plugin": "0.1.3",
"style-loader": "0.20.3",
"tapable": "1.0.0",
"thread-loader": "1.1.5",
"to-string-loader": "1.1.5",
"ts-loader": "4.0.1",
"tslint": "5.9.1",
"tslint-config-prettier": "1.9.0",
"tslint-loader": "3.6.0",
"typescript": "2.7.2",
"thread-loader": "1.1.5",
"sass-loader": "6.0.6",
"node-sass": "4.5.3",
"postcss-loader": "2.0.9",
"xml2js": "0.4.17",
"uglifyjs-webpack-plugin": "1.2.3",
"webpack": "4.1.1",
"webpack-cli": "2.0.11",
Expand All @@ -100,17 +99,21 @@
"webpack-visualizer-plugin": "0.1.11",
"workbox-webpack-plugin": "3.0.0-beta.1",
"write-file-webpack-plugin": "4.2.0",
"xml2js": "0.4.17",
"yargs": "6.6.0"
},
"engines": {
"node": ">=8.9.0"
"node": ">=10.0.0"
},
"lint-staged": {
"*.ts": ["prettier --write", "git add"]
"*.ts": [
"prettier --write",
"git add"
]
},
"scripts": {
"precommit": "lint-staged",
"prettier:format":"yarn prettier --write **/*.ts",
"prettier:format": "yarn prettier --write **/*.ts",
"lint": "tslint --project tsconfig.json -e 'node_modules/**'",
"lint:fix": "yarn run lint -- --fix",
"ngc": "ngc -p tsconfig-aot.json",
Expand Down
24 changes: 14 additions & 10 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
<maven.version>3.0.0</maven.version>
<java.version>1.8</java.version>
<scala.version>2.12.6</scala.version>
<node.version>v8.11.3</node.version>
<node.version>v10.13.0</node.version>
<npm.version>6.4.1</npm.version>
<yarn.version>v1.9.2</yarn.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
Expand All @@ -30,10 +31,10 @@
<profile.swagger />

<!-- Dependency versions -->
<jhipster-dependencies.version>2.0.19</jhipster-dependencies.version>
<jhipster-dependencies.version>2.0.28</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.0.4.RELEASE</spring-boot.version>
<spring-boot.version>2.0.5.RELEASE</spring-boot.version>
<!-- The hibernate version should match the one managed by
https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-dependencies/${spring-boot.version} -->
<hibernate.version>5.2.17.Final</hibernate.version>
Expand All @@ -49,17 +50,20 @@

<!-- Plugin versions -->
<maven-clean-plugin.version>3.1.0</maven-clean-plugin.version>
<maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
<maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
<maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
<maven-enforcer-plugin.version>3.0.0-M1</maven-enforcer-plugin.version>
<maven-enforcer-plugin.version>3.0.0-M2</maven-enforcer-plugin.version>
<maven-resources-plugin.version>3.1.0</maven-resources-plugin.version>
<maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
<maven-war-plugin.version>3.2.0</maven-war-plugin.version>
<maven-surefire-plugin.version>2.22.1</maven-surefire-plugin.version>
<maven-war-plugin.version>3.2.2</maven-war-plugin.version>
<jib-maven-plugin.version>0.9.11</jib-maven-plugin.version>
<frontend-maven-plugin.version>1.6</frontend-maven-plugin.version>
<dockerfile-maven-plugin.version>1.4.3</dockerfile-maven-plugin.version>
<jacoco-maven-plugin.version>0.8.1</jacoco-maven-plugin.version>
<scala-maven-plugin.version>3.3.2</scala-maven-plugin.version>
<sonar-maven-plugin.version>3.4.0.905</sonar-maven-plugin.version>
<jacoco-maven-plugin.version>0.8.2</jacoco-maven-plugin.version>
<lifecycle-mapping.version>1.0.0</lifecycle-mapping.version>
<scala-maven-plugin.version>3.4.2</scala-maven-plugin.version>
<sonar-maven-plugin.version>3.5.0.1254</sonar-maven-plugin.version>
<git-commit-id-plugin.version>2.2.5</git-commit-id-plugin.version>

<!-- Sonar properties -->
<sonar.exclusions>src/main/webapp/content/**/*.*, src/main/webapp/i18n/*.js, target/www/**/*.*</sonar.exclusions>
Expand Down
98 changes: 49 additions & 49 deletions src/main/webapp/app/admin/logfile/logfile.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,64 +5,64 @@ import { JhiLogfileService } from './logfile.service';
import { JhiRoutesService, Route } from 'app/shared';

@Component({
selector: 'jhi-logfile',
templateUrl: './logfile.component.html',
styleUrls: ['logfile.scss']
selector: 'jhi-logfile',
templateUrl: './logfile.component.html',
styleUrls: ['logfile.scss']
})
export class JhiLogfileComponent implements OnInit, OnDestroy {
activeRoute: Route;
updatingLogfile: boolean;
logtxt: string;
subscription: Subscription;
activeRoute: Route;
updatingLogfile: boolean;
logtxt: string;
subscription: Subscription;

@ViewChild('logfile') private logFileViewer: ElementRef;
@ViewChild('logfile') private logFileViewer: ElementRef;

constructor(private jhiLogfileService: JhiLogfileService, private routesService: JhiRoutesService) {}
constructor(private jhiLogfileService: JhiLogfileService, private routesService: JhiRoutesService) {}

ngOnInit() {
this.subscription = this.routesService.routeChanged$.subscribe(route => {
this.activeRoute = route;
this.displayActiveRouteLog();
});
}
ngOnInit() {
this.subscription = this.routesService.routeChanged$.subscribe((route) => {
this.activeRoute = route;
this.displayActiveRouteLog();
});
}

displayActiveRouteLog() {
this.updatingLogfile = true;
if (this.activeRoute && this.activeRoute.status !== 'DOWN') {
this.jhiLogfileService.getInstanceLogfile(this.activeRoute).subscribe(
logtxt => {
this.logtxt = logtxt;
this.updatingLogfile = false;
},
error => {
if (error.status === 503 || error.status === 500 || error.status === 404) {
this.logtxt =
'No available logfile. Please note that it is not available by default, you need to set up the Spring Boot properties below! \n' +
'Please check:\n ' +
'- if the microservice is up\n ' +
'- if these properties are set: \n ' +
' - logging.path\n ' +
' - logging.file (to avoid using the same spring.log)\n\n' +
'See:\n ' +
'- https://docs.spring.io/spring-boot/docs/current/reference/html/production-ready-endpoints.html\n ' +
'- https://docs.spring.io/spring-boot/docs/current/reference/html/howto-logging.html';
this.updatingLogfile = false;
}
displayActiveRouteLog() {
this.updatingLogfile = true;
if (this.activeRoute && this.activeRoute.status !== 'DOWN') {
this.jhiLogfileService.getInstanceLogfile(this.activeRoute).subscribe(
(logtxt) => {
this.logtxt = logtxt;
this.updatingLogfile = false;
},
(error) => {
if (error.status === 503 || error.status === 500 || error.status === 404) {
this.logtxt =
'No available logfile. Please note that it is not available by default, you need to set up the Spring Boot properties below! \n' +
'Please check:\n ' +
'- if the microservice is up\n ' +
'- if these properties are set: \n ' +
' - logging.path\n ' +
' - logging.file (to avoid using the same spring.log)\n\n' +
'See:\n ' +
'- https://docs.spring.io/spring-boot/docs/current/reference/html/production-ready-endpoints.html\n ' +
'- https://docs.spring.io/spring-boot/docs/current/reference/html/howto-logging.html';
this.updatingLogfile = false;
}
}
);
}
);
}
}

scrollToBottom() {
this.logFileViewer.nativeElement.scrollTop = this.logFileViewer.nativeElement.scrollHeight;
}
scrollToBottom() {
this.logFileViewer.nativeElement.scrollTop = this.logFileViewer.nativeElement.scrollHeight;
}

scrollToTop() {
this.logFileViewer.nativeElement.scrollTop = this.logFileViewer.nativeElement.scrolledUp;
}
scrollToTop() {
this.logFileViewer.nativeElement.scrollTop = this.logFileViewer.nativeElement.scrolledUp;
}

ngOnDestroy() {
// prevent memory leak when component destroyed
this.subscription.unsubscribe();
}
ngOnDestroy() {
// prevent memory leak when component destroyed
this.subscription.unsubscribe();
}
}
Loading

7 comments on commit 3cbc5d6

@DanielFran
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jdubois the current spring-boot version is 2.0.6.RELEASE 😉

@jdubois
Copy link
Member Author

@jdubois jdubois commented on 3cbc5d6 Nov 2, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@DanielFran where do you see an issue?

@jdubois
Copy link
Member Author

@jdubois jdubois commented on 3cbc5d6 Nov 2, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh yes, got it

@jdubois
Copy link
Member Author

@jdubois jdubois commented on 3cbc5d6 Nov 2, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And I just released everything :-(
So there will be a 4.0.7

@jdubois
Copy link
Member Author

@jdubois jdubois commented on 3cbc5d6 Nov 2, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, so this still uses 2.0.6 so it's correct, the property is in fact ignored.... That's pretty stupid/bad but this release is correct in fact - @DanielFran can you confirm?

@DanielFran
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems used only for spring-boot-maven-plugin

@jdubois
Copy link
Member Author

@jdubois jdubois commented on 3cbc5d6 Nov 2, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes I agree, this is only for the plugin, so it's good to use in prod. And I'm not even sure the plugin had any changes in this minor release. So that's fine! Thanks for seeing this!!

Please sign in to comment.