From 3e3b9471ed0b868af79ca60dbef75f410eca75e8 Mon Sep 17 00:00:00 2001 From: Micah Silverman Date: Thu, 22 Dec 2016 14:24:17 -0500 Subject: [PATCH 1/5] Added BOM --- bom/pom.xml | 104 ++++++++++++++++++++++++++++++++++++++++++++++++++++ pom.xml | 1 + 2 files changed, 105 insertions(+) create mode 100644 bom/pom.xml diff --git a/bom/pom.xml b/bom/pom.xml new file mode 100644 index 0000000000..53577cc901 --- /dev/null +++ b/bom/pom.xml @@ -0,0 +1,104 @@ + + + 4.0.0 + + com.stormpath.sdk + stormpath-bom + Stormpath Java SDK :: BOM + 1.3.0-SNAPSHOT + + + + + com.stormpath.sdk + stormpath-sdk-api + ${project.version} + + + com.stormpath.sdk + stormpath-sdk-impl + ${project.version} + + + com.stormpath.sdk + stormpath-sdk-oauth + ${project.version} + + + com.stormpath.sdk + stormpath-sdk-servlet + ${project.version} + + + com.stormpath.sdk + stormpath-sdk-httpclient + ${project.version} + + + com.stormpath.sdk + stormpath-servlet-plugin + ${project.version} + + + com.stormpath.sdk + stormpath-sdk-zuul + ${project.version} + + + com.stormpath.spring + stormpath-spring + ${project.version} + + + com.stormpath.spring + stormpath-spring-security + ${project.version} + + + com.stormpath.spring + stormpath-spring-security-webmvc + ${project.version} + + + com.stormpath.spring + stormpath-spring-webmvc + ${project.version} + + + com.stormpath.spring + stormpath-spring-boot-starter + ${project.version} + + + com.stormpath.spring + stormpath-webmvc-spring-boot-starter + ${project.version} + + + com.stormpath.spring + stormpath-thymeleaf-spring-boot-starter + ${project.version} + + + com.stormpath.spring + stormpath-spring-security-spring-boot-starter + ${project.version} + + + com.stormpath.spring + stormpath-spring-security-webmvc-spring-boot-starter + ${project.version} + + + com.stormpath.spring + stormpath-default-spring-boot-starter + ${project.version} + + + com.stormpath.spring + stormpath-zuul-spring-cloud-starter + ${project.version} + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 6e6992ae51..7f8b006a99 100644 --- a/pom.xml +++ b/pom.xml @@ -89,6 +89,7 @@ examples tutorials clover + bom From a2e297556863cbec7f6fb4525c7abeb70f81fc7e Mon Sep 17 00:00:00 2001 From: Micah Silverman Date: Thu, 22 Dec 2016 16:29:05 -0500 Subject: [PATCH 2/5] Added packaging type to bom --- bom/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/bom/pom.xml b/bom/pom.xml index 53577cc901..6b36e13192 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -5,6 +5,7 @@ com.stormpath.sdk stormpath-bom Stormpath Java SDK :: BOM + pom 1.3.0-SNAPSHOT From adf03dabf4504c8cb900fe2bfd3325ee2754b221 Mon Sep 17 00:00:00 2001 From: Micah Silverman Date: Thu, 22 Dec 2016 18:00:10 -0500 Subject: [PATCH 3/5] Added sonatype to bom for release --- bom/pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/bom/pom.xml b/bom/pom.xml index 6b36e13192..41b7948513 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -2,6 +2,12 @@ 4.0.0 + + org.sonatype.oss + oss-parent + 7 + + com.stormpath.sdk stormpath-bom Stormpath Java SDK :: BOM From 0951928fdb70989b97d2d69f1644dbc52a5a2f99 Mon Sep 17 00:00:00 2001 From: Micah Silverman Date: Thu, 22 Dec 2016 15:26:56 -0500 Subject: [PATCH 4/5] Tweaked ChangePasswordIT timeout settings --- .../com/stormpath/spring/config/AbstractClientIT.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extensions/spring/stormpath-spring-security-webmvc/src/test/groovy/com/stormpath/spring/config/AbstractClientIT.groovy b/extensions/spring/stormpath-spring-security-webmvc/src/test/groovy/com/stormpath/spring/config/AbstractClientIT.groovy index 709ac77b64..09d4e471fc 100644 --- a/extensions/spring/stormpath-spring-security-webmvc/src/test/groovy/com/stormpath/spring/config/AbstractClientIT.groovy +++ b/extensions/spring/stormpath-spring-security-webmvc/src/test/groovy/com/stormpath/spring/config/AbstractClientIT.groovy @@ -86,7 +86,7 @@ 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() @@ -96,7 +96,7 @@ abstract class AbstractClientIT extends AbstractTestNGSpringContextTests { } } if (emailId == null) { // try retrieving email again - Thread.sleep(500) + Thread.sleep(100) json = get(GUERILLA_MAIL_BASE + "?f=get_email_list&offset=0&sid_token=" + guerillaEmail.getToken()).asString() rootNode = mapper.readTree(json) emailList = rootNode.path("list") From cc700ec56e371459e4996770462f724ee792d222 Mon Sep 17 00:00:00 2001 From: Micah Silverman Date: Thu, 22 Dec 2016 15:53:34 -0500 Subject: [PATCH 5/5] fixed NPE in AbstractClientIT --- .../com/stormpath/spring/config/AbstractClientIT.groovy | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/extensions/spring/stormpath-spring-security-webmvc/src/test/groovy/com/stormpath/spring/config/AbstractClientIT.groovy b/extensions/spring/stormpath-spring-security-webmvc/src/test/groovy/com/stormpath/spring/config/AbstractClientIT.groovy index 09d4e471fc..3a93b41349 100644 --- a/extensions/spring/stormpath-spring-security-webmvc/src/test/groovy/com/stormpath/spring/config/AbstractClientIT.groovy +++ b/extensions/spring/stormpath-spring-security-webmvc/src/test/groovy/com/stormpath/spring/config/AbstractClientIT.groovy @@ -88,15 +88,15 @@ abstract class AbstractClientIT extends AbstractTestNGSpringContextTests { 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(100) + 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")