diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 3fe4d0654..0d35062f8 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -9,4 +9,10 @@ updates: directory: "/" schedule: interval: "daily" - open-pull-requests-limit: 10 \ No newline at end of file + open-pull-requests-limit: 10 + + - package-ecosystem: "github-actions" + directory: "/" + schedule: + # Check for updates to GitHub Actions every week + interval: "weekly" \ No newline at end of file diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml index 3a5f11c13..5df7f30b5 100644 --- a/.github/workflows/maven-build.yml +++ b/.github/workflows/maven-build.yml @@ -30,10 +30,10 @@ jobs: steps: - name: Checkout Source - uses: actions/checkout@v5 + uses: actions/checkout@v7.0.1 - name: Setup Java ${{ matrix.java }} - uses: actions/setup-java@v5 + uses: actions/setup-java@v6.0.1 with: distribution: 'temurin' java-version: ${{ matrix.java }} @@ -49,7 +49,7 @@ jobs: --activate-profiles test,coverage,${{ matrix.maven-profile-spring-framework }} - name: Upload coverage reports to Codecov - uses: codecov/codecov-action@v5 + uses: codecov/codecov-action@v7.1.1 with: token: ${{ secrets.CODECOV_TOKEN }} slug: microsphere-projects/microsphere-spring \ No newline at end of file diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index e5b7bba56..9b0f68f03 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -33,10 +33,10 @@ jobs: fi - name: Checkout Source - uses: actions/checkout@v5 + uses: actions/checkout@v7.0.1 - name: Setup Maven Central Repository - uses: actions/setup-java@v5 + uses: actions/setup-java@v6.0.1 with: java-version: '8' distribution: 'temurin' @@ -69,7 +69,7 @@ jobs: models: read steps: - name: Checkout Source - uses: actions/checkout@v5 + uses: actions/checkout@v7.0.1 with: fetch-depth: 0 diff --git a/.github/workflows/sync-branches-from-upstream.yml b/.github/workflows/sync-branches-from-upstream.yml index 95ee58254..fa2620ad4 100644 --- a/.github/workflows/sync-branches-from-upstream.yml +++ b/.github/workflows/sync-branches-from-upstream.yml @@ -52,7 +52,7 @@ jobs: - name: Checkout Repository if: steps.fork_check.outputs.is_fork == 'true' - uses: actions/checkout@v5 + uses: actions/checkout@v7.0.1 with: fetch-depth: 0 token: ${{ secrets.GITHUB_TOKEN }} diff --git a/microsphere-spring-parent/pom.xml b/microsphere-spring-parent/pom.xml index d02907e57..b14bbca28 100644 --- a/microsphere-spring-parent/pom.xml +++ b/microsphere-spring-parent/pom.xml @@ -19,8 +19,8 @@ Microsphere Spring Parent - 0.3.19 - 0.2.2 + 0.3.21 + 0.3.1 2.22.2 2.6 3.9.1 diff --git a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/WebRequestPatternsRule.java b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/WebRequestPatternsRule.java index f3bc961fc..bf1b4fbcc 100644 --- a/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/WebRequestPatternsRule.java +++ b/microsphere-spring-web/src/main/java/io/microsphere/spring/web/rule/WebRequestPatternsRule.java @@ -20,6 +20,7 @@ import org.springframework.util.AntPathMatcher; import org.springframework.util.PathMatcher; import org.springframework.web.context.request.NativeWebRequest; +import org.springframework.web.util.UrlPathHelper; import java.util.Collection; import java.util.List; @@ -50,6 +51,7 @@ * * @author Mercy * @see org.springframework.web.servlet.mvc.condition.PatternsRequestCondition + * @see org.springframework.web.reactive.result.condition.PatternsRequestCondition * @since 1.0.0 */ public class WebRequestPatternsRule extends AbstractWebRequestRule { @@ -90,6 +92,11 @@ public WebRequestPatternsRule(String[] patterns, boolean useTrailingSlashMatch, /** * Variant of {@link #WebRequestPatternsRule(String...)} with a + * {@link UrlPathHelper} and a {@link PathMatcher}, and whether to match + * trailing slashes. + *

As of 5.3 the path is obtained through the static method + * {@link UrlPathHelper#getResolvedLookupPath} and a {@code UrlPathHelper} + * does not need to be passed in. * {@link PathMatcher}, and whether to match trailing slashes. * {@link #WebRequestPatternsRule(String[], boolean, PathMatcher)}. */ @@ -100,7 +107,11 @@ public WebRequestPatternsRule(String[] patterns, @Nullable PathMatcher pathMatch /** * Variant of {@link #WebRequestPatternsRule(String...)} with a - * {@link PathMatcher}, and flags for matching with suffixes and trailing slashes. + * {@link UrlPathHelper} and a {@link PathMatcher}, and flags for matching + * with suffixes and trailing slashes. + *

As of 5.3 the path is obtained through the static method + * {@link UrlPathHelper#getResolvedLookupPath} and a {@code UrlPathHelper} + * does not need to be passed in. */ public WebRequestPatternsRule(String[] patterns, @Nullable PathMatcher pathMatcher, boolean useSuffixPatternMatch, boolean useTrailingSlashMatch) { this(patterns, pathMatcher, useSuffixPatternMatch, useTrailingSlashMatch, null); @@ -108,8 +119,8 @@ public WebRequestPatternsRule(String[] patterns, @Nullable PathMatcher pathMatch /** * Variant of {@link #WebRequestPatternsRule(String...)} with a - * {@link PathMatcher}, and flags for matching with suffixes and trailing - * slashes, along with specific extensions. + * {@link UrlPathHelper} and a {@link PathMatcher}, and flags for matching + * with suffixes and trailing slashes, along with specific extensions. * * @param patterns * @param pathMatcher diff --git a/pom.xml b/pom.xml index 956fb212d..8a7c7c901 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ io.github.microsphere-projects microsphere-build - 0.3.14 + 1.0.1 4.0.0