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

Commit a066be8

Browse files
dogeareddogeared
committed
Merge 1.3.x
2 parents eaffb61 + 4871b8f commit a066be8

7 files changed

Lines changed: 78 additions & 36 deletions

File tree

‎bom/pom.xml‎

Lines changed: 49 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,6 @@
22
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
33
<modelVersion>4.0.0</modelVersion>
44

5-
<parent>
6-
<groupId>com.stormpath.sdk</groupId>
7-
<artifactId>stormpath-sdk-root</artifactId>
8-
<version>1.4.0-SNAPSHOT</version>
9-
<relativePath>../pom.xml</relativePath>
10-
</parent>
11-
125
<groupId>com.stormpath.sdk</groupId>
136
<artifactId>stormpath-bom</artifactId>
147
<name>Stormpath Java SDK :: BOM</name>
@@ -144,6 +137,54 @@
144137
<artifactId>stormpath-zuul-spring-cloud-starter</artifactId>
145138
<version>1.4.0-SNAPSHOT</version>
146139
</dependency>
140+
<!--
141+
Temporary fix to ensure correct version of Spring Security is in use with the Stormpath SDK
142+
This will be removed when Spring Boot 1.5 is released.
143+
-->
144+
<dependency>
145+
<groupId>org.springframework.security</groupId>
146+
<artifactId>spring-security-bom</artifactId>
147+
<version>4.2.1.RELEASE</version>
148+
<type>pom</type>
149+
<scope>import</scope>
150+
</dependency>
147151
</dependencies>
148152
</dependencyManagement>
149-
</project>
153+
154+
<profiles>
155+
<profile>
156+
<id>stormpath-signature</id>
157+
<build>
158+
<plugins>
159+
<plugin>
160+
<groupId>org.sonatype.plugins</groupId>
161+
<artifactId>nexus-staging-maven-plugin</artifactId>
162+
<version>1.6.7</version>
163+
<extensions>true</extensions>
164+
<configuration>
165+
<serverId>sonatype-nexus-staging</serverId>
166+
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
167+
<skipStagingRepositoryClose>true</skipStagingRepositoryClose>
168+
<autoReleaseAfterClose>false</autoReleaseAfterClose>
169+
</configuration>
170+
</plugin>
171+
<plugin>
172+
<groupId>org.apache.maven.plugins</groupId>
173+
<artifactId>maven-gpg-plugin</artifactId>
174+
<version>1.4</version>
175+
<executions>
176+
<execution>
177+
<id>sign-artifacts</id>
178+
<phase>verify</phase>
179+
<goals>
180+
<goal>sign</goal>
181+
</goals>
182+
</execution>
183+
</executions>
184+
</plugin>
185+
</plugins>
186+
</build>
187+
</profile>
188+
</profiles>
189+
190+
</project>

‎changelog.md‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
## Change Log ##
22

3+
### 1.3.1 ##
4+
5+
See [1.3.1 closed issues](https://github.com/stormpath/stormpath-sdk-java/issues?q=milestone%3A1.3.1+is%3Aclosed)
6+
37
### 1.3.0 ##
48

59
This release has a number of feature additions and bug fixes. Of note:
@@ -24,6 +28,10 @@ This release has a number of feature additions and bug fixes. Of note:
2428

2529
See [1.3.0 closed issues](https://github.com/stormpath/stormpath-sdk-java/issues?q=milestone%3A1.3.0+is%3Aclosed)
2630

31+
### 1.2.5 ##
32+
33+
See [1.2.5 closed issues](https://github.com/stormpath/stormpath-sdk-java/issues?q=milestone%3A1.2.5+is%3Aclosed)
34+
2735
### 1.2.4 ##
2836

2937
This release fixes a bug whereby an Account would be cached with UNVERIFIED status which would interfere with a user
@@ -65,6 +73,10 @@ This release has a number of feature additions and bug fixes. Of note:
6573

6674
See [1.2.0 closed issues](https://github.com/stormpath/stormpath-sdk-java/issues?q=milestone%3A1.2.0+is%3Aclosed) for a complete list of changes.
6775

76+
### 1.1.7 ##
77+
78+
See [1.1.7 closed issues](https://github.com/stormpath/stormpath-sdk-java/issues?q=milestone%3A1.1.7+is%3Aclosed)
79+
6880
### 1.1.6 ##
6981

7082
This release fixes a bug whereby an Account would be cached with UNVERIFIED status which would interfere with a user

‎extensions/servlet/src/main/java/com/stormpath/sdk/servlet/mvc/RegisterController.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,10 @@ public void visit(Organization organization) {
259259
}
260260

261261
AccountStatus status = account.getStatus();
262+
if (status == AccountStatus.UNVERIFIED) {
263+
// purge account from cache in case status is updated on the backend
264+
invalidateAccountCache(account);
265+
}
262266

263267
if (isJsonPreferred(req, resp)) {
264268
//noinspection unchecked
@@ -275,8 +279,6 @@ public void visit(Organization organization) {
275279
return new DefaultViewModel(loginUri + "?status=created").setRedirect(true);
276280
}
277281
} else if (status == AccountStatus.UNVERIFIED) {
278-
// purge account from cache in case status is updated on the backend
279-
invalidateAccountCache(account);
280282
return new DefaultViewModel(loginUri + "?status=unverified").setRedirect(true);
281283
}
282284
return new DefaultViewModel(nextUri).setRedirect(true);

‎extensions/spring/boot/stormpath-spring-boot-starter/pom.xml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,18 +38,10 @@
3838
<artifactId>spring-boot-configuration-processor</artifactId>
3939
<optional>true</optional>
4040
</dependency>
41-
<dependency>
42-
<groupId>org.springframework</groupId>
43-
<artifactId>spring-core</artifactId>
44-
</dependency>
4541
<dependency>
4642
<groupId>com.stormpath.spring</groupId>
4743
<artifactId>stormpath-spring</artifactId>
4844
</dependency>
49-
<dependency>
50-
<groupId>com.stormpath.sdk</groupId>
51-
<artifactId>stormpath-sdk-api</artifactId>
52-
</dependency>
5345
<dependency>
5446
<groupId>com.stormpath.sdk</groupId>
5547
<artifactId>stormpath-sdk-impl</artifactId>

‎extensions/spring/stormpath-spring-security-webmvc/pom.xml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
</properties>
3434

3535
<dependencies>
36-
3736
<!-- Required dependencies: -->
3837
<dependency>
3938
<groupId>com.stormpath.sdk</groupId>
@@ -67,10 +66,6 @@
6766
<groupId>org.springframework</groupId>
6867
<artifactId>spring-webmvc</artifactId>
6968
</dependency>
70-
<dependency>
71-
<groupId>org.springframework.security</groupId>
72-
<artifactId>spring-security-config</artifactId>
73-
</dependency>
7469
<dependency>
7570
<groupId>org.springframework.security</groupId>
7671
<artifactId>spring-security-web</artifactId>
@@ -114,8 +109,6 @@
114109
<artifactId>jsoup</artifactId>
115110
<version>${jsoup.version}</version>
116111
</dependency>
117-
118-
119112
</dependencies>
120113

121114
</project>

‎extensions/spring/stormpath-spring-security/pom.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,6 @@
3535
<groupId>com.stormpath.spring</groupId>
3636
<artifactId>stormpath-spring</artifactId>
3737
</dependency>
38-
<dependency>
39-
<groupId>org.springframework.security</groupId>
40-
<artifactId>spring-security-core</artifactId>
41-
</dependency>
4238
<dependency>
4339
<groupId>org.springframework.security</groupId>
4440
<artifactId>spring-security-config</artifactId>

‎pom.xml‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,9 @@
103103
<servlet.version>3.1.0</servlet.version>
104104
<spring.version>4.3.5.RELEASE</spring.version>
105105
<spring.boot.version>1.4.3.RELEASE</spring.boot.version>
106-
<spring.cloud.netflix.version>1.1.5.RELEASE</spring.cloud.netflix.version>
106+
<spring.cloud.netflix.version>1.2.4.RELEASE</spring.cloud.netflix.version>
107107
<spring.security.version>4.2.1.RELEASE</spring.security.version>
108-
<zuul.version>1.2.2</zuul.version>
108+
<zuul.version>1.3.0</zuul.version>
109109

110110
<!-- Test Dependencies: Only required for testing when building the SDK. Not required by SDK users at runtime: -->
111111
<groovy.version>2.4.7</groovy.version>
@@ -322,6 +322,14 @@
322322
<groupId>commons-logging</groupId>
323323
<artifactId>commons-logging</artifactId>
324324
</exclusion>
325+
<exclusion>
326+
<artifactId>groovy-all</artifactId>
327+
<groupId>org.codehaus.groovy</groupId>
328+
</exclusion>
329+
<exclusion>
330+
<artifactId>mockito-all</artifactId>
331+
<groupId>org.mockito</groupId>
332+
</exclusion>
325333
</exclusions>
326334
</dependency>
327335
<dependency>
@@ -421,10 +429,6 @@
421429
<groupId>com.netflix.zuul</groupId>
422430
<artifactId>zuul-core</artifactId>
423431
</exclusion>
424-
<exclusion>
425-
<groupId>org.springframework.boot</groupId>
426-
<artifactId>spring-boot-starter-web</artifactId>
427-
</exclusion>
428432
</exclusions>
429433
</dependency>
430434
<dependency>
@@ -662,7 +666,9 @@
662666
<configuration>
663667
<rules>
664668
<requireMavenVersion>
665-
<message>You are running an older version of Maven. The Stormpath Java SDK requires at least Maven 3.3.9</message>
669+
<message>You are running an older version of Maven. The Stormpath Java SDK requires
670+
at least Maven 3.3.9
671+
</message>
666672
<version>[3.3.9,)</version>
667673
</requireMavenVersion>
668674
</rules>

0 commit comments

Comments
 (0)