Skip to content

Commit 038a7d9

Browse files
committed
Merge remote-tracking branch 'origin/main' into webauthn-test
# Conflicts: # .github/workflows/claude-code-review.yml
2 parents 7f36b38 + 604a736 commit 038a7d9

8 files changed

Lines changed: 57 additions & 56 deletions

File tree

Lines changed: 9 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
name: Claude Code Review
22

33
on:
4-
pull_request:
5-
types: [opened, synchronize]
4+
pull_request_target:
5+
types: [opened, synchronize, ready_for_review, reopened]
66
# Optional: Only run on specific file changes
77
# paths:
88
# - "src/**/*.ts"
@@ -21,36 +21,24 @@ jobs:
2121
runs-on: ubuntu-latest
2222
permissions:
2323
contents: read
24-
pull-requests: read
25-
issues: read
24+
pull-requests: write
25+
issues: write
2626
id-token: write
2727

2828
steps:
2929
- name: Checkout repository
3030
uses: actions/checkout@v4
3131
with:
32+
ref: ${{ github.event.pull_request.head.sha }}
3233
fetch-depth: 1
3334

3435
- name: Run Claude Code Review
3536
id: claude-review
3637
uses: anthropics/claude-code-action@v1
3738
with:
3839
anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY }}
39-
prompt: |
40-
REPO: ${{ github.repository }}
41-
PR NUMBER: ${{ github.event.pull_request.number }}
42-
43-
Please review this pull request and provide feedback on:
44-
- Code quality and best practices
45-
- Potential bugs or issues
46-
- Performance considerations
47-
- Security concerns
48-
- Test coverage
49-
50-
Use the repository's CLAUDE.md for guidance on style and conventions. Be constructive and helpful in your feedback.
51-
52-
Use `gh pr comment` with your Bash tool to leave your review as a comment on the PR.
53-
40+
plugin_marketplaces: 'https://github.com/anthropics/claude-code.git'
41+
plugins: 'code-review@claude-code-plugins'
42+
prompt: '/code-review:code-review ${{ github.repository }}/pull/${{ github.event.pull_request.number }}'
5443
# See https://github.com/anthropics/claude-code-action/blob/main/docs/usage.md
55-
# or https://docs.claude.com/en/docs/claude-code/cli-reference for available options
56-
claude_args: '--allowed-tools "Bash(gh issue view:*),Bash(gh search:*),Bash(gh issue list:*),Bash(gh pr comment:*),Bash(gh pr diff:*),Bash(gh pr view:*),Bash(gh pr list:*)"'
44+
# or https://code.claude.com/docs/en/cli-reference for available options

.github/workflows/claude.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ jobs:
2020
runs-on: ubuntu-latest
2121
permissions:
2222
contents: read
23-
pull-requests: read
24-
issues: read
23+
pull-requests: write
24+
issues: write
2525
id-token: write
2626
actions: read # Required for Claude to read CI results on PRs
2727
steps:
@@ -45,5 +45,5 @@ jobs:
4545

4646
# Optional: Add claude_args to customize behavior and configuration
4747
# See https://github.com/anthropics/claude-code-action/blob/main/docs/usage.md
48-
# or https://docs.claude.com/en/docs/claude-code/cli-reference for available options
48+
# or https://code.claude.com/docs/en/cli-reference for available options
4949
# claude_args: '--allowed-tools Bash(gh pr:*)'

build.gradle

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
id 'java'
3-
id 'org.springframework.boot' version '4.0.2'
3+
id 'org.springframework.boot' version '4.0.3'
44
id 'io.spring.dependency-management' version '1.1.7'
55
id "com.github.ben-manes.versions" version "0.53.0"
66

@@ -56,10 +56,20 @@ dependencies {
5656

5757
// Thymeleaf extras - Spring Boot 4 manages the version
5858
implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity6'
59-
implementation 'nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect:3.4.0'
59+
// Workaround for GROOVY-11745: Groovy 5.0.4 (shipped with Spring Boot 4.0.3) has a
60+
// regression that causes an NPE when Groovy 5 code calls setters on objects from
61+
// Groovy 4-compiled libraries. This breaks thymeleaf-layout-dialect 3.4.0 (compiled
62+
// with Groovy 4.0.25) in DecorateProcessor.doProcess().
63+
// See: https://issues.apache.org/jira/browse/GROOVY-11745
64+
// See: https://github.com/ultraq/thymeleaf-layout-dialect/issues/251
65+
// TODO: Remove this workaround when Groovy 5.0.5+ is available and adopted by Spring Boot
66+
implementation('nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect:3.4.0') {
67+
exclude group: 'org.apache.groovy'
68+
}
69+
implementation 'org.apache.groovy:groovy:5.0.3'
6070

6171
// OpenAPI (Swagger)
62-
implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.9'
72+
implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:3.0.1'
6373

6474
// Runtime dependencies
6575
runtimeOnly 'org.springframework.boot:spring-boot-devtools'
@@ -72,8 +82,7 @@ dependencies {
7282
// Utility libraries
7383
implementation 'org.passay:passay:1.6.6'
7484
implementation 'com.google.guava:guava:33.5.0-jre'
75-
implementation 'jakarta.validation:jakarta.validation-api:3.1.1'
76-
implementation 'org.hibernate.validator:hibernate-validator:8.0.2.Final'
85+
implementation 'org.hibernate.validator:hibernate-validator'
7786

7887
// Compile-only dependencies
7988
compileOnly 'org.projectlombok:lombok'
@@ -93,7 +102,7 @@ dependencies {
93102
testImplementation 'io.github.bonigarcia:webdrivermanager:6.3.3'
94103

95104
// OAuth2 Testing dependencies
96-
testImplementation 'com.github.tomakehurst:wiremock-jre8-standalone:3.0.1'
105+
testImplementation 'org.wiremock:wiremock-standalone:3.13.2'
97106
testImplementation 'io.jsonwebtoken:jjwt-api:0.13.0'
98107
testRuntimeOnly 'io.jsonwebtoken:jjwt-impl:0.13.0'
99108
testRuntimeOnly 'io.jsonwebtoken:jjwt-jackson:0.13.0'

compose.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
services:
77
mariadb:
8-
image: mariadb:11.6
8+
image: mariadb:12.2
99
environment:
1010
MARIADB_DATABASE: springuser
1111
MARIADB_USER: springuser

gradle/wrapper/gradle-wrapper.jar

-17.8 KB
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 14 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 14 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)