From 9405c7620d812b2fede2ca8b1073e1a819696b9c Mon Sep 17 00:00:00 2001 From: Mario Date: Wed, 8 Feb 2017 10:07:03 -0300 Subject: [PATCH 01/21] 1297 - Improved MCF implementation when registration workflow is specified --- .../stormpath/sdk/client/DirectoryIT.groovy | 34 +++++++++++++++++++ .../sdk/impl/directory/DefaultDirectory.java | 1 + 2 files changed, 35 insertions(+) diff --git a/extensions/httpclient/src/test/groovy/com/stormpath/sdk/client/DirectoryIT.groovy b/extensions/httpclient/src/test/groovy/com/stormpath/sdk/client/DirectoryIT.groovy index c8efedd38b..d9c6f30119 100644 --- a/extensions/httpclient/src/test/groovy/com/stormpath/sdk/client/DirectoryIT.groovy +++ b/extensions/httpclient/src/test/groovy/com/stormpath/sdk/client/DirectoryIT.groovy @@ -1299,4 +1299,38 @@ class DirectoryIT extends ClientIT { assertEquals(authenticationResult.getAccount().getUsername(), username) } + /** + * @since 1.5.4 + */ + @Test + void testBCryptPasswordForAccountCreatedViaDirectoryWithRegistrationWorkflowOverride() { + Application application = createTempApp() + Directory directory = client.instantiate(Directory) + directory.setName(uniquify("JSDK.DirectoryIT.testBCryptPasswordForAccountCreatedViaDirectoryWithRegistrationWorkflowOverride")) + directory = client.createDirectory(directory) + assertNotNull directory.href + deleteOnTeardown(directory) + + application.addAccountStore(directory) + + Account account = client.instantiate(Account.class) + String username = "deleteme" + UUID.randomUUID() + account.setEmail(username + "@mailinator.com") + .setUsername(username) + .setGivenName(username) + .setSurname(username) + .setPassword('$2a$12$PLmHvcbeliNkjIVFyVXg5O.LQfyYtHFm.1vAtj3l7itIP.z0V6OX2') //hash for Pa$sw0rd123 + + directory.createAccount(Accounts.newCreateRequestFor(account).setPasswordFormat(PasswordFormat.MCF).setRegistrationWorkflowEnabled(false).build()); + + AuthenticationResult authenticationResult = application.authenticateAccount( + UsernamePasswordRequests.builder() + .setUsernameOrEmail(username) + .setPassword('Pa$sw0rd123') + .withResponseOptions(UsernamePasswordRequests.options().withAccount()) + .build()); + + assertEquals(authenticationResult.getAccount().getUsername(), username) + } + } diff --git a/impl/src/main/java/com/stormpath/sdk/impl/directory/DefaultDirectory.java b/impl/src/main/java/com/stormpath/sdk/impl/directory/DefaultDirectory.java index 8f9deb8ffe..85dbc7fe95 100644 --- a/impl/src/main/java/com/stormpath/sdk/impl/directory/DefaultDirectory.java +++ b/impl/src/main/java/com/stormpath/sdk/impl/directory/DefaultDirectory.java @@ -155,6 +155,7 @@ public Account createAccount(CreateAccountRequest request) { if (request.isRegistrationWorkflowOptionSpecified()) { href += querySeparator + "registrationWorkflowEnabled=" + request.isRegistrationWorkflowEnabled(); + querySeparator = '&'; } //Fix for https://github.com/stormpath/stormpath-sdk-java/issues/1295 From e48549c848a29fca5de21887f4618fee46541ac0 Mon Sep 17 00:00:00 2001 From: Mario Date: Wed, 8 Feb 2017 14:34:09 -0300 Subject: [PATCH 02/21] 1297 - Improved IT --- .../com/stormpath/sdk/client/DirectoryIT.groovy | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/extensions/httpclient/src/test/groovy/com/stormpath/sdk/client/DirectoryIT.groovy b/extensions/httpclient/src/test/groovy/com/stormpath/sdk/client/DirectoryIT.groovy index d9c6f30119..c672b2dfde 100644 --- a/extensions/httpclient/src/test/groovy/com/stormpath/sdk/client/DirectoryIT.groovy +++ b/extensions/httpclient/src/test/groovy/com/stormpath/sdk/client/DirectoryIT.groovy @@ -16,7 +16,9 @@ package com.stormpath.sdk.client import com.stormpath.sdk.account.Account +import com.stormpath.sdk.account.AccountStatus import com.stormpath.sdk.account.Accounts +import com.stormpath.sdk.account.EmailVerificationStatus import com.stormpath.sdk.account.PasswordFormat import com.stormpath.sdk.application.Application import com.stormpath.sdk.authc.AuthenticationResult @@ -1287,14 +1289,14 @@ class DirectoryIT extends ClientIT { .setSurname(username) .setPassword('$2a$12$PLmHvcbeliNkjIVFyVXg5O.LQfyYtHFm.1vAtj3l7itIP.z0V6OX2') //hash for Pa$sw0rd123 - directory.createAccount(Accounts.newCreateRequestFor(account).setPasswordFormat(PasswordFormat.MCF).build()); + directory.createAccount(Accounts.newCreateRequestFor(account).setPasswordFormat(PasswordFormat.MCF).build()) AuthenticationResult authenticationResult = application.authenticateAccount( UsernamePasswordRequests.builder() .setUsernameOrEmail(username) .setPassword('Pa$sw0rd123') .withResponseOptions(UsernamePasswordRequests.options().withAccount()) - .build()); + .build()) assertEquals(authenticationResult.getAccount().getUsername(), username) } @@ -1319,16 +1321,21 @@ class DirectoryIT extends ClientIT { .setUsername(username) .setGivenName(username) .setSurname(username) + .setStatus(AccountStatus.ENABLED) + .setEmailVerificationStatus(EmailVerificationStatus.VERIFIED) .setPassword('$2a$12$PLmHvcbeliNkjIVFyVXg5O.LQfyYtHFm.1vAtj3l7itIP.z0V6OX2') //hash for Pa$sw0rd123 - directory.createAccount(Accounts.newCreateRequestFor(account).setPasswordFormat(PasswordFormat.MCF).setRegistrationWorkflowEnabled(false).build()); + directory.createAccount(Accounts.newCreateRequestFor(account) + .setPasswordFormat(PasswordFormat.MCF) + .setRegistrationWorkflowEnabled(false) + .build()) AuthenticationResult authenticationResult = application.authenticateAccount( UsernamePasswordRequests.builder() .setUsernameOrEmail(username) .setPassword('Pa$sw0rd123') .withResponseOptions(UsernamePasswordRequests.options().withAccount()) - .build()); + .build()) assertEquals(authenticationResult.getAccount().getUsername(), username) } From f57bae9ccab1ff75ffdbf20d29b5e09bf953ef5b Mon Sep 17 00:00:00 2001 From: stormpath-sdk-java Auto Doc Build Date: Wed, 8 Feb 2017 17:53:15 -0300 Subject: [PATCH 03/21] Changed poms to 1.5.4-SNAPSHOT --- api/pom.xml | 2 +- bom/pom.xml | 36 +++++++++---------- clover/pom.xml | 2 +- examples/pom.xml | 4 +-- examples/quickstart/pom.xml | 4 +-- examples/servlet/pom.xml | 4 +-- examples/spring-boot-default/pom.xml | 4 +-- examples/spring-boot-webmvc-angular/pom.xml | 4 +-- examples/spring-boot-webmvc/pom.xml | 4 +-- examples/spring-boot/pom.xml | 4 +-- .../pom.xml | 4 +-- .../pom.xml | 4 +-- examples/spring-security-webmvc/pom.xml | 4 +-- examples/spring-webmvc/pom.xml | 4 +-- examples/spring/pom.xml | 4 +-- examples/zuul-spring-cloud-starter/pom.xml | 4 +-- extensions/hazelcast/pom.xml | 2 +- extensions/httpclient/pom.xml | 2 +- extensions/oauth/pom.xml | 2 +- extensions/pom.xml | 2 +- extensions/servlet-plugin/pom.xml | 2 +- extensions/servlet/pom.xml | 2 +- extensions/spring/boot/pom.xml | 2 +- .../pom.xml | 2 +- .../stormpath-spring-boot-starter/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- extensions/spring/cloud/pom.xml | 2 +- .../pom.xml | 2 +- extensions/spring/pom.xml | 2 +- .../stormpath-spring-security-webmvc/pom.xml | 2 +- .../spring/stormpath-spring-security/pom.xml | 2 +- .../spring/stormpath-spring-webmvc/pom.xml | 2 +- extensions/spring/stormpath-spring/pom.xml | 2 +- extensions/zuul/pom.xml | 2 +- impl/pom.xml | 2 +- pom.xml | 2 +- tutorials/pom.xml | 2 +- tutorials/spring-boot/00-the-basics/pom.xml | 4 +-- .../01-some-access-controls/pom.xml | 4 +-- .../02-spring-security-ftw/pom.xml | 4 +-- .../03-spring-security-refined/pom.xml | 4 +-- .../04-a-finer-grain-of-control/pom.xml | 4 +-- .../spring-boot/05-token-management/pom.xml | 4 +-- tutorials/spring-boot/pom.xml | 2 +- tutorials/spring/00-the-basics/pom.xml | 4 +-- .../spring/01-some-access-controls/pom.xml | 4 +-- .../spring/02-spring-security-ftw/pom.xml | 4 +-- .../spring/03-spring-security-refined/pom.xml | 4 +-- .../04-a-finer-grain-of-control/pom.xml | 4 +-- tutorials/spring/05-token-management/pom.xml | 4 +-- tutorials/spring/pom.xml | 2 +- 54 files changed, 96 insertions(+), 96 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index 2b631cc486..f4d37faee6 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -21,7 +21,7 @@ com.stormpath.sdk stormpath-sdk-root - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT ../pom.xml diff --git a/bom/pom.xml b/bom/pom.xml index 050711ab63..76271b8e06 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -50,92 +50,92 @@ com.stormpath.sdk stormpath-sdk-api - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT com.stormpath.sdk stormpath-sdk-impl - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT com.stormpath.sdk stormpath-sdk-oauth - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT com.stormpath.sdk stormpath-sdk-servlet - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT com.stormpath.sdk stormpath-sdk-httpclient - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT com.stormpath.sdk stormpath-servlet-plugin - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT com.stormpath.sdk stormpath-sdk-zuul - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT com.stormpath.spring stormpath-spring - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT com.stormpath.spring stormpath-spring-security - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT com.stormpath.spring stormpath-spring-security-webmvc - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT com.stormpath.spring stormpath-spring-webmvc - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT com.stormpath.spring stormpath-spring-boot-starter - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT com.stormpath.spring stormpath-webmvc-spring-boot-starter - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT com.stormpath.spring stormpath-thymeleaf-spring-boot-starter - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT com.stormpath.spring stormpath-spring-security-spring-boot-starter - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT com.stormpath.spring stormpath-spring-security-webmvc-spring-boot-starter - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT com.stormpath.spring stormpath-default-spring-boot-starter - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT com.stormpath.spring stormpath-zuul-spring-cloud-starter - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT diff --git a/clover/pom.xml b/clover/pom.xml index 88ebc40279..4b95fa17b1 100644 --- a/clover/pom.xml +++ b/clover/pom.xml @@ -21,7 +21,7 @@ com.stormpath.sdk stormpath-sdk-root - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT ../pom.xml diff --git a/examples/pom.xml b/examples/pom.xml index eb1e0f97c2..b98eea0fdf 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-root - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT ../pom.xml stormpath-sdk-examples com.stormpath.sdk - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT Stormpath Java SDK :: Examples pom diff --git a/examples/quickstart/pom.xml b/examples/quickstart/pom.xml index bd027de258..53fe965fa6 100644 --- a/examples/quickstart/pom.xml +++ b/examples/quickstart/pom.xml @@ -5,13 +5,13 @@ com.stormpath.sdk stormpath-sdk-examples - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT ../pom.xml com.stormpath.sdk stormpath-sdk-examples-quickstart - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT Stormpath Java SDK :: Examples :: Quickstart Code A simple (non-web) application to demonstrate the example code in the Stormpath Java Quickstart diff --git a/examples/servlet/pom.xml b/examples/servlet/pom.xml index 8a0e3b1c3d..826a58f56a 100644 --- a/examples/servlet/pom.xml +++ b/examples/servlet/pom.xml @@ -21,12 +21,12 @@ com.stormpath.sdk stormpath-sdk-examples - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT ../pom.xml stormpath-sdk-examples-servlet - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT Stormpath Java SDK :: Examples :: Servlet Container-based Webapp A simple example webapp deployed in a servlet container. war diff --git a/examples/spring-boot-default/pom.xml b/examples/spring-boot-default/pom.xml index 55cdc7a485..f779b1ee15 100644 --- a/examples/spring-boot-default/pom.xml +++ b/examples/spring-boot-default/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-examples - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT ../pom.xml com.stormpath.spring stormpath-sdk-examples-spring-boot-default - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT Stormpath Java SDK :: Examples :: Spring Boot Default A simple Spring Boot Web MVC application with out-of-the-box login and self-service screens! diff --git a/examples/spring-boot-webmvc-angular/pom.xml b/examples/spring-boot-webmvc-angular/pom.xml index e0bdf4c9c5..26a044f41a 100644 --- a/examples/spring-boot-webmvc-angular/pom.xml +++ b/examples/spring-boot-webmvc-angular/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-examples - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT ../pom.xml com.stormpath.spring stormpath-sdk-examples-spring-boot-web-angular - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT Stormpath Java SDK :: Examples :: Spring Boot + Angular Webapp A Spring Boot web application that uses Stormpath. diff --git a/examples/spring-boot-webmvc/pom.xml b/examples/spring-boot-webmvc/pom.xml index d67d022e5d..b19fef0ddb 100644 --- a/examples/spring-boot-webmvc/pom.xml +++ b/examples/spring-boot-webmvc/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-examples - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT ../pom.xml com.stormpath.spring stormpath-sdk-examples-spring-boot-web - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT Stormpath Java SDK :: Examples :: Spring Boot Webapp A Spring Boot web application that uses Stormpath. diff --git a/examples/spring-boot/pom.xml b/examples/spring-boot/pom.xml index 8c6d9b6ad1..61f3f3414d 100644 --- a/examples/spring-boot/pom.xml +++ b/examples/spring-boot/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-examples - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT ../pom.xml com.stormpath.spring stormpath-sdk-examples-spring-boot - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT Stormpath Java SDK :: Examples :: Spring Boot A Spring Boot (non-web) application that uses Stormpath. diff --git a/examples/spring-security-spring-boot-webmvc-bare-bones/pom.xml b/examples/spring-security-spring-boot-webmvc-bare-bones/pom.xml index 17185eb6c3..45c8272423 100644 --- a/examples/spring-security-spring-boot-webmvc-bare-bones/pom.xml +++ b/examples/spring-security-spring-boot-webmvc-bare-bones/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-examples - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT ../pom.xml com.stormpath.spring stormpath-sdk-examples-spring-security-spring-boot-webmvc-bare-bones - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT Stormpath Java SDK :: Examples :: Spring Security :: Spring Boot :: Bare Bones A simple Spring Boot Web MVC application with out-of-the-box login and self-service screens! diff --git a/examples/spring-security-spring-boot-webmvc/pom.xml b/examples/spring-security-spring-boot-webmvc/pom.xml index e7d142cc96..9fbdab78fc 100644 --- a/examples/spring-security-spring-boot-webmvc/pom.xml +++ b/examples/spring-security-spring-boot-webmvc/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-examples - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT ../pom.xml com.stormpath.spring stormpath-sdk-examples-spring-security-spring-boot-webmvc - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT Stormpath Java SDK :: Examples :: Spring Security :: Spring Boot Webapp A simple Spring Boot Web MVC application with out-of-the-box login and self-service screens! diff --git a/examples/spring-security-webmvc/pom.xml b/examples/spring-security-webmvc/pom.xml index 496e79321d..34a5326cff 100644 --- a/examples/spring-security-webmvc/pom.xml +++ b/examples/spring-security-webmvc/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-examples - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT ../pom.xml com.stormpath.spring stormpath-sdk-examples-spring-security-webmvc - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT Stormpath Java SDK :: Examples :: Spring Security Web MVC A simple Spring Security Web MVC application with out-of-the-box login and self-service screens! diff --git a/examples/spring-webmvc/pom.xml b/examples/spring-webmvc/pom.xml index 7228f65333..688add6adf 100644 --- a/examples/spring-webmvc/pom.xml +++ b/examples/spring-webmvc/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-examples - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT ../pom.xml com.stormpath.spring stormpath-sdk-examples-spring-webmvc - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT Stormpath Java SDK :: Examples :: Spring Web MVC A Spring Boot web application that uses Stormpath and Spring Security diff --git a/examples/spring/pom.xml b/examples/spring/pom.xml index bafdac412e..5188499f6d 100644 --- a/examples/spring/pom.xml +++ b/examples/spring/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-examples - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT ../pom.xml com.stormpath.spring stormpath-sdk-examples-spring - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT Stormpath Java SDK :: Examples :: Spring A simple (non-web) Spring Application. diff --git a/examples/zuul-spring-cloud-starter/pom.xml b/examples/zuul-spring-cloud-starter/pom.xml index a216036db6..e1d4817ddb 100644 --- a/examples/zuul-spring-cloud-starter/pom.xml +++ b/examples/zuul-spring-cloud-starter/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-examples - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT ../pom.xml com.stormpath.spring stormpath-sdk-examples-zuul-spring-cloud-starter - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT Stormpath Java SDK :: Examples :: Zuul Spring Cloud Starter An example spring cloud zuul web gateway using Stormpath diff --git a/extensions/hazelcast/pom.xml b/extensions/hazelcast/pom.xml index 6fa43881a2..ef73664b3f 100644 --- a/extensions/hazelcast/pom.xml +++ b/extensions/hazelcast/pom.xml @@ -21,7 +21,7 @@ com.stormpath.sdk stormpath-sdk-root - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT ../../pom.xml diff --git a/extensions/httpclient/pom.xml b/extensions/httpclient/pom.xml index d144b8323c..c8cf1ee8bf 100644 --- a/extensions/httpclient/pom.xml +++ b/extensions/httpclient/pom.xml @@ -21,7 +21,7 @@ com.stormpath.sdk stormpath-sdk-root - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT ../../pom.xml diff --git a/extensions/oauth/pom.xml b/extensions/oauth/pom.xml index b6d99aa706..5e40605771 100644 --- a/extensions/oauth/pom.xml +++ b/extensions/oauth/pom.xml @@ -21,7 +21,7 @@ com.stormpath.sdk stormpath-sdk-root - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT ../../pom.xml diff --git a/extensions/pom.xml b/extensions/pom.xml index 483b8b0151..d01252f52c 100644 --- a/extensions/pom.xml +++ b/extensions/pom.xml @@ -19,7 +19,7 @@ com.stormpath.sdk stormpath-sdk-root - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT ../pom.xml diff --git a/extensions/servlet-plugin/pom.xml b/extensions/servlet-plugin/pom.xml index d7fcad52bc..d2fc4d8239 100644 --- a/extensions/servlet-plugin/pom.xml +++ b/extensions/servlet-plugin/pom.xml @@ -21,7 +21,7 @@ com.stormpath.sdk stormpath-sdk-root - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT ../../pom.xml diff --git a/extensions/servlet/pom.xml b/extensions/servlet/pom.xml index b3eeebece9..1b13e6ca95 100644 --- a/extensions/servlet/pom.xml +++ b/extensions/servlet/pom.xml @@ -21,7 +21,7 @@ com.stormpath.sdk stormpath-sdk-root - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT ../../pom.xml diff --git a/extensions/spring/boot/pom.xml b/extensions/spring/boot/pom.xml index e0602614d2..bcff245df7 100644 --- a/extensions/spring/boot/pom.xml +++ b/extensions/spring/boot/pom.xml @@ -21,7 +21,7 @@ com.stormpath.spring stormpath-spring-parent - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT ../pom.xml diff --git a/extensions/spring/boot/stormpath-default-spring-boot-starter/pom.xml b/extensions/spring/boot/stormpath-default-spring-boot-starter/pom.xml index 1f12039f37..d41f80173b 100644 --- a/extensions/spring/boot/stormpath-default-spring-boot-starter/pom.xml +++ b/extensions/spring/boot/stormpath-default-spring-boot-starter/pom.xml @@ -19,7 +19,7 @@ com.stormpath.spring stormpath-spring-parent - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT ../../pom.xml diff --git a/extensions/spring/boot/stormpath-spring-boot-starter/pom.xml b/extensions/spring/boot/stormpath-spring-boot-starter/pom.xml index 2be0847abf..8e2ddd5605 100644 --- a/extensions/spring/boot/stormpath-spring-boot-starter/pom.xml +++ b/extensions/spring/boot/stormpath-spring-boot-starter/pom.xml @@ -19,7 +19,7 @@ com.stormpath.spring stormpath-spring-parent - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT ../../pom.xml diff --git a/extensions/spring/boot/stormpath-spring-security-spring-boot-starter/pom.xml b/extensions/spring/boot/stormpath-spring-security-spring-boot-starter/pom.xml index d996d00c49..9be5684e11 100644 --- a/extensions/spring/boot/stormpath-spring-security-spring-boot-starter/pom.xml +++ b/extensions/spring/boot/stormpath-spring-security-spring-boot-starter/pom.xml @@ -19,7 +19,7 @@ com.stormpath.spring stormpath-spring-parent - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT ../../pom.xml diff --git a/extensions/spring/boot/stormpath-spring-security-webmvc-spring-boot-starter/pom.xml b/extensions/spring/boot/stormpath-spring-security-webmvc-spring-boot-starter/pom.xml index 2e30170c47..46cba9423f 100644 --- a/extensions/spring/boot/stormpath-spring-security-webmvc-spring-boot-starter/pom.xml +++ b/extensions/spring/boot/stormpath-spring-security-webmvc-spring-boot-starter/pom.xml @@ -19,7 +19,7 @@ com.stormpath.spring stormpath-spring-parent - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT ../../pom.xml diff --git a/extensions/spring/boot/stormpath-thymeleaf-spring-boot-starter/pom.xml b/extensions/spring/boot/stormpath-thymeleaf-spring-boot-starter/pom.xml index a6c24f7272..2d35fe54d4 100644 --- a/extensions/spring/boot/stormpath-thymeleaf-spring-boot-starter/pom.xml +++ b/extensions/spring/boot/stormpath-thymeleaf-spring-boot-starter/pom.xml @@ -19,7 +19,7 @@ com.stormpath.spring stormpath-spring-parent - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT ../../pom.xml diff --git a/extensions/spring/boot/stormpath-webmvc-spring-boot-starter/pom.xml b/extensions/spring/boot/stormpath-webmvc-spring-boot-starter/pom.xml index 6fdaaa8975..673fe9e351 100644 --- a/extensions/spring/boot/stormpath-webmvc-spring-boot-starter/pom.xml +++ b/extensions/spring/boot/stormpath-webmvc-spring-boot-starter/pom.xml @@ -19,7 +19,7 @@ com.stormpath.spring stormpath-spring-parent - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT ../../pom.xml diff --git a/extensions/spring/cloud/pom.xml b/extensions/spring/cloud/pom.xml index d7ee8ca70f..8448fcdbb2 100644 --- a/extensions/spring/cloud/pom.xml +++ b/extensions/spring/cloud/pom.xml @@ -21,7 +21,7 @@ com.stormpath.spring stormpath-spring-parent - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT ../pom.xml diff --git a/extensions/spring/cloud/stormpath-zuul-spring-cloud-starter/pom.xml b/extensions/spring/cloud/stormpath-zuul-spring-cloud-starter/pom.xml index 9eaed6a2cb..293508f2e2 100644 --- a/extensions/spring/cloud/stormpath-zuul-spring-cloud-starter/pom.xml +++ b/extensions/spring/cloud/stormpath-zuul-spring-cloud-starter/pom.xml @@ -19,7 +19,7 @@ com.stormpath.spring stormpath-spring-parent - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT ../../pom.xml diff --git a/extensions/spring/pom.xml b/extensions/spring/pom.xml index af36b03645..f3318a66e6 100644 --- a/extensions/spring/pom.xml +++ b/extensions/spring/pom.xml @@ -21,7 +21,7 @@ com.stormpath.sdk stormpath-sdk-root - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT ../../pom.xml diff --git a/extensions/spring/stormpath-spring-security-webmvc/pom.xml b/extensions/spring/stormpath-spring-security-webmvc/pom.xml index 296ba1b065..ba7cb2b8eb 100644 --- a/extensions/spring/stormpath-spring-security-webmvc/pom.xml +++ b/extensions/spring/stormpath-spring-security-webmvc/pom.xml @@ -19,7 +19,7 @@ com.stormpath.spring stormpath-spring-parent - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT ../pom.xml diff --git a/extensions/spring/stormpath-spring-security/pom.xml b/extensions/spring/stormpath-spring-security/pom.xml index ae92299a6d..9187189557 100644 --- a/extensions/spring/stormpath-spring-security/pom.xml +++ b/extensions/spring/stormpath-spring-security/pom.xml @@ -19,7 +19,7 @@ com.stormpath.spring stormpath-spring-parent - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT ../pom.xml diff --git a/extensions/spring/stormpath-spring-webmvc/pom.xml b/extensions/spring/stormpath-spring-webmvc/pom.xml index 03986ceb6a..5f5d3c144c 100644 --- a/extensions/spring/stormpath-spring-webmvc/pom.xml +++ b/extensions/spring/stormpath-spring-webmvc/pom.xml @@ -19,7 +19,7 @@ com.stormpath.spring stormpath-spring-parent - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT ../pom.xml diff --git a/extensions/spring/stormpath-spring/pom.xml b/extensions/spring/stormpath-spring/pom.xml index 72d614b1d1..605c3bd3c6 100644 --- a/extensions/spring/stormpath-spring/pom.xml +++ b/extensions/spring/stormpath-spring/pom.xml @@ -19,7 +19,7 @@ com.stormpath.spring stormpath-spring-parent - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT ../pom.xml diff --git a/extensions/zuul/pom.xml b/extensions/zuul/pom.xml index b0bdf92e01..7f88336ea3 100644 --- a/extensions/zuul/pom.xml +++ b/extensions/zuul/pom.xml @@ -21,7 +21,7 @@ com.stormpath.sdk stormpath-sdk-root - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT ../../pom.xml diff --git a/impl/pom.xml b/impl/pom.xml index 3f9a40834d..ee0a96d146 100644 --- a/impl/pom.xml +++ b/impl/pom.xml @@ -21,7 +21,7 @@ com.stormpath.sdk stormpath-sdk-root - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index afd7305185..352c6538bb 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ com.stormpath.sdk stormpath-sdk-root - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT pom Stormpath Java SDK diff --git a/tutorials/pom.xml b/tutorials/pom.xml index 4094c0cae3..5160961b6c 100644 --- a/tutorials/pom.xml +++ b/tutorials/pom.xml @@ -19,7 +19,7 @@ com.stormpath.sdk stormpath-sdk-root - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT ../pom.xml diff --git a/tutorials/spring-boot/00-the-basics/pom.xml b/tutorials/spring-boot/00-the-basics/pom.xml index a05e85d889..f59ba60c09 100644 --- a/tutorials/spring-boot/00-the-basics/pom.xml +++ b/tutorials/spring-boot/00-the-basics/pom.xml @@ -21,14 +21,14 @@ com.stormpath.sdk stormpath-sdk-tutorials-spring-boot - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT ../pom.xml com.stormpath.spring stormpath-sdk-tutorials-spring-boot-default-the-basics - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT Stormpath Java SDK :: Tutorials :: Spring Boot Default :: The Basics A simple Spring Boot Web MVC application with out-of-the-box login and self-service screens! diff --git a/tutorials/spring-boot/01-some-access-controls/pom.xml b/tutorials/spring-boot/01-some-access-controls/pom.xml index 74f882bc0a..ea940f6ff6 100644 --- a/tutorials/spring-boot/01-some-access-controls/pom.xml +++ b/tutorials/spring-boot/01-some-access-controls/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-tutorials-spring-boot - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT ../pom.xml com.stormpath.spring stormpath-sdk-tutorials-spring-boot-default-some-access-controls - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT Stormpath Java SDK :: Tutorials :: Spring Boot Default :: Some Access Controls A simple Spring Boot Web MVC application with out-of-the-box login and self-service screens! diff --git a/tutorials/spring-boot/02-spring-security-ftw/pom.xml b/tutorials/spring-boot/02-spring-security-ftw/pom.xml index f6096dd71e..86319aba5a 100644 --- a/tutorials/spring-boot/02-spring-security-ftw/pom.xml +++ b/tutorials/spring-boot/02-spring-security-ftw/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-tutorials-spring-boot - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT ../pom.xml com.stormpath.spring stormpath-sdk-tutorials-spring-boot-default-spring-security-ftw - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT Stormpath Java SDK :: Tutorials :: Spring Boot Default :: Spring Security FTW! A simple Spring Boot Web MVC application with out-of-the-box login and self-service screens! diff --git a/tutorials/spring-boot/03-spring-security-refined/pom.xml b/tutorials/spring-boot/03-spring-security-refined/pom.xml index eb156f4c7a..72140c4cfe 100644 --- a/tutorials/spring-boot/03-spring-security-refined/pom.xml +++ b/tutorials/spring-boot/03-spring-security-refined/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-tutorials-spring-boot - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT ../pom.xml com.stormpath.spring stormpath-sdk-tutorials-spring-boot-default-spring-security-refined - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT Stormpath Java SDK :: Tutorials :: Spring Boot Default :: Spring Security Refined A simple Spring Boot Web MVC application with out-of-the-box login and self-service screens! diff --git a/tutorials/spring-boot/04-a-finer-grain-of-control/pom.xml b/tutorials/spring-boot/04-a-finer-grain-of-control/pom.xml index c36c417766..d5819b736c 100644 --- a/tutorials/spring-boot/04-a-finer-grain-of-control/pom.xml +++ b/tutorials/spring-boot/04-a-finer-grain-of-control/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-tutorials-spring-boot - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT ../pom.xml com.stormpath.spring stormpath-sdk-tutorials-spring-boot-default-a-finer-grain-of-control - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT Stormpath Java SDK :: Tutorials :: Spring Boot Default :: A Finer Grain of Control A simple Spring Boot Web MVC application with out-of-the-box login and self-service screens! diff --git a/tutorials/spring-boot/05-token-management/pom.xml b/tutorials/spring-boot/05-token-management/pom.xml index a4d040763c..935f0dc7fe 100644 --- a/tutorials/spring-boot/05-token-management/pom.xml +++ b/tutorials/spring-boot/05-token-management/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-tutorials-spring-boot - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT ../pom.xml com.stormpath.spring stormpath-sdk-tutorials-spring-boot-default-token-management - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT Stormpath Java SDK :: Tutorials :: Spring Boot Default :: Token Management A simple Spring Boot Web MVC application with out-of-the-box login and self-service screens! diff --git a/tutorials/spring-boot/pom.xml b/tutorials/spring-boot/pom.xml index 788816b9d9..2acaab1ce2 100644 --- a/tutorials/spring-boot/pom.xml +++ b/tutorials/spring-boot/pom.xml @@ -19,7 +19,7 @@ com.stormpath.sdk stormpath-sdk-tutorials - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT ../pom.xml diff --git a/tutorials/spring/00-the-basics/pom.xml b/tutorials/spring/00-the-basics/pom.xml index b09db91e6f..a489c3c320 100644 --- a/tutorials/spring/00-the-basics/pom.xml +++ b/tutorials/spring/00-the-basics/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-tutorials-spring - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT ../pom.xml com.stormpath.spring stormpath-sdk-tutorials-spring-security-webmvc-the-basics - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT Stormpath Java SDK :: Tutorials :: Spring Security WebMVC :: The Basics A simple Spring Security Web MVC application with out-of-the-box login and self-service screens! diff --git a/tutorials/spring/01-some-access-controls/pom.xml b/tutorials/spring/01-some-access-controls/pom.xml index be4eea6158..f289a5794f 100644 --- a/tutorials/spring/01-some-access-controls/pom.xml +++ b/tutorials/spring/01-some-access-controls/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-tutorials-spring - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT ../pom.xml com.stormpath.spring stormpath-sdk-tutorials-spring-security-webmvc-some-access-controls - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT Stormpath Java SDK :: Tutorials :: Spring Security WebMVC :: Some Access Controls A simple Spring Security Web MVC application with out-of-the-box login and self-service screens! diff --git a/tutorials/spring/02-spring-security-ftw/pom.xml b/tutorials/spring/02-spring-security-ftw/pom.xml index b62558d698..18e9a0d418 100644 --- a/tutorials/spring/02-spring-security-ftw/pom.xml +++ b/tutorials/spring/02-spring-security-ftw/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-tutorials-spring - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT ../pom.xml com.stormpath.spring stormpath-sdk-tutorials-spring-security-webmvc-spring-security-ftw - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT Stormpath Java SDK :: Tutorials :: Spring Security WebMVC :: Spring Security For The Win A simple Spring Security Web MVC application with out-of-the-box login and self-service screens! diff --git a/tutorials/spring/03-spring-security-refined/pom.xml b/tutorials/spring/03-spring-security-refined/pom.xml index 184fa5362b..532fcbe96c 100644 --- a/tutorials/spring/03-spring-security-refined/pom.xml +++ b/tutorials/spring/03-spring-security-refined/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-tutorials-spring - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT ../pom.xml com.stormpath.spring stormpath-sdk-tutorials-spring-security-webmvc-spring-security-refined - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT Stormpath Java SDK :: Tutorials :: Spring Security WebMVC :: Spring Security Refined A simple Spring Security Web MVC application with out-of-the-box login and self-service screens! diff --git a/tutorials/spring/04-a-finer-grain-of-control/pom.xml b/tutorials/spring/04-a-finer-grain-of-control/pom.xml index 1be63d1200..497a8be56f 100644 --- a/tutorials/spring/04-a-finer-grain-of-control/pom.xml +++ b/tutorials/spring/04-a-finer-grain-of-control/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-tutorials-spring - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT ../pom.xml com.stormpath.spring stormpath-sdk-tutorials-spring-security-webmvc-a-finer-grain-of-control - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT Stormpath Java SDK :: Tutorials :: Spring Security WebMVC :: A Finer Grain Of Control A simple Spring Security Web MVC application with out-of-the-box login and self-service screens! diff --git a/tutorials/spring/05-token-management/pom.xml b/tutorials/spring/05-token-management/pom.xml index 5012174988..664b6f1aae 100644 --- a/tutorials/spring/05-token-management/pom.xml +++ b/tutorials/spring/05-token-management/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-tutorials-spring - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT ../pom.xml com.stormpath.spring stormpath-sdk-tutorials-spring-security-webmvc-token-management - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT Stormpath Java SDK :: Tutorials :: Spring Security WebMVC :: Token Management A simple Spring Security Web MVC application with out-of-the-box login and self-service screens! diff --git a/tutorials/spring/pom.xml b/tutorials/spring/pom.xml index ff01559707..3d9460c24f 100644 --- a/tutorials/spring/pom.xml +++ b/tutorials/spring/pom.xml @@ -19,7 +19,7 @@ com.stormpath.sdk stormpath-sdk-tutorials - 1.6.0-SNAPSHOT + 1.5.4-SNAPSHOT ../pom.xml From 142d22bb30822b38a27503f73800cf364ede56df Mon Sep 17 00:00:00 2001 From: stormpath-sdk-java Auto Doc Build Date: Wed, 8 Feb 2017 18:02:45 -0300 Subject: [PATCH 04/21] [maven-release-plugin] prepare release stormpath-sdk-root-1.5.4 --- api/pom.xml | 2 +- bom/pom.xml | 40 +++++++++---------- clover/pom.xml | 2 +- examples/pom.xml | 4 +- examples/quickstart/pom.xml | 4 +- examples/servlet/pom.xml | 4 +- examples/spring-boot-default/pom.xml | 4 +- examples/spring-boot-webmvc-angular/pom.xml | 4 +- examples/spring-boot-webmvc/pom.xml | 4 +- examples/spring-boot/pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- examples/spring-security-webmvc/pom.xml | 4 +- examples/spring-webmvc/pom.xml | 4 +- examples/spring/pom.xml | 4 +- examples/zuul-spring-cloud-starter/pom.xml | 4 +- extensions/hazelcast/pom.xml | 2 +- extensions/httpclient/pom.xml | 2 +- extensions/oauth/pom.xml | 2 +- extensions/pom.xml | 2 +- extensions/servlet-plugin/pom.xml | 2 +- extensions/servlet/pom.xml | 2 +- extensions/spring/boot/pom.xml | 2 +- .../pom.xml | 2 +- .../stormpath-spring-boot-starter/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- extensions/spring/cloud/pom.xml | 2 +- .../pom.xml | 2 +- extensions/spring/pom.xml | 2 +- .../stormpath-spring-security-webmvc/pom.xml | 2 +- .../spring/stormpath-spring-security/pom.xml | 2 +- .../spring/stormpath-spring-webmvc/pom.xml | 2 +- extensions/spring/stormpath-spring/pom.xml | 2 +- extensions/zuul/pom.xml | 2 +- impl/pom.xml | 2 +- pom.xml | 4 +- tutorials/pom.xml | 2 +- tutorials/spring-boot/00-the-basics/pom.xml | 4 +- .../01-some-access-controls/pom.xml | 4 +- .../02-spring-security-ftw/pom.xml | 4 +- .../03-spring-security-refined/pom.xml | 4 +- .../04-a-finer-grain-of-control/pom.xml | 4 +- .../spring-boot/05-token-management/pom.xml | 4 +- tutorials/spring-boot/pom.xml | 2 +- tutorials/spring/00-the-basics/pom.xml | 4 +- .../spring/01-some-access-controls/pom.xml | 4 +- .../spring/02-spring-security-ftw/pom.xml | 4 +- .../spring/03-spring-security-refined/pom.xml | 4 +- .../04-a-finer-grain-of-control/pom.xml | 4 +- tutorials/spring/05-token-management/pom.xml | 4 +- tutorials/spring/pom.xml | 2 +- 54 files changed, 99 insertions(+), 99 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index f4d37faee6..2de8f7892e 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -21,7 +21,7 @@ com.stormpath.sdk stormpath-sdk-root - 1.5.4-SNAPSHOT + 1.5.4 ../pom.xml diff --git a/bom/pom.xml b/bom/pom.xml index 76271b8e06..3f951f11d1 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -7,7 +7,7 @@ Stormpath Java SDK :: BOM Stormpath Bill of Materials pom - 1.6.0-SNAPSHOT + 1.5.4 https://github.com/stormpath/stormpath-sdk-java @@ -27,7 +27,7 @@ scm:git:git@github.com:stormpath/stormpath-sdk-java.git scm:git:git@github.com:stormpath/stormpath-sdk-java.git git@github.com:stormpath/stormpath-sdk-java.git - HEAD + stormpath-sdk-root-1.5.4 GitHub @@ -50,92 +50,92 @@ com.stormpath.sdk stormpath-sdk-api - 1.5.4-SNAPSHOT + 1.5.4 com.stormpath.sdk stormpath-sdk-impl - 1.5.4-SNAPSHOT + 1.5.4 com.stormpath.sdk stormpath-sdk-oauth - 1.5.4-SNAPSHOT + 1.5.4 com.stormpath.sdk stormpath-sdk-servlet - 1.5.4-SNAPSHOT + 1.5.4 com.stormpath.sdk stormpath-sdk-httpclient - 1.5.4-SNAPSHOT + 1.5.4 com.stormpath.sdk stormpath-servlet-plugin - 1.5.4-SNAPSHOT + 1.5.4 com.stormpath.sdk stormpath-sdk-zuul - 1.5.4-SNAPSHOT + 1.5.4 com.stormpath.spring stormpath-spring - 1.5.4-SNAPSHOT + 1.5.4 com.stormpath.spring stormpath-spring-security - 1.5.4-SNAPSHOT + 1.5.4 com.stormpath.spring stormpath-spring-security-webmvc - 1.5.4-SNAPSHOT + 1.5.4 com.stormpath.spring stormpath-spring-webmvc - 1.5.4-SNAPSHOT + 1.5.4 com.stormpath.spring stormpath-spring-boot-starter - 1.5.4-SNAPSHOT + 1.5.4 com.stormpath.spring stormpath-webmvc-spring-boot-starter - 1.5.4-SNAPSHOT + 1.5.4 com.stormpath.spring stormpath-thymeleaf-spring-boot-starter - 1.5.4-SNAPSHOT + 1.5.4 com.stormpath.spring stormpath-spring-security-spring-boot-starter - 1.5.4-SNAPSHOT + 1.5.4 com.stormpath.spring stormpath-spring-security-webmvc-spring-boot-starter - 1.5.4-SNAPSHOT + 1.5.4 com.stormpath.spring stormpath-default-spring-boot-starter - 1.5.4-SNAPSHOT + 1.5.4 com.stormpath.spring stormpath-zuul-spring-cloud-starter - 1.5.4-SNAPSHOT + 1.5.4 diff --git a/clover/pom.xml b/clover/pom.xml index 4b95fa17b1..149e0b830f 100644 --- a/clover/pom.xml +++ b/clover/pom.xml @@ -21,7 +21,7 @@ com.stormpath.sdk stormpath-sdk-root - 1.5.4-SNAPSHOT + 1.5.4 ../pom.xml diff --git a/examples/pom.xml b/examples/pom.xml index b98eea0fdf..76408afe7b 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-root - 1.5.4-SNAPSHOT + 1.5.4 ../pom.xml stormpath-sdk-examples com.stormpath.sdk - 1.5.4-SNAPSHOT + 1.5.4 Stormpath Java SDK :: Examples pom diff --git a/examples/quickstart/pom.xml b/examples/quickstart/pom.xml index 53fe965fa6..9561e93d81 100644 --- a/examples/quickstart/pom.xml +++ b/examples/quickstart/pom.xml @@ -5,13 +5,13 @@ com.stormpath.sdk stormpath-sdk-examples - 1.5.4-SNAPSHOT + 1.5.4 ../pom.xml com.stormpath.sdk stormpath-sdk-examples-quickstart - 1.5.4-SNAPSHOT + 1.5.4 Stormpath Java SDK :: Examples :: Quickstart Code A simple (non-web) application to demonstrate the example code in the Stormpath Java Quickstart diff --git a/examples/servlet/pom.xml b/examples/servlet/pom.xml index 826a58f56a..e3cbf7b891 100644 --- a/examples/servlet/pom.xml +++ b/examples/servlet/pom.xml @@ -21,12 +21,12 @@ com.stormpath.sdk stormpath-sdk-examples - 1.5.4-SNAPSHOT + 1.5.4 ../pom.xml stormpath-sdk-examples-servlet - 1.5.4-SNAPSHOT + 1.5.4 Stormpath Java SDK :: Examples :: Servlet Container-based Webapp A simple example webapp deployed in a servlet container. war diff --git a/examples/spring-boot-default/pom.xml b/examples/spring-boot-default/pom.xml index f779b1ee15..3f3407eef2 100644 --- a/examples/spring-boot-default/pom.xml +++ b/examples/spring-boot-default/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-examples - 1.5.4-SNAPSHOT + 1.5.4 ../pom.xml com.stormpath.spring stormpath-sdk-examples-spring-boot-default - 1.5.4-SNAPSHOT + 1.5.4 Stormpath Java SDK :: Examples :: Spring Boot Default A simple Spring Boot Web MVC application with out-of-the-box login and self-service screens! diff --git a/examples/spring-boot-webmvc-angular/pom.xml b/examples/spring-boot-webmvc-angular/pom.xml index 26a044f41a..0c384a2445 100644 --- a/examples/spring-boot-webmvc-angular/pom.xml +++ b/examples/spring-boot-webmvc-angular/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-examples - 1.5.4-SNAPSHOT + 1.5.4 ../pom.xml com.stormpath.spring stormpath-sdk-examples-spring-boot-web-angular - 1.5.4-SNAPSHOT + 1.5.4 Stormpath Java SDK :: Examples :: Spring Boot + Angular Webapp A Spring Boot web application that uses Stormpath. diff --git a/examples/spring-boot-webmvc/pom.xml b/examples/spring-boot-webmvc/pom.xml index b19fef0ddb..91450662dd 100644 --- a/examples/spring-boot-webmvc/pom.xml +++ b/examples/spring-boot-webmvc/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-examples - 1.5.4-SNAPSHOT + 1.5.4 ../pom.xml com.stormpath.spring stormpath-sdk-examples-spring-boot-web - 1.5.4-SNAPSHOT + 1.5.4 Stormpath Java SDK :: Examples :: Spring Boot Webapp A Spring Boot web application that uses Stormpath. diff --git a/examples/spring-boot/pom.xml b/examples/spring-boot/pom.xml index 61f3f3414d..b4a45095af 100644 --- a/examples/spring-boot/pom.xml +++ b/examples/spring-boot/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-examples - 1.5.4-SNAPSHOT + 1.5.4 ../pom.xml com.stormpath.spring stormpath-sdk-examples-spring-boot - 1.5.4-SNAPSHOT + 1.5.4 Stormpath Java SDK :: Examples :: Spring Boot A Spring Boot (non-web) application that uses Stormpath. diff --git a/examples/spring-security-spring-boot-webmvc-bare-bones/pom.xml b/examples/spring-security-spring-boot-webmvc-bare-bones/pom.xml index 45c8272423..07e4935e6a 100644 --- a/examples/spring-security-spring-boot-webmvc-bare-bones/pom.xml +++ b/examples/spring-security-spring-boot-webmvc-bare-bones/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-examples - 1.5.4-SNAPSHOT + 1.5.4 ../pom.xml com.stormpath.spring stormpath-sdk-examples-spring-security-spring-boot-webmvc-bare-bones - 1.5.4-SNAPSHOT + 1.5.4 Stormpath Java SDK :: Examples :: Spring Security :: Spring Boot :: Bare Bones A simple Spring Boot Web MVC application with out-of-the-box login and self-service screens! diff --git a/examples/spring-security-spring-boot-webmvc/pom.xml b/examples/spring-security-spring-boot-webmvc/pom.xml index 9fbdab78fc..861c0e156a 100644 --- a/examples/spring-security-spring-boot-webmvc/pom.xml +++ b/examples/spring-security-spring-boot-webmvc/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-examples - 1.5.4-SNAPSHOT + 1.5.4 ../pom.xml com.stormpath.spring stormpath-sdk-examples-spring-security-spring-boot-webmvc - 1.5.4-SNAPSHOT + 1.5.4 Stormpath Java SDK :: Examples :: Spring Security :: Spring Boot Webapp A simple Spring Boot Web MVC application with out-of-the-box login and self-service screens! diff --git a/examples/spring-security-webmvc/pom.xml b/examples/spring-security-webmvc/pom.xml index 34a5326cff..ff8116d6c7 100644 --- a/examples/spring-security-webmvc/pom.xml +++ b/examples/spring-security-webmvc/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-examples - 1.5.4-SNAPSHOT + 1.5.4 ../pom.xml com.stormpath.spring stormpath-sdk-examples-spring-security-webmvc - 1.5.4-SNAPSHOT + 1.5.4 Stormpath Java SDK :: Examples :: Spring Security Web MVC A simple Spring Security Web MVC application with out-of-the-box login and self-service screens! diff --git a/examples/spring-webmvc/pom.xml b/examples/spring-webmvc/pom.xml index 688add6adf..b6b64cf967 100644 --- a/examples/spring-webmvc/pom.xml +++ b/examples/spring-webmvc/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-examples - 1.5.4-SNAPSHOT + 1.5.4 ../pom.xml com.stormpath.spring stormpath-sdk-examples-spring-webmvc - 1.5.4-SNAPSHOT + 1.5.4 Stormpath Java SDK :: Examples :: Spring Web MVC A Spring Boot web application that uses Stormpath and Spring Security diff --git a/examples/spring/pom.xml b/examples/spring/pom.xml index 5188499f6d..c28d26b752 100644 --- a/examples/spring/pom.xml +++ b/examples/spring/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-examples - 1.5.4-SNAPSHOT + 1.5.4 ../pom.xml com.stormpath.spring stormpath-sdk-examples-spring - 1.5.4-SNAPSHOT + 1.5.4 Stormpath Java SDK :: Examples :: Spring A simple (non-web) Spring Application. diff --git a/examples/zuul-spring-cloud-starter/pom.xml b/examples/zuul-spring-cloud-starter/pom.xml index e1d4817ddb..6dfa3d4d0a 100644 --- a/examples/zuul-spring-cloud-starter/pom.xml +++ b/examples/zuul-spring-cloud-starter/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-examples - 1.5.4-SNAPSHOT + 1.5.4 ../pom.xml com.stormpath.spring stormpath-sdk-examples-zuul-spring-cloud-starter - 1.5.4-SNAPSHOT + 1.5.4 Stormpath Java SDK :: Examples :: Zuul Spring Cloud Starter An example spring cloud zuul web gateway using Stormpath diff --git a/extensions/hazelcast/pom.xml b/extensions/hazelcast/pom.xml index ef73664b3f..df6feb534f 100644 --- a/extensions/hazelcast/pom.xml +++ b/extensions/hazelcast/pom.xml @@ -21,7 +21,7 @@ com.stormpath.sdk stormpath-sdk-root - 1.5.4-SNAPSHOT + 1.5.4 ../../pom.xml diff --git a/extensions/httpclient/pom.xml b/extensions/httpclient/pom.xml index c8cf1ee8bf..d10cf29727 100644 --- a/extensions/httpclient/pom.xml +++ b/extensions/httpclient/pom.xml @@ -21,7 +21,7 @@ com.stormpath.sdk stormpath-sdk-root - 1.5.4-SNAPSHOT + 1.5.4 ../../pom.xml diff --git a/extensions/oauth/pom.xml b/extensions/oauth/pom.xml index 5e40605771..a29685331b 100644 --- a/extensions/oauth/pom.xml +++ b/extensions/oauth/pom.xml @@ -21,7 +21,7 @@ com.stormpath.sdk stormpath-sdk-root - 1.5.4-SNAPSHOT + 1.5.4 ../../pom.xml diff --git a/extensions/pom.xml b/extensions/pom.xml index d01252f52c..bc4e0d3ade 100644 --- a/extensions/pom.xml +++ b/extensions/pom.xml @@ -19,7 +19,7 @@ com.stormpath.sdk stormpath-sdk-root - 1.5.4-SNAPSHOT + 1.5.4 ../pom.xml diff --git a/extensions/servlet-plugin/pom.xml b/extensions/servlet-plugin/pom.xml index d2fc4d8239..32143857c7 100644 --- a/extensions/servlet-plugin/pom.xml +++ b/extensions/servlet-plugin/pom.xml @@ -21,7 +21,7 @@ com.stormpath.sdk stormpath-sdk-root - 1.5.4-SNAPSHOT + 1.5.4 ../../pom.xml diff --git a/extensions/servlet/pom.xml b/extensions/servlet/pom.xml index 1b13e6ca95..ec51a549b6 100644 --- a/extensions/servlet/pom.xml +++ b/extensions/servlet/pom.xml @@ -21,7 +21,7 @@ com.stormpath.sdk stormpath-sdk-root - 1.5.4-SNAPSHOT + 1.5.4 ../../pom.xml diff --git a/extensions/spring/boot/pom.xml b/extensions/spring/boot/pom.xml index bcff245df7..1f5b41b418 100644 --- a/extensions/spring/boot/pom.xml +++ b/extensions/spring/boot/pom.xml @@ -21,7 +21,7 @@ com.stormpath.spring stormpath-spring-parent - 1.5.4-SNAPSHOT + 1.5.4 ../pom.xml diff --git a/extensions/spring/boot/stormpath-default-spring-boot-starter/pom.xml b/extensions/spring/boot/stormpath-default-spring-boot-starter/pom.xml index d41f80173b..ac21d32fa8 100644 --- a/extensions/spring/boot/stormpath-default-spring-boot-starter/pom.xml +++ b/extensions/spring/boot/stormpath-default-spring-boot-starter/pom.xml @@ -19,7 +19,7 @@ com.stormpath.spring stormpath-spring-parent - 1.5.4-SNAPSHOT + 1.5.4 ../../pom.xml diff --git a/extensions/spring/boot/stormpath-spring-boot-starter/pom.xml b/extensions/spring/boot/stormpath-spring-boot-starter/pom.xml index 8e2ddd5605..ceb6d5b3fa 100644 --- a/extensions/spring/boot/stormpath-spring-boot-starter/pom.xml +++ b/extensions/spring/boot/stormpath-spring-boot-starter/pom.xml @@ -19,7 +19,7 @@ com.stormpath.spring stormpath-spring-parent - 1.5.4-SNAPSHOT + 1.5.4 ../../pom.xml diff --git a/extensions/spring/boot/stormpath-spring-security-spring-boot-starter/pom.xml b/extensions/spring/boot/stormpath-spring-security-spring-boot-starter/pom.xml index 9be5684e11..8eff13414e 100644 --- a/extensions/spring/boot/stormpath-spring-security-spring-boot-starter/pom.xml +++ b/extensions/spring/boot/stormpath-spring-security-spring-boot-starter/pom.xml @@ -19,7 +19,7 @@ com.stormpath.spring stormpath-spring-parent - 1.5.4-SNAPSHOT + 1.5.4 ../../pom.xml diff --git a/extensions/spring/boot/stormpath-spring-security-webmvc-spring-boot-starter/pom.xml b/extensions/spring/boot/stormpath-spring-security-webmvc-spring-boot-starter/pom.xml index 46cba9423f..847b06fe8e 100644 --- a/extensions/spring/boot/stormpath-spring-security-webmvc-spring-boot-starter/pom.xml +++ b/extensions/spring/boot/stormpath-spring-security-webmvc-spring-boot-starter/pom.xml @@ -19,7 +19,7 @@ com.stormpath.spring stormpath-spring-parent - 1.5.4-SNAPSHOT + 1.5.4 ../../pom.xml diff --git a/extensions/spring/boot/stormpath-thymeleaf-spring-boot-starter/pom.xml b/extensions/spring/boot/stormpath-thymeleaf-spring-boot-starter/pom.xml index 2d35fe54d4..b947c8e3af 100644 --- a/extensions/spring/boot/stormpath-thymeleaf-spring-boot-starter/pom.xml +++ b/extensions/spring/boot/stormpath-thymeleaf-spring-boot-starter/pom.xml @@ -19,7 +19,7 @@ com.stormpath.spring stormpath-spring-parent - 1.5.4-SNAPSHOT + 1.5.4 ../../pom.xml diff --git a/extensions/spring/boot/stormpath-webmvc-spring-boot-starter/pom.xml b/extensions/spring/boot/stormpath-webmvc-spring-boot-starter/pom.xml index 673fe9e351..90c94c72aa 100644 --- a/extensions/spring/boot/stormpath-webmvc-spring-boot-starter/pom.xml +++ b/extensions/spring/boot/stormpath-webmvc-spring-boot-starter/pom.xml @@ -19,7 +19,7 @@ com.stormpath.spring stormpath-spring-parent - 1.5.4-SNAPSHOT + 1.5.4 ../../pom.xml diff --git a/extensions/spring/cloud/pom.xml b/extensions/spring/cloud/pom.xml index 8448fcdbb2..7bd3308599 100644 --- a/extensions/spring/cloud/pom.xml +++ b/extensions/spring/cloud/pom.xml @@ -21,7 +21,7 @@ com.stormpath.spring stormpath-spring-parent - 1.5.4-SNAPSHOT + 1.5.4 ../pom.xml diff --git a/extensions/spring/cloud/stormpath-zuul-spring-cloud-starter/pom.xml b/extensions/spring/cloud/stormpath-zuul-spring-cloud-starter/pom.xml index 293508f2e2..eb8976c183 100644 --- a/extensions/spring/cloud/stormpath-zuul-spring-cloud-starter/pom.xml +++ b/extensions/spring/cloud/stormpath-zuul-spring-cloud-starter/pom.xml @@ -19,7 +19,7 @@ com.stormpath.spring stormpath-spring-parent - 1.5.4-SNAPSHOT + 1.5.4 ../../pom.xml diff --git a/extensions/spring/pom.xml b/extensions/spring/pom.xml index f3318a66e6..a9e80889d4 100644 --- a/extensions/spring/pom.xml +++ b/extensions/spring/pom.xml @@ -21,7 +21,7 @@ com.stormpath.sdk stormpath-sdk-root - 1.5.4-SNAPSHOT + 1.5.4 ../../pom.xml diff --git a/extensions/spring/stormpath-spring-security-webmvc/pom.xml b/extensions/spring/stormpath-spring-security-webmvc/pom.xml index ba7cb2b8eb..02239b9d5f 100644 --- a/extensions/spring/stormpath-spring-security-webmvc/pom.xml +++ b/extensions/spring/stormpath-spring-security-webmvc/pom.xml @@ -19,7 +19,7 @@ com.stormpath.spring stormpath-spring-parent - 1.5.4-SNAPSHOT + 1.5.4 ../pom.xml diff --git a/extensions/spring/stormpath-spring-security/pom.xml b/extensions/spring/stormpath-spring-security/pom.xml index 9187189557..1925b45d64 100644 --- a/extensions/spring/stormpath-spring-security/pom.xml +++ b/extensions/spring/stormpath-spring-security/pom.xml @@ -19,7 +19,7 @@ com.stormpath.spring stormpath-spring-parent - 1.5.4-SNAPSHOT + 1.5.4 ../pom.xml diff --git a/extensions/spring/stormpath-spring-webmvc/pom.xml b/extensions/spring/stormpath-spring-webmvc/pom.xml index 5f5d3c144c..11e31a5c11 100644 --- a/extensions/spring/stormpath-spring-webmvc/pom.xml +++ b/extensions/spring/stormpath-spring-webmvc/pom.xml @@ -19,7 +19,7 @@ com.stormpath.spring stormpath-spring-parent - 1.5.4-SNAPSHOT + 1.5.4 ../pom.xml diff --git a/extensions/spring/stormpath-spring/pom.xml b/extensions/spring/stormpath-spring/pom.xml index 605c3bd3c6..dea9a29d07 100644 --- a/extensions/spring/stormpath-spring/pom.xml +++ b/extensions/spring/stormpath-spring/pom.xml @@ -19,7 +19,7 @@ com.stormpath.spring stormpath-spring-parent - 1.5.4-SNAPSHOT + 1.5.4 ../pom.xml diff --git a/extensions/zuul/pom.xml b/extensions/zuul/pom.xml index 7f88336ea3..8de82547f5 100644 --- a/extensions/zuul/pom.xml +++ b/extensions/zuul/pom.xml @@ -21,7 +21,7 @@ com.stormpath.sdk stormpath-sdk-root - 1.5.4-SNAPSHOT + 1.5.4 ../../pom.xml diff --git a/impl/pom.xml b/impl/pom.xml index ee0a96d146..c687211c43 100644 --- a/impl/pom.xml +++ b/impl/pom.xml @@ -21,7 +21,7 @@ com.stormpath.sdk stormpath-sdk-root - 1.5.4-SNAPSHOT + 1.5.4 ../pom.xml diff --git a/pom.xml b/pom.xml index 352c6538bb..06df2653aa 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ com.stormpath.sdk stormpath-sdk-root - 1.5.4-SNAPSHOT + 1.5.4 pom Stormpath Java SDK @@ -41,7 +41,7 @@ scm:git:git@github.com:stormpath/stormpath-sdk-java.git scm:git:git@github.com:stormpath/stormpath-sdk-java.git git@github.com:stormpath/stormpath-sdk-java.git - HEAD + stormpath-sdk-root-1.5.4 GitHub diff --git a/tutorials/pom.xml b/tutorials/pom.xml index 5160961b6c..e0bb35b428 100644 --- a/tutorials/pom.xml +++ b/tutorials/pom.xml @@ -19,7 +19,7 @@ com.stormpath.sdk stormpath-sdk-root - 1.5.4-SNAPSHOT + 1.5.4 ../pom.xml diff --git a/tutorials/spring-boot/00-the-basics/pom.xml b/tutorials/spring-boot/00-the-basics/pom.xml index f59ba60c09..913a13a1d4 100644 --- a/tutorials/spring-boot/00-the-basics/pom.xml +++ b/tutorials/spring-boot/00-the-basics/pom.xml @@ -21,14 +21,14 @@ com.stormpath.sdk stormpath-sdk-tutorials-spring-boot - 1.5.4-SNAPSHOT + 1.5.4 ../pom.xml com.stormpath.spring stormpath-sdk-tutorials-spring-boot-default-the-basics - 1.5.4-SNAPSHOT + 1.5.4 Stormpath Java SDK :: Tutorials :: Spring Boot Default :: The Basics A simple Spring Boot Web MVC application with out-of-the-box login and self-service screens! diff --git a/tutorials/spring-boot/01-some-access-controls/pom.xml b/tutorials/spring-boot/01-some-access-controls/pom.xml index ea940f6ff6..e83784e77d 100644 --- a/tutorials/spring-boot/01-some-access-controls/pom.xml +++ b/tutorials/spring-boot/01-some-access-controls/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-tutorials-spring-boot - 1.5.4-SNAPSHOT + 1.5.4 ../pom.xml com.stormpath.spring stormpath-sdk-tutorials-spring-boot-default-some-access-controls - 1.5.4-SNAPSHOT + 1.5.4 Stormpath Java SDK :: Tutorials :: Spring Boot Default :: Some Access Controls A simple Spring Boot Web MVC application with out-of-the-box login and self-service screens! diff --git a/tutorials/spring-boot/02-spring-security-ftw/pom.xml b/tutorials/spring-boot/02-spring-security-ftw/pom.xml index 86319aba5a..2b52db7226 100644 --- a/tutorials/spring-boot/02-spring-security-ftw/pom.xml +++ b/tutorials/spring-boot/02-spring-security-ftw/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-tutorials-spring-boot - 1.5.4-SNAPSHOT + 1.5.4 ../pom.xml com.stormpath.spring stormpath-sdk-tutorials-spring-boot-default-spring-security-ftw - 1.5.4-SNAPSHOT + 1.5.4 Stormpath Java SDK :: Tutorials :: Spring Boot Default :: Spring Security FTW! A simple Spring Boot Web MVC application with out-of-the-box login and self-service screens! diff --git a/tutorials/spring-boot/03-spring-security-refined/pom.xml b/tutorials/spring-boot/03-spring-security-refined/pom.xml index 72140c4cfe..6649e13523 100644 --- a/tutorials/spring-boot/03-spring-security-refined/pom.xml +++ b/tutorials/spring-boot/03-spring-security-refined/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-tutorials-spring-boot - 1.5.4-SNAPSHOT + 1.5.4 ../pom.xml com.stormpath.spring stormpath-sdk-tutorials-spring-boot-default-spring-security-refined - 1.5.4-SNAPSHOT + 1.5.4 Stormpath Java SDK :: Tutorials :: Spring Boot Default :: Spring Security Refined A simple Spring Boot Web MVC application with out-of-the-box login and self-service screens! diff --git a/tutorials/spring-boot/04-a-finer-grain-of-control/pom.xml b/tutorials/spring-boot/04-a-finer-grain-of-control/pom.xml index d5819b736c..7b09c29ab1 100644 --- a/tutorials/spring-boot/04-a-finer-grain-of-control/pom.xml +++ b/tutorials/spring-boot/04-a-finer-grain-of-control/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-tutorials-spring-boot - 1.5.4-SNAPSHOT + 1.5.4 ../pom.xml com.stormpath.spring stormpath-sdk-tutorials-spring-boot-default-a-finer-grain-of-control - 1.5.4-SNAPSHOT + 1.5.4 Stormpath Java SDK :: Tutorials :: Spring Boot Default :: A Finer Grain of Control A simple Spring Boot Web MVC application with out-of-the-box login and self-service screens! diff --git a/tutorials/spring-boot/05-token-management/pom.xml b/tutorials/spring-boot/05-token-management/pom.xml index 935f0dc7fe..8c91cd052f 100644 --- a/tutorials/spring-boot/05-token-management/pom.xml +++ b/tutorials/spring-boot/05-token-management/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-tutorials-spring-boot - 1.5.4-SNAPSHOT + 1.5.4 ../pom.xml com.stormpath.spring stormpath-sdk-tutorials-spring-boot-default-token-management - 1.5.4-SNAPSHOT + 1.5.4 Stormpath Java SDK :: Tutorials :: Spring Boot Default :: Token Management A simple Spring Boot Web MVC application with out-of-the-box login and self-service screens! diff --git a/tutorials/spring-boot/pom.xml b/tutorials/spring-boot/pom.xml index 2acaab1ce2..e985749f29 100644 --- a/tutorials/spring-boot/pom.xml +++ b/tutorials/spring-boot/pom.xml @@ -19,7 +19,7 @@ com.stormpath.sdk stormpath-sdk-tutorials - 1.5.4-SNAPSHOT + 1.5.4 ../pom.xml diff --git a/tutorials/spring/00-the-basics/pom.xml b/tutorials/spring/00-the-basics/pom.xml index a489c3c320..0f65f2d9da 100644 --- a/tutorials/spring/00-the-basics/pom.xml +++ b/tutorials/spring/00-the-basics/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-tutorials-spring - 1.5.4-SNAPSHOT + 1.5.4 ../pom.xml com.stormpath.spring stormpath-sdk-tutorials-spring-security-webmvc-the-basics - 1.5.4-SNAPSHOT + 1.5.4 Stormpath Java SDK :: Tutorials :: Spring Security WebMVC :: The Basics A simple Spring Security Web MVC application with out-of-the-box login and self-service screens! diff --git a/tutorials/spring/01-some-access-controls/pom.xml b/tutorials/spring/01-some-access-controls/pom.xml index f289a5794f..583f5e5691 100644 --- a/tutorials/spring/01-some-access-controls/pom.xml +++ b/tutorials/spring/01-some-access-controls/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-tutorials-spring - 1.5.4-SNAPSHOT + 1.5.4 ../pom.xml com.stormpath.spring stormpath-sdk-tutorials-spring-security-webmvc-some-access-controls - 1.5.4-SNAPSHOT + 1.5.4 Stormpath Java SDK :: Tutorials :: Spring Security WebMVC :: Some Access Controls A simple Spring Security Web MVC application with out-of-the-box login and self-service screens! diff --git a/tutorials/spring/02-spring-security-ftw/pom.xml b/tutorials/spring/02-spring-security-ftw/pom.xml index 18e9a0d418..8e45b18d67 100644 --- a/tutorials/spring/02-spring-security-ftw/pom.xml +++ b/tutorials/spring/02-spring-security-ftw/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-tutorials-spring - 1.5.4-SNAPSHOT + 1.5.4 ../pom.xml com.stormpath.spring stormpath-sdk-tutorials-spring-security-webmvc-spring-security-ftw - 1.5.4-SNAPSHOT + 1.5.4 Stormpath Java SDK :: Tutorials :: Spring Security WebMVC :: Spring Security For The Win A simple Spring Security Web MVC application with out-of-the-box login and self-service screens! diff --git a/tutorials/spring/03-spring-security-refined/pom.xml b/tutorials/spring/03-spring-security-refined/pom.xml index 532fcbe96c..da5933e4b5 100644 --- a/tutorials/spring/03-spring-security-refined/pom.xml +++ b/tutorials/spring/03-spring-security-refined/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-tutorials-spring - 1.5.4-SNAPSHOT + 1.5.4 ../pom.xml com.stormpath.spring stormpath-sdk-tutorials-spring-security-webmvc-spring-security-refined - 1.5.4-SNAPSHOT + 1.5.4 Stormpath Java SDK :: Tutorials :: Spring Security WebMVC :: Spring Security Refined A simple Spring Security Web MVC application with out-of-the-box login and self-service screens! diff --git a/tutorials/spring/04-a-finer-grain-of-control/pom.xml b/tutorials/spring/04-a-finer-grain-of-control/pom.xml index 497a8be56f..9db86e7b8b 100644 --- a/tutorials/spring/04-a-finer-grain-of-control/pom.xml +++ b/tutorials/spring/04-a-finer-grain-of-control/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-tutorials-spring - 1.5.4-SNAPSHOT + 1.5.4 ../pom.xml com.stormpath.spring stormpath-sdk-tutorials-spring-security-webmvc-a-finer-grain-of-control - 1.5.4-SNAPSHOT + 1.5.4 Stormpath Java SDK :: Tutorials :: Spring Security WebMVC :: A Finer Grain Of Control A simple Spring Security Web MVC application with out-of-the-box login and self-service screens! diff --git a/tutorials/spring/05-token-management/pom.xml b/tutorials/spring/05-token-management/pom.xml index 664b6f1aae..d4bd969fed 100644 --- a/tutorials/spring/05-token-management/pom.xml +++ b/tutorials/spring/05-token-management/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-tutorials-spring - 1.5.4-SNAPSHOT + 1.5.4 ../pom.xml com.stormpath.spring stormpath-sdk-tutorials-spring-security-webmvc-token-management - 1.5.4-SNAPSHOT + 1.5.4 Stormpath Java SDK :: Tutorials :: Spring Security WebMVC :: Token Management A simple Spring Security Web MVC application with out-of-the-box login and self-service screens! diff --git a/tutorials/spring/pom.xml b/tutorials/spring/pom.xml index 3d9460c24f..71b4d67199 100644 --- a/tutorials/spring/pom.xml +++ b/tutorials/spring/pom.xml @@ -19,7 +19,7 @@ com.stormpath.sdk stormpath-sdk-tutorials - 1.5.4-SNAPSHOT + 1.5.4 ../pom.xml From dfa03c424d268314c573ca2f36c86ca79d72004a Mon Sep 17 00:00:00 2001 From: stormpath-sdk-java Auto Doc Build Date: Wed, 8 Feb 2017 18:02:59 -0300 Subject: [PATCH 05/21] [maven-release-plugin] prepare for next development iteration --- api/pom.xml | 2 +- bom/pom.xml | 40 +++++++++---------- clover/pom.xml | 2 +- examples/pom.xml | 4 +- examples/quickstart/pom.xml | 4 +- examples/servlet/pom.xml | 4 +- examples/spring-boot-default/pom.xml | 4 +- examples/spring-boot-webmvc-angular/pom.xml | 4 +- examples/spring-boot-webmvc/pom.xml | 4 +- examples/spring-boot/pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- examples/spring-security-webmvc/pom.xml | 4 +- examples/spring-webmvc/pom.xml | 4 +- examples/spring/pom.xml | 4 +- examples/zuul-spring-cloud-starter/pom.xml | 4 +- extensions/hazelcast/pom.xml | 2 +- extensions/httpclient/pom.xml | 2 +- extensions/oauth/pom.xml | 2 +- extensions/pom.xml | 2 +- extensions/servlet-plugin/pom.xml | 2 +- extensions/servlet/pom.xml | 2 +- extensions/spring/boot/pom.xml | 2 +- .../pom.xml | 2 +- .../stormpath-spring-boot-starter/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- extensions/spring/cloud/pom.xml | 2 +- .../pom.xml | 2 +- extensions/spring/pom.xml | 2 +- .../stormpath-spring-security-webmvc/pom.xml | 2 +- .../spring/stormpath-spring-security/pom.xml | 2 +- .../spring/stormpath-spring-webmvc/pom.xml | 2 +- extensions/spring/stormpath-spring/pom.xml | 2 +- extensions/zuul/pom.xml | 2 +- impl/pom.xml | 2 +- pom.xml | 4 +- tutorials/pom.xml | 2 +- tutorials/spring-boot/00-the-basics/pom.xml | 4 +- .../01-some-access-controls/pom.xml | 4 +- .../02-spring-security-ftw/pom.xml | 4 +- .../03-spring-security-refined/pom.xml | 4 +- .../04-a-finer-grain-of-control/pom.xml | 4 +- .../spring-boot/05-token-management/pom.xml | 4 +- tutorials/spring-boot/pom.xml | 2 +- tutorials/spring/00-the-basics/pom.xml | 4 +- .../spring/01-some-access-controls/pom.xml | 4 +- .../spring/02-spring-security-ftw/pom.xml | 4 +- .../spring/03-spring-security-refined/pom.xml | 4 +- .../04-a-finer-grain-of-control/pom.xml | 4 +- tutorials/spring/05-token-management/pom.xml | 4 +- tutorials/spring/pom.xml | 2 +- 54 files changed, 99 insertions(+), 99 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index 2de8f7892e..dd2a7e90e6 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -21,7 +21,7 @@ com.stormpath.sdk stormpath-sdk-root - 1.5.4 + 1.5.5-SNAPSHOT ../pom.xml diff --git a/bom/pom.xml b/bom/pom.xml index 3f951f11d1..8b2caac892 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -7,7 +7,7 @@ Stormpath Java SDK :: BOM Stormpath Bill of Materials pom - 1.5.4 + 1.5.5-SNAPSHOT https://github.com/stormpath/stormpath-sdk-java @@ -27,7 +27,7 @@ scm:git:git@github.com:stormpath/stormpath-sdk-java.git scm:git:git@github.com:stormpath/stormpath-sdk-java.git git@github.com:stormpath/stormpath-sdk-java.git - stormpath-sdk-root-1.5.4 + HEAD GitHub @@ -50,92 +50,92 @@ com.stormpath.sdk stormpath-sdk-api - 1.5.4 + 1.5.5-SNAPSHOT com.stormpath.sdk stormpath-sdk-impl - 1.5.4 + 1.5.5-SNAPSHOT com.stormpath.sdk stormpath-sdk-oauth - 1.5.4 + 1.5.5-SNAPSHOT com.stormpath.sdk stormpath-sdk-servlet - 1.5.4 + 1.5.5-SNAPSHOT com.stormpath.sdk stormpath-sdk-httpclient - 1.5.4 + 1.5.5-SNAPSHOT com.stormpath.sdk stormpath-servlet-plugin - 1.5.4 + 1.5.5-SNAPSHOT com.stormpath.sdk stormpath-sdk-zuul - 1.5.4 + 1.5.5-SNAPSHOT com.stormpath.spring stormpath-spring - 1.5.4 + 1.5.5-SNAPSHOT com.stormpath.spring stormpath-spring-security - 1.5.4 + 1.5.5-SNAPSHOT com.stormpath.spring stormpath-spring-security-webmvc - 1.5.4 + 1.5.5-SNAPSHOT com.stormpath.spring stormpath-spring-webmvc - 1.5.4 + 1.5.5-SNAPSHOT com.stormpath.spring stormpath-spring-boot-starter - 1.5.4 + 1.5.5-SNAPSHOT com.stormpath.spring stormpath-webmvc-spring-boot-starter - 1.5.4 + 1.5.5-SNAPSHOT com.stormpath.spring stormpath-thymeleaf-spring-boot-starter - 1.5.4 + 1.5.5-SNAPSHOT com.stormpath.spring stormpath-spring-security-spring-boot-starter - 1.5.4 + 1.5.5-SNAPSHOT com.stormpath.spring stormpath-spring-security-webmvc-spring-boot-starter - 1.5.4 + 1.5.5-SNAPSHOT com.stormpath.spring stormpath-default-spring-boot-starter - 1.5.4 + 1.5.5-SNAPSHOT com.stormpath.spring stormpath-zuul-spring-cloud-starter - 1.5.4 + 1.5.5-SNAPSHOT diff --git a/clover/pom.xml b/clover/pom.xml index 149e0b830f..9b8ad64123 100644 --- a/clover/pom.xml +++ b/clover/pom.xml @@ -21,7 +21,7 @@ com.stormpath.sdk stormpath-sdk-root - 1.5.4 + 1.5.5-SNAPSHOT ../pom.xml diff --git a/examples/pom.xml b/examples/pom.xml index 76408afe7b..069090cbf3 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-root - 1.5.4 + 1.5.5-SNAPSHOT ../pom.xml stormpath-sdk-examples com.stormpath.sdk - 1.5.4 + 1.5.5-SNAPSHOT Stormpath Java SDK :: Examples pom diff --git a/examples/quickstart/pom.xml b/examples/quickstart/pom.xml index 9561e93d81..4a4f3285dc 100644 --- a/examples/quickstart/pom.xml +++ b/examples/quickstart/pom.xml @@ -5,13 +5,13 @@ com.stormpath.sdk stormpath-sdk-examples - 1.5.4 + 1.5.5-SNAPSHOT ../pom.xml com.stormpath.sdk stormpath-sdk-examples-quickstart - 1.5.4 + 1.5.5-SNAPSHOT Stormpath Java SDK :: Examples :: Quickstart Code A simple (non-web) application to demonstrate the example code in the Stormpath Java Quickstart diff --git a/examples/servlet/pom.xml b/examples/servlet/pom.xml index e3cbf7b891..658e0795f8 100644 --- a/examples/servlet/pom.xml +++ b/examples/servlet/pom.xml @@ -21,12 +21,12 @@ com.stormpath.sdk stormpath-sdk-examples - 1.5.4 + 1.5.5-SNAPSHOT ../pom.xml stormpath-sdk-examples-servlet - 1.5.4 + 1.5.5-SNAPSHOT Stormpath Java SDK :: Examples :: Servlet Container-based Webapp A simple example webapp deployed in a servlet container. war diff --git a/examples/spring-boot-default/pom.xml b/examples/spring-boot-default/pom.xml index 3f3407eef2..5db869ab1a 100644 --- a/examples/spring-boot-default/pom.xml +++ b/examples/spring-boot-default/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-examples - 1.5.4 + 1.5.5-SNAPSHOT ../pom.xml com.stormpath.spring stormpath-sdk-examples-spring-boot-default - 1.5.4 + 1.5.5-SNAPSHOT Stormpath Java SDK :: Examples :: Spring Boot Default A simple Spring Boot Web MVC application with out-of-the-box login and self-service screens! diff --git a/examples/spring-boot-webmvc-angular/pom.xml b/examples/spring-boot-webmvc-angular/pom.xml index 0c384a2445..47670807c9 100644 --- a/examples/spring-boot-webmvc-angular/pom.xml +++ b/examples/spring-boot-webmvc-angular/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-examples - 1.5.4 + 1.5.5-SNAPSHOT ../pom.xml com.stormpath.spring stormpath-sdk-examples-spring-boot-web-angular - 1.5.4 + 1.5.5-SNAPSHOT Stormpath Java SDK :: Examples :: Spring Boot + Angular Webapp A Spring Boot web application that uses Stormpath. diff --git a/examples/spring-boot-webmvc/pom.xml b/examples/spring-boot-webmvc/pom.xml index 91450662dd..112a49bdce 100644 --- a/examples/spring-boot-webmvc/pom.xml +++ b/examples/spring-boot-webmvc/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-examples - 1.5.4 + 1.5.5-SNAPSHOT ../pom.xml com.stormpath.spring stormpath-sdk-examples-spring-boot-web - 1.5.4 + 1.5.5-SNAPSHOT Stormpath Java SDK :: Examples :: Spring Boot Webapp A Spring Boot web application that uses Stormpath. diff --git a/examples/spring-boot/pom.xml b/examples/spring-boot/pom.xml index b4a45095af..e2dda46377 100644 --- a/examples/spring-boot/pom.xml +++ b/examples/spring-boot/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-examples - 1.5.4 + 1.5.5-SNAPSHOT ../pom.xml com.stormpath.spring stormpath-sdk-examples-spring-boot - 1.5.4 + 1.5.5-SNAPSHOT Stormpath Java SDK :: Examples :: Spring Boot A Spring Boot (non-web) application that uses Stormpath. diff --git a/examples/spring-security-spring-boot-webmvc-bare-bones/pom.xml b/examples/spring-security-spring-boot-webmvc-bare-bones/pom.xml index 07e4935e6a..28a35cf5fa 100644 --- a/examples/spring-security-spring-boot-webmvc-bare-bones/pom.xml +++ b/examples/spring-security-spring-boot-webmvc-bare-bones/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-examples - 1.5.4 + 1.5.5-SNAPSHOT ../pom.xml com.stormpath.spring stormpath-sdk-examples-spring-security-spring-boot-webmvc-bare-bones - 1.5.4 + 1.5.5-SNAPSHOT Stormpath Java SDK :: Examples :: Spring Security :: Spring Boot :: Bare Bones A simple Spring Boot Web MVC application with out-of-the-box login and self-service screens! diff --git a/examples/spring-security-spring-boot-webmvc/pom.xml b/examples/spring-security-spring-boot-webmvc/pom.xml index 861c0e156a..978e4ce495 100644 --- a/examples/spring-security-spring-boot-webmvc/pom.xml +++ b/examples/spring-security-spring-boot-webmvc/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-examples - 1.5.4 + 1.5.5-SNAPSHOT ../pom.xml com.stormpath.spring stormpath-sdk-examples-spring-security-spring-boot-webmvc - 1.5.4 + 1.5.5-SNAPSHOT Stormpath Java SDK :: Examples :: Spring Security :: Spring Boot Webapp A simple Spring Boot Web MVC application with out-of-the-box login and self-service screens! diff --git a/examples/spring-security-webmvc/pom.xml b/examples/spring-security-webmvc/pom.xml index ff8116d6c7..98038b8bd5 100644 --- a/examples/spring-security-webmvc/pom.xml +++ b/examples/spring-security-webmvc/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-examples - 1.5.4 + 1.5.5-SNAPSHOT ../pom.xml com.stormpath.spring stormpath-sdk-examples-spring-security-webmvc - 1.5.4 + 1.5.5-SNAPSHOT Stormpath Java SDK :: Examples :: Spring Security Web MVC A simple Spring Security Web MVC application with out-of-the-box login and self-service screens! diff --git a/examples/spring-webmvc/pom.xml b/examples/spring-webmvc/pom.xml index b6b64cf967..7dacba4ccd 100644 --- a/examples/spring-webmvc/pom.xml +++ b/examples/spring-webmvc/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-examples - 1.5.4 + 1.5.5-SNAPSHOT ../pom.xml com.stormpath.spring stormpath-sdk-examples-spring-webmvc - 1.5.4 + 1.5.5-SNAPSHOT Stormpath Java SDK :: Examples :: Spring Web MVC A Spring Boot web application that uses Stormpath and Spring Security diff --git a/examples/spring/pom.xml b/examples/spring/pom.xml index c28d26b752..9e0c7a27cd 100644 --- a/examples/spring/pom.xml +++ b/examples/spring/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-examples - 1.5.4 + 1.5.5-SNAPSHOT ../pom.xml com.stormpath.spring stormpath-sdk-examples-spring - 1.5.4 + 1.5.5-SNAPSHOT Stormpath Java SDK :: Examples :: Spring A simple (non-web) Spring Application. diff --git a/examples/zuul-spring-cloud-starter/pom.xml b/examples/zuul-spring-cloud-starter/pom.xml index 6dfa3d4d0a..2a123dab2b 100644 --- a/examples/zuul-spring-cloud-starter/pom.xml +++ b/examples/zuul-spring-cloud-starter/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-examples - 1.5.4 + 1.5.5-SNAPSHOT ../pom.xml com.stormpath.spring stormpath-sdk-examples-zuul-spring-cloud-starter - 1.5.4 + 1.5.5-SNAPSHOT Stormpath Java SDK :: Examples :: Zuul Spring Cloud Starter An example spring cloud zuul web gateway using Stormpath diff --git a/extensions/hazelcast/pom.xml b/extensions/hazelcast/pom.xml index df6feb534f..07b2b1ba68 100644 --- a/extensions/hazelcast/pom.xml +++ b/extensions/hazelcast/pom.xml @@ -21,7 +21,7 @@ com.stormpath.sdk stormpath-sdk-root - 1.5.4 + 1.5.5-SNAPSHOT ../../pom.xml diff --git a/extensions/httpclient/pom.xml b/extensions/httpclient/pom.xml index d10cf29727..54d8ffa9f0 100644 --- a/extensions/httpclient/pom.xml +++ b/extensions/httpclient/pom.xml @@ -21,7 +21,7 @@ com.stormpath.sdk stormpath-sdk-root - 1.5.4 + 1.5.5-SNAPSHOT ../../pom.xml diff --git a/extensions/oauth/pom.xml b/extensions/oauth/pom.xml index a29685331b..6dc14cb7fe 100644 --- a/extensions/oauth/pom.xml +++ b/extensions/oauth/pom.xml @@ -21,7 +21,7 @@ com.stormpath.sdk stormpath-sdk-root - 1.5.4 + 1.5.5-SNAPSHOT ../../pom.xml diff --git a/extensions/pom.xml b/extensions/pom.xml index bc4e0d3ade..3502181bd8 100644 --- a/extensions/pom.xml +++ b/extensions/pom.xml @@ -19,7 +19,7 @@ com.stormpath.sdk stormpath-sdk-root - 1.5.4 + 1.5.5-SNAPSHOT ../pom.xml diff --git a/extensions/servlet-plugin/pom.xml b/extensions/servlet-plugin/pom.xml index 32143857c7..5ecd14d5b7 100644 --- a/extensions/servlet-plugin/pom.xml +++ b/extensions/servlet-plugin/pom.xml @@ -21,7 +21,7 @@ com.stormpath.sdk stormpath-sdk-root - 1.5.4 + 1.5.5-SNAPSHOT ../../pom.xml diff --git a/extensions/servlet/pom.xml b/extensions/servlet/pom.xml index ec51a549b6..54f2e93455 100644 --- a/extensions/servlet/pom.xml +++ b/extensions/servlet/pom.xml @@ -21,7 +21,7 @@ com.stormpath.sdk stormpath-sdk-root - 1.5.4 + 1.5.5-SNAPSHOT ../../pom.xml diff --git a/extensions/spring/boot/pom.xml b/extensions/spring/boot/pom.xml index 1f5b41b418..8a36500aaa 100644 --- a/extensions/spring/boot/pom.xml +++ b/extensions/spring/boot/pom.xml @@ -21,7 +21,7 @@ com.stormpath.spring stormpath-spring-parent - 1.5.4 + 1.5.5-SNAPSHOT ../pom.xml diff --git a/extensions/spring/boot/stormpath-default-spring-boot-starter/pom.xml b/extensions/spring/boot/stormpath-default-spring-boot-starter/pom.xml index ac21d32fa8..a0545789c3 100644 --- a/extensions/spring/boot/stormpath-default-spring-boot-starter/pom.xml +++ b/extensions/spring/boot/stormpath-default-spring-boot-starter/pom.xml @@ -19,7 +19,7 @@ com.stormpath.spring stormpath-spring-parent - 1.5.4 + 1.5.5-SNAPSHOT ../../pom.xml diff --git a/extensions/spring/boot/stormpath-spring-boot-starter/pom.xml b/extensions/spring/boot/stormpath-spring-boot-starter/pom.xml index ceb6d5b3fa..59855083ac 100644 --- a/extensions/spring/boot/stormpath-spring-boot-starter/pom.xml +++ b/extensions/spring/boot/stormpath-spring-boot-starter/pom.xml @@ -19,7 +19,7 @@ com.stormpath.spring stormpath-spring-parent - 1.5.4 + 1.5.5-SNAPSHOT ../../pom.xml diff --git a/extensions/spring/boot/stormpath-spring-security-spring-boot-starter/pom.xml b/extensions/spring/boot/stormpath-spring-security-spring-boot-starter/pom.xml index 8eff13414e..48265236ca 100644 --- a/extensions/spring/boot/stormpath-spring-security-spring-boot-starter/pom.xml +++ b/extensions/spring/boot/stormpath-spring-security-spring-boot-starter/pom.xml @@ -19,7 +19,7 @@ com.stormpath.spring stormpath-spring-parent - 1.5.4 + 1.5.5-SNAPSHOT ../../pom.xml diff --git a/extensions/spring/boot/stormpath-spring-security-webmvc-spring-boot-starter/pom.xml b/extensions/spring/boot/stormpath-spring-security-webmvc-spring-boot-starter/pom.xml index 847b06fe8e..d2445c5fe6 100644 --- a/extensions/spring/boot/stormpath-spring-security-webmvc-spring-boot-starter/pom.xml +++ b/extensions/spring/boot/stormpath-spring-security-webmvc-spring-boot-starter/pom.xml @@ -19,7 +19,7 @@ com.stormpath.spring stormpath-spring-parent - 1.5.4 + 1.5.5-SNAPSHOT ../../pom.xml diff --git a/extensions/spring/boot/stormpath-thymeleaf-spring-boot-starter/pom.xml b/extensions/spring/boot/stormpath-thymeleaf-spring-boot-starter/pom.xml index b947c8e3af..39269ee34e 100644 --- a/extensions/spring/boot/stormpath-thymeleaf-spring-boot-starter/pom.xml +++ b/extensions/spring/boot/stormpath-thymeleaf-spring-boot-starter/pom.xml @@ -19,7 +19,7 @@ com.stormpath.spring stormpath-spring-parent - 1.5.4 + 1.5.5-SNAPSHOT ../../pom.xml diff --git a/extensions/spring/boot/stormpath-webmvc-spring-boot-starter/pom.xml b/extensions/spring/boot/stormpath-webmvc-spring-boot-starter/pom.xml index 90c94c72aa..8d16dadb6f 100644 --- a/extensions/spring/boot/stormpath-webmvc-spring-boot-starter/pom.xml +++ b/extensions/spring/boot/stormpath-webmvc-spring-boot-starter/pom.xml @@ -19,7 +19,7 @@ com.stormpath.spring stormpath-spring-parent - 1.5.4 + 1.5.5-SNAPSHOT ../../pom.xml diff --git a/extensions/spring/cloud/pom.xml b/extensions/spring/cloud/pom.xml index 7bd3308599..d5ba609ea6 100644 --- a/extensions/spring/cloud/pom.xml +++ b/extensions/spring/cloud/pom.xml @@ -21,7 +21,7 @@ com.stormpath.spring stormpath-spring-parent - 1.5.4 + 1.5.5-SNAPSHOT ../pom.xml diff --git a/extensions/spring/cloud/stormpath-zuul-spring-cloud-starter/pom.xml b/extensions/spring/cloud/stormpath-zuul-spring-cloud-starter/pom.xml index eb8976c183..7775d93431 100644 --- a/extensions/spring/cloud/stormpath-zuul-spring-cloud-starter/pom.xml +++ b/extensions/spring/cloud/stormpath-zuul-spring-cloud-starter/pom.xml @@ -19,7 +19,7 @@ com.stormpath.spring stormpath-spring-parent - 1.5.4 + 1.5.5-SNAPSHOT ../../pom.xml diff --git a/extensions/spring/pom.xml b/extensions/spring/pom.xml index a9e80889d4..70a9e3403d 100644 --- a/extensions/spring/pom.xml +++ b/extensions/spring/pom.xml @@ -21,7 +21,7 @@ com.stormpath.sdk stormpath-sdk-root - 1.5.4 + 1.5.5-SNAPSHOT ../../pom.xml diff --git a/extensions/spring/stormpath-spring-security-webmvc/pom.xml b/extensions/spring/stormpath-spring-security-webmvc/pom.xml index 02239b9d5f..5c32847555 100644 --- a/extensions/spring/stormpath-spring-security-webmvc/pom.xml +++ b/extensions/spring/stormpath-spring-security-webmvc/pom.xml @@ -19,7 +19,7 @@ com.stormpath.spring stormpath-spring-parent - 1.5.4 + 1.5.5-SNAPSHOT ../pom.xml diff --git a/extensions/spring/stormpath-spring-security/pom.xml b/extensions/spring/stormpath-spring-security/pom.xml index 1925b45d64..86b6e4a88e 100644 --- a/extensions/spring/stormpath-spring-security/pom.xml +++ b/extensions/spring/stormpath-spring-security/pom.xml @@ -19,7 +19,7 @@ com.stormpath.spring stormpath-spring-parent - 1.5.4 + 1.5.5-SNAPSHOT ../pom.xml diff --git a/extensions/spring/stormpath-spring-webmvc/pom.xml b/extensions/spring/stormpath-spring-webmvc/pom.xml index 11e31a5c11..99fddbff1a 100644 --- a/extensions/spring/stormpath-spring-webmvc/pom.xml +++ b/extensions/spring/stormpath-spring-webmvc/pom.xml @@ -19,7 +19,7 @@ com.stormpath.spring stormpath-spring-parent - 1.5.4 + 1.5.5-SNAPSHOT ../pom.xml diff --git a/extensions/spring/stormpath-spring/pom.xml b/extensions/spring/stormpath-spring/pom.xml index dea9a29d07..834c7a7b6c 100644 --- a/extensions/spring/stormpath-spring/pom.xml +++ b/extensions/spring/stormpath-spring/pom.xml @@ -19,7 +19,7 @@ com.stormpath.spring stormpath-spring-parent - 1.5.4 + 1.5.5-SNAPSHOT ../pom.xml diff --git a/extensions/zuul/pom.xml b/extensions/zuul/pom.xml index 8de82547f5..9eafe93100 100644 --- a/extensions/zuul/pom.xml +++ b/extensions/zuul/pom.xml @@ -21,7 +21,7 @@ com.stormpath.sdk stormpath-sdk-root - 1.5.4 + 1.5.5-SNAPSHOT ../../pom.xml diff --git a/impl/pom.xml b/impl/pom.xml index c687211c43..7eb8ef2980 100644 --- a/impl/pom.xml +++ b/impl/pom.xml @@ -21,7 +21,7 @@ com.stormpath.sdk stormpath-sdk-root - 1.5.4 + 1.5.5-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index 06df2653aa..4505b31100 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ com.stormpath.sdk stormpath-sdk-root - 1.5.4 + 1.5.5-SNAPSHOT pom Stormpath Java SDK @@ -41,7 +41,7 @@ scm:git:git@github.com:stormpath/stormpath-sdk-java.git scm:git:git@github.com:stormpath/stormpath-sdk-java.git git@github.com:stormpath/stormpath-sdk-java.git - stormpath-sdk-root-1.5.4 + HEAD GitHub diff --git a/tutorials/pom.xml b/tutorials/pom.xml index e0bb35b428..c63cbce3fc 100644 --- a/tutorials/pom.xml +++ b/tutorials/pom.xml @@ -19,7 +19,7 @@ com.stormpath.sdk stormpath-sdk-root - 1.5.4 + 1.5.5-SNAPSHOT ../pom.xml diff --git a/tutorials/spring-boot/00-the-basics/pom.xml b/tutorials/spring-boot/00-the-basics/pom.xml index 913a13a1d4..c00075a1a0 100644 --- a/tutorials/spring-boot/00-the-basics/pom.xml +++ b/tutorials/spring-boot/00-the-basics/pom.xml @@ -21,14 +21,14 @@ com.stormpath.sdk stormpath-sdk-tutorials-spring-boot - 1.5.4 + 1.5.5-SNAPSHOT ../pom.xml com.stormpath.spring stormpath-sdk-tutorials-spring-boot-default-the-basics - 1.5.4 + 1.5.5-SNAPSHOT Stormpath Java SDK :: Tutorials :: Spring Boot Default :: The Basics A simple Spring Boot Web MVC application with out-of-the-box login and self-service screens! diff --git a/tutorials/spring-boot/01-some-access-controls/pom.xml b/tutorials/spring-boot/01-some-access-controls/pom.xml index e83784e77d..bea8a0511f 100644 --- a/tutorials/spring-boot/01-some-access-controls/pom.xml +++ b/tutorials/spring-boot/01-some-access-controls/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-tutorials-spring-boot - 1.5.4 + 1.5.5-SNAPSHOT ../pom.xml com.stormpath.spring stormpath-sdk-tutorials-spring-boot-default-some-access-controls - 1.5.4 + 1.5.5-SNAPSHOT Stormpath Java SDK :: Tutorials :: Spring Boot Default :: Some Access Controls A simple Spring Boot Web MVC application with out-of-the-box login and self-service screens! diff --git a/tutorials/spring-boot/02-spring-security-ftw/pom.xml b/tutorials/spring-boot/02-spring-security-ftw/pom.xml index 2b52db7226..0d776efd5c 100644 --- a/tutorials/spring-boot/02-spring-security-ftw/pom.xml +++ b/tutorials/spring-boot/02-spring-security-ftw/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-tutorials-spring-boot - 1.5.4 + 1.5.5-SNAPSHOT ../pom.xml com.stormpath.spring stormpath-sdk-tutorials-spring-boot-default-spring-security-ftw - 1.5.4 + 1.5.5-SNAPSHOT Stormpath Java SDK :: Tutorials :: Spring Boot Default :: Spring Security FTW! A simple Spring Boot Web MVC application with out-of-the-box login and self-service screens! diff --git a/tutorials/spring-boot/03-spring-security-refined/pom.xml b/tutorials/spring-boot/03-spring-security-refined/pom.xml index 6649e13523..68805323fe 100644 --- a/tutorials/spring-boot/03-spring-security-refined/pom.xml +++ b/tutorials/spring-boot/03-spring-security-refined/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-tutorials-spring-boot - 1.5.4 + 1.5.5-SNAPSHOT ../pom.xml com.stormpath.spring stormpath-sdk-tutorials-spring-boot-default-spring-security-refined - 1.5.4 + 1.5.5-SNAPSHOT Stormpath Java SDK :: Tutorials :: Spring Boot Default :: Spring Security Refined A simple Spring Boot Web MVC application with out-of-the-box login and self-service screens! diff --git a/tutorials/spring-boot/04-a-finer-grain-of-control/pom.xml b/tutorials/spring-boot/04-a-finer-grain-of-control/pom.xml index 7b09c29ab1..50bc263d43 100644 --- a/tutorials/spring-boot/04-a-finer-grain-of-control/pom.xml +++ b/tutorials/spring-boot/04-a-finer-grain-of-control/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-tutorials-spring-boot - 1.5.4 + 1.5.5-SNAPSHOT ../pom.xml com.stormpath.spring stormpath-sdk-tutorials-spring-boot-default-a-finer-grain-of-control - 1.5.4 + 1.5.5-SNAPSHOT Stormpath Java SDK :: Tutorials :: Spring Boot Default :: A Finer Grain of Control A simple Spring Boot Web MVC application with out-of-the-box login and self-service screens! diff --git a/tutorials/spring-boot/05-token-management/pom.xml b/tutorials/spring-boot/05-token-management/pom.xml index 8c91cd052f..cad7709f6e 100644 --- a/tutorials/spring-boot/05-token-management/pom.xml +++ b/tutorials/spring-boot/05-token-management/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-tutorials-spring-boot - 1.5.4 + 1.5.5-SNAPSHOT ../pom.xml com.stormpath.spring stormpath-sdk-tutorials-spring-boot-default-token-management - 1.5.4 + 1.5.5-SNAPSHOT Stormpath Java SDK :: Tutorials :: Spring Boot Default :: Token Management A simple Spring Boot Web MVC application with out-of-the-box login and self-service screens! diff --git a/tutorials/spring-boot/pom.xml b/tutorials/spring-boot/pom.xml index e985749f29..78006ef477 100644 --- a/tutorials/spring-boot/pom.xml +++ b/tutorials/spring-boot/pom.xml @@ -19,7 +19,7 @@ com.stormpath.sdk stormpath-sdk-tutorials - 1.5.4 + 1.5.5-SNAPSHOT ../pom.xml diff --git a/tutorials/spring/00-the-basics/pom.xml b/tutorials/spring/00-the-basics/pom.xml index 0f65f2d9da..992580c599 100644 --- a/tutorials/spring/00-the-basics/pom.xml +++ b/tutorials/spring/00-the-basics/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-tutorials-spring - 1.5.4 + 1.5.5-SNAPSHOT ../pom.xml com.stormpath.spring stormpath-sdk-tutorials-spring-security-webmvc-the-basics - 1.5.4 + 1.5.5-SNAPSHOT Stormpath Java SDK :: Tutorials :: Spring Security WebMVC :: The Basics A simple Spring Security Web MVC application with out-of-the-box login and self-service screens! diff --git a/tutorials/spring/01-some-access-controls/pom.xml b/tutorials/spring/01-some-access-controls/pom.xml index 583f5e5691..d7b058f2d5 100644 --- a/tutorials/spring/01-some-access-controls/pom.xml +++ b/tutorials/spring/01-some-access-controls/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-tutorials-spring - 1.5.4 + 1.5.5-SNAPSHOT ../pom.xml com.stormpath.spring stormpath-sdk-tutorials-spring-security-webmvc-some-access-controls - 1.5.4 + 1.5.5-SNAPSHOT Stormpath Java SDK :: Tutorials :: Spring Security WebMVC :: Some Access Controls A simple Spring Security Web MVC application with out-of-the-box login and self-service screens! diff --git a/tutorials/spring/02-spring-security-ftw/pom.xml b/tutorials/spring/02-spring-security-ftw/pom.xml index 8e45b18d67..e736cf7fea 100644 --- a/tutorials/spring/02-spring-security-ftw/pom.xml +++ b/tutorials/spring/02-spring-security-ftw/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-tutorials-spring - 1.5.4 + 1.5.5-SNAPSHOT ../pom.xml com.stormpath.spring stormpath-sdk-tutorials-spring-security-webmvc-spring-security-ftw - 1.5.4 + 1.5.5-SNAPSHOT Stormpath Java SDK :: Tutorials :: Spring Security WebMVC :: Spring Security For The Win A simple Spring Security Web MVC application with out-of-the-box login and self-service screens! diff --git a/tutorials/spring/03-spring-security-refined/pom.xml b/tutorials/spring/03-spring-security-refined/pom.xml index da5933e4b5..90fd0b3118 100644 --- a/tutorials/spring/03-spring-security-refined/pom.xml +++ b/tutorials/spring/03-spring-security-refined/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-tutorials-spring - 1.5.4 + 1.5.5-SNAPSHOT ../pom.xml com.stormpath.spring stormpath-sdk-tutorials-spring-security-webmvc-spring-security-refined - 1.5.4 + 1.5.5-SNAPSHOT Stormpath Java SDK :: Tutorials :: Spring Security WebMVC :: Spring Security Refined A simple Spring Security Web MVC application with out-of-the-box login and self-service screens! diff --git a/tutorials/spring/04-a-finer-grain-of-control/pom.xml b/tutorials/spring/04-a-finer-grain-of-control/pom.xml index 9db86e7b8b..31ccd0e10e 100644 --- a/tutorials/spring/04-a-finer-grain-of-control/pom.xml +++ b/tutorials/spring/04-a-finer-grain-of-control/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-tutorials-spring - 1.5.4 + 1.5.5-SNAPSHOT ../pom.xml com.stormpath.spring stormpath-sdk-tutorials-spring-security-webmvc-a-finer-grain-of-control - 1.5.4 + 1.5.5-SNAPSHOT Stormpath Java SDK :: Tutorials :: Spring Security WebMVC :: A Finer Grain Of Control A simple Spring Security Web MVC application with out-of-the-box login and self-service screens! diff --git a/tutorials/spring/05-token-management/pom.xml b/tutorials/spring/05-token-management/pom.xml index d4bd969fed..3ac8bc0d82 100644 --- a/tutorials/spring/05-token-management/pom.xml +++ b/tutorials/spring/05-token-management/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-tutorials-spring - 1.5.4 + 1.5.5-SNAPSHOT ../pom.xml com.stormpath.spring stormpath-sdk-tutorials-spring-security-webmvc-token-management - 1.5.4 + 1.5.5-SNAPSHOT Stormpath Java SDK :: Tutorials :: Spring Security WebMVC :: Token Management A simple Spring Security Web MVC application with out-of-the-box login and self-service screens! diff --git a/tutorials/spring/pom.xml b/tutorials/spring/pom.xml index 71b4d67199..b3f33c8bd6 100644 --- a/tutorials/spring/pom.xml +++ b/tutorials/spring/pom.xml @@ -19,7 +19,7 @@ com.stormpath.sdk stormpath-sdk-tutorials - 1.5.4 + 1.5.5-SNAPSHOT ../pom.xml From af5850eb7b2767b2e34e99630776a4551655b71b Mon Sep 17 00:00:00 2001 From: Mario Date: Wed, 8 Feb 2017 22:55:39 -0300 Subject: [PATCH 06/21] Added 1.5.4 to changelog --- changelog.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changelog.md b/changelog.md index ec926ff858..e822236775 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,9 @@ ## Change Log ## +### 1.5.4 ## + +* Fixed a bug whereby Account with MCF password is not properly created via Directory when the RegistrationWorkflow is specified + ### 1.5.3 ## * Fixed a bug whereby Account with MCF password is not properly created via Directory From 452971a1570049d32ab1d5559573f2a1eb6c2101 Mon Sep 17 00:00:00 2001 From: mraible Date: Tue, 7 Mar 2017 09:35:17 -0700 Subject: [PATCH 07/21] Remove cookies from /oauth/revoke --- .../config/filter/RevokeTokenFilterFactory.java | 1 + .../sdk/servlet/mvc/RevokeTokenController.java | 16 +++++++++++----- .../AbstractStormpathWebMvcConfiguration.java | 1 + 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/extensions/servlet/src/main/java/com/stormpath/sdk/servlet/config/filter/RevokeTokenFilterFactory.java b/extensions/servlet/src/main/java/com/stormpath/sdk/servlet/config/filter/RevokeTokenFilterFactory.java index abdb803cf1..b0fe6052a3 100644 --- a/extensions/servlet/src/main/java/com/stormpath/sdk/servlet/config/filter/RevokeTokenFilterFactory.java +++ b/extensions/servlet/src/main/java/com/stormpath/sdk/servlet/config/filter/RevokeTokenFilterFactory.java @@ -33,5 +33,6 @@ protected RevokeTokenController newController() { @Override protected void configure(RevokeTokenController controller, Config config) throws Exception { controller.setApplicationResolver(config.getApplicationResolver()); + controller.setAuthenticationResultSaver(config.getAuthenticationResultSaver()); } } diff --git a/extensions/servlet/src/main/java/com/stormpath/sdk/servlet/mvc/RevokeTokenController.java b/extensions/servlet/src/main/java/com/stormpath/sdk/servlet/mvc/RevokeTokenController.java index 1ee3bacc3b..dc5d854edf 100644 --- a/extensions/servlet/src/main/java/com/stormpath/sdk/servlet/mvc/RevokeTokenController.java +++ b/extensions/servlet/src/main/java/com/stormpath/sdk/servlet/mvc/RevokeTokenController.java @@ -16,18 +16,16 @@ package com.stormpath.sdk.servlet.mvc; import com.stormpath.sdk.application.Application; +import com.stormpath.sdk.authc.AuthenticationResult; import com.stormpath.sdk.http.HttpMethod; import com.stormpath.sdk.impl.error.DefaultError; import com.stormpath.sdk.lang.Strings; -import com.stormpath.sdk.oauth.OAuthRequests; -import com.stormpath.sdk.oauth.OAuthRevocationRequest; -import com.stormpath.sdk.oauth.OAuthRevocationRequestBuilder; -import com.stormpath.sdk.oauth.OAuthTokenRevocators; -import com.stormpath.sdk.oauth.TokenTypeHint; +import com.stormpath.sdk.oauth.*; import com.stormpath.sdk.resource.ResourceException; import com.stormpath.sdk.servlet.filter.oauth.OAuthErrorCode; import com.stormpath.sdk.servlet.filter.oauth.OAuthException; import com.stormpath.sdk.servlet.http.MediaType; +import com.stormpath.sdk.servlet.http.Saver; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -46,6 +44,8 @@ public class RevokeTokenController extends AbstractController { private final static String TOKEN = "token"; private final static String TOKEN_TYPE_HINT = "token_type_hint"; + private Saver authenticationResultSaver; + public void init() { } @@ -54,6 +54,10 @@ public boolean isNotAllowedIfAuthenticated() { return false; } + public void setAuthenticationResultSaver(Saver authenticationResultSaver) { + this.authenticationResultSaver = authenticationResultSaver; + } + @Override public ViewModel handleRequest(HttpServletRequest request, HttpServletResponse response) throws Exception { String method = request.getMethod(); @@ -96,6 +100,8 @@ protected ViewModel doPost(HttpServletRequest request, HttpServletResponse respo this.revoke(getApplication(request), builder.setToken(token).build()); + authenticationResultSaver.set(request, response, null); + response.setStatus(HttpServletResponse.SC_OK); response.setHeader("Content-Length", "0"); diff --git a/extensions/spring/stormpath-spring-webmvc/src/main/java/com/stormpath/spring/config/AbstractStormpathWebMvcConfiguration.java b/extensions/spring/stormpath-spring-webmvc/src/main/java/com/stormpath/spring/config/AbstractStormpathWebMvcConfiguration.java index 0301be0c74..12f2e59400 100644 --- a/extensions/spring/stormpath-spring-webmvc/src/main/java/com/stormpath/spring/config/AbstractStormpathWebMvcConfiguration.java +++ b/extensions/spring/stormpath-spring-webmvc/src/main/java/com/stormpath/spring/config/AbstractStormpathWebMvcConfiguration.java @@ -1225,6 +1225,7 @@ public RevokeTokenControllerConfig stormpathRevokeTokenConfig() { public Controller stormpathRevokeTokenController() { RevokeTokenController c = new RevokeTokenController(); c.setApplicationResolver(stormpathApplicationResolver()); + c.setAuthenticationResultSaver(stormpathAuthenticationResultSaver()); return init(c); } From 3c7bbb5d183f7a417b57197e3a2c73178140e389 Mon Sep 17 00:00:00 2001 From: Micah Silverman Date: Mon, 13 Mar 2017 22:45:59 -0400 Subject: [PATCH 08/21] Put back fully qualified imports --- .../stormpath/sdk/servlet/mvc/RevokeTokenController.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/extensions/servlet/src/main/java/com/stormpath/sdk/servlet/mvc/RevokeTokenController.java b/extensions/servlet/src/main/java/com/stormpath/sdk/servlet/mvc/RevokeTokenController.java index dc5d854edf..7c5006c168 100644 --- a/extensions/servlet/src/main/java/com/stormpath/sdk/servlet/mvc/RevokeTokenController.java +++ b/extensions/servlet/src/main/java/com/stormpath/sdk/servlet/mvc/RevokeTokenController.java @@ -20,7 +20,11 @@ import com.stormpath.sdk.http.HttpMethod; import com.stormpath.sdk.impl.error.DefaultError; import com.stormpath.sdk.lang.Strings; -import com.stormpath.sdk.oauth.*; +import com.stormpath.sdk.oauth.OAuthRequests; +import com.stormpath.sdk.oauth.OAuthRevocationRequest; +import com.stormpath.sdk.oauth.OAuthRevocationRequestBuilder; +import com.stormpath.sdk.oauth.OAuthTokenRevocators; +import com.stormpath.sdk.oauth.TokenTypeHint; import com.stormpath.sdk.resource.ResourceException; import com.stormpath.sdk.servlet.filter.oauth.OAuthErrorCode; import com.stormpath.sdk.servlet.filter.oauth.OAuthException; From 1afd2a83802ae93e98f3233d48271f08dc73b3ae Mon Sep 17 00:00:00 2001 From: Micah Silverman Date: Tue, 14 Mar 2017 12:55:38 -0400 Subject: [PATCH 09/21] temp echo to troubleshoot build issues --- tck.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tck.sh b/tck.sh index c8ebee1325..812c7b1c2d 100755 --- a/tck.sh +++ b/tck.sh @@ -44,6 +44,9 @@ case "$OPTION" in ;; run) SCRIPT_DIR=$(cd "$(dirname "$0")"; pwd) + CI_DIR_CONTENTS=`ls $SCRIPT_DIR/ci` + echo "CI DIR Contents:" + echo $CI_DIR_CONTENTS if [ -e "$SCRIPT_DIR/ci/stormpath_env.sh" ]; then source ${SCRIPT_DIR}/ci/stormpath_env.sh export STORMPATH_APPLICATION_HREF=$STORMPATH_TEST_APPLICATION_HREF From 1eb7729c63221a8c5b0398b91c21c17dccaf8c75 Mon Sep 17 00:00:00 2001 From: Micah Silverman Date: Tue, 14 Mar 2017 13:49:32 -0400 Subject: [PATCH 10/21] temp echo to troubleshoot build issues --- tck.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/tck.sh b/tck.sh index 812c7b1c2d..7fe9c28422 100755 --- a/tck.sh +++ b/tck.sh @@ -46,10 +46,8 @@ case "$OPTION" in SCRIPT_DIR=$(cd "$(dirname "$0")"; pwd) CI_DIR_CONTENTS=`ls $SCRIPT_DIR/ci` echo "CI DIR Contents:" - echo $CI_DIR_CONTENTS if [ -e "$SCRIPT_DIR/ci/stormpath_env.sh" ]; then source ${SCRIPT_DIR}/ci/stormpath_env.sh - export STORMPATH_APPLICATION_HREF=$STORMPATH_TEST_APPLICATION_HREF fi PROFILE=${OPTION_ARGUMENT01} DIR=${OPTION_ARGUMENT02} From 28b3162db6def93e1d790cbd64b5925eb983e686 Mon Sep 17 00:00:00 2001 From: Micah Silverman Date: Tue, 14 Mar 2017 16:53:52 -0400 Subject: [PATCH 11/21] updated changelog --- changelog.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/changelog.md b/changelog.md index e822236775..2351a4f93d 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,11 @@ ## Change Log ## +### 1.5.5 ## + +* Refactored the /oauth/revoke endpoint to remove cookies + +See [1.5.5 closed issues](https://github.com/stormpath/stormpath-sdk-java/issues?q=milestone%3A1.5.5+is%3Aclosed) + ### 1.5.4 ## * Fixed a bug whereby Account with MCF password is not properly created via Directory when the RegistrationWorkflow is specified From 7ea3eab1b920cb7165c9cfebc2e267199224cd45 Mon Sep 17 00:00:00 2001 From: Micah Silverman Date: Tue, 14 Mar 2017 17:00:49 -0400 Subject: [PATCH 12/21] [maven-release-plugin] prepare release stormpath-sdk-root-1.5.5 --- api/pom.xml | 2 +- bom/pom.xml | 40 +++++++++---------- clover/pom.xml | 2 +- examples/pom.xml | 4 +- examples/quickstart/pom.xml | 4 +- examples/servlet/pom.xml | 4 +- examples/spring-boot-default/pom.xml | 4 +- examples/spring-boot-webmvc-angular/pom.xml | 4 +- examples/spring-boot-webmvc/pom.xml | 4 +- examples/spring-boot/pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- examples/spring-security-webmvc/pom.xml | 4 +- examples/spring-webmvc/pom.xml | 4 +- examples/spring/pom.xml | 4 +- examples/zuul-spring-cloud-starter/pom.xml | 4 +- extensions/hazelcast/pom.xml | 2 +- extensions/httpclient/pom.xml | 2 +- extensions/oauth/pom.xml | 2 +- extensions/pom.xml | 2 +- extensions/servlet-plugin/pom.xml | 2 +- extensions/servlet/pom.xml | 2 +- extensions/spring/boot/pom.xml | 2 +- .../pom.xml | 2 +- .../stormpath-spring-boot-starter/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- extensions/spring/cloud/pom.xml | 2 +- .../pom.xml | 2 +- extensions/spring/pom.xml | 2 +- .../stormpath-spring-security-webmvc/pom.xml | 2 +- .../spring/stormpath-spring-security/pom.xml | 2 +- .../spring/stormpath-spring-webmvc/pom.xml | 2 +- extensions/spring/stormpath-spring/pom.xml | 2 +- extensions/zuul/pom.xml | 2 +- impl/pom.xml | 2 +- pom.xml | 4 +- tutorials/pom.xml | 2 +- tutorials/spring-boot/00-the-basics/pom.xml | 4 +- .../01-some-access-controls/pom.xml | 4 +- .../02-spring-security-ftw/pom.xml | 4 +- .../03-spring-security-refined/pom.xml | 4 +- .../04-a-finer-grain-of-control/pom.xml | 4 +- .../spring-boot/05-token-management/pom.xml | 4 +- tutorials/spring-boot/pom.xml | 2 +- tutorials/spring/00-the-basics/pom.xml | 4 +- .../spring/01-some-access-controls/pom.xml | 4 +- .../spring/02-spring-security-ftw/pom.xml | 4 +- .../spring/03-spring-security-refined/pom.xml | 4 +- .../04-a-finer-grain-of-control/pom.xml | 4 +- tutorials/spring/05-token-management/pom.xml | 4 +- tutorials/spring/pom.xml | 2 +- 54 files changed, 99 insertions(+), 99 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index dd2a7e90e6..735426b580 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -21,7 +21,7 @@ com.stormpath.sdk stormpath-sdk-root - 1.5.5-SNAPSHOT + 1.5.5 ../pom.xml diff --git a/bom/pom.xml b/bom/pom.xml index 8b2caac892..66e9ea83be 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -7,7 +7,7 @@ Stormpath Java SDK :: BOM Stormpath Bill of Materials pom - 1.5.5-SNAPSHOT + 1.5.5 https://github.com/stormpath/stormpath-sdk-java @@ -27,7 +27,7 @@ scm:git:git@github.com:stormpath/stormpath-sdk-java.git scm:git:git@github.com:stormpath/stormpath-sdk-java.git git@github.com:stormpath/stormpath-sdk-java.git - HEAD + stormpath-sdk-root-1.5.5 GitHub @@ -50,92 +50,92 @@ com.stormpath.sdk stormpath-sdk-api - 1.5.5-SNAPSHOT + 1.5.5 com.stormpath.sdk stormpath-sdk-impl - 1.5.5-SNAPSHOT + 1.5.5 com.stormpath.sdk stormpath-sdk-oauth - 1.5.5-SNAPSHOT + 1.5.5 com.stormpath.sdk stormpath-sdk-servlet - 1.5.5-SNAPSHOT + 1.5.5 com.stormpath.sdk stormpath-sdk-httpclient - 1.5.5-SNAPSHOT + 1.5.5 com.stormpath.sdk stormpath-servlet-plugin - 1.5.5-SNAPSHOT + 1.5.5 com.stormpath.sdk stormpath-sdk-zuul - 1.5.5-SNAPSHOT + 1.5.5 com.stormpath.spring stormpath-spring - 1.5.5-SNAPSHOT + 1.5.5 com.stormpath.spring stormpath-spring-security - 1.5.5-SNAPSHOT + 1.5.5 com.stormpath.spring stormpath-spring-security-webmvc - 1.5.5-SNAPSHOT + 1.5.5 com.stormpath.spring stormpath-spring-webmvc - 1.5.5-SNAPSHOT + 1.5.5 com.stormpath.spring stormpath-spring-boot-starter - 1.5.5-SNAPSHOT + 1.5.5 com.stormpath.spring stormpath-webmvc-spring-boot-starter - 1.5.5-SNAPSHOT + 1.5.5 com.stormpath.spring stormpath-thymeleaf-spring-boot-starter - 1.5.5-SNAPSHOT + 1.5.5 com.stormpath.spring stormpath-spring-security-spring-boot-starter - 1.5.5-SNAPSHOT + 1.5.5 com.stormpath.spring stormpath-spring-security-webmvc-spring-boot-starter - 1.5.5-SNAPSHOT + 1.5.5 com.stormpath.spring stormpath-default-spring-boot-starter - 1.5.5-SNAPSHOT + 1.5.5 com.stormpath.spring stormpath-zuul-spring-cloud-starter - 1.5.5-SNAPSHOT + 1.5.5 diff --git a/clover/pom.xml b/clover/pom.xml index 9b8ad64123..57365646f6 100644 --- a/clover/pom.xml +++ b/clover/pom.xml @@ -21,7 +21,7 @@ com.stormpath.sdk stormpath-sdk-root - 1.5.5-SNAPSHOT + 1.5.5 ../pom.xml diff --git a/examples/pom.xml b/examples/pom.xml index 069090cbf3..00c6efa471 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-root - 1.5.5-SNAPSHOT + 1.5.5 ../pom.xml stormpath-sdk-examples com.stormpath.sdk - 1.5.5-SNAPSHOT + 1.5.5 Stormpath Java SDK :: Examples pom diff --git a/examples/quickstart/pom.xml b/examples/quickstart/pom.xml index 4a4f3285dc..d15db1b120 100644 --- a/examples/quickstart/pom.xml +++ b/examples/quickstart/pom.xml @@ -5,13 +5,13 @@ com.stormpath.sdk stormpath-sdk-examples - 1.5.5-SNAPSHOT + 1.5.5 ../pom.xml com.stormpath.sdk stormpath-sdk-examples-quickstart - 1.5.5-SNAPSHOT + 1.5.5 Stormpath Java SDK :: Examples :: Quickstart Code A simple (non-web) application to demonstrate the example code in the Stormpath Java Quickstart diff --git a/examples/servlet/pom.xml b/examples/servlet/pom.xml index 658e0795f8..96e0ddc1ea 100644 --- a/examples/servlet/pom.xml +++ b/examples/servlet/pom.xml @@ -21,12 +21,12 @@ com.stormpath.sdk stormpath-sdk-examples - 1.5.5-SNAPSHOT + 1.5.5 ../pom.xml stormpath-sdk-examples-servlet - 1.5.5-SNAPSHOT + 1.5.5 Stormpath Java SDK :: Examples :: Servlet Container-based Webapp A simple example webapp deployed in a servlet container. war diff --git a/examples/spring-boot-default/pom.xml b/examples/spring-boot-default/pom.xml index 5db869ab1a..65b66597a6 100644 --- a/examples/spring-boot-default/pom.xml +++ b/examples/spring-boot-default/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-examples - 1.5.5-SNAPSHOT + 1.5.5 ../pom.xml com.stormpath.spring stormpath-sdk-examples-spring-boot-default - 1.5.5-SNAPSHOT + 1.5.5 Stormpath Java SDK :: Examples :: Spring Boot Default A simple Spring Boot Web MVC application with out-of-the-box login and self-service screens! diff --git a/examples/spring-boot-webmvc-angular/pom.xml b/examples/spring-boot-webmvc-angular/pom.xml index 47670807c9..230b4669ed 100644 --- a/examples/spring-boot-webmvc-angular/pom.xml +++ b/examples/spring-boot-webmvc-angular/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-examples - 1.5.5-SNAPSHOT + 1.5.5 ../pom.xml com.stormpath.spring stormpath-sdk-examples-spring-boot-web-angular - 1.5.5-SNAPSHOT + 1.5.5 Stormpath Java SDK :: Examples :: Spring Boot + Angular Webapp A Spring Boot web application that uses Stormpath. diff --git a/examples/spring-boot-webmvc/pom.xml b/examples/spring-boot-webmvc/pom.xml index 112a49bdce..d10f63f451 100644 --- a/examples/spring-boot-webmvc/pom.xml +++ b/examples/spring-boot-webmvc/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-examples - 1.5.5-SNAPSHOT + 1.5.5 ../pom.xml com.stormpath.spring stormpath-sdk-examples-spring-boot-web - 1.5.5-SNAPSHOT + 1.5.5 Stormpath Java SDK :: Examples :: Spring Boot Webapp A Spring Boot web application that uses Stormpath. diff --git a/examples/spring-boot/pom.xml b/examples/spring-boot/pom.xml index e2dda46377..49bfd2f8c3 100644 --- a/examples/spring-boot/pom.xml +++ b/examples/spring-boot/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-examples - 1.5.5-SNAPSHOT + 1.5.5 ../pom.xml com.stormpath.spring stormpath-sdk-examples-spring-boot - 1.5.5-SNAPSHOT + 1.5.5 Stormpath Java SDK :: Examples :: Spring Boot A Spring Boot (non-web) application that uses Stormpath. diff --git a/examples/spring-security-spring-boot-webmvc-bare-bones/pom.xml b/examples/spring-security-spring-boot-webmvc-bare-bones/pom.xml index 28a35cf5fa..5fa2d7c5d4 100644 --- a/examples/spring-security-spring-boot-webmvc-bare-bones/pom.xml +++ b/examples/spring-security-spring-boot-webmvc-bare-bones/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-examples - 1.5.5-SNAPSHOT + 1.5.5 ../pom.xml com.stormpath.spring stormpath-sdk-examples-spring-security-spring-boot-webmvc-bare-bones - 1.5.5-SNAPSHOT + 1.5.5 Stormpath Java SDK :: Examples :: Spring Security :: Spring Boot :: Bare Bones A simple Spring Boot Web MVC application with out-of-the-box login and self-service screens! diff --git a/examples/spring-security-spring-boot-webmvc/pom.xml b/examples/spring-security-spring-boot-webmvc/pom.xml index 978e4ce495..2c6213c351 100644 --- a/examples/spring-security-spring-boot-webmvc/pom.xml +++ b/examples/spring-security-spring-boot-webmvc/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-examples - 1.5.5-SNAPSHOT + 1.5.5 ../pom.xml com.stormpath.spring stormpath-sdk-examples-spring-security-spring-boot-webmvc - 1.5.5-SNAPSHOT + 1.5.5 Stormpath Java SDK :: Examples :: Spring Security :: Spring Boot Webapp A simple Spring Boot Web MVC application with out-of-the-box login and self-service screens! diff --git a/examples/spring-security-webmvc/pom.xml b/examples/spring-security-webmvc/pom.xml index 98038b8bd5..661d5c70ee 100644 --- a/examples/spring-security-webmvc/pom.xml +++ b/examples/spring-security-webmvc/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-examples - 1.5.5-SNAPSHOT + 1.5.5 ../pom.xml com.stormpath.spring stormpath-sdk-examples-spring-security-webmvc - 1.5.5-SNAPSHOT + 1.5.5 Stormpath Java SDK :: Examples :: Spring Security Web MVC A simple Spring Security Web MVC application with out-of-the-box login and self-service screens! diff --git a/examples/spring-webmvc/pom.xml b/examples/spring-webmvc/pom.xml index 7dacba4ccd..b81997284e 100644 --- a/examples/spring-webmvc/pom.xml +++ b/examples/spring-webmvc/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-examples - 1.5.5-SNAPSHOT + 1.5.5 ../pom.xml com.stormpath.spring stormpath-sdk-examples-spring-webmvc - 1.5.5-SNAPSHOT + 1.5.5 Stormpath Java SDK :: Examples :: Spring Web MVC A Spring Boot web application that uses Stormpath and Spring Security diff --git a/examples/spring/pom.xml b/examples/spring/pom.xml index 9e0c7a27cd..463b7b467c 100644 --- a/examples/spring/pom.xml +++ b/examples/spring/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-examples - 1.5.5-SNAPSHOT + 1.5.5 ../pom.xml com.stormpath.spring stormpath-sdk-examples-spring - 1.5.5-SNAPSHOT + 1.5.5 Stormpath Java SDK :: Examples :: Spring A simple (non-web) Spring Application. diff --git a/examples/zuul-spring-cloud-starter/pom.xml b/examples/zuul-spring-cloud-starter/pom.xml index 2a123dab2b..61bd29a7b4 100644 --- a/examples/zuul-spring-cloud-starter/pom.xml +++ b/examples/zuul-spring-cloud-starter/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-examples - 1.5.5-SNAPSHOT + 1.5.5 ../pom.xml com.stormpath.spring stormpath-sdk-examples-zuul-spring-cloud-starter - 1.5.5-SNAPSHOT + 1.5.5 Stormpath Java SDK :: Examples :: Zuul Spring Cloud Starter An example spring cloud zuul web gateway using Stormpath diff --git a/extensions/hazelcast/pom.xml b/extensions/hazelcast/pom.xml index 07b2b1ba68..5d8803aef0 100644 --- a/extensions/hazelcast/pom.xml +++ b/extensions/hazelcast/pom.xml @@ -21,7 +21,7 @@ com.stormpath.sdk stormpath-sdk-root - 1.5.5-SNAPSHOT + 1.5.5 ../../pom.xml diff --git a/extensions/httpclient/pom.xml b/extensions/httpclient/pom.xml index 54d8ffa9f0..3fa4d0ca15 100644 --- a/extensions/httpclient/pom.xml +++ b/extensions/httpclient/pom.xml @@ -21,7 +21,7 @@ com.stormpath.sdk stormpath-sdk-root - 1.5.5-SNAPSHOT + 1.5.5 ../../pom.xml diff --git a/extensions/oauth/pom.xml b/extensions/oauth/pom.xml index 6dc14cb7fe..800e631904 100644 --- a/extensions/oauth/pom.xml +++ b/extensions/oauth/pom.xml @@ -21,7 +21,7 @@ com.stormpath.sdk stormpath-sdk-root - 1.5.5-SNAPSHOT + 1.5.5 ../../pom.xml diff --git a/extensions/pom.xml b/extensions/pom.xml index 3502181bd8..2ca79881cf 100644 --- a/extensions/pom.xml +++ b/extensions/pom.xml @@ -19,7 +19,7 @@ com.stormpath.sdk stormpath-sdk-root - 1.5.5-SNAPSHOT + 1.5.5 ../pom.xml diff --git a/extensions/servlet-plugin/pom.xml b/extensions/servlet-plugin/pom.xml index 5ecd14d5b7..898a586942 100644 --- a/extensions/servlet-plugin/pom.xml +++ b/extensions/servlet-plugin/pom.xml @@ -21,7 +21,7 @@ com.stormpath.sdk stormpath-sdk-root - 1.5.5-SNAPSHOT + 1.5.5 ../../pom.xml diff --git a/extensions/servlet/pom.xml b/extensions/servlet/pom.xml index 54f2e93455..496b288c47 100644 --- a/extensions/servlet/pom.xml +++ b/extensions/servlet/pom.xml @@ -21,7 +21,7 @@ com.stormpath.sdk stormpath-sdk-root - 1.5.5-SNAPSHOT + 1.5.5 ../../pom.xml diff --git a/extensions/spring/boot/pom.xml b/extensions/spring/boot/pom.xml index 8a36500aaa..b92cdd4348 100644 --- a/extensions/spring/boot/pom.xml +++ b/extensions/spring/boot/pom.xml @@ -21,7 +21,7 @@ com.stormpath.spring stormpath-spring-parent - 1.5.5-SNAPSHOT + 1.5.5 ../pom.xml diff --git a/extensions/spring/boot/stormpath-default-spring-boot-starter/pom.xml b/extensions/spring/boot/stormpath-default-spring-boot-starter/pom.xml index a0545789c3..b5bec2687b 100644 --- a/extensions/spring/boot/stormpath-default-spring-boot-starter/pom.xml +++ b/extensions/spring/boot/stormpath-default-spring-boot-starter/pom.xml @@ -19,7 +19,7 @@ com.stormpath.spring stormpath-spring-parent - 1.5.5-SNAPSHOT + 1.5.5 ../../pom.xml diff --git a/extensions/spring/boot/stormpath-spring-boot-starter/pom.xml b/extensions/spring/boot/stormpath-spring-boot-starter/pom.xml index 59855083ac..216c071e14 100644 --- a/extensions/spring/boot/stormpath-spring-boot-starter/pom.xml +++ b/extensions/spring/boot/stormpath-spring-boot-starter/pom.xml @@ -19,7 +19,7 @@ com.stormpath.spring stormpath-spring-parent - 1.5.5-SNAPSHOT + 1.5.5 ../../pom.xml diff --git a/extensions/spring/boot/stormpath-spring-security-spring-boot-starter/pom.xml b/extensions/spring/boot/stormpath-spring-security-spring-boot-starter/pom.xml index 48265236ca..351301938f 100644 --- a/extensions/spring/boot/stormpath-spring-security-spring-boot-starter/pom.xml +++ b/extensions/spring/boot/stormpath-spring-security-spring-boot-starter/pom.xml @@ -19,7 +19,7 @@ com.stormpath.spring stormpath-spring-parent - 1.5.5-SNAPSHOT + 1.5.5 ../../pom.xml diff --git a/extensions/spring/boot/stormpath-spring-security-webmvc-spring-boot-starter/pom.xml b/extensions/spring/boot/stormpath-spring-security-webmvc-spring-boot-starter/pom.xml index d2445c5fe6..4511b5a8b0 100644 --- a/extensions/spring/boot/stormpath-spring-security-webmvc-spring-boot-starter/pom.xml +++ b/extensions/spring/boot/stormpath-spring-security-webmvc-spring-boot-starter/pom.xml @@ -19,7 +19,7 @@ com.stormpath.spring stormpath-spring-parent - 1.5.5-SNAPSHOT + 1.5.5 ../../pom.xml diff --git a/extensions/spring/boot/stormpath-thymeleaf-spring-boot-starter/pom.xml b/extensions/spring/boot/stormpath-thymeleaf-spring-boot-starter/pom.xml index 39269ee34e..519e7a2c94 100644 --- a/extensions/spring/boot/stormpath-thymeleaf-spring-boot-starter/pom.xml +++ b/extensions/spring/boot/stormpath-thymeleaf-spring-boot-starter/pom.xml @@ -19,7 +19,7 @@ com.stormpath.spring stormpath-spring-parent - 1.5.5-SNAPSHOT + 1.5.5 ../../pom.xml diff --git a/extensions/spring/boot/stormpath-webmvc-spring-boot-starter/pom.xml b/extensions/spring/boot/stormpath-webmvc-spring-boot-starter/pom.xml index 8d16dadb6f..223019b822 100644 --- a/extensions/spring/boot/stormpath-webmvc-spring-boot-starter/pom.xml +++ b/extensions/spring/boot/stormpath-webmvc-spring-boot-starter/pom.xml @@ -19,7 +19,7 @@ com.stormpath.spring stormpath-spring-parent - 1.5.5-SNAPSHOT + 1.5.5 ../../pom.xml diff --git a/extensions/spring/cloud/pom.xml b/extensions/spring/cloud/pom.xml index d5ba609ea6..c5a324cc5e 100644 --- a/extensions/spring/cloud/pom.xml +++ b/extensions/spring/cloud/pom.xml @@ -21,7 +21,7 @@ com.stormpath.spring stormpath-spring-parent - 1.5.5-SNAPSHOT + 1.5.5 ../pom.xml diff --git a/extensions/spring/cloud/stormpath-zuul-spring-cloud-starter/pom.xml b/extensions/spring/cloud/stormpath-zuul-spring-cloud-starter/pom.xml index 7775d93431..ae4d819219 100644 --- a/extensions/spring/cloud/stormpath-zuul-spring-cloud-starter/pom.xml +++ b/extensions/spring/cloud/stormpath-zuul-spring-cloud-starter/pom.xml @@ -19,7 +19,7 @@ com.stormpath.spring stormpath-spring-parent - 1.5.5-SNAPSHOT + 1.5.5 ../../pom.xml diff --git a/extensions/spring/pom.xml b/extensions/spring/pom.xml index 70a9e3403d..8b90b95041 100644 --- a/extensions/spring/pom.xml +++ b/extensions/spring/pom.xml @@ -21,7 +21,7 @@ com.stormpath.sdk stormpath-sdk-root - 1.5.5-SNAPSHOT + 1.5.5 ../../pom.xml diff --git a/extensions/spring/stormpath-spring-security-webmvc/pom.xml b/extensions/spring/stormpath-spring-security-webmvc/pom.xml index 5c32847555..1d6b601622 100644 --- a/extensions/spring/stormpath-spring-security-webmvc/pom.xml +++ b/extensions/spring/stormpath-spring-security-webmvc/pom.xml @@ -19,7 +19,7 @@ com.stormpath.spring stormpath-spring-parent - 1.5.5-SNAPSHOT + 1.5.5 ../pom.xml diff --git a/extensions/spring/stormpath-spring-security/pom.xml b/extensions/spring/stormpath-spring-security/pom.xml index 86b6e4a88e..5a8c425166 100644 --- a/extensions/spring/stormpath-spring-security/pom.xml +++ b/extensions/spring/stormpath-spring-security/pom.xml @@ -19,7 +19,7 @@ com.stormpath.spring stormpath-spring-parent - 1.5.5-SNAPSHOT + 1.5.5 ../pom.xml diff --git a/extensions/spring/stormpath-spring-webmvc/pom.xml b/extensions/spring/stormpath-spring-webmvc/pom.xml index 99fddbff1a..1e32f13874 100644 --- a/extensions/spring/stormpath-spring-webmvc/pom.xml +++ b/extensions/spring/stormpath-spring-webmvc/pom.xml @@ -19,7 +19,7 @@ com.stormpath.spring stormpath-spring-parent - 1.5.5-SNAPSHOT + 1.5.5 ../pom.xml diff --git a/extensions/spring/stormpath-spring/pom.xml b/extensions/spring/stormpath-spring/pom.xml index 834c7a7b6c..ea15056210 100644 --- a/extensions/spring/stormpath-spring/pom.xml +++ b/extensions/spring/stormpath-spring/pom.xml @@ -19,7 +19,7 @@ com.stormpath.spring stormpath-spring-parent - 1.5.5-SNAPSHOT + 1.5.5 ../pom.xml diff --git a/extensions/zuul/pom.xml b/extensions/zuul/pom.xml index 9eafe93100..c3c7895974 100644 --- a/extensions/zuul/pom.xml +++ b/extensions/zuul/pom.xml @@ -21,7 +21,7 @@ com.stormpath.sdk stormpath-sdk-root - 1.5.5-SNAPSHOT + 1.5.5 ../../pom.xml diff --git a/impl/pom.xml b/impl/pom.xml index 7eb8ef2980..2ab16253d8 100644 --- a/impl/pom.xml +++ b/impl/pom.xml @@ -21,7 +21,7 @@ com.stormpath.sdk stormpath-sdk-root - 1.5.5-SNAPSHOT + 1.5.5 ../pom.xml diff --git a/pom.xml b/pom.xml index 4505b31100..4fbbc9ea34 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ com.stormpath.sdk stormpath-sdk-root - 1.5.5-SNAPSHOT + 1.5.5 pom Stormpath Java SDK @@ -41,7 +41,7 @@ scm:git:git@github.com:stormpath/stormpath-sdk-java.git scm:git:git@github.com:stormpath/stormpath-sdk-java.git git@github.com:stormpath/stormpath-sdk-java.git - HEAD + stormpath-sdk-root-1.5.5 GitHub diff --git a/tutorials/pom.xml b/tutorials/pom.xml index c63cbce3fc..d6e0f192a0 100644 --- a/tutorials/pom.xml +++ b/tutorials/pom.xml @@ -19,7 +19,7 @@ com.stormpath.sdk stormpath-sdk-root - 1.5.5-SNAPSHOT + 1.5.5 ../pom.xml diff --git a/tutorials/spring-boot/00-the-basics/pom.xml b/tutorials/spring-boot/00-the-basics/pom.xml index c00075a1a0..7f4ab96378 100644 --- a/tutorials/spring-boot/00-the-basics/pom.xml +++ b/tutorials/spring-boot/00-the-basics/pom.xml @@ -21,14 +21,14 @@ com.stormpath.sdk stormpath-sdk-tutorials-spring-boot - 1.5.5-SNAPSHOT + 1.5.5 ../pom.xml com.stormpath.spring stormpath-sdk-tutorials-spring-boot-default-the-basics - 1.5.5-SNAPSHOT + 1.5.5 Stormpath Java SDK :: Tutorials :: Spring Boot Default :: The Basics A simple Spring Boot Web MVC application with out-of-the-box login and self-service screens! diff --git a/tutorials/spring-boot/01-some-access-controls/pom.xml b/tutorials/spring-boot/01-some-access-controls/pom.xml index bea8a0511f..f07686ebca 100644 --- a/tutorials/spring-boot/01-some-access-controls/pom.xml +++ b/tutorials/spring-boot/01-some-access-controls/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-tutorials-spring-boot - 1.5.5-SNAPSHOT + 1.5.5 ../pom.xml com.stormpath.spring stormpath-sdk-tutorials-spring-boot-default-some-access-controls - 1.5.5-SNAPSHOT + 1.5.5 Stormpath Java SDK :: Tutorials :: Spring Boot Default :: Some Access Controls A simple Spring Boot Web MVC application with out-of-the-box login and self-service screens! diff --git a/tutorials/spring-boot/02-spring-security-ftw/pom.xml b/tutorials/spring-boot/02-spring-security-ftw/pom.xml index 0d776efd5c..aa785a20d2 100644 --- a/tutorials/spring-boot/02-spring-security-ftw/pom.xml +++ b/tutorials/spring-boot/02-spring-security-ftw/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-tutorials-spring-boot - 1.5.5-SNAPSHOT + 1.5.5 ../pom.xml com.stormpath.spring stormpath-sdk-tutorials-spring-boot-default-spring-security-ftw - 1.5.5-SNAPSHOT + 1.5.5 Stormpath Java SDK :: Tutorials :: Spring Boot Default :: Spring Security FTW! A simple Spring Boot Web MVC application with out-of-the-box login and self-service screens! diff --git a/tutorials/spring-boot/03-spring-security-refined/pom.xml b/tutorials/spring-boot/03-spring-security-refined/pom.xml index 68805323fe..5c53777f55 100644 --- a/tutorials/spring-boot/03-spring-security-refined/pom.xml +++ b/tutorials/spring-boot/03-spring-security-refined/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-tutorials-spring-boot - 1.5.5-SNAPSHOT + 1.5.5 ../pom.xml com.stormpath.spring stormpath-sdk-tutorials-spring-boot-default-spring-security-refined - 1.5.5-SNAPSHOT + 1.5.5 Stormpath Java SDK :: Tutorials :: Spring Boot Default :: Spring Security Refined A simple Spring Boot Web MVC application with out-of-the-box login and self-service screens! diff --git a/tutorials/spring-boot/04-a-finer-grain-of-control/pom.xml b/tutorials/spring-boot/04-a-finer-grain-of-control/pom.xml index 50bc263d43..7a687f7345 100644 --- a/tutorials/spring-boot/04-a-finer-grain-of-control/pom.xml +++ b/tutorials/spring-boot/04-a-finer-grain-of-control/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-tutorials-spring-boot - 1.5.5-SNAPSHOT + 1.5.5 ../pom.xml com.stormpath.spring stormpath-sdk-tutorials-spring-boot-default-a-finer-grain-of-control - 1.5.5-SNAPSHOT + 1.5.5 Stormpath Java SDK :: Tutorials :: Spring Boot Default :: A Finer Grain of Control A simple Spring Boot Web MVC application with out-of-the-box login and self-service screens! diff --git a/tutorials/spring-boot/05-token-management/pom.xml b/tutorials/spring-boot/05-token-management/pom.xml index cad7709f6e..14e7216f51 100644 --- a/tutorials/spring-boot/05-token-management/pom.xml +++ b/tutorials/spring-boot/05-token-management/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-tutorials-spring-boot - 1.5.5-SNAPSHOT + 1.5.5 ../pom.xml com.stormpath.spring stormpath-sdk-tutorials-spring-boot-default-token-management - 1.5.5-SNAPSHOT + 1.5.5 Stormpath Java SDK :: Tutorials :: Spring Boot Default :: Token Management A simple Spring Boot Web MVC application with out-of-the-box login and self-service screens! diff --git a/tutorials/spring-boot/pom.xml b/tutorials/spring-boot/pom.xml index 78006ef477..620e0885d8 100644 --- a/tutorials/spring-boot/pom.xml +++ b/tutorials/spring-boot/pom.xml @@ -19,7 +19,7 @@ com.stormpath.sdk stormpath-sdk-tutorials - 1.5.5-SNAPSHOT + 1.5.5 ../pom.xml diff --git a/tutorials/spring/00-the-basics/pom.xml b/tutorials/spring/00-the-basics/pom.xml index 992580c599..65e87c082f 100644 --- a/tutorials/spring/00-the-basics/pom.xml +++ b/tutorials/spring/00-the-basics/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-tutorials-spring - 1.5.5-SNAPSHOT + 1.5.5 ../pom.xml com.stormpath.spring stormpath-sdk-tutorials-spring-security-webmvc-the-basics - 1.5.5-SNAPSHOT + 1.5.5 Stormpath Java SDK :: Tutorials :: Spring Security WebMVC :: The Basics A simple Spring Security Web MVC application with out-of-the-box login and self-service screens! diff --git a/tutorials/spring/01-some-access-controls/pom.xml b/tutorials/spring/01-some-access-controls/pom.xml index d7b058f2d5..3403b12019 100644 --- a/tutorials/spring/01-some-access-controls/pom.xml +++ b/tutorials/spring/01-some-access-controls/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-tutorials-spring - 1.5.5-SNAPSHOT + 1.5.5 ../pom.xml com.stormpath.spring stormpath-sdk-tutorials-spring-security-webmvc-some-access-controls - 1.5.5-SNAPSHOT + 1.5.5 Stormpath Java SDK :: Tutorials :: Spring Security WebMVC :: Some Access Controls A simple Spring Security Web MVC application with out-of-the-box login and self-service screens! diff --git a/tutorials/spring/02-spring-security-ftw/pom.xml b/tutorials/spring/02-spring-security-ftw/pom.xml index e736cf7fea..0a4920d1a4 100644 --- a/tutorials/spring/02-spring-security-ftw/pom.xml +++ b/tutorials/spring/02-spring-security-ftw/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-tutorials-spring - 1.5.5-SNAPSHOT + 1.5.5 ../pom.xml com.stormpath.spring stormpath-sdk-tutorials-spring-security-webmvc-spring-security-ftw - 1.5.5-SNAPSHOT + 1.5.5 Stormpath Java SDK :: Tutorials :: Spring Security WebMVC :: Spring Security For The Win A simple Spring Security Web MVC application with out-of-the-box login and self-service screens! diff --git a/tutorials/spring/03-spring-security-refined/pom.xml b/tutorials/spring/03-spring-security-refined/pom.xml index 90fd0b3118..c594db86de 100644 --- a/tutorials/spring/03-spring-security-refined/pom.xml +++ b/tutorials/spring/03-spring-security-refined/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-tutorials-spring - 1.5.5-SNAPSHOT + 1.5.5 ../pom.xml com.stormpath.spring stormpath-sdk-tutorials-spring-security-webmvc-spring-security-refined - 1.5.5-SNAPSHOT + 1.5.5 Stormpath Java SDK :: Tutorials :: Spring Security WebMVC :: Spring Security Refined A simple Spring Security Web MVC application with out-of-the-box login and self-service screens! diff --git a/tutorials/spring/04-a-finer-grain-of-control/pom.xml b/tutorials/spring/04-a-finer-grain-of-control/pom.xml index 31ccd0e10e..deedd267c1 100644 --- a/tutorials/spring/04-a-finer-grain-of-control/pom.xml +++ b/tutorials/spring/04-a-finer-grain-of-control/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-tutorials-spring - 1.5.5-SNAPSHOT + 1.5.5 ../pom.xml com.stormpath.spring stormpath-sdk-tutorials-spring-security-webmvc-a-finer-grain-of-control - 1.5.5-SNAPSHOT + 1.5.5 Stormpath Java SDK :: Tutorials :: Spring Security WebMVC :: A Finer Grain Of Control A simple Spring Security Web MVC application with out-of-the-box login and self-service screens! diff --git a/tutorials/spring/05-token-management/pom.xml b/tutorials/spring/05-token-management/pom.xml index 3ac8bc0d82..4396f6c965 100644 --- a/tutorials/spring/05-token-management/pom.xml +++ b/tutorials/spring/05-token-management/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-tutorials-spring - 1.5.5-SNAPSHOT + 1.5.5 ../pom.xml com.stormpath.spring stormpath-sdk-tutorials-spring-security-webmvc-token-management - 1.5.5-SNAPSHOT + 1.5.5 Stormpath Java SDK :: Tutorials :: Spring Security WebMVC :: Token Management A simple Spring Security Web MVC application with out-of-the-box login and self-service screens! diff --git a/tutorials/spring/pom.xml b/tutorials/spring/pom.xml index b3f33c8bd6..23188ad070 100644 --- a/tutorials/spring/pom.xml +++ b/tutorials/spring/pom.xml @@ -19,7 +19,7 @@ com.stormpath.sdk stormpath-sdk-tutorials - 1.5.5-SNAPSHOT + 1.5.5 ../pom.xml From 42b87e1ce8c555ac0c71ee3b836b1a1ea41c5dc5 Mon Sep 17 00:00:00 2001 From: Micah Silverman Date: Tue, 14 Mar 2017 17:00:56 -0400 Subject: [PATCH 13/21] [maven-release-plugin] prepare for next development iteration --- api/pom.xml | 2 +- bom/pom.xml | 40 +++++++++---------- clover/pom.xml | 2 +- examples/pom.xml | 4 +- examples/quickstart/pom.xml | 4 +- examples/servlet/pom.xml | 4 +- examples/spring-boot-default/pom.xml | 4 +- examples/spring-boot-webmvc-angular/pom.xml | 4 +- examples/spring-boot-webmvc/pom.xml | 4 +- examples/spring-boot/pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- examples/spring-security-webmvc/pom.xml | 4 +- examples/spring-webmvc/pom.xml | 4 +- examples/spring/pom.xml | 4 +- examples/zuul-spring-cloud-starter/pom.xml | 4 +- extensions/hazelcast/pom.xml | 2 +- extensions/httpclient/pom.xml | 2 +- extensions/oauth/pom.xml | 2 +- extensions/pom.xml | 2 +- extensions/servlet-plugin/pom.xml | 2 +- extensions/servlet/pom.xml | 2 +- extensions/spring/boot/pom.xml | 2 +- .../pom.xml | 2 +- .../stormpath-spring-boot-starter/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- extensions/spring/cloud/pom.xml | 2 +- .../pom.xml | 2 +- extensions/spring/pom.xml | 2 +- .../stormpath-spring-security-webmvc/pom.xml | 2 +- .../spring/stormpath-spring-security/pom.xml | 2 +- .../spring/stormpath-spring-webmvc/pom.xml | 2 +- extensions/spring/stormpath-spring/pom.xml | 2 +- extensions/zuul/pom.xml | 2 +- impl/pom.xml | 2 +- pom.xml | 4 +- tutorials/pom.xml | 2 +- tutorials/spring-boot/00-the-basics/pom.xml | 4 +- .../01-some-access-controls/pom.xml | 4 +- .../02-spring-security-ftw/pom.xml | 4 +- .../03-spring-security-refined/pom.xml | 4 +- .../04-a-finer-grain-of-control/pom.xml | 4 +- .../spring-boot/05-token-management/pom.xml | 4 +- tutorials/spring-boot/pom.xml | 2 +- tutorials/spring/00-the-basics/pom.xml | 4 +- .../spring/01-some-access-controls/pom.xml | 4 +- .../spring/02-spring-security-ftw/pom.xml | 4 +- .../spring/03-spring-security-refined/pom.xml | 4 +- .../04-a-finer-grain-of-control/pom.xml | 4 +- tutorials/spring/05-token-management/pom.xml | 4 +- tutorials/spring/pom.xml | 2 +- 54 files changed, 99 insertions(+), 99 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index 735426b580..2b631cc486 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -21,7 +21,7 @@ com.stormpath.sdk stormpath-sdk-root - 1.5.5 + 1.6.0-SNAPSHOT ../pom.xml diff --git a/bom/pom.xml b/bom/pom.xml index 66e9ea83be..050711ab63 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -7,7 +7,7 @@ Stormpath Java SDK :: BOM Stormpath Bill of Materials pom - 1.5.5 + 1.6.0-SNAPSHOT https://github.com/stormpath/stormpath-sdk-java @@ -27,7 +27,7 @@ scm:git:git@github.com:stormpath/stormpath-sdk-java.git scm:git:git@github.com:stormpath/stormpath-sdk-java.git git@github.com:stormpath/stormpath-sdk-java.git - stormpath-sdk-root-1.5.5 + HEAD GitHub @@ -50,92 +50,92 @@ com.stormpath.sdk stormpath-sdk-api - 1.5.5 + 1.6.0-SNAPSHOT com.stormpath.sdk stormpath-sdk-impl - 1.5.5 + 1.6.0-SNAPSHOT com.stormpath.sdk stormpath-sdk-oauth - 1.5.5 + 1.6.0-SNAPSHOT com.stormpath.sdk stormpath-sdk-servlet - 1.5.5 + 1.6.0-SNAPSHOT com.stormpath.sdk stormpath-sdk-httpclient - 1.5.5 + 1.6.0-SNAPSHOT com.stormpath.sdk stormpath-servlet-plugin - 1.5.5 + 1.6.0-SNAPSHOT com.stormpath.sdk stormpath-sdk-zuul - 1.5.5 + 1.6.0-SNAPSHOT com.stormpath.spring stormpath-spring - 1.5.5 + 1.6.0-SNAPSHOT com.stormpath.spring stormpath-spring-security - 1.5.5 + 1.6.0-SNAPSHOT com.stormpath.spring stormpath-spring-security-webmvc - 1.5.5 + 1.6.0-SNAPSHOT com.stormpath.spring stormpath-spring-webmvc - 1.5.5 + 1.6.0-SNAPSHOT com.stormpath.spring stormpath-spring-boot-starter - 1.5.5 + 1.6.0-SNAPSHOT com.stormpath.spring stormpath-webmvc-spring-boot-starter - 1.5.5 + 1.6.0-SNAPSHOT com.stormpath.spring stormpath-thymeleaf-spring-boot-starter - 1.5.5 + 1.6.0-SNAPSHOT com.stormpath.spring stormpath-spring-security-spring-boot-starter - 1.5.5 + 1.6.0-SNAPSHOT com.stormpath.spring stormpath-spring-security-webmvc-spring-boot-starter - 1.5.5 + 1.6.0-SNAPSHOT com.stormpath.spring stormpath-default-spring-boot-starter - 1.5.5 + 1.6.0-SNAPSHOT com.stormpath.spring stormpath-zuul-spring-cloud-starter - 1.5.5 + 1.6.0-SNAPSHOT diff --git a/clover/pom.xml b/clover/pom.xml index 57365646f6..88ebc40279 100644 --- a/clover/pom.xml +++ b/clover/pom.xml @@ -21,7 +21,7 @@ com.stormpath.sdk stormpath-sdk-root - 1.5.5 + 1.6.0-SNAPSHOT ../pom.xml diff --git a/examples/pom.xml b/examples/pom.xml index 00c6efa471..eb1e0f97c2 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-root - 1.5.5 + 1.6.0-SNAPSHOT ../pom.xml stormpath-sdk-examples com.stormpath.sdk - 1.5.5 + 1.6.0-SNAPSHOT Stormpath Java SDK :: Examples pom diff --git a/examples/quickstart/pom.xml b/examples/quickstart/pom.xml index d15db1b120..bd027de258 100644 --- a/examples/quickstart/pom.xml +++ b/examples/quickstart/pom.xml @@ -5,13 +5,13 @@ com.stormpath.sdk stormpath-sdk-examples - 1.5.5 + 1.6.0-SNAPSHOT ../pom.xml com.stormpath.sdk stormpath-sdk-examples-quickstart - 1.5.5 + 1.6.0-SNAPSHOT Stormpath Java SDK :: Examples :: Quickstart Code A simple (non-web) application to demonstrate the example code in the Stormpath Java Quickstart diff --git a/examples/servlet/pom.xml b/examples/servlet/pom.xml index 96e0ddc1ea..8a0e3b1c3d 100644 --- a/examples/servlet/pom.xml +++ b/examples/servlet/pom.xml @@ -21,12 +21,12 @@ com.stormpath.sdk stormpath-sdk-examples - 1.5.5 + 1.6.0-SNAPSHOT ../pom.xml stormpath-sdk-examples-servlet - 1.5.5 + 1.6.0-SNAPSHOT Stormpath Java SDK :: Examples :: Servlet Container-based Webapp A simple example webapp deployed in a servlet container. war diff --git a/examples/spring-boot-default/pom.xml b/examples/spring-boot-default/pom.xml index 65b66597a6..55cdc7a485 100644 --- a/examples/spring-boot-default/pom.xml +++ b/examples/spring-boot-default/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-examples - 1.5.5 + 1.6.0-SNAPSHOT ../pom.xml com.stormpath.spring stormpath-sdk-examples-spring-boot-default - 1.5.5 + 1.6.0-SNAPSHOT Stormpath Java SDK :: Examples :: Spring Boot Default A simple Spring Boot Web MVC application with out-of-the-box login and self-service screens! diff --git a/examples/spring-boot-webmvc-angular/pom.xml b/examples/spring-boot-webmvc-angular/pom.xml index 230b4669ed..e0bdf4c9c5 100644 --- a/examples/spring-boot-webmvc-angular/pom.xml +++ b/examples/spring-boot-webmvc-angular/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-examples - 1.5.5 + 1.6.0-SNAPSHOT ../pom.xml com.stormpath.spring stormpath-sdk-examples-spring-boot-web-angular - 1.5.5 + 1.6.0-SNAPSHOT Stormpath Java SDK :: Examples :: Spring Boot + Angular Webapp A Spring Boot web application that uses Stormpath. diff --git a/examples/spring-boot-webmvc/pom.xml b/examples/spring-boot-webmvc/pom.xml index d10f63f451..d67d022e5d 100644 --- a/examples/spring-boot-webmvc/pom.xml +++ b/examples/spring-boot-webmvc/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-examples - 1.5.5 + 1.6.0-SNAPSHOT ../pom.xml com.stormpath.spring stormpath-sdk-examples-spring-boot-web - 1.5.5 + 1.6.0-SNAPSHOT Stormpath Java SDK :: Examples :: Spring Boot Webapp A Spring Boot web application that uses Stormpath. diff --git a/examples/spring-boot/pom.xml b/examples/spring-boot/pom.xml index 49bfd2f8c3..8c6d9b6ad1 100644 --- a/examples/spring-boot/pom.xml +++ b/examples/spring-boot/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-examples - 1.5.5 + 1.6.0-SNAPSHOT ../pom.xml com.stormpath.spring stormpath-sdk-examples-spring-boot - 1.5.5 + 1.6.0-SNAPSHOT Stormpath Java SDK :: Examples :: Spring Boot A Spring Boot (non-web) application that uses Stormpath. diff --git a/examples/spring-security-spring-boot-webmvc-bare-bones/pom.xml b/examples/spring-security-spring-boot-webmvc-bare-bones/pom.xml index 5fa2d7c5d4..17185eb6c3 100644 --- a/examples/spring-security-spring-boot-webmvc-bare-bones/pom.xml +++ b/examples/spring-security-spring-boot-webmvc-bare-bones/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-examples - 1.5.5 + 1.6.0-SNAPSHOT ../pom.xml com.stormpath.spring stormpath-sdk-examples-spring-security-spring-boot-webmvc-bare-bones - 1.5.5 + 1.6.0-SNAPSHOT Stormpath Java SDK :: Examples :: Spring Security :: Spring Boot :: Bare Bones A simple Spring Boot Web MVC application with out-of-the-box login and self-service screens! diff --git a/examples/spring-security-spring-boot-webmvc/pom.xml b/examples/spring-security-spring-boot-webmvc/pom.xml index 2c6213c351..e7d142cc96 100644 --- a/examples/spring-security-spring-boot-webmvc/pom.xml +++ b/examples/spring-security-spring-boot-webmvc/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-examples - 1.5.5 + 1.6.0-SNAPSHOT ../pom.xml com.stormpath.spring stormpath-sdk-examples-spring-security-spring-boot-webmvc - 1.5.5 + 1.6.0-SNAPSHOT Stormpath Java SDK :: Examples :: Spring Security :: Spring Boot Webapp A simple Spring Boot Web MVC application with out-of-the-box login and self-service screens! diff --git a/examples/spring-security-webmvc/pom.xml b/examples/spring-security-webmvc/pom.xml index 661d5c70ee..496e79321d 100644 --- a/examples/spring-security-webmvc/pom.xml +++ b/examples/spring-security-webmvc/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-examples - 1.5.5 + 1.6.0-SNAPSHOT ../pom.xml com.stormpath.spring stormpath-sdk-examples-spring-security-webmvc - 1.5.5 + 1.6.0-SNAPSHOT Stormpath Java SDK :: Examples :: Spring Security Web MVC A simple Spring Security Web MVC application with out-of-the-box login and self-service screens! diff --git a/examples/spring-webmvc/pom.xml b/examples/spring-webmvc/pom.xml index b81997284e..7228f65333 100644 --- a/examples/spring-webmvc/pom.xml +++ b/examples/spring-webmvc/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-examples - 1.5.5 + 1.6.0-SNAPSHOT ../pom.xml com.stormpath.spring stormpath-sdk-examples-spring-webmvc - 1.5.5 + 1.6.0-SNAPSHOT Stormpath Java SDK :: Examples :: Spring Web MVC A Spring Boot web application that uses Stormpath and Spring Security diff --git a/examples/spring/pom.xml b/examples/spring/pom.xml index 463b7b467c..bafdac412e 100644 --- a/examples/spring/pom.xml +++ b/examples/spring/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-examples - 1.5.5 + 1.6.0-SNAPSHOT ../pom.xml com.stormpath.spring stormpath-sdk-examples-spring - 1.5.5 + 1.6.0-SNAPSHOT Stormpath Java SDK :: Examples :: Spring A simple (non-web) Spring Application. diff --git a/examples/zuul-spring-cloud-starter/pom.xml b/examples/zuul-spring-cloud-starter/pom.xml index 61bd29a7b4..a216036db6 100644 --- a/examples/zuul-spring-cloud-starter/pom.xml +++ b/examples/zuul-spring-cloud-starter/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-examples - 1.5.5 + 1.6.0-SNAPSHOT ../pom.xml com.stormpath.spring stormpath-sdk-examples-zuul-spring-cloud-starter - 1.5.5 + 1.6.0-SNAPSHOT Stormpath Java SDK :: Examples :: Zuul Spring Cloud Starter An example spring cloud zuul web gateway using Stormpath diff --git a/extensions/hazelcast/pom.xml b/extensions/hazelcast/pom.xml index 5d8803aef0..6fa43881a2 100644 --- a/extensions/hazelcast/pom.xml +++ b/extensions/hazelcast/pom.xml @@ -21,7 +21,7 @@ com.stormpath.sdk stormpath-sdk-root - 1.5.5 + 1.6.0-SNAPSHOT ../../pom.xml diff --git a/extensions/httpclient/pom.xml b/extensions/httpclient/pom.xml index 3fa4d0ca15..d144b8323c 100644 --- a/extensions/httpclient/pom.xml +++ b/extensions/httpclient/pom.xml @@ -21,7 +21,7 @@ com.stormpath.sdk stormpath-sdk-root - 1.5.5 + 1.6.0-SNAPSHOT ../../pom.xml diff --git a/extensions/oauth/pom.xml b/extensions/oauth/pom.xml index 800e631904..b6d99aa706 100644 --- a/extensions/oauth/pom.xml +++ b/extensions/oauth/pom.xml @@ -21,7 +21,7 @@ com.stormpath.sdk stormpath-sdk-root - 1.5.5 + 1.6.0-SNAPSHOT ../../pom.xml diff --git a/extensions/pom.xml b/extensions/pom.xml index 2ca79881cf..483b8b0151 100644 --- a/extensions/pom.xml +++ b/extensions/pom.xml @@ -19,7 +19,7 @@ com.stormpath.sdk stormpath-sdk-root - 1.5.5 + 1.6.0-SNAPSHOT ../pom.xml diff --git a/extensions/servlet-plugin/pom.xml b/extensions/servlet-plugin/pom.xml index 898a586942..d7fcad52bc 100644 --- a/extensions/servlet-plugin/pom.xml +++ b/extensions/servlet-plugin/pom.xml @@ -21,7 +21,7 @@ com.stormpath.sdk stormpath-sdk-root - 1.5.5 + 1.6.0-SNAPSHOT ../../pom.xml diff --git a/extensions/servlet/pom.xml b/extensions/servlet/pom.xml index 496b288c47..b3eeebece9 100644 --- a/extensions/servlet/pom.xml +++ b/extensions/servlet/pom.xml @@ -21,7 +21,7 @@ com.stormpath.sdk stormpath-sdk-root - 1.5.5 + 1.6.0-SNAPSHOT ../../pom.xml diff --git a/extensions/spring/boot/pom.xml b/extensions/spring/boot/pom.xml index b92cdd4348..e0602614d2 100644 --- a/extensions/spring/boot/pom.xml +++ b/extensions/spring/boot/pom.xml @@ -21,7 +21,7 @@ com.stormpath.spring stormpath-spring-parent - 1.5.5 + 1.6.0-SNAPSHOT ../pom.xml diff --git a/extensions/spring/boot/stormpath-default-spring-boot-starter/pom.xml b/extensions/spring/boot/stormpath-default-spring-boot-starter/pom.xml index b5bec2687b..1f12039f37 100644 --- a/extensions/spring/boot/stormpath-default-spring-boot-starter/pom.xml +++ b/extensions/spring/boot/stormpath-default-spring-boot-starter/pom.xml @@ -19,7 +19,7 @@ com.stormpath.spring stormpath-spring-parent - 1.5.5 + 1.6.0-SNAPSHOT ../../pom.xml diff --git a/extensions/spring/boot/stormpath-spring-boot-starter/pom.xml b/extensions/spring/boot/stormpath-spring-boot-starter/pom.xml index 216c071e14..2be0847abf 100644 --- a/extensions/spring/boot/stormpath-spring-boot-starter/pom.xml +++ b/extensions/spring/boot/stormpath-spring-boot-starter/pom.xml @@ -19,7 +19,7 @@ com.stormpath.spring stormpath-spring-parent - 1.5.5 + 1.6.0-SNAPSHOT ../../pom.xml diff --git a/extensions/spring/boot/stormpath-spring-security-spring-boot-starter/pom.xml b/extensions/spring/boot/stormpath-spring-security-spring-boot-starter/pom.xml index 351301938f..d996d00c49 100644 --- a/extensions/spring/boot/stormpath-spring-security-spring-boot-starter/pom.xml +++ b/extensions/spring/boot/stormpath-spring-security-spring-boot-starter/pom.xml @@ -19,7 +19,7 @@ com.stormpath.spring stormpath-spring-parent - 1.5.5 + 1.6.0-SNAPSHOT ../../pom.xml diff --git a/extensions/spring/boot/stormpath-spring-security-webmvc-spring-boot-starter/pom.xml b/extensions/spring/boot/stormpath-spring-security-webmvc-spring-boot-starter/pom.xml index 4511b5a8b0..2e30170c47 100644 --- a/extensions/spring/boot/stormpath-spring-security-webmvc-spring-boot-starter/pom.xml +++ b/extensions/spring/boot/stormpath-spring-security-webmvc-spring-boot-starter/pom.xml @@ -19,7 +19,7 @@ com.stormpath.spring stormpath-spring-parent - 1.5.5 + 1.6.0-SNAPSHOT ../../pom.xml diff --git a/extensions/spring/boot/stormpath-thymeleaf-spring-boot-starter/pom.xml b/extensions/spring/boot/stormpath-thymeleaf-spring-boot-starter/pom.xml index 519e7a2c94..a6c24f7272 100644 --- a/extensions/spring/boot/stormpath-thymeleaf-spring-boot-starter/pom.xml +++ b/extensions/spring/boot/stormpath-thymeleaf-spring-boot-starter/pom.xml @@ -19,7 +19,7 @@ com.stormpath.spring stormpath-spring-parent - 1.5.5 + 1.6.0-SNAPSHOT ../../pom.xml diff --git a/extensions/spring/boot/stormpath-webmvc-spring-boot-starter/pom.xml b/extensions/spring/boot/stormpath-webmvc-spring-boot-starter/pom.xml index 223019b822..6fdaaa8975 100644 --- a/extensions/spring/boot/stormpath-webmvc-spring-boot-starter/pom.xml +++ b/extensions/spring/boot/stormpath-webmvc-spring-boot-starter/pom.xml @@ -19,7 +19,7 @@ com.stormpath.spring stormpath-spring-parent - 1.5.5 + 1.6.0-SNAPSHOT ../../pom.xml diff --git a/extensions/spring/cloud/pom.xml b/extensions/spring/cloud/pom.xml index c5a324cc5e..d7ee8ca70f 100644 --- a/extensions/spring/cloud/pom.xml +++ b/extensions/spring/cloud/pom.xml @@ -21,7 +21,7 @@ com.stormpath.spring stormpath-spring-parent - 1.5.5 + 1.6.0-SNAPSHOT ../pom.xml diff --git a/extensions/spring/cloud/stormpath-zuul-spring-cloud-starter/pom.xml b/extensions/spring/cloud/stormpath-zuul-spring-cloud-starter/pom.xml index ae4d819219..9eaed6a2cb 100644 --- a/extensions/spring/cloud/stormpath-zuul-spring-cloud-starter/pom.xml +++ b/extensions/spring/cloud/stormpath-zuul-spring-cloud-starter/pom.xml @@ -19,7 +19,7 @@ com.stormpath.spring stormpath-spring-parent - 1.5.5 + 1.6.0-SNAPSHOT ../../pom.xml diff --git a/extensions/spring/pom.xml b/extensions/spring/pom.xml index 8b90b95041..af36b03645 100644 --- a/extensions/spring/pom.xml +++ b/extensions/spring/pom.xml @@ -21,7 +21,7 @@ com.stormpath.sdk stormpath-sdk-root - 1.5.5 + 1.6.0-SNAPSHOT ../../pom.xml diff --git a/extensions/spring/stormpath-spring-security-webmvc/pom.xml b/extensions/spring/stormpath-spring-security-webmvc/pom.xml index 1d6b601622..296ba1b065 100644 --- a/extensions/spring/stormpath-spring-security-webmvc/pom.xml +++ b/extensions/spring/stormpath-spring-security-webmvc/pom.xml @@ -19,7 +19,7 @@ com.stormpath.spring stormpath-spring-parent - 1.5.5 + 1.6.0-SNAPSHOT ../pom.xml diff --git a/extensions/spring/stormpath-spring-security/pom.xml b/extensions/spring/stormpath-spring-security/pom.xml index 5a8c425166..ae92299a6d 100644 --- a/extensions/spring/stormpath-spring-security/pom.xml +++ b/extensions/spring/stormpath-spring-security/pom.xml @@ -19,7 +19,7 @@ com.stormpath.spring stormpath-spring-parent - 1.5.5 + 1.6.0-SNAPSHOT ../pom.xml diff --git a/extensions/spring/stormpath-spring-webmvc/pom.xml b/extensions/spring/stormpath-spring-webmvc/pom.xml index 1e32f13874..03986ceb6a 100644 --- a/extensions/spring/stormpath-spring-webmvc/pom.xml +++ b/extensions/spring/stormpath-spring-webmvc/pom.xml @@ -19,7 +19,7 @@ com.stormpath.spring stormpath-spring-parent - 1.5.5 + 1.6.0-SNAPSHOT ../pom.xml diff --git a/extensions/spring/stormpath-spring/pom.xml b/extensions/spring/stormpath-spring/pom.xml index ea15056210..72d614b1d1 100644 --- a/extensions/spring/stormpath-spring/pom.xml +++ b/extensions/spring/stormpath-spring/pom.xml @@ -19,7 +19,7 @@ com.stormpath.spring stormpath-spring-parent - 1.5.5 + 1.6.0-SNAPSHOT ../pom.xml diff --git a/extensions/zuul/pom.xml b/extensions/zuul/pom.xml index c3c7895974..b0bdf92e01 100644 --- a/extensions/zuul/pom.xml +++ b/extensions/zuul/pom.xml @@ -21,7 +21,7 @@ com.stormpath.sdk stormpath-sdk-root - 1.5.5 + 1.6.0-SNAPSHOT ../../pom.xml diff --git a/impl/pom.xml b/impl/pom.xml index 2ab16253d8..3f9a40834d 100644 --- a/impl/pom.xml +++ b/impl/pom.xml @@ -21,7 +21,7 @@ com.stormpath.sdk stormpath-sdk-root - 1.5.5 + 1.6.0-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index 4fbbc9ea34..afd7305185 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ com.stormpath.sdk stormpath-sdk-root - 1.5.5 + 1.6.0-SNAPSHOT pom Stormpath Java SDK @@ -41,7 +41,7 @@ scm:git:git@github.com:stormpath/stormpath-sdk-java.git scm:git:git@github.com:stormpath/stormpath-sdk-java.git git@github.com:stormpath/stormpath-sdk-java.git - stormpath-sdk-root-1.5.5 + HEAD GitHub diff --git a/tutorials/pom.xml b/tutorials/pom.xml index d6e0f192a0..4094c0cae3 100644 --- a/tutorials/pom.xml +++ b/tutorials/pom.xml @@ -19,7 +19,7 @@ com.stormpath.sdk stormpath-sdk-root - 1.5.5 + 1.6.0-SNAPSHOT ../pom.xml diff --git a/tutorials/spring-boot/00-the-basics/pom.xml b/tutorials/spring-boot/00-the-basics/pom.xml index 7f4ab96378..a05e85d889 100644 --- a/tutorials/spring-boot/00-the-basics/pom.xml +++ b/tutorials/spring-boot/00-the-basics/pom.xml @@ -21,14 +21,14 @@ com.stormpath.sdk stormpath-sdk-tutorials-spring-boot - 1.5.5 + 1.6.0-SNAPSHOT ../pom.xml com.stormpath.spring stormpath-sdk-tutorials-spring-boot-default-the-basics - 1.5.5 + 1.6.0-SNAPSHOT Stormpath Java SDK :: Tutorials :: Spring Boot Default :: The Basics A simple Spring Boot Web MVC application with out-of-the-box login and self-service screens! diff --git a/tutorials/spring-boot/01-some-access-controls/pom.xml b/tutorials/spring-boot/01-some-access-controls/pom.xml index f07686ebca..74f882bc0a 100644 --- a/tutorials/spring-boot/01-some-access-controls/pom.xml +++ b/tutorials/spring-boot/01-some-access-controls/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-tutorials-spring-boot - 1.5.5 + 1.6.0-SNAPSHOT ../pom.xml com.stormpath.spring stormpath-sdk-tutorials-spring-boot-default-some-access-controls - 1.5.5 + 1.6.0-SNAPSHOT Stormpath Java SDK :: Tutorials :: Spring Boot Default :: Some Access Controls A simple Spring Boot Web MVC application with out-of-the-box login and self-service screens! diff --git a/tutorials/spring-boot/02-spring-security-ftw/pom.xml b/tutorials/spring-boot/02-spring-security-ftw/pom.xml index aa785a20d2..f6096dd71e 100644 --- a/tutorials/spring-boot/02-spring-security-ftw/pom.xml +++ b/tutorials/spring-boot/02-spring-security-ftw/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-tutorials-spring-boot - 1.5.5 + 1.6.0-SNAPSHOT ../pom.xml com.stormpath.spring stormpath-sdk-tutorials-spring-boot-default-spring-security-ftw - 1.5.5 + 1.6.0-SNAPSHOT Stormpath Java SDK :: Tutorials :: Spring Boot Default :: Spring Security FTW! A simple Spring Boot Web MVC application with out-of-the-box login and self-service screens! diff --git a/tutorials/spring-boot/03-spring-security-refined/pom.xml b/tutorials/spring-boot/03-spring-security-refined/pom.xml index 5c53777f55..eb156f4c7a 100644 --- a/tutorials/spring-boot/03-spring-security-refined/pom.xml +++ b/tutorials/spring-boot/03-spring-security-refined/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-tutorials-spring-boot - 1.5.5 + 1.6.0-SNAPSHOT ../pom.xml com.stormpath.spring stormpath-sdk-tutorials-spring-boot-default-spring-security-refined - 1.5.5 + 1.6.0-SNAPSHOT Stormpath Java SDK :: Tutorials :: Spring Boot Default :: Spring Security Refined A simple Spring Boot Web MVC application with out-of-the-box login and self-service screens! diff --git a/tutorials/spring-boot/04-a-finer-grain-of-control/pom.xml b/tutorials/spring-boot/04-a-finer-grain-of-control/pom.xml index 7a687f7345..c36c417766 100644 --- a/tutorials/spring-boot/04-a-finer-grain-of-control/pom.xml +++ b/tutorials/spring-boot/04-a-finer-grain-of-control/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-tutorials-spring-boot - 1.5.5 + 1.6.0-SNAPSHOT ../pom.xml com.stormpath.spring stormpath-sdk-tutorials-spring-boot-default-a-finer-grain-of-control - 1.5.5 + 1.6.0-SNAPSHOT Stormpath Java SDK :: Tutorials :: Spring Boot Default :: A Finer Grain of Control A simple Spring Boot Web MVC application with out-of-the-box login and self-service screens! diff --git a/tutorials/spring-boot/05-token-management/pom.xml b/tutorials/spring-boot/05-token-management/pom.xml index 14e7216f51..a4d040763c 100644 --- a/tutorials/spring-boot/05-token-management/pom.xml +++ b/tutorials/spring-boot/05-token-management/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-tutorials-spring-boot - 1.5.5 + 1.6.0-SNAPSHOT ../pom.xml com.stormpath.spring stormpath-sdk-tutorials-spring-boot-default-token-management - 1.5.5 + 1.6.0-SNAPSHOT Stormpath Java SDK :: Tutorials :: Spring Boot Default :: Token Management A simple Spring Boot Web MVC application with out-of-the-box login and self-service screens! diff --git a/tutorials/spring-boot/pom.xml b/tutorials/spring-boot/pom.xml index 620e0885d8..788816b9d9 100644 --- a/tutorials/spring-boot/pom.xml +++ b/tutorials/spring-boot/pom.xml @@ -19,7 +19,7 @@ com.stormpath.sdk stormpath-sdk-tutorials - 1.5.5 + 1.6.0-SNAPSHOT ../pom.xml diff --git a/tutorials/spring/00-the-basics/pom.xml b/tutorials/spring/00-the-basics/pom.xml index 65e87c082f..b09db91e6f 100644 --- a/tutorials/spring/00-the-basics/pom.xml +++ b/tutorials/spring/00-the-basics/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-tutorials-spring - 1.5.5 + 1.6.0-SNAPSHOT ../pom.xml com.stormpath.spring stormpath-sdk-tutorials-spring-security-webmvc-the-basics - 1.5.5 + 1.6.0-SNAPSHOT Stormpath Java SDK :: Tutorials :: Spring Security WebMVC :: The Basics A simple Spring Security Web MVC application with out-of-the-box login and self-service screens! diff --git a/tutorials/spring/01-some-access-controls/pom.xml b/tutorials/spring/01-some-access-controls/pom.xml index 3403b12019..be4eea6158 100644 --- a/tutorials/spring/01-some-access-controls/pom.xml +++ b/tutorials/spring/01-some-access-controls/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-tutorials-spring - 1.5.5 + 1.6.0-SNAPSHOT ../pom.xml com.stormpath.spring stormpath-sdk-tutorials-spring-security-webmvc-some-access-controls - 1.5.5 + 1.6.0-SNAPSHOT Stormpath Java SDK :: Tutorials :: Spring Security WebMVC :: Some Access Controls A simple Spring Security Web MVC application with out-of-the-box login and self-service screens! diff --git a/tutorials/spring/02-spring-security-ftw/pom.xml b/tutorials/spring/02-spring-security-ftw/pom.xml index 0a4920d1a4..b62558d698 100644 --- a/tutorials/spring/02-spring-security-ftw/pom.xml +++ b/tutorials/spring/02-spring-security-ftw/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-tutorials-spring - 1.5.5 + 1.6.0-SNAPSHOT ../pom.xml com.stormpath.spring stormpath-sdk-tutorials-spring-security-webmvc-spring-security-ftw - 1.5.5 + 1.6.0-SNAPSHOT Stormpath Java SDK :: Tutorials :: Spring Security WebMVC :: Spring Security For The Win A simple Spring Security Web MVC application with out-of-the-box login and self-service screens! diff --git a/tutorials/spring/03-spring-security-refined/pom.xml b/tutorials/spring/03-spring-security-refined/pom.xml index c594db86de..184fa5362b 100644 --- a/tutorials/spring/03-spring-security-refined/pom.xml +++ b/tutorials/spring/03-spring-security-refined/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-tutorials-spring - 1.5.5 + 1.6.0-SNAPSHOT ../pom.xml com.stormpath.spring stormpath-sdk-tutorials-spring-security-webmvc-spring-security-refined - 1.5.5 + 1.6.0-SNAPSHOT Stormpath Java SDK :: Tutorials :: Spring Security WebMVC :: Spring Security Refined A simple Spring Security Web MVC application with out-of-the-box login and self-service screens! diff --git a/tutorials/spring/04-a-finer-grain-of-control/pom.xml b/tutorials/spring/04-a-finer-grain-of-control/pom.xml index deedd267c1..1be63d1200 100644 --- a/tutorials/spring/04-a-finer-grain-of-control/pom.xml +++ b/tutorials/spring/04-a-finer-grain-of-control/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-tutorials-spring - 1.5.5 + 1.6.0-SNAPSHOT ../pom.xml com.stormpath.spring stormpath-sdk-tutorials-spring-security-webmvc-a-finer-grain-of-control - 1.5.5 + 1.6.0-SNAPSHOT Stormpath Java SDK :: Tutorials :: Spring Security WebMVC :: A Finer Grain Of Control A simple Spring Security Web MVC application with out-of-the-box login and self-service screens! diff --git a/tutorials/spring/05-token-management/pom.xml b/tutorials/spring/05-token-management/pom.xml index 4396f6c965..5012174988 100644 --- a/tutorials/spring/05-token-management/pom.xml +++ b/tutorials/spring/05-token-management/pom.xml @@ -21,13 +21,13 @@ com.stormpath.sdk stormpath-sdk-tutorials-spring - 1.5.5 + 1.6.0-SNAPSHOT ../pom.xml com.stormpath.spring stormpath-sdk-tutorials-spring-security-webmvc-token-management - 1.5.5 + 1.6.0-SNAPSHOT Stormpath Java SDK :: Tutorials :: Spring Security WebMVC :: Token Management A simple Spring Security Web MVC application with out-of-the-box login and self-service screens! diff --git a/tutorials/spring/pom.xml b/tutorials/spring/pom.xml index 23188ad070..ff01559707 100644 --- a/tutorials/spring/pom.xml +++ b/tutorials/spring/pom.xml @@ -19,7 +19,7 @@ com.stormpath.sdk stormpath-sdk-tutorials - 1.5.5 + 1.6.0-SNAPSHOT ../pom.xml From 448c34a9feb67af0c3ac690c73acc8d03054608b Mon Sep 17 00:00:00 2001 From: Brian Demers Date: Fri, 17 Mar 2017 11:50:51 -0400 Subject: [PATCH 14/21] Revert "temporarily disabled failing tests" This reverts commit 878839026f4025e54e8297968f8e18781a8b5f4c. --- .../com/stormpath/sdk/impl/application/OAuthPolicyIT.groovy | 3 +-- .../groovy/com/stormpath/sdk/impl/openidconnect/ScopeIT.groovy | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/extensions/httpclient/src/test/groovy/com/stormpath/sdk/impl/application/OAuthPolicyIT.groovy b/extensions/httpclient/src/test/groovy/com/stormpath/sdk/impl/application/OAuthPolicyIT.groovy index 6ab380c443..a91e71085f 100644 --- a/extensions/httpclient/src/test/groovy/com/stormpath/sdk/impl/application/OAuthPolicyIT.groovy +++ b/extensions/httpclient/src/test/groovy/com/stormpath/sdk/impl/application/OAuthPolicyIT.groovy @@ -109,8 +109,7 @@ class OAuthPolicyIT extends ClientIT { //getDeletedResourceError(identityProvider.href, SamlIdentityProvider) } - // todo - currently failing against production @mrafiei - @Test(enabled = false) + @Test void testRetrieveAndUpdateOAuthPolicy() { def app = createTempApp() diff --git a/extensions/httpclient/src/test/groovy/com/stormpath/sdk/impl/openidconnect/ScopeIT.groovy b/extensions/httpclient/src/test/groovy/com/stormpath/sdk/impl/openidconnect/ScopeIT.groovy index 6bf94fa352..4b9eeeab90 100644 --- a/extensions/httpclient/src/test/groovy/com/stormpath/sdk/impl/openidconnect/ScopeIT.groovy +++ b/extensions/httpclient/src/test/groovy/com/stormpath/sdk/impl/openidconnect/ScopeIT.groovy @@ -87,8 +87,7 @@ class ScopeIT extends ClientIT { assertNotNull(scope.getOAuthPolicy().href) } - // todo - currently failing against production @mrafiei - @Test(enabled = false) + @Test void testUpdateScope() { def app = createTempApp() assertNotNull app.getOAuthPolicy().href From 63ff06b3e326b41690e9c13c00f91e9a69db59aa Mon Sep 17 00:00:00 2001 From: Brian Demers Date: Fri, 17 Mar 2017 11:52:06 -0400 Subject: [PATCH 15/21] Revert "Openid-connect-new-OAuthPolicy-fields review comments" This reverts commit 67ad6542d5f59638e26695c58150b3ad1b38ccbf. --- .../com/stormpath/sdk/oauth/OAuthPolicy.java | 16 ++++++------- .../sdk/oauth/OAuthPolicyOptions.java | 24 ------------------- 2 files changed, 8 insertions(+), 32 deletions(-) diff --git a/api/src/main/java/com/stormpath/sdk/oauth/OAuthPolicy.java b/api/src/main/java/com/stormpath/sdk/oauth/OAuthPolicy.java index a4dd2459ce..438cdcd532 100644 --- a/api/src/main/java/com/stormpath/sdk/oauth/OAuthPolicy.java +++ b/api/src/main/java/com/stormpath/sdk/oauth/OAuthPolicy.java @@ -114,8 +114,8 @@ public interface OAuthPolicy extends Resource, Saveable { /** * Returns access token attribute mappings. - *

Open Id provider (OP) would enter any custom mappings used for their internal purposes in this map. - * Authorization server would then add all these mappings as part of the access token upon its generation.

+ * Open Id provider (OP) would enter any custom mappings used for their internal purposes in this map. + * Authorization server would then add all these mappings as part of the access token upon its generation. * * @return access token attribute mappings. * @@ -127,8 +127,8 @@ public interface OAuthPolicy extends Resource, Saveable { * Sets access token attribute mappings to be inserted into access tokens. * * @param accessTokenAttributeMap access token attribute mappings to be inserted into access tokens - *

Open Id provider (OP) would enter any custom mappings used for their internal purposes in this map. - * Authorization server would then add all these mappings as part of the access token upon its generation.

+ * Open Id provider (OP) would enter any custom mappings used for their internal purposes in this map. + * Authorization server would then add all these mappings as part of the access token upon its generation. * @return this instance for method chaining. * * @since 1.6.0 @@ -137,8 +137,8 @@ public interface OAuthPolicy extends Resource, Saveable { /** * Returns id token attribute mappings. - *

Open Id provider (OP) would enter any custom mappings used for their internal purposes in this map. - * Authorization server would then add all these mappings as part of the id token upon its generation.

+ * Open Id provider (OP) would enter any custom mappings used for their internal purposes in this map. + * Authorization server would then add all these mappings as part of the id token upon its generation. * * @return id token attribute mappings. * @@ -150,8 +150,8 @@ public interface OAuthPolicy extends Resource, Saveable { * Sets id token attribute mappings to be inserted into id tokens. * * @param idTokenAttributeMap id token attribute mappings to be inserted into id tokens - *

Open Id provider (OP) would enter any custom mappings used for their internal purposes in this map. - * Authorization server would then add all these mappings as part of the id token upon its generation.

+ * Open Id provider (OP) would enter any custom mappings used for their internal purposes in this map. + * Authorization server would then add all these mappings as part of the id token upon its generation. * @return this instance for method chaining. * * @since 1.6.0 diff --git a/api/src/main/java/com/stormpath/sdk/oauth/OAuthPolicyOptions.java b/api/src/main/java/com/stormpath/sdk/oauth/OAuthPolicyOptions.java index 97b3c74fe9..a57d4ddcfa 100644 --- a/api/src/main/java/com/stormpath/sdk/oauth/OAuthPolicyOptions.java +++ b/api/src/main/java/com/stormpath/sdk/oauth/OAuthPolicyOptions.java @@ -22,33 +22,9 @@ */ public interface OAuthPolicyOptions extends Options { - /** - * Ensures that when retrieving an OAuthPolicy, the OAuthPolicy's assigned {@link OAuthPolicy#getScopes()} scopes} - * are also retrieved in the same request. This enhances performance by leveraging a single request - * to retrieve multiple related resources you know you will use. - * - * @return this instance for method chaining. - */ T withScopes(); - /** - * Ensures that when retrieving an OAuthPolicy, the OAuthPolicy's assigned {@link OAuthPolicy#getScopes()} scopes} - * are also retrieved in the same request. This enhances performance by leveraging a single request - * to retrieve multiple related resources you know you will use. - * - * @param limit defines the maximum quantity of items to be retrieved when expanding this Collection Resource. Min:1, Max: 100. The default value is 25. - * @return this instance for method chaining. - */ T withScopes(int limit); - /** - * Ensures that when retrieving an OAuthPolicy, the OAuthPolicy's assigned {@link OAuthPolicy#getScopes()} scopes} - * are also retrieved in the same request. This enhances performance by leveraging a single request - * to retrieve multiple related resources you know you will use. - * - * @param limit defines the maximum quantity of items to be retrieved when expanding this Collection Resource. Min:1, Max: 100. The default value is 25. - * @param offset the zero-based starting index in the entire collection of the first item to return. Default is 0 - * @return this instance for method chaining. - */ T withScopes(int limit, int offset); } From 253e0685565829b9eed59dc7cc2de9827f628855 Mon Sep 17 00:00:00 2001 From: Brian Demers Date: Fri, 17 Mar 2017 11:52:24 -0400 Subject: [PATCH 16/21] Revert "penid-connect-new-OAuthPolicy-fields Review Comments" This reverts commit 85797f05805eee1e4457c5e47a7caca27a958ecd. --- .../stormpath/sdk/oauth/OAuthPolicies.java | 28 ----------- .../com/stormpath/sdk/oauth/OAuthPolicy.java | 12 +---- .../sdk/oauth/OAuthPolicyOptions.java | 30 ------------ .../sdk/oauth/openidconnect/Scope.java | 2 +- .../sdk/impl/application/OAuthPolicyIT.groovy | 46 +++++-------------- .../impl/oauth/DefaultOAuthPolicyOptions.java | 39 ---------------- 6 files changed, 13 insertions(+), 144 deletions(-) delete mode 100644 api/src/main/java/com/stormpath/sdk/oauth/OAuthPolicies.java delete mode 100644 api/src/main/java/com/stormpath/sdk/oauth/OAuthPolicyOptions.java delete mode 100644 impl/src/main/java/com/stormpath/sdk/impl/oauth/DefaultOAuthPolicyOptions.java diff --git a/api/src/main/java/com/stormpath/sdk/oauth/OAuthPolicies.java b/api/src/main/java/com/stormpath/sdk/oauth/OAuthPolicies.java deleted file mode 100644 index 44ec638f5d..0000000000 --- a/api/src/main/java/com/stormpath/sdk/oauth/OAuthPolicies.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright 2013 Stormpath, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.stormpath.sdk.oauth; - -import com.stormpath.sdk.lang.Classes; - -/** - * @since 1.6.0 - */ -public final class OAuthPolicies { - - public static OAuthPolicyOptions options() { - return (OAuthPolicyOptions) Classes.newInstance("com.stormpath.sdk.impl.oauth.DefaultOAuthPolicyOptions"); - } -} diff --git a/api/src/main/java/com/stormpath/sdk/oauth/OAuthPolicy.java b/api/src/main/java/com/stormpath/sdk/oauth/OAuthPolicy.java index 438cdcd532..0f97695fdc 100644 --- a/api/src/main/java/com/stormpath/sdk/oauth/OAuthPolicy.java +++ b/api/src/main/java/com/stormpath/sdk/oauth/OAuthPolicy.java @@ -51,7 +51,6 @@ public interface OAuthPolicy extends Resource, Saveable { * Returns the Time To Live for the id tokens created for the parent {@link Application Application} expressed in a period of time format, for example: PT1H. * * @return the String representation of the Time To Live for the id tokens created for the parent {@link Application Application} - * @since 1.6.0 */ String getIdTokenTtl(); @@ -88,7 +87,6 @@ public interface OAuthPolicy extends Resource, Saveable { * Sets the Time To Live for the id tokens created for the parent {@link Application Application} expressed in a period of time format, for example: PT1H. * * @return this instance for method chaining. - * @since 1.6.0 */ OAuthPolicy setIdTokenTtl(String idTokenTtl); @@ -96,7 +94,7 @@ public interface OAuthPolicy extends Resource, Saveable { * Creates a new {@link Scope} assigned to this oauthPolicy in the Stormpath server and returns the created resource. * The scope is used for openid connect flows. * - * @param scope {@link Scope} pojo to hold necessary data to send to the back-end to create a {@link Scope}. + * @param scope {@link Scope} pojo to hold necessary data to send to the back- end to create a {@link Scope}. * @return the newly created {@link Scope}. * * @since 1.6.0 @@ -114,8 +112,6 @@ public interface OAuthPolicy extends Resource, Saveable { /** * Returns access token attribute mappings. - * Open Id provider (OP) would enter any custom mappings used for their internal purposes in this map. - * Authorization server would then add all these mappings as part of the access token upon its generation. * * @return access token attribute mappings. * @@ -127,8 +123,6 @@ public interface OAuthPolicy extends Resource, Saveable { * Sets access token attribute mappings to be inserted into access tokens. * * @param accessTokenAttributeMap access token attribute mappings to be inserted into access tokens - * Open Id provider (OP) would enter any custom mappings used for their internal purposes in this map. - * Authorization server would then add all these mappings as part of the access token upon its generation. * @return this instance for method chaining. * * @since 1.6.0 @@ -137,8 +131,6 @@ public interface OAuthPolicy extends Resource, Saveable { /** * Returns id token attribute mappings. - * Open Id provider (OP) would enter any custom mappings used for their internal purposes in this map. - * Authorization server would then add all these mappings as part of the id token upon its generation. * * @return id token attribute mappings. * @@ -150,8 +142,6 @@ public interface OAuthPolicy extends Resource, Saveable { * Sets id token attribute mappings to be inserted into id tokens. * * @param idTokenAttributeMap id token attribute mappings to be inserted into id tokens - * Open Id provider (OP) would enter any custom mappings used for their internal purposes in this map. - * Authorization server would then add all these mappings as part of the id token upon its generation. * @return this instance for method chaining. * * @since 1.6.0 diff --git a/api/src/main/java/com/stormpath/sdk/oauth/OAuthPolicyOptions.java b/api/src/main/java/com/stormpath/sdk/oauth/OAuthPolicyOptions.java deleted file mode 100644 index a57d4ddcfa..0000000000 --- a/api/src/main/java/com/stormpath/sdk/oauth/OAuthPolicyOptions.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright 2017 Stormpath, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.stormpath.sdk.oauth; - -import com.stormpath.sdk.query.Options; - -/** - * @since 1.6.0 - */ -public interface OAuthPolicyOptions extends Options { - - T withScopes(); - - T withScopes(int limit); - - T withScopes(int limit, int offset); -} diff --git a/api/src/main/java/com/stormpath/sdk/oauth/openidconnect/Scope.java b/api/src/main/java/com/stormpath/sdk/oauth/openidconnect/Scope.java index 745bea5151..eecf3044ad 100644 --- a/api/src/main/java/com/stormpath/sdk/oauth/openidconnect/Scope.java +++ b/api/src/main/java/com/stormpath/sdk/oauth/openidconnect/Scope.java @@ -27,7 +27,7 @@ * A Scope resource is used to configure different openid connect scopes * with an {@link OAuthPolicy OAuthPolicy} * - * @since 1.6.0 + * @since 1.0.RC7 */ public interface Scope extends Resource, Saveable, Deletable, Auditable { /** diff --git a/extensions/httpclient/src/test/groovy/com/stormpath/sdk/impl/application/OAuthPolicyIT.groovy b/extensions/httpclient/src/test/groovy/com/stormpath/sdk/impl/application/OAuthPolicyIT.groovy index a91e71085f..734456cbdc 100644 --- a/extensions/httpclient/src/test/groovy/com/stormpath/sdk/impl/application/OAuthPolicyIT.groovy +++ b/extensions/httpclient/src/test/groovy/com/stormpath/sdk/impl/application/OAuthPolicyIT.groovy @@ -16,21 +16,14 @@ package com.stormpath.sdk.impl.application import com.stormpath.sdk.client.ClientIT -import com.stormpath.sdk.impl.resource.AbstractResource -import com.stormpath.sdk.oauth.OAuthPolicies import com.stormpath.sdk.oauth.OAuthPolicy -import com.stormpath.sdk.oauth.OAuthPolicyOptions import com.stormpath.sdk.oauth.openidconnect.Scope import com.stormpath.sdk.oauth.openidconnect.ScopeList import org.testng.annotations.Test -import java.lang.reflect.Field - import static org.testng.Assert.assertEquals import static org.testng.Assert.assertNotNull import static org.testng.Assert.assertFalse -import static org.testng.Assert.assertTrue - /** * @since 1.6.0 */ @@ -75,30 +68,19 @@ class OAuthPolicyIT extends ClientIT { @Test void testPolicyExpandOnScopes(){ def app = createTempApp() - def policyHref = app.getOAuthPolicy().href - - OAuthPolicyOptions options = OAuthPolicies.options().withScopes() - - assertNotNull options - assertEquals options.expansions.size(), 1 - - options = OAuthPolicies.options().withScopes(10) - - assertNotNull options - assertEquals options.expansions.size(), 1 + def policyHref = app.getOAuthPolicy().href+"?expand=scopes" - options = OAuthPolicies.options().withScopes(10,0) - - assertNotNull options - assertEquals options.expansions.size(), 1 + def oauthPolicy = client.getResource(policyHref, OAuthPolicy.class) + assertNotNull oauthPolicy + assertNotNull oauthPolicy.href - def retrieved = client.getResource(policyHref, OAuthPolicy.class, options) - Map policyProperties = getValue(AbstractResource, retrieved, "properties") - def scopes = policyProperties.get("scopes").size() - assertTrue scopes == 5 - assertTrue policyProperties.get("scopes").items.get(0).name != null - assertTrue policyProperties.get("scopes").items.get(1).name != null - assertTrue policyProperties.get("scopes").items.get(2).name != null + assertEquals(oauthPolicy.scopes.size, 3) + assertNotNull(oauthPolicy.scopes.asList().get(0).href) + assertNotNull(oauthPolicy.scopes.asList().get(0).name) + assertNotNull(oauthPolicy.scopes.asList().get(1).href) + assertNotNull(oauthPolicy.scopes.asList().get(1).name) + assertNotNull(oauthPolicy.scopes.asList().get(2).href) + assertNotNull(oauthPolicy.scopes.asList().get(2).name) } @Test @@ -196,10 +178,4 @@ class OAuthPolicyIT extends ClientIT { assertEquals(items[1].name, "updatedName2") assertEquals(items[2].name, "updatedName3") } - - private Object getValue(Class clazz, Object object, String fieldName) { - Field field = clazz.getDeclaredField(fieldName) - field.setAccessible(true) - return field.get(object) - } } diff --git a/impl/src/main/java/com/stormpath/sdk/impl/oauth/DefaultOAuthPolicyOptions.java b/impl/src/main/java/com/stormpath/sdk/impl/oauth/DefaultOAuthPolicyOptions.java deleted file mode 100644 index a54acfd031..0000000000 --- a/impl/src/main/java/com/stormpath/sdk/impl/oauth/DefaultOAuthPolicyOptions.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright 2017 Stormpath, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.stormpath.sdk.impl.oauth; - -import com.stormpath.sdk.impl.query.DefaultOptions; -import com.stormpath.sdk.oauth.OAuthPolicyOptions; - -/** - * @since 1.6.0 - */ -public class DefaultOAuthPolicyOptions extends DefaultOptions implements OAuthPolicyOptions{ - @Override - public OAuthPolicyOptions withScopes() { - return expand(DefaultOAuthPolicy.SCOPES); - } - - @Override - public OAuthPolicyOptions withScopes(int limit) { - return expand(DefaultOAuthPolicy.SCOPES, limit); - } - - @Override - public OAuthPolicyOptions withScopes(int limit, int offset) { - return expand(DefaultOAuthPolicy.SCOPES, limit, offset); - } -} From c51a472ba2ffd53e910ee1890870e9cf44a2c8d8 Mon Sep 17 00:00:00 2001 From: Brian Demers Date: Fri, 17 Mar 2017 11:53:07 -0400 Subject: [PATCH 17/21] Revert "penid-connect-new-OAuthPolicy-fields Fixing Test" This reverts commit 7592e7fa083c0bd64738a6bf44426a9bd8c52a54. --- .../com/stormpath/sdk/impl/oauth/DefaultOAuthPolicyTest.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/impl/src/test/groovy/com/stormpath/sdk/impl/oauth/DefaultOAuthPolicyTest.groovy b/impl/src/test/groovy/com/stormpath/sdk/impl/oauth/DefaultOAuthPolicyTest.groovy index 786afe5635..2c0e1df531 100644 --- a/impl/src/test/groovy/com/stormpath/sdk/impl/oauth/DefaultOAuthPolicyTest.groovy +++ b/impl/src/test/groovy/com/stormpath/sdk/impl/oauth/DefaultOAuthPolicyTest.groovy @@ -40,7 +40,7 @@ class DefaultOAuthPolicyTest { OAuthPolicy passwordPolicy = new DefaultOAuthPolicy(createStrictMock(InternalDataStore)) def propertyDescriptors = passwordPolicy.getPropertyDescriptors() - assertEquals(propertyDescriptors.size(), 9) + assertEquals(propertyDescriptors.size(), 5) assertTrue(propertyDescriptors.get("accessTokenTtl") instanceof StringProperty) assertTrue(propertyDescriptors.get("refreshTokenTtl") instanceof StringProperty) From 6a61ff117a8d5f40cd17424dc497acdd8e40535f Mon Sep 17 00:00:00 2001 From: Brian Demers Date: Fri, 17 Mar 2017 11:53:33 -0400 Subject: [PATCH 18/21] Revert "penid-connect-new-OAuthPolicy-fields" This reverts commit 6158fcc0072ea930269475ebcea984dae1c77c9a. --- .../com/stormpath/sdk/oauth/OAuthPolicy.java | 77 -------- .../sdk/oauth/openidconnect/Scope.java | 108 ---------- .../sdk/oauth/openidconnect/ScopeList.java | 26 --- .../sdk/impl/application/OAuthPolicyIT.groovy | 181 ----------------- .../sdk/impl/openidconnect/ScopeIT.groovy | 184 ------------------ .../sdk/impl/oauth/DefaultOAuthPolicy.java | 60 +----- .../oauth/openidconnect/DefaultScope.java | 124 ------------ .../oauth/openidconnect/DefaultScopeList.java | 57 ------ 8 files changed, 5 insertions(+), 812 deletions(-) delete mode 100644 api/src/main/java/com/stormpath/sdk/oauth/openidconnect/Scope.java delete mode 100644 api/src/main/java/com/stormpath/sdk/oauth/openidconnect/ScopeList.java delete mode 100644 extensions/httpclient/src/test/groovy/com/stormpath/sdk/impl/application/OAuthPolicyIT.groovy delete mode 100644 extensions/httpclient/src/test/groovy/com/stormpath/sdk/impl/openidconnect/ScopeIT.groovy delete mode 100644 impl/src/main/java/com/stormpath/sdk/impl/oauth/openidconnect/DefaultScope.java delete mode 100644 impl/src/main/java/com/stormpath/sdk/impl/oauth/openidconnect/DefaultScopeList.java diff --git a/api/src/main/java/com/stormpath/sdk/oauth/OAuthPolicy.java b/api/src/main/java/com/stormpath/sdk/oauth/OAuthPolicy.java index 0f97695fdc..e28dfc89bc 100644 --- a/api/src/main/java/com/stormpath/sdk/oauth/OAuthPolicy.java +++ b/api/src/main/java/com/stormpath/sdk/oauth/OAuthPolicy.java @@ -16,15 +16,10 @@ package com.stormpath.sdk.oauth; import com.stormpath.sdk.application.Application; -import com.stormpath.sdk.oauth.openidconnect.Scope; -import com.stormpath.sdk.oauth.openidconnect.ScopeList; import com.stormpath.sdk.resource.Resource; -import com.stormpath.sdk.resource.ResourceException; import com.stormpath.sdk.resource.Saveable; import com.stormpath.sdk.tenant.Tenant; -import java.util.Map; - /** * An OAuthPolicy resource is used to configure different aspects of the OAuth tokens associated * with an {@link Application Application} @@ -47,13 +42,6 @@ public interface OAuthPolicy extends Resource, Saveable { */ String getRefreshTokenTtl(); - /** - * Returns the Time To Live for the id tokens created for the parent {@link Application Application} expressed in a period of time format, for example: PT1H. - * - * @return the String representation of the Time To Live for the id tokens created for the parent {@link Application Application} - */ - String getIdTokenTtl(); - /** * The href corresponding to the Endpoint for Access Tokens created for the parent {@link Application Application} * @@ -83,71 +71,6 @@ public interface OAuthPolicy extends Resource, Saveable { */ OAuthPolicy setRefreshTokenTtl(String refreshTokenTtl); - /** - * Sets the Time To Live for the id tokens created for the parent {@link Application Application} expressed in a period of time format, for example: PT1H. - * - * @return this instance for method chaining. - */ - OAuthPolicy setIdTokenTtl(String idTokenTtl); - - /** - * Creates a new {@link Scope} assigned to this oauthPolicy in the Stormpath server and returns the created resource. - * The scope is used for openid connect flows. - * - * @param scope {@link Scope} pojo to hold necessary data to send to the back- end to create a {@link Scope}. - * @return the newly created {@link Scope}. - * - * @since 1.6.0 - */ - Scope createScope(Scope scope) throws ResourceException; - - /** - * Returns a paginated list of all the scopes that belong to the oAuthPolicy. - * - * @return a paginated list of all the oAuthPolicy's scopes. - * - * @since 1.6.0 - */ - ScopeList getScopes(); - - /** - * Returns access token attribute mappings. - * - * @return access token attribute mappings. - * - * @since 1.6.0 - */ - Map getAccessTokenAttributeMap(); - - /** - * Sets access token attribute mappings to be inserted into access tokens. - * - * @param accessTokenAttributeMap access token attribute mappings to be inserted into access tokens - * @return this instance for method chaining. - * - * @since 1.6.0 - */ - OAuthPolicy setAccessTokenAttributeMap(Map accessTokenAttributeMap); - - /** - * Returns id token attribute mappings. - * - * @return id token attribute mappings. - * - * @since 1.6.0 - */ - Map getIdTokenAttributeMap(); - - /** - * Sets id token attribute mappings to be inserted into id tokens. - * - * @param idTokenAttributeMap id token attribute mappings to be inserted into id tokens - * @return this instance for method chaining. - * - * @since 1.6.0 - */ - OAuthPolicy setIdTokenAttributeMap(Map idTokenAttributeMap); - /** * Returns the {@link Application Application} associated to this {@link OAuthPolicy OAuthPolicy} * diff --git a/api/src/main/java/com/stormpath/sdk/oauth/openidconnect/Scope.java b/api/src/main/java/com/stormpath/sdk/oauth/openidconnect/Scope.java deleted file mode 100644 index eecf3044ad..0000000000 --- a/api/src/main/java/com/stormpath/sdk/oauth/openidconnect/Scope.java +++ /dev/null @@ -1,108 +0,0 @@ -/* -* Copyright 2017 Stormpath, Inc. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -package com.stormpath.sdk.oauth.openidconnect; - -import com.stormpath.sdk.oauth.OAuthPolicy; -import com.stormpath.sdk.resource.Auditable; -import com.stormpath.sdk.resource.Deletable; -import com.stormpath.sdk.resource.Resource; -import com.stormpath.sdk.resource.Saveable; - -import java.util.Map; - -/** - * A Scope resource is used to configure different openid connect scopes - * with an {@link OAuthPolicy OAuthPolicy} - * - * @since 1.0.RC7 - */ -public interface Scope extends Resource, Saveable, Deletable, Auditable { - /** - * Returns the scope's name. - * - * @return the scope's name. - */ - String getName(); - - /** - * Sets the scope's name. - * @param name the scope's name. - * - * @return this instance for method chaining. - */ - Scope setName(String name); - - /** - * Returns the scope's friendly name. - * - * @return the scope's friendly name. - */ - String getFriendlyName(); - - /** - * Sets the scope's friendly name. - * - * @param name the scope's friendly name. - * @return this instance for method chaining. - */ - Scope setFriendlyName(String name); - - /** - * Returns the scope's description. - * - * @return the scope's description. - */ - String getDescription(); - - /** - * Sets the scope's description. - * @param description the scope's description. - * - * @return this instance for method chaining. - */ - Scope setDescription(String description); - - - /** - * Returns the scope's attribute mappings. - * - * @return the scope's attribute mappings. - */ - Map getAttributeMappings(); - - /** - * Sets the scope's attribute mappings. - * @param attributeMappings the scope's attribute mappings. - * - * @return this instance for method chaining. - */ - Scope setAttributeMappings(Map attributeMappings); - - /** - * Returns the {@link OAuthPolicy} associated with this scope. - * - * @return the {@link OAuthPolicy} associated with this scope. - */ - OAuthPolicy getOAuthPolicy(); - - /** - * Sets the {@link OAuthPolicy} associated with this scope. - * @param oAuthPolicy the {@link OAuthPolicy} associated with this scope. - * - * @return this instance for method chaining. - */ - Scope setOAuthPolicy(OAuthPolicy oAuthPolicy); -} diff --git a/api/src/main/java/com/stormpath/sdk/oauth/openidconnect/ScopeList.java b/api/src/main/java/com/stormpath/sdk/oauth/openidconnect/ScopeList.java deleted file mode 100644 index 7ae2825848..0000000000 --- a/api/src/main/java/com/stormpath/sdk/oauth/openidconnect/ScopeList.java +++ /dev/null @@ -1,26 +0,0 @@ -/* -* Copyright 2017 Stormpath, Inc. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -package com.stormpath.sdk.oauth.openidconnect; - -import com.stormpath.sdk.resource.CollectionResource; - -/** - * A {@link CollectionResource} containing {@link Scope} instances. - * - * @since 1.6.0 - */ -public interface ScopeList extends CollectionResource { -} diff --git a/extensions/httpclient/src/test/groovy/com/stormpath/sdk/impl/application/OAuthPolicyIT.groovy b/extensions/httpclient/src/test/groovy/com/stormpath/sdk/impl/application/OAuthPolicyIT.groovy deleted file mode 100644 index 734456cbdc..0000000000 --- a/extensions/httpclient/src/test/groovy/com/stormpath/sdk/impl/application/OAuthPolicyIT.groovy +++ /dev/null @@ -1,181 +0,0 @@ -/* - * Copyright 2017 Stormpath, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License") - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.stormpath.sdk.impl.application - -import com.stormpath.sdk.client.ClientIT -import com.stormpath.sdk.oauth.OAuthPolicy -import com.stormpath.sdk.oauth.openidconnect.Scope -import com.stormpath.sdk.oauth.openidconnect.ScopeList -import org.testng.annotations.Test - -import static org.testng.Assert.assertEquals -import static org.testng.Assert.assertNotNull -import static org.testng.Assert.assertFalse -/** - * @since 1.6.0 - */ -class OAuthPolicyIT extends ClientIT { - - @Test - void testPolicyCreatedForNewApplication() { - def app = createTempApp() - - OAuthPolicy oauthPolicy = app.getOAuthPolicy() - assertNotNull oauthPolicy - assertNotNull oauthPolicy.href - assertEquals oauthPolicy.getApplication().getHref(), app.href - } - - @Test - void testNewlyCreatedPolicyGotDefaultScopes(){ - def app = createTempApp() - - OAuthPolicy oauthPolicy = app.getOAuthPolicy() - assertNotNull oauthPolicy - assertNotNull oauthPolicy.href - assertEquals oauthPolicy.getApplication().getHref(), app.href - - def oAuthPolicyScopesEndPoint = oauthPolicy.href + "/scopes" - def scopes = client.getResource(oAuthPolicyScopesEndPoint, ScopeList.class) - assertEquals scopes.asList().size(), 3 - - assertNotNull scopes.asList().get(0).href - assertNotNull scopes.asList().get(1).href - assertNotNull scopes.asList().get(2).href - - for(def currentDefaultScope : scopes.asList()){ - assertNotNull(currentDefaultScope.name) - assertNotNull(currentDefaultScope.friendlyName) - assertNotNull(currentDefaultScope.description) - assertNotNull(currentDefaultScope.attributeMappings) - assertFalse(currentDefaultScope.attributeMappings.isEmpty()) - } - } - - @Test - void testPolicyExpandOnScopes(){ - def app = createTempApp() - def policyHref = app.getOAuthPolicy().href+"?expand=scopes" - - def oauthPolicy = client.getResource(policyHref, OAuthPolicy.class) - assertNotNull oauthPolicy - assertNotNull oauthPolicy.href - - assertEquals(oauthPolicy.scopes.size, 3) - assertNotNull(oauthPolicy.scopes.asList().get(0).href) - assertNotNull(oauthPolicy.scopes.asList().get(0).name) - assertNotNull(oauthPolicy.scopes.asList().get(1).href) - assertNotNull(oauthPolicy.scopes.asList().get(1).name) - assertNotNull(oauthPolicy.scopes.asList().get(2).href) - assertNotNull(oauthPolicy.scopes.asList().get(2).name) - } - - @Test - void testDeleteOAuthPolicyDeletesScopes(){ - // todo: openid connect uncomment the snippet below once cascading deletes are supported in SDK - // Cascading deletes are not supported in SDK for now - // Following issue will address it: https://github.com/stormpath/stormpath-sdk-java/issues/985 - //getDeletedResourceError(identityProvider.href, SamlIdentityProvider) - } - - @Test - void testRetrieveAndUpdateOAuthPolicy() { - def app = createTempApp() - - OAuthPolicy oauthPolicy = app.getOAuthPolicy() - assertNotNull oauthPolicy - assertEquals oauthPolicy.getApplication().getHref(), app.href - assertNotNull oauthPolicy.getTokenEndpoint() - assertNotNull oauthPolicy.getRevocationEndpoint() - assertNotNull oauthPolicy.getScopes() - assertNotNull oauthPolicy.getAccessTokenAttributeMap() - assertNotNull oauthPolicy.getIdTokenAttributeMap() - - ScopeList scopeList = client.getResource(oauthPolicy.getScopes().getHref(), ScopeList.class) - assertEquals scopeList.asList().size(), 3 - - Scope scope = client.instantiate(Scope.class) - scope.setName("testScope").setFriendlyName("friendly testing").setDescription("some description").setAttributeMappings(["name":"mapped_name"]) - scope = oauthPolicy.createScope(scope) - assertEquals scope.getOAuthPolicy().href, oauthPolicy.href - - scopeList = client.getResource(oauthPolicy.getScopes().getHref(), ScopeList.class) - assertEquals scopeList.asList().size(), 4 - - oauthPolicy.setAccessTokenTtl("P8D") - oauthPolicy.setRefreshTokenTtl("P2D") - oauthPolicy.setIdTokenTtl("P5D") - oauthPolicy.setAccessTokenAttributeMap(["atk1":"atv1"]) - oauthPolicy.setIdTokenAttributeMap(["itk1":"itv1", "itk2":"itv2"]) - oauthPolicy.save() - - oauthPolicy = app.getOAuthPolicy() - assertEquals oauthPolicy.getAccessTokenTtl(), "P8D" - assertEquals oauthPolicy.getRefreshTokenTtl(), "P2D" - assertEquals oauthPolicy.getIdTokenTtl(), "P5D" - assertEquals oauthPolicy.getAccessTokenAttributeMap(), ["atk1":"atv1"] - assertEquals oauthPolicy.getIdTokenAttributeMap(), ["itk1":"itv1", "itk2":"itv2"] - assertEquals oauthPolicy.getApplication().getHref(), app.href - - oauthPolicy.setAccessTokenAttributeMap(["atk1":"atv1", "atk2":"atv2"]) - oauthPolicy.setIdTokenAttributeMap(["itk1":"itv1"]) - oauthPolicy.save() - - oauthPolicy = app.getOAuthPolicy() - assertEquals oauthPolicy.getAccessTokenAttributeMap(), ["atk1":"atv1", "atk2":"atv2"] - assertEquals oauthPolicy.getIdTokenAttributeMap(), ["itk1":"itv1"] - } - - @Test - void testUpdateScopesUpdatesPolicyCollection(){ - def app = createTempApp() - - OAuthPolicy oauthPolicy = app.getOAuthPolicy() - assertNotNull oauthPolicy - assertEquals oauthPolicy.getApplication().getHref(), app.href - assertNotNull oauthPolicy.getScopes() - - def oAuthPolicyScopesEndPoint = oauthPolicy.href + "/scopes" - def scopes = client.getResource(oAuthPolicyScopesEndPoint, ScopeList.class) - - def items = scopes.asList() - - assertEquals(items.size, 3) - assertNotNull(items[0].href) - assertNotNull(items[1].href) - assertNotNull(items[2].href) - - items[0].setName("updatedName1") - items[1].setName("updatedName2") - items[2].setName("updatedName3") - - items[0].save() - items[1].save() - items[2].save() - - scopes = client.getResource(oAuthPolicyScopesEndPoint, ScopeList.class) - - items = scopes.asList() - - assertEquals(items.size, 3) - assertNotNull(items[0].href) - assertNotNull(items[1].href) - assertNotNull(items[2].href) - assertEquals(items[0].name, "updatedName1") - assertEquals(items[1].name, "updatedName2") - assertEquals(items[2].name, "updatedName3") - } -} diff --git a/extensions/httpclient/src/test/groovy/com/stormpath/sdk/impl/openidconnect/ScopeIT.groovy b/extensions/httpclient/src/test/groovy/com/stormpath/sdk/impl/openidconnect/ScopeIT.groovy deleted file mode 100644 index 4b9eeeab90..0000000000 --- a/extensions/httpclient/src/test/groovy/com/stormpath/sdk/impl/openidconnect/ScopeIT.groovy +++ /dev/null @@ -1,184 +0,0 @@ -/* - * Copyright 2017 Stormpath, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License") - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.stormpath.sdk.impl.openidconnect - -import com.stormpath.sdk.client.ClientIT -import com.stormpath.sdk.oauth.OAuthPolicy -import com.stormpath.sdk.oauth.openidconnect.Scope -import com.stormpath.sdk.oauth.openidconnect.ScopeList -import com.stormpath.sdk.resource.ResourceException -import org.testng.annotations.Test - -import static org.testng.Assert.assertEquals -import static org.testng.Assert.assertNotNull -import static org.testng.Assert.assertNull -import static org.testng.Assert.assertTrue - -/** - * @since 1.6.0 - */ -class ScopeIT extends ClientIT { - - @Test - void testGetPolicyScopes() { - - def app = createTempApp() - - OAuthPolicy oauthPolicy = app.getOAuthPolicy() - assertNotNull oauthPolicy - - ScopeList scopeList = client.getResource(oauthPolicy.getScopes().getHref(), ScopeList.class) - assertEquals app.getOAuthPolicy().scopes.href, scopeList.href - assertEquals scopeList.asList().size(), 3 - } - - @Test - void testCreateScope() { - def app = createTempApp() - assertNotNull app.getOAuthPolicy().href - assertNotNull app.getOAuthPolicy().scopes.href - - OAuthPolicy oAuthPolicy = app.getOAuthPolicy() - assertNotNull oAuthPolicy.href - - def oAuthPolicyScopesEndPoint = oAuthPolicy.href + "/scopes" - def scopeList = client.getResource(oAuthPolicyScopesEndPoint, ScopeList.class) - assertNotNull scopeList.href - - Scope scope = client.instantiate(Scope.class) - scope.setDescription("description") - - Throwable e = null - try{ - oAuthPolicy.createScope(scope) - } - catch(ResourceException re){ - e = re - assertEquals(re.status, 400) - assertEquals(re.getCode(), 2000) - } - assertTrue(e instanceof ResourceException) - - scope.setName("name").setAttributeMappings(["attribute1":"value1"]) - scope = oAuthPolicy.createScope(scope) - scope = client.getResource(scope.href, Scope.class) - - assertNotNull(scope.href) - assertNotNull(scope.name) - assertNull(scope.friendlyName) - assertNotNull(scope.description) - assertNotNull(scope.attributeMappings) - assertNotNull(scope.createdAt) - assertNotNull(scope.modifiedAt) - assertNotNull(scope.getOAuthPolicy()) - assertNotNull(scope.getOAuthPolicy().href) - } - - @Test - void testUpdateScope() { - def app = createTempApp() - assertNotNull app.getOAuthPolicy().href - assertNotNull app.getOAuthPolicy().scopes.href - - OAuthPolicy oAuthPolicy = app.getOAuthPolicy() - assertNotNull oAuthPolicy.href - - Scope scope = client.instantiate(Scope.class) - scope.setName("myScopeName").setAttributeMappings(["attribute1":"value1"]) - scope.setDescription("myScopeDescription") - - scope = oAuthPolicy.createScope(scope) - scope = client.getResource(scope.href, Scope.class) - - assertNotNull(scope.href) - assertEquals scope.name, "myScopeName" - assertNull(scope.friendlyName) - assertEquals scope.description, "myScopeDescription" - assertNotNull(scope.attributeMappings) - assertEquals scope.attributeMappings, ["attribute1":"value1"] - assertNotNull(scope.createdAt) - assertNotNull(scope.modifiedAt) - assertNotNull(scope.getOAuthPolicy()) - assertNotNull(scope.getOAuthPolicy().href) - - scope.setFriendlyName("myFriendlyName") - scope.setAttributeMappings(["attribute1":"value1", "attribute2":"value2"]) - scope.save() - scope = client.getResource(scope.href, Scope.class) - - assertNotNull(scope.href) - assertNotNull(scope.name) - assertEquals scope.friendlyName, "myFriendlyName" - assertNotNull(scope.description) - assertEquals scope.attributeMappings, ["attribute1":"value1", "attribute2":"value2"] - assertNotNull(scope.createdAt) - assertNotNull(scope.modifiedAt) - assertNotNull(scope.getOAuthPolicy()) - assertNotNull(scope.getOAuthPolicy().href) - - scope.setAttributeMappings(["attribute1":"value1"]) - scope.save() - scope = client.getResource(scope.href, Scope.class) - - assertNotNull(scope.href) - assertNotNull(scope.name) - assertEquals scope.friendlyName, "myFriendlyName" - assertNotNull(scope.description) - assertEquals scope.attributeMappings, ["attribute1":"value1"] - assertNotNull(scope.createdAt) - assertNotNull(scope.modifiedAt) - assertNotNull(scope.getOAuthPolicy()) - assertNotNull(scope.getOAuthPolicy().href) - } - - @Test - void testDeleteScope() { - def app = createTempApp() - assertNotNull app.getOAuthPolicy().href - assertNotNull app.getOAuthPolicy().scopes.href - - OAuthPolicy oAuthPolicy = app.getOAuthPolicy() - assertNotNull oAuthPolicy.href - - Scope scope = client.instantiate(Scope.class) - scope.setName("myScopeName").setAttributeMappings(["attribute1":"value1"]) - scope.setDescription("myScopeDescription") - - oAuthPolicy.createScope(scope) - - def oAuthPolicyScopesEndPoint = oAuthPolicy.href + "/scopes" - - def scopes = client.getResource(oAuthPolicyScopesEndPoint, ScopeList.class) - assertEquals scopes.size, 4 - - scope.delete() - - Throwable e = null - try{ - client.getResource(scope.href, Scope.class) - } - catch(ResourceException re){ - e = re - assertEquals(re.status, 404) - assertEquals(re.getCode(), 404) - } - assertTrue(e instanceof ResourceException) - - scopes = client.getResource(oAuthPolicyScopesEndPoint, ScopeList.class) - assertEquals scopes.size, 3 - } - -} diff --git a/impl/src/main/java/com/stormpath/sdk/impl/oauth/DefaultOAuthPolicy.java b/impl/src/main/java/com/stormpath/sdk/impl/oauth/DefaultOAuthPolicy.java index 4bec6c57c1..386055ada6 100644 --- a/impl/src/main/java/com/stormpath/sdk/impl/oauth/DefaultOAuthPolicy.java +++ b/impl/src/main/java/com/stormpath/sdk/impl/oauth/DefaultOAuthPolicy.java @@ -17,12 +17,12 @@ import com.stormpath.sdk.application.Application; import com.stormpath.sdk.impl.ds.InternalDataStore; -import com.stormpath.sdk.impl.resource.*; +import com.stormpath.sdk.impl.resource.AbstractInstanceResource; +import com.stormpath.sdk.impl.resource.Property; +import com.stormpath.sdk.impl.resource.ResourceReference; +import com.stormpath.sdk.impl.resource.StringProperty; import com.stormpath.sdk.lang.Assert; import com.stormpath.sdk.oauth.OAuthPolicy; -import com.stormpath.sdk.oauth.openidconnect.Scope; -import com.stormpath.sdk.oauth.openidconnect.ScopeList; -import com.stormpath.sdk.resource.ResourceException; import com.stormpath.sdk.tenant.Tenant; import java.util.Map; @@ -35,23 +35,16 @@ public class DefaultOAuthPolicy extends AbstractInstanceResource implements OAut // SIMPLE PROPERTIES static final StringProperty ACCESS_TOKEN_TTL = new StringProperty("accessTokenTtl"); static final StringProperty REFRESH_TOKEN_TTL = new StringProperty("refreshTokenTtl"); - static final StringProperty ID_TOKEN_TTL = new StringProperty("idTokenTtl"); static final StringProperty TOKEN_ENDPOINT = new StringProperty("tokenEndpoint"); static final StringProperty REVOCATION_ENDPOINT = new StringProperty("revocationEndpoint"); - static final CollectionReference SCOPES = - new CollectionReference<>("scopes", ScopeList.class, Scope.class); - - static final MapProperty ACCESS_TOKEN_ATTRIBUTE_MAPPINGS = new MapProperty("accessTokenAttributeMappings"); - static final MapProperty ID_TOKEN_ATTRIBUTE_MAPPINGS = new MapProperty("idTokenAttributeMappings"); - // INSTANCE RESOURCE REFERENCES: static final ResourceReference APPLICATION = new ResourceReference("application", Application.class); static final ResourceReference TENANT = new ResourceReference("tenant", Tenant.class); private static final Map PROPERTY_DESCRIPTORS = createPropertyDescriptorMap( - ACCESS_TOKEN_TTL, REFRESH_TOKEN_TTL, ID_TOKEN_TTL, TOKEN_ENDPOINT, SCOPES, ACCESS_TOKEN_ATTRIBUTE_MAPPINGS, ID_TOKEN_ATTRIBUTE_MAPPINGS, APPLICATION, TENANT); + ACCESS_TOKEN_TTL, REFRESH_TOKEN_TTL, TOKEN_ENDPOINT, APPLICATION, TENANT); @Override public Map getPropertyDescriptors() { @@ -76,9 +69,6 @@ public String getRefreshTokenTtl() { return getString(REFRESH_TOKEN_TTL); } - @Override - public String getIdTokenTtl() { return getString(ID_TOKEN_TTL); } - @Override public String getTokenEndpoint() { return getString(TOKEN_ENDPOINT); @@ -103,46 +93,6 @@ public OAuthPolicy setRefreshTokenTtl(String refreshTokenTtl) { return this; } - @Override - public OAuthPolicy setIdTokenTtl(String idTokenTtl) { - Assert.notNull(idTokenTtl, "idTokenTtl cannot be null."); - setProperty(ID_TOKEN_TTL, idTokenTtl); - return this; - } - - @Override - public Scope createScope(Scope scope) throws ResourceException { - Assert.notNull(scope, "Scope instance cannot be null."); - return getDataStore().create(getScopes().getHref(), scope); - } - - @Override - public ScopeList getScopes() { - return getResourceProperty(SCOPES); - } - - @Override - public Map getAccessTokenAttributeMap() { - return getMap(ACCESS_TOKEN_ATTRIBUTE_MAPPINGS); - } - - @Override - public OAuthPolicy setAccessTokenAttributeMap(Map accessTokenAttributeMap) { - setProperty(ACCESS_TOKEN_ATTRIBUTE_MAPPINGS, accessTokenAttributeMap); - return this; - } - - @Override - public Map getIdTokenAttributeMap() { - return getMap(ID_TOKEN_ATTRIBUTE_MAPPINGS); - } - - @Override - public OAuthPolicy setIdTokenAttributeMap(Map idTokenAttributeMap) { - setProperty(ID_TOKEN_ATTRIBUTE_MAPPINGS, idTokenAttributeMap); - return this; - } - @Override public Application getApplication() { return getResourceProperty(APPLICATION); diff --git a/impl/src/main/java/com/stormpath/sdk/impl/oauth/openidconnect/DefaultScope.java b/impl/src/main/java/com/stormpath/sdk/impl/oauth/openidconnect/DefaultScope.java deleted file mode 100644 index 31af164e66..0000000000 --- a/impl/src/main/java/com/stormpath/sdk/impl/oauth/openidconnect/DefaultScope.java +++ /dev/null @@ -1,124 +0,0 @@ -/* -* Copyright 2017 Stormpath, Inc. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -package com.stormpath.sdk.impl.oauth.openidconnect; - -import com.stormpath.sdk.impl.ds.InternalDataStore; -import com.stormpath.sdk.impl.resource.*; -import com.stormpath.sdk.oauth.OAuthPolicy; -import com.stormpath.sdk.oauth.openidconnect.Scope; - -import java.util.Date; -import java.util.Map; - -/** - * @since 1.6.0 - */ -public class DefaultScope extends AbstractInstanceResource implements Scope { - - static final StringProperty NAME = new StringProperty("name"); - static final StringProperty FRIENDLY_NAME = new StringProperty("friendlyName"); - static final StringProperty DESCRIPTION = new StringProperty("description"); - static final MapProperty ATTRIBUTE_MAPPINGS = new MapProperty("attributeMappings"); - public static final DateProperty CREATED_AT = new DateProperty("createdAt"); - public static final DateProperty MODIFIED_AT = new DateProperty("modifiedAt"); - - static final ResourceReference O_AUTH_POLICY = new ResourceReference<>("oAuthPolicy", OAuthPolicy.class); - - static final Map PROPERTY_DESCRIPTORS = createPropertyDescriptorMap(NAME, FRIENDLY_NAME, DESCRIPTION, ATTRIBUTE_MAPPINGS, O_AUTH_POLICY, CREATED_AT, MODIFIED_AT); - - public DefaultScope(InternalDataStore dataStore) { - super(dataStore); - } - - public DefaultScope(InternalDataStore dataStore, Map properties) { - super(dataStore, properties); - } - - @Override - public Map getPropertyDescriptors() { - return PROPERTY_DESCRIPTORS; - } - - @Override - public String getName() { - return getString(NAME); - } - - @Override - public Scope setName(String name) { - setProperty(NAME, name); - return this; - } - - @Override - public String getFriendlyName() { - return getString(FRIENDLY_NAME); - } - - @Override - public Scope setFriendlyName(String friendlyName) { - setProperty(FRIENDLY_NAME, friendlyName); - return this; - } - - @Override - public String getDescription() { - return getString(DESCRIPTION); - } - - @Override - public Scope setDescription(String description) { - setProperty(DESCRIPTION, description); - return this; - } - - @Override - public Map getAttributeMappings() { - return getMap(ATTRIBUTE_MAPPINGS); - } - - @Override - public Scope setAttributeMappings(Map attributeMappings) { - setProperty(ATTRIBUTE_MAPPINGS, attributeMappings); - return this; - } - - @Override - public OAuthPolicy getOAuthPolicy() { - return getResourceProperty(O_AUTH_POLICY); - } - - @Override - public Scope setOAuthPolicy(OAuthPolicy oAuthPolicy) { - setMaterializableResourceProperty(O_AUTH_POLICY, oAuthPolicy); - return this; - } - - @Override - public void delete() { - getDataStore().delete(this); - } - - @Override - public Date getCreatedAt() { - return getDateProperty(CREATED_AT); - } - - @Override - public Date getModifiedAt() { - return getDateProperty(MODIFIED_AT); - } -} diff --git a/impl/src/main/java/com/stormpath/sdk/impl/oauth/openidconnect/DefaultScopeList.java b/impl/src/main/java/com/stormpath/sdk/impl/oauth/openidconnect/DefaultScopeList.java deleted file mode 100644 index 79b5150cb1..0000000000 --- a/impl/src/main/java/com/stormpath/sdk/impl/oauth/openidconnect/DefaultScopeList.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright 2017 Stormpath, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.stormpath.sdk.impl.oauth.openidconnect; - -import com.stormpath.sdk.impl.ds.InternalDataStore; -import com.stormpath.sdk.impl.resource.AbstractCollectionResource; -import com.stormpath.sdk.impl.resource.ArrayProperty; -import com.stormpath.sdk.impl.resource.Property; -import com.stormpath.sdk.oauth.openidconnect.Scope; -import com.stormpath.sdk.oauth.openidconnect.ScopeList; - -import java.util.Map; - -/** - * @since 1.6.0 - */ -public class DefaultScopeList extends AbstractCollectionResource implements ScopeList { - - private static final ArrayProperty ITEMS = new ArrayProperty<>("items", Scope.class); - - private static final Map PROPERTY_DESCRIPTORS = createPropertyDescriptorMap(OFFSET, LIMIT, ITEMS); - - public DefaultScopeList(InternalDataStore dataStore) { - super(dataStore); - } - - public DefaultScopeList(InternalDataStore dataStore, Map properties) { - super(dataStore, properties); - } - - public DefaultScopeList(InternalDataStore dataStore, Map properties, Map queryParams) { - super(dataStore, properties, queryParams); - } - - @Override - protected Class getItemType() { - return Scope.class; - } - - @Override - public Map getPropertyDescriptors() { - return PROPERTY_DESCRIPTORS; - } -} From f0e275b6cdff90ec1f6087aa8d9fd48d273dd98c Mon Sep 17 00:00:00 2001 From: Brian Demers Date: Fri, 17 Mar 2017 16:45:18 -0400 Subject: [PATCH 19/21] reverting tck.sh change that removed STORMPATH_APPLICATION_HREF --- tck.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tck.sh b/tck.sh index 7fe9c28422..804d8c23d7 100755 --- a/tck.sh +++ b/tck.sh @@ -48,6 +48,7 @@ case "$OPTION" in echo "CI DIR Contents:" if [ -e "$SCRIPT_DIR/ci/stormpath_env.sh" ]; then source ${SCRIPT_DIR}/ci/stormpath_env.sh + export STORMPATH_APPLICATION_HREF=$STORMPATH_TEST_APPLICATION_HREF fi PROFILE=${OPTION_ARGUMENT01} DIR=${OPTION_ARGUMENT02} From 5cba8b5574232c9e5efcd1050e19240b7768e56c Mon Sep 17 00:00:00 2001 From: Brian Demers Date: Thu, 30 Mar 2017 10:01:30 -0400 Subject: [PATCH 20/21] Revert "temp echo to troubleshoot build issues" This reverts commit 1eb7729c63221a8c5b0398b91c21c17dccaf8c75. --- tck.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tck.sh b/tck.sh index 804d8c23d7..812c7b1c2d 100755 --- a/tck.sh +++ b/tck.sh @@ -46,6 +46,7 @@ case "$OPTION" in SCRIPT_DIR=$(cd "$(dirname "$0")"; pwd) CI_DIR_CONTENTS=`ls $SCRIPT_DIR/ci` echo "CI DIR Contents:" + echo $CI_DIR_CONTENTS if [ -e "$SCRIPT_DIR/ci/stormpath_env.sh" ]; then source ${SCRIPT_DIR}/ci/stormpath_env.sh export STORMPATH_APPLICATION_HREF=$STORMPATH_TEST_APPLICATION_HREF From 0eab775099b8421d39fe75f5c370f1d3e1eb311f Mon Sep 17 00:00:00 2001 From: Brian Demers Date: Thu, 30 Mar 2017 10:01:39 -0400 Subject: [PATCH 21/21] Revert "temp echo to troubleshoot build issues" This reverts commit 1afd2a83802ae93e98f3233d48271f08dc73b3ae. --- tck.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/tck.sh b/tck.sh index 812c7b1c2d..c8ebee1325 100755 --- a/tck.sh +++ b/tck.sh @@ -44,9 +44,6 @@ case "$OPTION" in ;; run) SCRIPT_DIR=$(cd "$(dirname "$0")"; pwd) - CI_DIR_CONTENTS=`ls $SCRIPT_DIR/ci` - echo "CI DIR Contents:" - echo $CI_DIR_CONTENTS if [ -e "$SCRIPT_DIR/ci/stormpath_env.sh" ]; then source ${SCRIPT_DIR}/ci/stormpath_env.sh export STORMPATH_APPLICATION_HREF=$STORMPATH_TEST_APPLICATION_HREF