From b7400d4f7f68158639547c267bdf4c834c00902f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 26 Oct 2024 15:57:48 +0800 Subject: [PATCH] Update Spring Boot version to 3.3.5 (#61) * Update Spring Boot version to 3.3.5 * optimize pre-commit * add org.gradle.parallel=true & org.gradle.caching=true * add clean --------- Co-authored-by: DanielLiu1123 <62151295+DanielLiu1123@users.noreply.github.com> Co-authored-by: Freeman Liu --- .githooks/pre-commit | 17 +++++++---------- .github/workflows/build.yml | 2 +- .github/workflows/release-snapshot.yml | 2 +- .github/workflows/release.yml | 2 +- gradle.properties | 8 +++++--- website/docs/40-configuration-properties.md | 1 - 6 files changed, 15 insertions(+), 17 deletions(-) diff --git a/.githooks/pre-commit b/.githooks/pre-commit index 961adab..6db4964 100755 --- a/.githooks/pre-commit +++ b/.githooks/pre-commit @@ -1,21 +1,18 @@ #!/usr/bin/env bash +set -e + ./gradlew spotlessApply > /dev/null # generate configuration properties docs -./gradlew classes > /dev/null -./gradlew generateConfigurationPropertiesDocs > /dev/null +./gradlew classes generateConfigurationPropertiesDocs > /dev/null # escape {} in md -sed -i '' 's/{/\\{/g' build/configuration-properties.md - +perl -pi -e 's/{/\\{/g' build/configuration-properties.md # add sidebar_position -sed -i '' '1i\ ----\ -sidebar_position: 40\ ----\ -\ -' build/configuration-properties.md +perl -pi -e 'print "---\nsidebar_position: 40\n---\n\n" if $. == 1' build/configuration-properties.md +# remove generated time +perl -pi -e 's/This is a generated file.*\n//g' build/configuration-properties.md cp -f build/configuration-properties.md website/docs/40-configuration-properties.md diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 345780a..3c7a0f0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,4 +26,4 @@ jobs: cache: 'gradle' - name: Build - run: ./gradlew build --no-daemon + run: ./gradlew clean build --no-daemon --stacktrace diff --git a/.github/workflows/release-snapshot.yml b/.github/workflows/release-snapshot.yml index 7bb6998..fbc0d1e 100644 --- a/.github/workflows/release-snapshot.yml +++ b/.github/workflows/release-snapshot.yml @@ -21,4 +21,4 @@ jobs: cache: 'gradle' - name: Release Snapshot - run: OSSRH_USER=${{ secrets.OSSRH_USER }} OSSRH_PASSWORD=${{ secrets.OSSRH_PASSWORD }} ./gradlew publish + run: OSSRH_USER=${{ secrets.OSSRH_USER }} OSSRH_PASSWORD=${{ secrets.OSSRH_PASSWORD }} ./gradlew clean publish --no-daemon --stacktrace diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 45848f5..4a6aac3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -31,7 +31,7 @@ jobs: fi - name: Build - run: ./gradlew build --no-daemon + run: ./gradlew clean build --no-daemon --stacktrace - name: Decrypt secring.gpg run: openssl enc -aes-256-cbc -d -pbkdf2 -in secring.gpg.bin -out secring.gpg -pass pass:${{ secrets.privateKeyPassword }} diff --git a/gradle.properties b/gradle.properties index 24e8983..82c611e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ group=io.github.danielliu1123 -version=3.3.4-SNAPSHOT +version=3.3.5-SNAPSHOT -springBootVersion=3.3.4 +springBootVersion=3.3.5 # https://docs.spring.io/spring-cloud-release/reference/index.html # https://mvnrepository.com/artifact/org.springframework.cloud/spring-cloud-dependencies #springCloudVersion=2023.0.3 @@ -18,7 +18,7 @@ springConfigurationPropertyDocumenterVersion=0.7.1 # https://plugins.gradle.org/plugin/com.diffplug.gradle.spotless spotlessVersion=6.25.0 # https://plugins.gradle.org/plugin/com.github.spotbugs -spotbugsVersion=6.0.22 +spotbugsVersion=6.0.25 # /~https://github.com/spotbugs/spotbugs-gradle-plugin/blob/master/build.gradle.kts spotbugsAnnotationsVersion=4.8.6 @@ -26,3 +26,5 @@ spotbugsAnnotationsVersion=4.8.6 graalvmBuildToolsVersion=0.10.3 org.gradle.jvmargs=-Xmx2g +org.gradle.parallel=true +org.gradle.caching=true diff --git a/website/docs/40-configuration-properties.md b/website/docs/40-configuration-properties.md index a6fc4b7..6ddaa8e 100644 --- a/website/docs/40-configuration-properties.md +++ b/website/docs/40-configuration-properties.md @@ -41,4 +41,3 @@ This page was generated by [spring-configuration-property-documenter](https://gi |---|----|-----------|-------------|-----------| | enabled| java.lang.Boolean| Whether to enable refresh exchange clients, default \{@code false}. <p> This feature needs \{@code spring-cloud-context} dependency in the classpath. <p color="orange"> NOTE: This feature is not supported by native image. @see <a href="/~https://github.com/spring-cloud/spring-cloud-release/wiki/AOT-transformations-and-native-image-support#refresh-scope">Refresh Scope</a>| false| | -This is a generated file, generated at: **2024-09-26T01:16:48.554446**