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

Issue/1168 #1178

Merged
merged 5 commits into from
Dec 28, 2016
Merged

Issue/1168 #1178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3e3b947
Added BOM
dogeared Dec 22, 2016
a2e2975
Added packaging type to bom
dogeared Dec 22, 2016
adf03da
Added sonatype to bom for release
dogeared Dec 22, 2016
0951928
Tweaked ChangePasswordIT timeout settings
dogeared Dec 22, 2016
cc700ec
fixed NPE in AbstractClientIT
dogeared Dec 22, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
111 changes: 111 additions & 0 deletions bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
<?xml version="1.0" encoding="UTF-8"?>
<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">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.sonatype.oss</groupId>
<artifactId>oss-parent</artifactId>
<version>7</version>
</parent>

<groupId>com.stormpath.sdk</groupId>
<artifactId>stormpath-bom</artifactId>
<name>Stormpath Java SDK :: BOM</name>
<packaging>pom</packaging>
<version>1.3.0-SNAPSHOT</version>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.stormpath.sdk</groupId>
<artifactId>stormpath-sdk-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.stormpath.sdk</groupId>
<artifactId>stormpath-sdk-impl</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.stormpath.sdk</groupId>
<artifactId>stormpath-sdk-oauth</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.stormpath.sdk</groupId>
<artifactId>stormpath-sdk-servlet</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.stormpath.sdk</groupId>
<artifactId>stormpath-sdk-httpclient</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.stormpath.sdk</groupId>
<artifactId>stormpath-servlet-plugin</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.stormpath.sdk</groupId>
<artifactId>stormpath-sdk-zuul</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.stormpath.spring</groupId>
<artifactId>stormpath-spring</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.stormpath.spring</groupId>
<artifactId>stormpath-spring-security</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.stormpath.spring</groupId>
<artifactId>stormpath-spring-security-webmvc</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.stormpath.spring</groupId>
<artifactId>stormpath-spring-webmvc</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.stormpath.spring</groupId>
<artifactId>stormpath-spring-boot-starter</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.stormpath.spring</groupId>
<artifactId>stormpath-webmvc-spring-boot-starter</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.stormpath.spring</groupId>
<artifactId>stormpath-thymeleaf-spring-boot-starter</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.stormpath.spring</groupId>
<artifactId>stormpath-spring-security-spring-boot-starter</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.stormpath.spring</groupId>
<artifactId>stormpath-spring-security-webmvc-spring-boot-starter</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.stormpath.spring</groupId>
<artifactId>stormpath-default-spring-boot-starter</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.stormpath.spring</groupId>
<artifactId>stormpath-zuul-spring-cloud-starter</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
</project>
10 changes: 5 additions & 5 deletions ...pring-security-webmvc/src/test/groovy/com/stormpath/spring/config/AbstractClientIT.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,17 +86,17 @@ abstract class AbstractClientIT extends AbstractTestNGSpringContextTests {
String emailId = null
int count = 0

while (emailId == null && count++ < 30) {
while (emailId == null && count++ < 150) {
for (JsonNode emailNode : emailList) {
String mailSubject = emailNode.get("mail_subject").asText()
String localEmailId = emailNode.get("mail_id").asText()
if (mailSubject.toLowerCase().contains("reset your password")) {
String mailSubject = (emailNode.get("mail_subject") != null) ? emailNode.get("mail_subject").asText() : null
String localEmailId = (emailNode.get("mail_id") != null) ? emailNode.get("mail_id").asText() : null
if (mailSubject != null && mailSubject.toLowerCase().contains("reset your password")) {
emailId = localEmailId
break
}
}
if (emailId == null) { // try retrieving email again
Thread.sleep(500)
Thread.sleep(200)
json = get(GUERILLA_MAIL_BASE + "?f=get_email_list&offset=0&sid_token=" + guerillaEmail.getToken()).asString()
rootNode = mapper.readTree(json)
emailList = rootNode.path("list")
Expand Down
1 change: 1 addition & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@
<module>examples</module>
<module>tutorials</module>
<module>clover</module>
<module>bom</module>
</modules>

<properties>
Expand Down