Skip to content

Commit 6906f61

Browse files
author
shrexster42
committed
Upgrade to Java 11 and Spring 5
1 parent 7eba3c1 commit 6906f61

File tree

22 files changed

+228
-203
lines changed

22 files changed

+228
-203
lines changed

‎openid-connect-common/pom.xml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,26 @@
8787
<groupId>org.bouncycastle</groupId>
8888
<artifactId>bcprov-jdk15on</artifactId>
8989
</dependency>
90+
<dependency>
91+
<groupId>javax.annotation</groupId>
92+
<artifactId>javax.annotation-api</artifactId>
93+
</dependency>
94+
<dependency>
95+
<groupId>jakarta.xml.bind</groupId>
96+
<artifactId>jakarta.xml.bind-api</artifactId>
97+
</dependency>
98+
<dependency>
99+
<groupId>javax.xml.bind</groupId>
100+
<artifactId>jaxb-api</artifactId>
101+
</dependency>
102+
<dependency>
103+
<groupId>javax.activation</groupId>
104+
<artifactId>activation</artifactId>
105+
</dependency>
106+
<dependency>
107+
<groupId>org.glassfish.jaxb</groupId>
108+
<artifactId>jaxb-runtime</artifactId>
109+
</dependency>
90110
</dependencies>
91111

92112
<packaging>jar</packaging>

‎openid-connect-common/src/main/java/org/mitre/oauth2/service/impl/UriEncodedClientUserDetailsService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public UserDetails loadUserByUsername(String clientId) throws UsernameNotFoundE
9191
} else {
9292
throw new UsernameNotFoundException("Client not found: " + clientId);
9393
}
94-
} catch (UnsupportedEncodingException | InvalidClientException e) {
94+
} catch (InvalidClientException e) {
9595
throw new UsernameNotFoundException("Client not found: " + clientId);
9696
}
9797

‎openid-connect-server-webapp/src/main/webapp/WEB-INF/application-context.xml‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@
2525
xmlns:oauth="http://www.springframework.org/schema/security/oauth2"
2626
xmlns:util="http://www.springframework.org/schema/util"
2727
xsi:schemaLocation="http://www.springframework.org/schema/security/oauth2 http://www.springframework.org/schema/security/spring-security-oauth2-2.0.xsd
28-
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.3.xsd
29-
http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-4.2.xsd
30-
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
31-
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.3.xsd
32-
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.3.xsd
33-
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.3.xsd">
28+
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd
29+
http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security.xsd
30+
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
31+
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
32+
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd
33+
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
3434

3535
<!-- Scan for components -->
3636
<context:component-scan annotation-config="true" base-package="org.mitre" />
@@ -246,9 +246,15 @@
246246
<property name="authenticationManager" ref="clientAssertionAuthenticationManager" />
247247
</bean>
248248

249+
<bean id="noOpPasswordEncoder" class="org.springframework.security.crypto.password.NoOpPasswordEncoder"/>
250+
249251
<security:authentication-manager id="clientAuthenticationManager">
250-
<security:authentication-provider user-service-ref="clientUserDetailsService" />
251-
<security:authentication-provider user-service-ref="uriEncodedClientUserDetailsService" />
252+
<security:authentication-provider user-service-ref="clientUserDetailsService">
253+
<security:password-encoder ref="noOpPasswordEncoder"/>
254+
</security:authentication-provider>
255+
<security:authentication-provider user-service-ref="uriEncodedClientUserDetailsService">
256+
<security:password-encoder ref="noOpPasswordEncoder"/>
257+
</security:authentication-provider>
252258
</security:authentication-manager>
253259

254260
<security:authentication-manager id="clientAssertionAuthenticationManager">

‎openid-connect-server-webapp/src/main/webapp/WEB-INF/assertion-config.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222
xmlns:security="http://www.springframework.org/schema/security"
2323
xmlns:oauth="http://www.springframework.org/schema/security/oauth2"
2424
xsi:schemaLocation="http://www.springframework.org/schema/security/oauth2 http://www.springframework.org/schema/security/spring-security-oauth2-2.0.xsd
25-
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.3.xsd
26-
http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-4.2.xsd
27-
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
28-
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.3.xsd
29-
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.3.xsd">
25+
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd
26+
http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security.xsd
27+
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
28+
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd
29+
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
3030

3131
<!-- validate incoming tokens for JWT assertions -->
3232
<bean id="jwtAssertionValidator" class="org.mitre.jwt.assertion.impl.NullAssertionValidator" />

‎openid-connect-server-webapp/src/main/webapp/WEB-INF/authz-config.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222
xmlns:security="http://www.springframework.org/schema/security"
2323
xmlns:oauth="http://www.springframework.org/schema/security/oauth2"
2424
xsi:schemaLocation="http://www.springframework.org/schema/security/oauth2 http://www.springframework.org/schema/security/spring-security-oauth2-2.0.xsd
25-
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.3.xsd
26-
http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-4.2.xsd
27-
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
28-
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.3.xsd
29-
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.3.xsd">
25+
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd
26+
http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security.xsd
27+
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
28+
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd
29+
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
3030

3131

3232
<oauth:authorization-server

‎openid-connect-server-webapp/src/main/webapp/WEB-INF/crypto-config.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@
2424
xmlns:security="http://www.springframework.org/schema/security"
2525
xmlns:oauth="http://www.springframework.org/schema/security/oauth2"
2626
xsi:schemaLocation="http://www.springframework.org/schema/security/oauth2 http://www.springframework.org/schema/security/spring-security-oauth2-2.0.xsd
27-
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.3.xsd
28-
http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-4.2.xsd
29-
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
30-
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.3.xsd
31-
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.3.xsd">
27+
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd
28+
http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security.xsd
29+
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
30+
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd
31+
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
3232

3333
<bean id="defaultKeyStore" class="org.mitre.jose.keystore.JWKSetKeyStore">
3434
<property name="location" value="classpath:keystore.jwks" />

‎openid-connect-server-webapp/src/main/webapp/WEB-INF/data-context.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
<beans xmlns="http://www.springframework.org/schema/beans"
2020
xmlns:jdbc="http://www.springframework.org/schema/jdbc"
2121
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
22-
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
23-
http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-4.3.xsd">
22+
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
23+
http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd">
2424

2525
<bean id="dataSource" class="com.zaxxer.hikari.HikariDataSource" destroy-method="close">
2626
<property name="driverClassName" value="org.hsqldb.jdbcDriver" />

‎openid-connect-server-webapp/src/main/webapp/WEB-INF/endpoint-config.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222
xmlns:security="http://www.springframework.org/schema/security"
2323
xmlns:oauth="http://www.springframework.org/schema/security/oauth2"
2424
xsi:schemaLocation="http://www.springframework.org/schema/security/oauth2 http://www.springframework.org/schema/security/spring-security-oauth2-2.0.xsd
25-
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.3.xsd
26-
http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-4.2.xsd
27-
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
28-
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.3.xsd
29-
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.3.xsd">
25+
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd
26+
http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security.xsd
27+
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
28+
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd
29+
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
3030

3131

3232
<!-- This file allows you to define additional endpoints, it's normally empty in the OIDC server and has entries in the UMA server -->

‎openid-connect-server-webapp/src/main/webapp/WEB-INF/jpa-config.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222
xmlns:security="http://www.springframework.org/schema/security"
2323
xmlns:oauth="http://www.springframework.org/schema/security/oauth2"
2424
xsi:schemaLocation="http://www.springframework.org/schema/security/oauth2 http://www.springframework.org/schema/security/spring-security-oauth2-2.0.xsd
25-
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.3.xsd
26-
http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-4.2.xsd
27-
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
28-
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.3.xsd
29-
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.3.xsd">
25+
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd
26+
http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security.xsd
27+
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
28+
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd
29+
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
3030

3131
<bean id="transactionManager" class="org.springframework.orm.jpa.JpaTransactionManager">
3232
<property name="entityManagerFactory" ref="entityManagerFactory" />

‎openid-connect-server-webapp/src/main/webapp/WEB-INF/local-config.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@
2424
xmlns:security="http://www.springframework.org/schema/security"
2525
xmlns:oauth="http://www.springframework.org/schema/security/oauth2"
2626
xsi:schemaLocation="http://www.springframework.org/schema/security/oauth2 http://www.springframework.org/schema/security/spring-security-oauth2-2.0.xsd
27-
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.3.xsd
28-
http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-4.2.xsd
29-
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
30-
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.3.xsd
31-
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.3.xsd">
27+
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd
28+
http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security.xsd
29+
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
30+
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd
31+
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
3232

3333

3434
<!-- Empty: Override this file in your local project to change configuration options. -->

0 commit comments

Comments
 (0)