Skip to content

Commit a84b538

Browse files
committed
Merge remote-tracking branch 'origin/update-from-template' into develop
2 parents 5837d41 + 4865729 commit a84b538

File tree

7 files changed

+9
-27
lines changed

7 files changed

+9
-27
lines changed

.github/dependabot.yml

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

.github/workflows/checkBuild.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ jobs:
7272

7373
code-style:
7474
runs-on: ubuntu-latest
75+
if: ${{ github.event_name != 'pull_request' || !startsWith(github.head_ref, 'renovate/') }}
7576

7677
strategy:
7778
matrix:

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ jobs:
161161
working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
162162

163163
- name: Deploy to Github pages
164-
uses: peaceiris/actions-gh-pages@v3
164+
uses: peaceiris/actions-gh-pages@v4
165165
with:
166166
github_token: ${{ secrets.GITHUB_TOKEN }}
167167
publish_dir: ./${{ env.PRIMARY_MAVEN_MODULE }}/target/site

.github/workflows/sonar.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@ jobs:
2727
sonar:
2828
name: SonarCloud Scan
2929
runs-on: ubuntu-latest
30-
# Dependabot PRs have no access to secrets (SONAR_TOKEN) -> Ignore them
31-
if: ${{ github.event_name != 'pull_request' || !startsWith(github.head_ref, 'dependabot/') }}
30+
if: ${{ github.event_name != 'pull_request' || !startsWith(github.head_ref, 'renovate/') }}
3231
steps:
3332
- uses: actions/checkout@v4
3433
with:

.mvn/wrapper/maven-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@
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.5/apache-maven-3.9.5-bin.zip
17+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip
1818
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar

renovate.json5

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
3+
"rebaseWhen": "behind-base-branch"
4+
}

spring-security-advanced-authentication-ui/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@
183183
<plugin>
184184
<groupId>org.apache.maven.plugins</groupId>
185185
<artifactId>maven-source-plugin</artifactId>
186-
<version>3.3.0</version>
186+
<version>3.3.1</version>
187187
<executions>
188188
<execution>
189189
<id>attach-sources</id>

0 commit comments

Comments
 (0)