Skip to content

Commit da79fbb

Browse files
authored
Merge branch 'main' into dependabot/maven/com.nimbusds-oauth2-oidc-sdk-11.23.1
2 parents e36b03c + 784f50b commit da79fbb

File tree

4 files changed

+11
-6
lines changed

4 files changed

+11
-6
lines changed

.github/workflows/actions.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,4 @@ jobs:
4040
run: mvn -B clean install
4141

4242
- name: Codecov
43-
uses: codecov/[email protected].0
43+
uses: codecov/[email protected].2

oidc/src/main/java/oidc/endpoints/UserInfoEndpoint.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
@RestController
2828
public class UserInfoEndpoint {
2929

30-
private AccessTokenRepository accessTokenRepository;
31-
private TokenGenerator tokenGenerator;
30+
private final AccessTokenRepository accessTokenRepository;
31+
private final TokenGenerator tokenGenerator;
3232

3333
public UserInfoEndpoint(AccessTokenRepository accessTokenRepository, TokenGenerator tokenGenerator) {
3434
this.accessTokenRepository = accessTokenRepository;

oidc/src/main/resources/oidc/saml_mapping.json

+5
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,11 @@
110110
"oidc": "date_of_birth",
111111
"multiValue": false
112112
},
113+
{
114+
"saml": "urn:mace:dir:attribute-def:preferredLanguage",
115+
"oidc": "preferred_language",
116+
"multiValue": false
117+
},
113118
{
114119
"saml": "urn:mace:surf.nl:attribute-def:surf-autorisaties",
115120
"oidc": "surf-autorisaties",

pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.springframework.boot</groupId>
77
<artifactId>spring-boot-starter-parent</artifactId>
8-
<version>3.4.2</version>
8+
<version>3.4.4</version>
99
<relativePath/>
1010
</parent>
1111

@@ -24,7 +24,7 @@
2424
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2525
<bouncycastle.version>1.80</bouncycastle.version>
2626
<commons-io.version>2.18.0</commons-io.version>
27-
<dependency-check-maven.version>12.1.0</dependency-check-maven.version>
27+
<dependency-check-maven.version>12.1.1</dependency-check-maven.version>
2828
<git-commit-id-maven-plugin.version>9.0.1</git-commit-id-maven-plugin.version>
2929
<jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>
3030
<jackson-dataformat-xml.version>2.15.0</jackson-dataformat-xml.version>
@@ -36,7 +36,7 @@
3636
<mockito-core.version>4.2.0</mockito-core.version>
3737
<mongock-bom.version>4.3.8</mongock-bom.version>
3838
<oauth2-oidc-sdk.version>11.23.1</oauth2-oidc-sdk.version>
39-
<opensaml-saml.version>5.1.3</opensaml-saml.version>
39+
<opensaml-saml.version>5.1.4</opensaml-saml.version>
4040
<protobuf-java.version>3.25.5</protobuf-java.version>
4141
<rest-assured.version>5.2.0</rest-assured.version>
4242
<require-maven.version>3.8.4</require-maven.version>

0 commit comments

Comments
 (0)