Skip to content

Commit 38f20af

Browse files
author
Justin Richer
committed
added necessary dependencies to common
1 parent 451fcf6 commit 38f20af

File tree

3 files changed

+107
-5
lines changed

3 files changed

+107
-5
lines changed

‎openid-connect-common/pom.xml‎

Lines changed: 105 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,96 @@
2727
<description>OpenID Connect Common modules</description>
2828
<name>OpenID Connect Common</name>
2929
<dependencies>
30+
<dependency>
31+
<groupId>org.springframework</groupId>
32+
<artifactId>spring-webmvc</artifactId>
33+
<version>${org.springframework-version}</version>
34+
</dependency>
35+
<dependency>
36+
<groupId>org.springframework.security</groupId>
37+
<artifactId>spring-security-core</artifactId>
38+
<version>${spring.security.version}</version>
39+
</dependency>
40+
<dependency>
41+
<groupId>com.google.guava</groupId>
42+
<artifactId>guava</artifactId>
43+
<version>14.0.1</version>
44+
</dependency>
45+
<dependency>
46+
<groupId>org.apache.httpcomponents</groupId>
47+
<artifactId>httpclient</artifactId>
48+
<version>4.2.3</version>
49+
</dependency>
50+
<dependency>
51+
<groupId>org.springframework.security.oauth</groupId>
52+
<version>1.1.0.M1</version>
53+
<artifactId>spring-security-oauth2</artifactId>
54+
</dependency>
55+
<dependency>
56+
<groupId>com.nimbusds</groupId>
57+
<artifactId>nimbus-jose-jwt</artifactId>
58+
<version>2.17.2</version>
59+
</dependency>
60+
<dependency>
61+
<groupId>org.eclipse.persistence</groupId>
62+
<artifactId>javax.persistence</artifactId>
63+
<version>2.0.3</version>
64+
</dependency>
65+
<dependency>
66+
<groupId>com.google.code.gson</groupId>
67+
<artifactId>gson</artifactId>
68+
<version>2.0</version>
69+
</dependency>
70+
71+
<!-- Servlet -->
72+
<dependency>
73+
<groupId>javax.servlet</groupId>
74+
<artifactId>servlet-api</artifactId>
75+
<version>2.5</version>
76+
<scope>provided</scope>
77+
</dependency>
78+
<dependency>
79+
<groupId>javax.servlet.jsp</groupId>
80+
<artifactId>jsp-api</artifactId>
81+
<version>2.1</version>
82+
<scope>provided</scope>
83+
</dependency>
84+
<dependency>
85+
<groupId>javax.servlet</groupId>
86+
<artifactId>jstl</artifactId>
87+
<version>1.2</version>
88+
</dependency>
89+
<!-- /Servlet -->
90+
91+
<!-- Test -->
92+
<dependency>
93+
<groupId>junit</groupId>
94+
<artifactId>junit</artifactId>
95+
<version>4.7</version>
96+
<scope>test</scope>
97+
</dependency>
98+
<dependency>
99+
<groupId>org.easymock</groupId>
100+
<artifactId>easymock</artifactId>
101+
<version>2.0</version>
102+
<scope>test</scope>
103+
</dependency>
104+
<dependency>
105+
<groupId>org.springframework</groupId>
106+
<artifactId>spring-test</artifactId>
107+
<version>${org.springframework-version}</version>
108+
<scope>test</scope>
109+
</dependency>
110+
<!-- /Test -->
111+
112+
<!-- Logging -->
113+
<dependency>
114+
<groupId>org.slf4j</groupId>
115+
<artifactId>slf4j-api</artifactId>
116+
<version>${org.slf4j-version}</version>
117+
</dependency>
118+
<!-- /Logging -->
119+
30120
</dependencies>
31121
<packaging>jar</packaging>
32122
<build>
@@ -67,4 +157,19 @@
67157
</plugin>
68158
</plugins>
69159
</build>
160+
<repositories>
161+
<repository>
162+
<id>org.eclipse.persistence</id>
163+
<name>EclipseLink repository</name>
164+
<url>http://download.eclipse.org/rt/eclipselink/maven.repo</url>
165+
<snapshots>
166+
<enabled>true</enabled>
167+
</snapshots>
168+
</repository>
169+
<repository>
170+
<id>spring-milestone</id>
171+
<name>Spring Maven MILESTONE Repository</name>
172+
<url>http://maven.springframework.org/milestone</url>
173+
</repository>
174+
</repositories>
70175
</project>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import java.util.Collection;
2121

2222
import org.springframework.beans.factory.annotation.Autowired;
23-
import org.springframework.dao.DataAccessException;
2423
import org.springframework.security.core.GrantedAuthority;
2524
import org.springframework.security.core.authority.SimpleGrantedAuthority;
2625
import org.springframework.security.core.userdetails.User;
@@ -44,7 +43,7 @@ public class DefaultClientUserDetailsService implements UserDetailsService {
4443
private ClientDetailsService clientDetailsService;
4544

4645
@Override
47-
public UserDetails loadUserByUsername(String clientId) throws UsernameNotFoundException, DataAccessException {
46+
public UserDetails loadUserByUsername(String clientId) throws UsernameNotFoundException {
4847

4948
ClientDetails client = clientDetailsService.loadClientByClientId(clientId);
5049

‎openid-connect-common/src/main/java/org/mitre/util/jpa/JpaUtil.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020

2121
import javax.persistence.EntityManager;
2222

23-
import org.springframework.dao.IncorrectResultSizeDataAccessException;
24-
2523
/**
2624
* @author mfranklin
2725
* Date: 4/28/11
@@ -35,7 +33,7 @@ public static <T> T getSingleResult(List<T> list) {
3533
case 1:
3634
return list.get(0);
3735
default:
38-
throw new IncorrectResultSizeDataAccessException(1);
36+
throw new IllegalStateException("Expected single result, got " + list.size());
3937
}
4038
}
4139

0 commit comments

Comments
 (0)