Skip to content

S
spring-boot-admin
Commit 67ae7c2d by Johannes Edmeier
Options

Update to Boot RC2 and Cloud Finchley.M7

parent 83384d9b
Showing with 42 additions and 42 deletions
pom.xml
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<properties> <properties>
<revision>2.0.0-SNAPSHOT</revision> <revision>2.0.0-SNAPSHOT</revision>
<spring-boot.version>2.0.0.RC2</spring-boot.version> <spring-boot.version>2.0.0.RC2</spring-boot.version>
<spring-cloud.version>Finchley.BUILD-SNAPSHOT</spring-cloud.version> <spring-cloud.version>Finchley.M7</spring-cloud.version>
<hazelcast-tests.version>3.9.2</hazelcast-tests.version> <hazelcast-tests.version>3.9.2</hazelcast-tests.version>
<java.version>1.8</java.version> <java.version>1.8</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source> <maven.compiler.source>${java.version}</maven.compiler.source>
......
spring-boot-admin-server-ui/package-lock.json
...@@ -141,40 +141,40 @@ ...@@ -141,40 +141,40 @@
} }
}, },
"@fortawesome/fontawesome": { "@fortawesome/fontawesome": {
"version": "1.1.3", "version": "1.1.4",
"resolved": "https://registry.npmjs.org/@fortawesome/fontawesome/-/fontawesome-1.1.3.tgz", "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome/-/fontawesome-1.1.4.tgz",
"integrity": "sha512-zSKSJsYpV8jHUJYni6YNLN7pOcTBXG4sNVX4vXL6IJsqlwosyZm/IftWNOwbr4tbw3O1MxeY05TzYfjVB3T+QQ==", "integrity": "sha512-KgmesNO47kpIRBWgy9Tkw62T5stz1PDKn2QNFCuwEuk05zl+NHgy90oZQuww2dXZ24hTOS9YRAx0klE8UBLsxg==",
"requires": { "requires": {
"@fortawesome/fontawesome-common-types": "0.1.2" "@fortawesome/fontawesome-common-types": "0.1.3"
} }
}, },
"@fortawesome/fontawesome-common-types": { "@fortawesome/fontawesome-common-types": {
"version": "0.1.2", "version": "0.1.3",
"resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.1.2.tgz", "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.1.3.tgz",
"integrity": "sha512-l6pzAz8wVL7Z6CD/hYN7593xogzMFfX04dwyniqDswT8whGSopSG3UMOIx7xkBFbnXTdRgi4/2tbwFXyBy2WBw==" "integrity": "sha512-jJXUoNkmHozqlcXzNiYytcmEe3eNxn7Vh8hmnIoRi0TmT3ChQ0osuSApuIObIomnIcvqlA24FCpnamKvfZ7F5g=="
}, },
"@fortawesome/fontawesome-free-brands": { "@fortawesome/fontawesome-free-brands": {
"version": "5.0.6", "version": "5.0.7",
"resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free-brands/-/fontawesome-free-brands-5.0.6.tgz", "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free-brands/-/fontawesome-free-brands-5.0.7.tgz",
"integrity": "sha512-rDf1kn/rnddo+PE9WCZhCRqHsa5kPm1IiA5sVfKrnT2TAn2RfNbHp3hddl+DDBbgW2DLiT0Y7xZTY7OHUR428A==", "integrity": "sha512-+rJGLIG+MDk4i4rEVvTCdBlPS8lj+pXz6dZwURN7I4XSrAayUYnU95pyMuRNNeA/fLJTX6cDFXFSFHF5I/1zcw==",
"requires": { "requires": {
"@fortawesome/fontawesome-common-types": "0.1.2" "@fortawesome/fontawesome-common-types": "0.1.3"
} }
}, },
"@fortawesome/fontawesome-free-regular": { "@fortawesome/fontawesome-free-regular": {
"version": "5.0.6", "version": "5.0.7",
"resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free-regular/-/fontawesome-free-regular-5.0.6.tgz", "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free-regular/-/fontawesome-free-regular-5.0.7.tgz",
"integrity": "sha512-BIu/uFfyrV7SfXLtQbmBFlm+Nt1v6eBnwkTmlvaP9LK5F/r+NTS5Fk86ai4hwCkms8EmE3kGIZXggZwHNT14GQ==", "integrity": "sha512-JunQcUhMR32SGuKbC/Dt87ESxHEjl5dynJajc7YAOWpcGPsI9y/eyCLR60qON8owhlorVE4xtT+iYaJosc4MzQ==",
"requires": { "requires": {
"@fortawesome/fontawesome-common-types": "0.1.2" "@fortawesome/fontawesome-common-types": "0.1.3"
} }
}, },
"@fortawesome/fontawesome-free-solid": { "@fortawesome/fontawesome-free-solid": {
"version": "5.0.6", "version": "5.0.7",
"resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free-solid/-/fontawesome-free-solid-5.0.6.tgz", "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free-solid/-/fontawesome-free-solid-5.0.7.tgz",
"integrity": "sha512-vpysFybs2fWuI5RblDQX8r20vMX1Kc9yXmqoJ5RGOdRiXs105FLzJgGK1UlYf2NeECdvZ/O65Oo74oDgshpE7A==", "integrity": "sha512-eRboWGNrgW2cyl9pGpWfDSEc8KekBZWCCmL1Sad/K15JkqvWRKywzWzuiOt0c6LOTxOxnIDrCMI/QUUzfATf2Q==",
"requires": { "requires": {
"@fortawesome/fontawesome-common-types": "0.1.2" "@fortawesome/fontawesome-common-types": "0.1.3"
} }
}, },
"@fortawesome/vue-fontawesome": { "@fortawesome/vue-fontawesome": {
...@@ -3927,9 +3927,9 @@ ...@@ -3927,9 +3927,9 @@
} }
}, },
"file-loader": { "file-loader": {
"version": "1.1.9", "version": "1.1.10",
"resolved": "https://registry.npmjs.org/file-loader/-/file-loader-1.1.9.tgz", "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-1.1.10.tgz",
"integrity": "sha512-6ql03hOSoJHBkTB+3De/f7NJse+JXkUwvAf3y4Q5rIcTD0kqJiE3btvLnDcZT+P4t1QYLb9dJ9EI4auzfo3wFA==", "integrity": "sha512-dNnT4yJgUPtGDg0+m03kQ0b/PZi3Y12EnqYuRPNCsbYkBZc6j+fwVWy40jWzZjn5kIzQ4BLIxzJimbwAYlnPGw==",
"dev": true, "dev": true,
"requires": { "requires": {
"loader-utils": "1.1.0", "loader-utils": "1.1.0",
...@@ -3937,9 +3937,9 @@ ...@@ -3937,9 +3937,9 @@
}, },
"dependencies": { "dependencies": {
"ajv": { "ajv": {
"version": "6.1.1", "version": "6.2.0",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.1.1.tgz", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.2.0.tgz",
"integrity": "sha1-l41Zf7wrfQ5aXD3esUmmgvKr+g4=", "integrity": "sha1-r6wpW7qgFSRJ5SJ0LkVHwa6TKNI=",
"dev": true, "dev": true,
"requires": { "requires": {
"fast-deep-equal": "1.0.0", "fast-deep-equal": "1.0.0",
...@@ -3959,7 +3959,7 @@ ...@@ -3959,7 +3959,7 @@
"integrity": "sha512-yYrjb9TX2k/J1Y5UNy3KYdZq10xhYcF8nMpAW6o3hy6Q8WSIEf9lJHG/ePnOBfziPM3fvQwfOwa13U/Fh8qTfA==", "integrity": "sha512-yYrjb9TX2k/J1Y5UNy3KYdZq10xhYcF8nMpAW6o3hy6Q8WSIEf9lJHG/ePnOBfziPM3fvQwfOwa13U/Fh8qTfA==",
"dev": true, "dev": true,
"requires": { "requires": {
"ajv": "6.1.1", "ajv": "6.2.0",
"ajv-keywords": "3.1.0" "ajv-keywords": "3.1.0"
} }
} }
...@@ -8755,9 +8755,9 @@ ...@@ -8755,9 +8755,9 @@
} }
}, },
"postcss-loader": { "postcss-loader": {
"version": "2.1.0", "version": "2.1.1",
"resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-2.1.0.tgz", "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-2.1.1.tgz",
"integrity": "sha512-S/dKzpDwGFmP9g8eyCu9sUIV+/+3UooeTpYlsKf23qKDdrhHuA4pTSfytVu0rEJ0iDqUavXrgtOPq5KhNyNMOw==", "integrity": "sha512-f0J/DWE/hyO9/LH0WHpXkny/ZZ238sSaG3p1SRBtVZnFWUtD7GXIEgHoBg8cnAeRbmEvUxHQptY46zWfwNYj/w==",
"dev": true, "dev": true,
"requires": { "requires": {
"loader-utils": "1.1.0", "loader-utils": "1.1.0",
...@@ -8767,9 +8767,9 @@ ...@@ -8767,9 +8767,9 @@
}, },
"dependencies": { "dependencies": {
"ajv": { "ajv": {
"version": "6.1.1", "version": "6.2.0",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.1.1.tgz", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.2.0.tgz",
"integrity": "sha1-l41Zf7wrfQ5aXD3esUmmgvKr+g4=", "integrity": "sha1-r6wpW7qgFSRJ5SJ0LkVHwa6TKNI=",
"dev": true, "dev": true,
"requires": { "requires": {
"fast-deep-equal": "1.0.0", "fast-deep-equal": "1.0.0",
...@@ -8789,7 +8789,7 @@ ...@@ -8789,7 +8789,7 @@
"integrity": "sha512-yYrjb9TX2k/J1Y5UNy3KYdZq10xhYcF8nMpAW6o3hy6Q8WSIEf9lJHG/ePnOBfziPM3fvQwfOwa13U/Fh8qTfA==", "integrity": "sha512-yYrjb9TX2k/J1Y5UNy3KYdZq10xhYcF8nMpAW6o3hy6Q8WSIEf9lJHG/ePnOBfziPM3fvQwfOwa13U/Fh8qTfA==",
"dev": true, "dev": true,
"requires": { "requires": {
"ajv": "6.1.1", "ajv": "6.2.0",
"ajv-keywords": "3.1.0" "ajv-keywords": "3.1.0"
} }
} }
......
spring-boot-admin-server-ui/package.json
...@@ -9,10 +9,10 @@ ...@@ -9,10 +9,10 @@
"test:watch": "jest --watch" "test:watch": "jest --watch"
}, },
"dependencies": { "dependencies": {
"@fortawesome/fontawesome": "^1.1.3", "@fortawesome/fontawesome": "^1.1.4",
"@fortawesome/fontawesome-free-brands": "^5.0.6", "@fortawesome/fontawesome-free-brands": "^5.0.7",
"@fortawesome/fontawesome-free-regular": "^5.0.6", "@fortawesome/fontawesome-free-regular": "^5.0.7",
"@fortawesome/fontawesome-free-solid": "^5.0.6", "@fortawesome/fontawesome-free-solid": "^5.0.7",
"@fortawesome/vue-fontawesome": "0.0.22", "@fortawesome/vue-fontawesome": "0.0.22",
"axios": "^0.18.0", "axios": "^0.18.0",
"bulma": "^0.6.2", "bulma": "^0.6.2",
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
"eslint-plugin-html": "^4.0.2", "eslint-plugin-html": "^4.0.2",
"eslint-plugin-vue": "^4.3.0", "eslint-plugin-vue": "^4.3.0",
"extract-text-webpack-plugin": "^3.0.2", "extract-text-webpack-plugin": "^3.0.2",
"file-loader": "^1.1.9", "file-loader": "^1.1.10",
"glob": "^7.1.2", "glob": "^7.1.2",
"html-loader": "^0.5.5", "html-loader": "^0.5.5",
"html-webpack-plugin": "^2.30.0", "html-webpack-plugin": "^2.30.0",
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
"lodash-webpack-plugin": "^0.11.4", "lodash-webpack-plugin": "^0.11.4",
"node-sass": "^4.7.2", "node-sass": "^4.7.2",
"optimize-css-assets-webpack-plugin": "^3.2.0", "optimize-css-assets-webpack-plugin": "^3.2.0",
"postcss-loader": "^2.1.0", "postcss-loader": "^2.1.1",
"sass-loader": "^6.0.6", "sass-loader": "^6.0.6",
"style-loader": "^0.20.2", "style-loader": "^0.20.2",
"url-loader": "^0.6.2", "url-loader": "^0.6.2",
......
spring-boot-admin-server-ui/src/main/frontend/views/applications/index.vue
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
statusGroups() { statusGroups() {
const byStatus = _.groupBy(this.applications, application => application.status); const byStatus = _.groupBy(this.applications, application => application.status);
const list = _.transform(byStatus, (result, value, key) => { const list = _.transform(byStatus, (result, value, key) => {
result.push({status: key, applications: value}) result.push({status: key, applications: _.sortBy(value, [application => application.name])})
}, []); }, []);
return _.sortBy(list, [item => item.status]); return _.sortBy(list, [item => item.status]);
}, },
......
spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/web/servlet/InstancesProxyController.java
...@@ -93,7 +93,7 @@ public class InstancesProxyController extends AbstractInstancesProxyController { ...@@ -93,7 +93,7 @@ public class InstancesProxyController extends AbstractInstancesProxyController {
try { try {
return DataBufferUtils.write(clientResponse.body(BodyExtractors.toDataBuffers()), response.getBody()) return DataBufferUtils.write(clientResponse.body(BodyExtractors.toDataBuffers()), response.getBody())
.doOnNext(DataBufferUtils::release) .map(DataBufferUtils::release)
.then(); .then();
} catch (IOException ex) { } catch (IOException ex) {
return Mono.error(new ResponseStatusException(HttpStatus.INTERNAL_SERVER_ERROR, null, ex)); return Mono.error(new ResponseStatusException(HttpStatus.INTERNAL_SERVER_ERROR, null, ex));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment