Skip to content

Commit fb0b565

Browse files
SteKoeSteKoe
committed
Merge remote-tracking branch 'origin/master' into feat/grouping-wallboard
* origin/master: (93 commits) chore(deps): update storybook monorepo to v8.2.2 (#3496) chore(deps): update dependency sass to v1.77.8 (#3495) chore(deps): update babel monorepo to v7.24.8 (#3494) chore(deps): update dependency org.apache.maven.plugins:maven-surefire-plugin to v3.3.1 (#3492) fix(deps): update dependency org.springframework.cloud:spring-cloud-dependencies to v2023.0.3 (#3493) chore(deps): update dependency org.apache.maven.plugins:maven-failsafe-plugin to v3.3.1 (#3491) chore(deps): update npm to v10.8.2 (#3490) chore(deps): update storybook monorepo to v8.2.1 (#3489) chore(deps): update storybook monorepo to v8.2.0 (#3470) chore(deps): update dependency sass to v1.77.7 (#3488) chore(deps): update typescript-eslint monorepo to v7.16.0 (#3487) chore(deps): update node.js to v20.15.1 (#3486) chore(deps): update jamesives/github-pages-deploy-action action to v4.6.3 (#3484) chore(deps): update dependency org.eclipse.jetty:jetty-alpn-server to v12.0.11 (#3483) chore(deps): update dependency vite to v5.3.3 (#3482) chore(deps): update dependency vite-plugin-static-copy to v1.0.6 (#3481) chore(deps): update dependency vite-plugin-static-copy to v1.0.6 (#3480) chore(deps): update dependency eslint-plugin-vue to v9.27.0 (#3479) chore(deps): update dependency typescript to v5.5.3 (#3478) chore(deps): update typescript-eslint monorepo to v7.15.0 (#3477) ...
2 parents 9186d22 + 0391c12 commit fb0b565

File tree

17 files changed

+2135
-4459
lines changed

17 files changed

+2135
-4459
lines changed

‎.github/workflows/build-feature.yml‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,26 @@ on:
66
- master
77
- 1.*
88
- 2.*
9+
pull_request:
910

1011
jobs:
1112
build:
12-
1313
strategy:
1414
matrix:
1515
os: [ubuntu-latest]
1616

1717
runs-on: ${{ matrix.os }}
1818
steps:
1919

20+
- name: free disk space
21+
run: |
22+
df -h
23+
sudo swapoff -a
24+
sudo rm -f /swapfile
25+
sudo apt clean
26+
docker rmi $(docker image ls -aq)
27+
df -h
28+
2029
- uses: actions/checkout@v4
2130

2231
- name: Set up JDK 17

‎.github/workflows/build-main.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ jobs:
8484
run: echo ${{ steps.project.outputs.version }}
8585

8686
- name: Deploy Asciidoc docs output to GitHub Pages
87-
uses: JamesIves/github-pages-deploy-action@v4.6.1
87+
uses: JamesIves/github-pages-deploy-action@v4.6.3
8888
with:
8989
branch: gh-pages # The branch the action should deploy to.
9090
folder: spring-boot-admin-docs/target/generated-docs # The folder the action should deploy.

‎.github/workflows/build-pullrequest.yml‎

Lines changed: 0 additions & 42 deletions
This file was deleted.

‎.github/workflows/release-to-maven-central.yml‎

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,15 @@ jobs:
1919
steps:
2020
- run: echo "Will start a Maven Central upload with version ${{ github.event.inputs.releaseversion }}"
2121

22+
- name: free disk space
23+
run: |
24+
df -h
25+
sudo swapoff -a
26+
sudo rm -f /swapfile
27+
sudo apt clean
28+
docker rmi $(docker image ls -aq)
29+
df -h
30+
2231
- uses: actions/checkout@v4
2332

2433
- name: Set up settings.xml for Maven Central Repository
@@ -56,15 +65,15 @@ jobs:
5665
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
5766

5867
- name: Deploy Asciidoc docs output to GitHub Pages
59-
uses: JamesIves/github-pages-deploy-action@v4.6.1
68+
uses: JamesIves/github-pages-deploy-action@v4.6.3
6069
with:
6170
branch: gh-pages # The branch the action should deploy to.
6271
folder: spring-boot-admin-docs/target/generated-docs # The folder the action should deploy.
6372
target-folder: ${{ github.event.inputs.releaseversion }}
6473
clean: true # Automatically remove deleted files from the deploy branch
6574

6675
- name: Deploy Asciidoc docs output to GitHub Pages
67-
uses: JamesIves/github-pages-deploy-action@v4.6.1
76+
uses: JamesIves/github-pages-deploy-action@v4.6.3
6877
if: github.event.inputs.copyDocsToCurrent == 'true'
6978
with:
7079
branch: gh-pages # The branch the action should deploy to.
@@ -80,6 +89,15 @@ jobs:
8089
steps:
8190
- uses: actions/checkout@v4
8291

92+
- name: free disk space
93+
run: |
94+
df -h
95+
sudo swapoff -a
96+
sudo rm -f /swapfile
97+
sudo apt clean
98+
docker rmi $(docker image ls -aq)
99+
df -h
100+
83101
- name: Generate changelog
84102
id: changelog
85103
uses: metcalfc/changelog-generator@v4.3.1

‎.mvn/wrapper/maven-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@
1414
# KIND, either express or implied. See the License for the
1515
# specific language governing permissions and limitations
1616
# under the License.
17-
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip
17+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.8/apache-maven-3.9.8-bin.zip

‎README.md‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,12 @@ Monitoring Python applications is available using [Pyctuator](https://github.com
1212
## Compatibility Matrix
1313
In the Spring Boot Admin Server App, the Spring Boot Admin's version matches the major and minor versions of Spring Boot.
1414

15-
| Spring Boot Version | Spring Boot Admin |
16-
|---------------------|--------------------|
17-
| 2.6 | 2.6.Y |
18-
| 2.7 | 2.7.Y |
19-
| 3.0 | 3.0.Y |
20-
| 3.1 | 3.1.Y |
21-
| 3.2 | 3.2.Y |
15+
| Spring Boot Version | Spring Boot Admin |
16+
|---------------------|-------------------|
17+
| 2.7 | 2.7.Y |
18+
| 3.0 | 3.0.Y |
19+
| ... | ... |
20+
| 3.3 | 3.3.Y |
2221

2322
Nevertheless, it is possible to monitor any version of a Spring Boot service independently of the underlying Spring Boot version in the service.
2423
Hence, it is possible to run Spring Boot Admin Server version 2.6 and monitor a service that is running on Spring Boot 2.3 using Spring Boot Admin Client version 2.3.

‎pom.xml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<description>Spring Boot Admin</description>
2727
<url>https://github.com/codecentric/spring-boot-admin/</url>
2828
<properties>
29-
<revision>3.2.4-SNAPSHOT</revision>
29+
<revision>3.3.3-SNAPSHOT</revision>
3030
<java.version>17</java.version>
3131

3232
<maven.compiler.source>${java.version}</maven.compiler.source>
@@ -36,31 +36,31 @@
3636
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
3737

3838
<!-- used dependencies versions -->
39-
<spring-boot.version>3.3.0</spring-boot.version>
40-
<spring-cloud.version>2023.0.1</spring-cloud.version>
39+
<spring-boot.version>3.3.1</spring-boot.version>
40+
<spring-cloud.version>2023.0.3</spring-cloud.version>
4141
<wiremock.version>3.0.1</wiremock.version>
4242
<hazelcast-tests.version>5.4.0</hazelcast-tests.version>
4343
<findbugs-jsr305.version>3.0.2</findbugs-jsr305.version>
4444
<awaitility.version>4.2.1</awaitility.version>
4545
<testcontainers.version>1.19.8</testcontainers.version>
4646
<eureka-client.version>3.1.1</eureka-client.version>
47-
<jetty.version>12.0.9</jetty.version>
47+
<jetty.version>12.0.11</jetty.version>
4848

4949
<!-- plugin versions -->
5050
<build-helper-maven-plugin.version>3.6.0</build-helper-maven-plugin.version>
5151
<maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
52-
<versions-maven-plugin.version>2.16.2
52+
<versions-maven-plugin.version>2.17.0
5353
</versions-maven-plugin.version> <!-- because of https://github.com/mojohaus/versions/issues/855 -->
54-
<maven-clean-plugin.version>3.3.2</maven-clean-plugin.version>
54+
<maven-clean-plugin.version>3.4.0</maven-clean-plugin.version>
5555
<maven-site-plugin.version>3.12.1</maven-site-plugin.version>
56-
<maven-dependency-plugin.version>3.6.1</maven-dependency-plugin.version>
56+
<maven-dependency-plugin.version>3.7.1</maven-dependency-plugin.version>
5757
<maven-deploy-plugin.version>3.1.2</maven-deploy-plugin.version>
58-
<maven-enforcer-plugin.version>3.4.1</maven-enforcer-plugin.version>
59-
<maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
60-
<maven-failsafe-plugin.version>3.2.5</maven-failsafe-plugin.version>
58+
<maven-enforcer-plugin.version>3.5.0</maven-enforcer-plugin.version>
59+
<maven-surefire-plugin.version>3.3.1</maven-surefire-plugin.version>
60+
<maven-failsafe-plugin.version>3.3.1</maven-failsafe-plugin.version>
6161
<maven-install-plugin.version>3.1.2</maven-install-plugin.version>
62-
<maven-jar-plugin.version>3.4.1</maven-jar-plugin.version>
63-
<maven-javadoc-plugin.version>3.6.3</maven-javadoc-plugin.version>
62+
<maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
63+
<maven-javadoc-plugin.version>3.7.0</maven-javadoc-plugin.version>
6464
<maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
6565
<maven-source-plugin.version>3.3.1</maven-source-plugin.version>
6666
<maven-war-plugin.version>3.4.0</maven-war-plugin.version>
@@ -71,10 +71,10 @@
7171
<asciidoctor-converter-doxia-module.version>3.0.0</asciidoctor-converter-doxia-module.version>
7272
<git-commit-id-maven-plugin.version>4.9.10</git-commit-id-maven-plugin.version>
7373
<flatten-maven-plugin.version>1.6.0</flatten-maven-plugin.version>
74-
<maven-checkstyle-plugin.version>3.3.1</maven-checkstyle-plugin.version>
75-
<checkstyle.version>10.16.0</checkstyle.version>
76-
<spring-javaformat-checkstyle.version>0.0.41</spring-javaformat-checkstyle.version>
77-
<nexus-staging-maven-plugin.version>1.6.13</nexus-staging-maven-plugin.version>
74+
<maven-checkstyle-plugin.version>3.4.0</maven-checkstyle-plugin.version>
75+
<checkstyle.version>10.17.0</checkstyle.version>
76+
<spring-javaformat-checkstyle.version>0.0.42</spring-javaformat-checkstyle.version>
77+
<nexus-staging-maven-plugin.version>1.7.0</nexus-staging-maven-plugin.version>
7878
<node.version>v18.20.2</node.version>
7979
<npm.version>10.5.2</npm.version>
8080
</properties>

‎spring-boot-admin-docs/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
<plugin>
101101
<groupId>org.apache.maven.plugins</groupId>
102102
<artifactId>maven-project-info-reports-plugin</artifactId>
103-
<version>3.5.0</version>
103+
<version>3.6.1</version>
104104
</plugin>
105105
</plugins>
106106
</reporting>

0 commit comments

Comments
 (0)