Merge branch 'master' into Openid-connect-new-OAuthPolicy-fields

stormpath · Feb 3, 2017 · aaf6ab2 · aaf6ab2
2 parents 7592e7f + fdc2503
commit aaf6ab2
Show file tree

Hide file tree

Showing 19 changed files with 64 additions and 57 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,19 @@
 ## Change Log ##
 
+### 1.5.2 ##
+
+* Added static default page with Logout button for empty Spring Boot projects, such as those created by start.spring.io
+* Updated to Spring Boot 1.5.1 and removed workaround exclusions
+* Fixed runtime bug whereby exception was thrown when dealing with non-resource maps
+
+See [1.5.2 closed issues](https://github.com/stormpath/stormpath-sdk-java/issues?q=milestone%3A1.5.2+is%3Aclosed)
+
+### 1.5.1 ##
+
+* Removed unnecessary throws in AccountStoreVisitorAdapter
+
+See [1.5.1 closed issues](https://github.com/stormpath/stormpath-sdk-java/issues?q=milestone%3A1.5.1+is%3Aclosed)
+
 ### 1.5.0 ##
 
 * Added passwordPolicy to registration json model to support Client API

diff --git a/examples/spring-boot-default/pom.xml b/examples/spring-boot-default/pom.xml
@@ -37,7 +37,7 @@
         <logback.version>1.1.8</logback.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <slf4j.version>1.7.22</slf4j.version>
-        <spring.boot.version>1.5.0.RELEASE</spring.boot.version>
+        <spring.boot.version>1.5.1.RELEASE</spring.boot.version>
     </properties>
 
     <dependencies>

diff --git a/examples/spring-boot-webmvc-angular/pom.xml b/examples/spring-boot-webmvc-angular/pom.xml
@@ -38,7 +38,7 @@
         <bootstrap.version>3.3.7</bootstrap.version>
         <logback.version>1.1.8</logback.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <spring.boot.version>1.5.0.RELEASE</spring.boot.version>
+        <spring.boot.version>1.5.1.RELEASE</spring.boot.version>
         <stormpath.angular.version>1.0.0</stormpath.angular.version>
         <webjars.locator.version>0.32</webjars.locator.version>
     </properties>

diff --git a/examples/spring-boot-webmvc/pom.xml b/examples/spring-boot-webmvc/pom.xml
@@ -36,7 +36,7 @@
         <jdk.version>1.7</jdk.version>
         <logback.version>1.1.8</logback.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <spring.boot.version>1.5.0.RELEASE</spring.boot.version>
+        <spring.boot.version>1.5.1.RELEASE</spring.boot.version>
     </properties>
 
     <dependencies>

diff --git a/examples/spring-boot/pom.xml b/examples/spring-boot/pom.xml
@@ -36,7 +36,7 @@
         <jdk.version>1.7</jdk.version>
         <logback.version>1.1.8</logback.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <spring.boot.version>1.5.0.RELEASE</spring.boot.version>
+        <spring.boot.version>1.5.1.RELEASE</spring.boot.version>
     </properties>
 
     <dependencies>

diff --git a/examples/spring-security-spring-boot-webmvc-bare-bones/pom.xml b/examples/spring-security-spring-boot-webmvc-bare-bones/pom.xml
@@ -37,7 +37,7 @@
         <logback.version>1.1.8</logback.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <slf4j.version>1.7.22</slf4j.version>
-        <spring.boot.version>1.5.0.RELEASE</spring.boot.version>
+        <spring.boot.version>1.5.1.RELEASE</spring.boot.version>
         <tomcat.version>8.5.9</tomcat.version>
     </properties>
 

diff --git a/examples/spring-security-spring-boot-webmvc/pom.xml b/examples/spring-security-spring-boot-webmvc/pom.xml
@@ -38,7 +38,7 @@
         <logback.version>1.1.8</logback.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <slf4j.version>1.7.22</slf4j.version>
-        <spring.boot.version>1.5.0.RELEASE</spring.boot.version>
+        <spring.boot.version>1.5.1.RELEASE</spring.boot.version>
         <tomcat.version>8.5.9</tomcat.version>
     </properties>
 

diff --git a/extensions/spring/boot/stormpath-spring-boot-starter/pom.xml b/extensions/spring/boot/stormpath-spring-boot-starter/pom.xml
@@ -37,17 +37,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-configuration-processor</artifactId>
             <optional>true</optional>
-            <!--
-                TODO
-                temporary workaround per https://github.com/spring-projects/spring-boot/issues/8136
-                remove after spring boot 1.5.1 is released
-            -->
-            <exclusions>
-                <exclusion>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-test-support</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.stormpath.spring</groupId>

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
@@ -42,17 +42,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-configuration-processor</artifactId>
             <optional>true</optional>
-            <!--
-                TODO
-                temporary workaround per https://github.com/spring-projects/spring-boot/issues/8136
-                remove after spring boot 1.5.1 is released
-            -->
-            <exclusions>
-                <exclusion>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-test-support</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <!-- Testing-only dependencies: -->

diff --git a/.../spring/boot/stormpath-thymeleaf-spring-boot-starter/src/main/resources/static/index.html b/.../spring/boot/stormpath-thymeleaf-spring-boot-starter/src/main/resources/static/index.html
@@ -0,0 +1,37 @@
+<!--/*
+~ Copyright 2016 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.
+*/-->
+<!DOCTYPE html>
+<html>
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+    <meta charset="utf-8"/>
+    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
+    <meta name="viewport" content="width=device-width, initial-scale=1"/>
+    <link href="//netdna.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" rel="stylesheet" type="text/css"/>
+</head>
+<body>
+<div class="container text-center">
+    You've reached the default home page.<br/>
+    It can be easily overridden by providing a Controller mapped to "/"
+
+    <form method="post" action="/logout">
+        <input type="submit" class="btn btn-danger" value="Logout"/>
+    </form>
+</div>
+<script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
+<script src="//netdna.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"></script>
+</body>
+</html>
diff --git a/extensions/spring/boot/stormpath-webmvc-spring-boot-starter/pom.xml b/extensions/spring/boot/stormpath-webmvc-spring-boot-starter/pom.xml
@@ -75,17 +75,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-configuration-processor</artifactId>
             <optional>true</optional>
-            <!--
-                TODO
-                temporary workaround per https://github.com/spring-projects/spring-boot/issues/8136
-                remove after spring boot 1.5.1 is released
-            -->
-            <exclusions>
-                <exclusion>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-test-support</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <dependency>

diff --git a/extensions/spring/cloud/stormpath-zuul-spring-cloud-starter/pom.xml b/extensions/spring/cloud/stormpath-zuul-spring-cloud-starter/pom.xml
@@ -50,17 +50,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-configuration-processor</artifactId>
             <optional>true</optional>
-            <!--
-                TODO
-                temporary workaround per https://github.com/spring-projects/spring-boot/issues/8136
-                remove after spring boot 1.5.1 is released
-            -->
-            <exclusions>
-                <exclusion>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-test-support</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
     </dependencies>
 </project>
diff --git a/pom.xml b/pom.xml
@@ -102,7 +102,7 @@
         <snakeyaml.version>1.17</snakeyaml.version>
         <servlet.version>3.1.0</servlet.version>
         <spring.version>4.3.5.RELEASE</spring.version>
-        <spring.boot.version>1.5.0.RELEASE</spring.boot.version>
+        <spring.boot.version>1.5.1.RELEASE</spring.boot.version>
         <spring.cloud.netflix.version>1.2.4.RELEASE</spring.cloud.netflix.version>
         <spring.security.version>4.2.1.RELEASE</spring.security.version>
         <zuul.version>1.3.0</zuul.version>

diff --git a/tutorials/spring-boot/00-the-basics/pom.xml b/tutorials/spring-boot/00-the-basics/pom.xml
@@ -36,7 +36,7 @@
     <properties>
         <logback.version>1.1.8</logback.version>
         <slf4j.version>1.7.22</slf4j.version>
-        <spring.boot.version>1.5.0.RELEASE</spring.boot.version>
+        <spring.boot.version>1.5.1.RELEASE</spring.boot.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 

diff --git a/tutorials/spring-boot/01-some-access-controls/pom.xml b/tutorials/spring-boot/01-some-access-controls/pom.xml
@@ -35,7 +35,7 @@
     <properties>
         <logback.version>1.1.8</logback.version>
         <slf4j.version>1.7.22</slf4j.version>
-        <spring.boot.version>1.5.0.RELEASE</spring.boot.version>
+        <spring.boot.version>1.5.1.RELEASE</spring.boot.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 

diff --git a/tutorials/spring-boot/02-spring-security-ftw/pom.xml b/tutorials/spring-boot/02-spring-security-ftw/pom.xml
@@ -35,7 +35,7 @@
     <properties>
         <logback.version>1.1.8</logback.version>
         <slf4j.version>1.7.22</slf4j.version>
-        <spring.boot.version>1.5.0.RELEASE</spring.boot.version>
+        <spring.boot.version>1.5.1.RELEASE</spring.boot.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 

diff --git a/tutorials/spring-boot/03-spring-security-refined/pom.xml b/tutorials/spring-boot/03-spring-security-refined/pom.xml
@@ -35,7 +35,7 @@
     <properties>
         <logback.version>1.1.8</logback.version>
         <slf4j.version>1.7.22</slf4j.version>
-        <spring.boot.version>1.5.0.RELEASE</spring.boot.version>
+        <spring.boot.version>1.5.1.RELEASE</spring.boot.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 

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
@@ -35,7 +35,7 @@
     <properties>
         <logback.version>1.1.8</logback.version>
         <slf4j.version>1.7.22</slf4j.version>
-        <spring.boot.version>1.5.0.RELEASE</spring.boot.version>
+        <spring.boot.version>1.5.1.RELEASE</spring.boot.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 

diff --git a/tutorials/spring-boot/05-token-management/pom.xml b/tutorials/spring-boot/05-token-management/pom.xml
@@ -35,7 +35,7 @@
     <properties>
         <logback.version>1.1.8</logback.version>
         <slf4j.version>1.7.22</slf4j.version>
-        <spring.boot.version>1.5.0.RELEASE</spring.boot.version>
+        <spring.boot.version>1.5.1.RELEASE</spring.boot.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>