Skip to content

Commit

Permalink
chore: merge master
Browse files Browse the repository at this point in the history
  • Loading branch information
@SteKoe
SteKoe committed Dec 6, 2024
2 parents 8e04cdb + 18318d2 commit ce33789
Show file tree
Hide file tree
Showing 23 changed files with 2,011 additions and 2,355 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-feature.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
run: |
mvn -B verify -P coverage --no-transfer-progress -D maven.javadoc.skip=true
- uses: codecov/codecov-action@v4
- uses: codecov/codecov-action@v5
with:
files: "'*/jacoco.xml'"

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-main.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
run: |
mvn -B verify -P coverage --no-transfer-progress -D maven.javadoc.skip=true
- uses: codecov/codecov-action@v4
- uses: codecov/codecov-action@v5
with:
files: "'*/jacoco.xml'"

Expand Down Expand Up @@ -84,7 +84,7 @@ jobs:
run: echo ${{ steps.project.outputs.version }}

- name: Deploy Asciidoc docs output to GitHub Pages
uses: JamesIves/github-pages-deploy-action@v4.6.8
uses: JamesIves/github-pages-deploy-action@v4.7.2
with:
branch: gh-pages # The branch the action should deploy to.
folder: spring-boot-admin-docs/target/generated-docs # The folder the action should deploy.
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release-to-maven-central.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,15 +66,15 @@ jobs:
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}

- name: Deploy Asciidoc docs output to GitHub Pages
uses: JamesIves/github-pages-deploy-action@v4.6.8
uses: JamesIves/github-pages-deploy-action@v4.7.2
with:
branch: gh-pages # The branch the action should deploy to.
folder: spring-boot-admin-docs/target/generated-docs # The folder the action should deploy.
target-folder: ${{ github.event.inputs.releaseversion }}
clean: true # Automatically remove deleted files from the deploy branch

- name: Deploy Asciidoc docs output to GitHub Pages
uses: JamesIves/github-pages-deploy-action@v4.6.8
uses: JamesIves/github-pages-deploy-action@v4.7.2
if: github.event.inputs.copyDocsToCurrent == 'true'
with:
branch: gh-pages # The branch the action should deploy to.
Expand Down Expand Up @@ -146,7 +146,7 @@ jobs:
- name: Commit new SNAPSHOT version
uses: stefanzweifel/git-auto-commit-action@v5
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.PAT }}
with:
commit_message: "chore: update to next SNAPSHOT version"

Expand Down
34 changes: 18 additions & 16 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<description>Spring Boot Admin</description>
<url>https://github.com/codecentric/spring-boot-admin/</url>
<properties>
<revision>3.3.5-SNAPSHOT</revision>
<revision>3.4.2-SNAPSHOT</revision>
<java.version>17</java.version>

<maven.compiler.source>${java.version}</maven.compiler.source>
Expand All @@ -36,48 +36,50 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

<!-- used dependencies versions -->
<spring-boot.version>3.3.5</spring-boot.version>
<spring-cloud.version>2023.0.3</spring-cloud.version>
<spring-boot.version>3.4.0</spring-boot.version>
<spring-cloud.version>2024.0.0</spring-cloud.version>
<wiremock.version>3.0.1</wiremock.version>
<hazelcast-tests.version>5.4.0</hazelcast-tests.version>
<hazelcast-tests.version>5.5.0</hazelcast-tests.version>
<findbugs-jsr305.version>3.0.2</findbugs-jsr305.version>
<awaitility.version>4.2.2</awaitility.version>
<testcontainers.version>1.20.3</testcontainers.version>
<testcontainers.version>1.20.4</testcontainers.version>
<eureka-client.version>3.1.1</eureka-client.version>
<jetty.version>12.0.14</jetty.version>
<jetty.version>12.0.15</jetty.version>

<!-- plugin versions -->
<build-helper-maven-plugin.version>3.6.0</build-helper-maven-plugin.version>
<maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
<versions-maven-plugin.version>2.17.1
<versions-maven-plugin.version>2.18.0
</versions-maven-plugin.version> <!-- because of https://github.com/mojohaus/versions/issues/855 -->
<maven-clean-plugin.version>3.4.0</maven-clean-plugin.version>
<maven-site-plugin.version>3.21.0</maven-site-plugin.version>
<maven-dependency-plugin.version>3.8.1</maven-dependency-plugin.version>
<maven-deploy-plugin.version>3.1.3</maven-deploy-plugin.version>
<maven-enforcer-plugin.version>3.5.0</maven-enforcer-plugin.version>
<maven-surefire-plugin.version>3.5.1</maven-surefire-plugin.version>
<maven-failsafe-plugin.version>3.5.1</maven-failsafe-plugin.version>
<maven-surefire-plugin.version>3.5.2</maven-surefire-plugin.version>
<maven-failsafe-plugin.version>3.5.2</maven-failsafe-plugin.version>
<maven-install-plugin.version>3.1.3</maven-install-plugin.version>
<maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
<maven-javadoc-plugin.version>3.10.1</maven-javadoc-plugin.version>
<maven-javadoc-plugin.version>3.11.1</maven-javadoc-plugin.version>
<maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
<maven-source-plugin.version>3.3.1</maven-source-plugin.version>
<maven-war-plugin.version>3.4.0</maven-war-plugin.version>
<maven-gpg-plugin.version>3.2.7</maven-gpg-plugin.version>
<frontend-maven-plugin.version>1.15.1</frontend-maven-plugin.version>
<jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>
<asciidoctor-maven-plugin.version>3.0.0</asciidoctor-maven-plugin.version>
<asciidoctor-converter-doxia-module.version>3.0.0</asciidoctor-converter-doxia-module.version>
<asciidoctor-maven-plugin.version>3.1.0</asciidoctor-maven-plugin.version>
<asciidoctor-converter-doxia-module.version>3.1.0</asciidoctor-converter-doxia-module.version>
<asciidoctor-maven-plugin.version>3.1.1</asciidoctor-maven-plugin.version>
<asciidoctor-converter-doxia-module.version>3.1.1</asciidoctor-converter-doxia-module.version>
<git-commit-id-maven-plugin.version>4.9.10</git-commit-id-maven-plugin.version>
<flatten-maven-plugin.version>1.6.0</flatten-maven-plugin.version>
<maven-checkstyle-plugin.version>3.6.0</maven-checkstyle-plugin.version>
<checkstyle.version>10.18.2</checkstyle.version>
<checkstyle.version>10.20.2</checkstyle.version>
<spring-javaformat-checkstyle.version>0.0.43</spring-javaformat-checkstyle.version>
<nexus-staging-maven-plugin.version>1.7.0</nexus-staging-maven-plugin.version>
<node.version>v20.18.0</node.version>
<npm.version>10.8.2</npm.version>
<jolokia-support-spring.version>2.1.1</jolokia-support-spring.version>
<node.version>v18.20.2</node.version>
<npm.version>10.5.2</npm.version>
<jolokia-support-spring.version>2.1.2</jolokia-support-spring.version>
</properties>
<modules>
<module>spring-boot-admin-server</module>
Expand Down
4 changes: 4 additions & 0 deletions renovate.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@
"automerge": true,
"automergeType": "pr",
"platformAutomerge": true
},
{
"matchPackageNames": ["org.apache.maven.plugins:maven-site-plugin"],
"enabled": false
}
]
}
6 changes: 4 additions & 2 deletions ...a/de/codecentric/boot/admin/client/config/SpringBootAdminClientAutoConfigurationTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@

package de.codecentric.boot.admin.client.config;

import java.time.Duration;

import org.junit.jupiter.api.Test;
import org.springframework.boot.actuate.autoconfigure.endpoint.EndpointAutoConfiguration;
import org.springframework.boot.actuate.autoconfigure.endpoint.web.WebEndpointAutoConfiguration;
Expand Down Expand Up @@ -106,8 +108,8 @@ public void blockingClientInBlockingEnvironment() {

Integer connectTimeout = (Integer) ReflectionTestUtils.getField(requestFactory, "connectTimeout");
assertThat(connectTimeout).isEqualTo(1337);
Integer readTimeout = (Integer) ReflectionTestUtils.getField(requestFactory, "readTimeout");
assertThat(readTimeout).isEqualTo(42);
Duration readTimeout = (Duration) ReflectionTestUtils.getField(requestFactory, "readTimeout");
assertThat(readTimeout).isEqualTo(Duration.ofMillis(42));
});
}

Expand Down
112 changes: 43 additions & 69 deletions spring-boot-admin-docs/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
~ limitations under the License.
-->

<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-boot-admin-docs</artifactId>
Expand All @@ -29,86 +29,60 @@
<relativePath>../spring-boot-admin-build</relativePath>
</parent>

<properties>
<site.skin.version>2.3.3</site.skin.version>
</properties>

<build>
<plugins>
<plugin>
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
<configuration>
<workingDirectory>src/site</workingDirectory>
<environmentVariables>
<NODE_ENV>production</NODE_ENV>
<VERSION>${project.version}</VERSION>
</environmentVariables>
</configuration>
<executions>
<execution>
<id>install-node-and-npm</id>
<goals>
<goal>install-node-and-npm</goal>
</goals>
<configuration>
<nodeVersion>${node.version}</nodeVersion>
<npmVersion>${npm.version}</npmVersion>
</configuration>
</execution>
<execution>
<id>npm-install</id>
<phase>compile</phase>
<goals>
<goal>npm</goal>
</goals>
<configuration>
<arguments>ci --prefer-offline --no-audit</arguments>
</configuration>
</execution>
<execution>
<id>npm-build</id>
<phase>prepare-package</phase>
<goals>
<goal>npm</goal>
</goals>
<configuration>
<arguments>run build:prod</arguments>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.rodnansol</groupId>
<artifactId>spring-configuration-property-documenter-maven-plugin</artifactId>
<version>0.6.1</version>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<!--
Due to changes in Doxia (see https://cwiki.apache.org/confluence/display/MAVEN/Towards+Doxia+2.0.0+Stack),
we have to use a fixed version here, as our site skin does not work with the latest version.
-->
<version>3.12.1</version>
<executions>
<execution>
<id>generate-adoc</id>
<id>output-html</id>
<phase>generate-resources</phase>
<goals>
<goal>generate-and-aggregate-documents</goal>
<goal>site</goal>
</goals>
<phase>generate-resources</phase>
<configuration>
<type>ADOC</type>
<asciiDocCustomization>
<removeEmptyGroups>true</removeEmptyGroups>
<contentCustomization>
<includeType>false</includeType>
<includeDeprecation>false</includeDeprecation>
</contentCustomization>
</asciiDocCustomization>
<inputs>
<input>
<name>spring-boot-admin-server</name>
<input>../spring-boot-admin-server</input>
</input>
<input>
<name>spring-boot-admin-client</name>
<input>../spring-boot-admin-client</input>
</input>
</inputs>
<outputFile>target/aggregated-adoc.adoc</outputFile>
<outputDirectory>target/generated-docs</outputDirectory>
</configuration>
</execution>
</executions>
<configuration>
<!-- Disable generateReports if you don't want to include the built-in reports -->
<generateReports>false</generateReports>
<generateSitemap>false</generateSitemap>
<relativizeDecorationLinks>false</relativizeDecorationLinks>
<inputEncoding>UTF-8</inputEncoding>
<outputEncoding>UTF-8</outputEncoding>
<asciidoc>
<!-- Optional site-wide AsciiDoc attributes -->
<attributes>
<icons>font</icons>
<source-highlighter>coderay</source-highlighter>
<commit-id>${git.commit.id.abbrev}</commit-id>
<commit-time>${git.commit.time}</commit-time>
<project-version>${project.version}</project-version>
<spring-cloud-version>${spring-cloud.version}</spring-cloud-version>
<samples-dir>${basedir}/../spring-boot-admin-samples/</samples-dir>
<main-dir>${basedir}/../</main-dir>
<github-src>https://github.com/codecentric/spring-boot-admin/tree/master</github-src>
</attributes>
</asciidoc>
</configuration>
<dependencies>
<dependency>
<groupId>com.bernardomg.maven.skins</groupId>
<artifactId>docs-maven-skin</artifactId>
<version>${site.skin.version}</version>
</dependency>
<dependency>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctor-converter-doxia-module</artifactId>
Expand Down
Loading

0 comments on commit ce33789

Please sign in to comment.