Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,10 @@ updates:
directory: "/"
schedule:
interval: "daily"
open-pull-requests-limit: 10
open-pull-requests-limit: 10

- package-ecosystem: "github-actions"
directory: "/"
schedule:
# Check for updates to GitHub Actions every week
interval: "weekly"
6 changes: 3 additions & 3 deletions .github/workflows/maven-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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
6 changes: 3 additions & 3 deletions .github/workflows/maven-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sync-branches-from-upstream.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
4 changes: 2 additions & 2 deletions microsphere-spring-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
<description>Microsphere Spring Parent</description>

<properties>
<microsphere-java.version>0.3.19</microsphere-java.version>
<microsphere-logging.version>0.2.2</microsphere-logging.version>
<microsphere-java.version>0.3.20</microsphere-java.version>
<microsphere-logging.version>0.2.3</microsphere-logging.version>
<jackson.version>2.22.2</jackson.version>
<snakeyaml.version>2.6</snakeyaml.version>
<p6spy.version>3.9.1</p6spy.version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -50,6 +51,7 @@
*
* @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
* @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<String> {
Expand Down Expand Up @@ -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.
* <p>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)}.
*/
Expand All @@ -100,16 +107,20 @@ 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.
* <p>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);
}

/**
* 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
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.github.microsphere-projects</groupId>
<artifactId>microsphere-build</artifactId>
<version>0.3.14</version>
<version>1.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
Loading