Skip to content
This repository was archived by the owner on Dec 12, 2018. It is now read-only.

Commit 2e6b2f0

Browse files
dogeareddogeared
authored
Merge pull request #1178 from stormpath/issue/1168
Issue/1168
2 parents 2c5ca6d + cc700ec commit 2e6b2f0

File tree

3 files changed

+117
-5
lines changed

3 files changed

+117
-5
lines changed

‎bom/pom.xml‎

Lines changed: 111 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,111 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
5+
<parent>
6+
<groupId>org.sonatype.oss</groupId>
7+
<artifactId>oss-parent</artifactId>
8+
<version>7</version>
9+
</parent>
10+
11+
<groupId>com.stormpath.sdk</groupId>
12+
<artifactId>stormpath-bom</artifactId>
13+
<name>Stormpath Java SDK :: BOM</name>
14+
<packaging>pom</packaging>
15+
<version>1.3.0-SNAPSHOT</version>
16+
17+
<dependencyManagement>
18+
<dependencies>
19+
<dependency>
20+
<groupId>com.stormpath.sdk</groupId>
21+
<artifactId>stormpath-sdk-api</artifactId>
22+
<version>${project.version}</version>
23+
</dependency>
24+
<dependency>
25+
<groupId>com.stormpath.sdk</groupId>
26+
<artifactId>stormpath-sdk-impl</artifactId>
27+
<version>${project.version}</version>
28+
</dependency>
29+
<dependency>
30+
<groupId>com.stormpath.sdk</groupId>
31+
<artifactId>stormpath-sdk-oauth</artifactId>
32+
<version>${project.version}</version>
33+
</dependency>
34+
<dependency>
35+
<groupId>com.stormpath.sdk</groupId>
36+
<artifactId>stormpath-sdk-servlet</artifactId>
37+
<version>${project.version}</version>
38+
</dependency>
39+
<dependency>
40+
<groupId>com.stormpath.sdk</groupId>
41+
<artifactId>stormpath-sdk-httpclient</artifactId>
42+
<version>${project.version}</version>
43+
</dependency>
44+
<dependency>
45+
<groupId>com.stormpath.sdk</groupId>
46+
<artifactId>stormpath-servlet-plugin</artifactId>
47+
<version>${project.version}</version>
48+
</dependency>
49+
<dependency>
50+
<groupId>com.stormpath.sdk</groupId>
51+
<artifactId>stormpath-sdk-zuul</artifactId>
52+
<version>${project.version}</version>
53+
</dependency>
54+
<dependency>
55+
<groupId>com.stormpath.spring</groupId>
56+
<artifactId>stormpath-spring</artifactId>
57+
<version>${project.version}</version>
58+
</dependency>
59+
<dependency>
60+
<groupId>com.stormpath.spring</groupId>
61+
<artifactId>stormpath-spring-security</artifactId>
62+
<version>${project.version}</version>
63+
</dependency>
64+
<dependency>
65+
<groupId>com.stormpath.spring</groupId>
66+
<artifactId>stormpath-spring-security-webmvc</artifactId>
67+
<version>${project.version}</version>
68+
</dependency>
69+
<dependency>
70+
<groupId>com.stormpath.spring</groupId>
71+
<artifactId>stormpath-spring-webmvc</artifactId>
72+
<version>${project.version}</version>
73+
</dependency>
74+
<dependency>
75+
<groupId>com.stormpath.spring</groupId>
76+
<artifactId>stormpath-spring-boot-starter</artifactId>
77+
<version>${project.version}</version>
78+
</dependency>
79+
<dependency>
80+
<groupId>com.stormpath.spring</groupId>
81+
<artifactId>stormpath-webmvc-spring-boot-starter</artifactId>
82+
<version>${project.version}</version>
83+
</dependency>
84+
<dependency>
85+
<groupId>com.stormpath.spring</groupId>
86+
<artifactId>stormpath-thymeleaf-spring-boot-starter</artifactId>
87+
<version>${project.version}</version>
88+
</dependency>
89+
<dependency>
90+
<groupId>com.stormpath.spring</groupId>
91+
<artifactId>stormpath-spring-security-spring-boot-starter</artifactId>
92+
<version>${project.version}</version>
93+
</dependency>
94+
<dependency>
95+
<groupId>com.stormpath.spring</groupId>
96+
<artifactId>stormpath-spring-security-webmvc-spring-boot-starter</artifactId>
97+
<version>${project.version}</version>
98+
</dependency>
99+
<dependency>
100+
<groupId>com.stormpath.spring</groupId>
101+
<artifactId>stormpath-default-spring-boot-starter</artifactId>
102+
<version>${project.version}</version>
103+
</dependency>
104+
<dependency>
105+
<groupId>com.stormpath.spring</groupId>
106+
<artifactId>stormpath-zuul-spring-cloud-starter</artifactId>
107+
<version>${project.version}</version>
108+
</dependency>
109+
</dependencies>
110+
</dependencyManagement>
111+
</project>

‎extensions/spring/stormpath-spring-security-webmvc/src/test/groovy/com/stormpath/spring/config/AbstractClientIT.groovy‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,17 +86,17 @@ abstract class AbstractClientIT extends AbstractTestNGSpringContextTests {
8686
String emailId = null
8787
int count = 0
8888

89-
while (emailId == null && count++ < 30) {
89+
while (emailId == null && count++ < 150) {
9090
for (JsonNode emailNode : emailList) {
91-
String mailSubject = emailNode.get("mail_subject").asText()
92-
String localEmailId = emailNode.get("mail_id").asText()
93-
if (mailSubject.toLowerCase().contains("reset your password")) {
91+
String mailSubject = (emailNode.get("mail_subject") != null) ? emailNode.get("mail_subject").asText() : null
92+
String localEmailId = (emailNode.get("mail_id") != null) ? emailNode.get("mail_id").asText() : null
93+
if (mailSubject != null && mailSubject.toLowerCase().contains("reset your password")) {
9494
emailId = localEmailId
9595
break
9696
}
9797
}
9898
if (emailId == null) { // try retrieving email again
99-
Thread.sleep(500)
99+
Thread.sleep(200)
100100
json = get(GUERILLA_MAIL_BASE + "?f=get_email_list&offset=0&sid_token=" + guerillaEmail.getToken()).asString()
101101
rootNode = mapper.readTree(json)
102102
emailList = rootNode.path("list")

‎pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@
8989
<module>examples</module>
9090
<module>tutorials</module>
9191
<module>clover</module>
92+
<module>bom</module>
9293
</modules>
9394

9495
<properties>

0 commit comments

Comments
 (0)