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

Commit 94925b3

Browse files
author
josebarrueta
committed
Merge branch 'master' into 1.3.x
2 parents 5c17776 + 4a4d185 commit 94925b3

File tree

58 files changed

+239
-103
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+239
-103
lines changed

‎api/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>com.stormpath.sdk</groupId>
2323
<artifactId>stormpath-sdk-root</artifactId>
24-
<version>1.2.1-SNAPSHOT</version>
24+
<version>1.2.2-SNAPSHOT</version>
2525
<relativePath>../pom.xml</relativePath>
2626
</parent>
2727

‎api/src/main/java/com/stormpath/sdk/lang/Strings.java‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
package com.stormpath.sdk.lang;
1717

1818
import java.nio.charset.Charset;
19+
import java.nio.charset.StandardCharsets;
1920
import java.util.ArrayList;
2021
import java.util.Arrays;
2122
import java.util.Collection;
@@ -1264,4 +1265,34 @@ public static String arrayToCommaDelimitedString(Object[] arr) {
12641265
return arrayToDelimitedString(arr, ",");
12651266
}
12661267

1268+
/**
1269+
* Calls {@link String#getBytes(Charset)}
1270+
*
1271+
* @param string The string to encode (if null, return null).
1272+
* @param charset The {@link Charset} to encode the <code>String</code>
1273+
* @return the encoded bytes
1274+
* @since 1.2.1
1275+
*/
1276+
private static byte[] getBytes(final String string, final Charset charset) {
1277+
if (string == null) {
1278+
return null;
1279+
}
1280+
return string.getBytes(charset);
1281+
}
1282+
1283+
/**
1284+
* Encodes the given string into a sequence of bytes using the UTF-8 charset, storing the result into a new byte
1285+
* array.
1286+
*
1287+
* @param string the String to encode, may be <code>null</code>
1288+
* @return encoded bytes, or <code>null</code> if the input string was <code>null</code>
1289+
* @throws NullPointerException Thrown if {@link StandardCharsets#UTF_8} is not initialized, which should never happen since it is
1290+
* required by the Java platform specification.
1291+
* @see <a href="http://download.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
1292+
* @since 1.2.1
1293+
*/
1294+
public static byte[] getBytesUtf8(final String string) {
1295+
return getBytes(string, StandardCharsets.UTF_8);
1296+
}
1297+
12671298
}

‎changelog.md‎

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

3+
### 1.2.1 ##
4+
5+
This release fixes four bugs. We are adding one more supported grant_type to the AccessTokenController, also enhancing the signature validation of access/refresh tokens and improving error handing when required fields are missing in the token endpoint.
6+
7+
See [1.2.1 closed bugs](https://github.com/stormpath/stormpath-sdk-java/issues?q=milestone%3A1.2.1+is%3Aclosed)
8+
39
### 1.2.0 ##
410

511
This release has a number of feature additions and bug fixes. Of note:

‎ci/before_install.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export IS_RELEASE="$([ ${RELEASE_VERSION/SNAPSHOT} == $RELEASE_VERSION ] && [ $T
1414
export BUILD_DOCS="$([ $TRAVIS_JDK_VERSION == 'oraclejdk8' ] && echo 'true')"
1515
export RUN_ITS="$([ $TRAVIS_JDK_VERSION == 'openjdk7' ] && echo 'true')"
1616
#Install Maven 3.3.9 since Travis uses 3.2 by default
17-
wget https://archive.apache.org/dist/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.zip
17+
wget http://mirror.cc.columbia.edu/pub/software/apache/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.zip
1818
unzip -qq apache-maven-3.3.9-bin.zip
1919
export M2_HOME=$PWD/apache-maven-3.3.9
2020
export PATH=$M2_HOME/bin:$PATH

‎clover/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>com.stormpath.sdk</groupId>
2323
<artifactId>stormpath-sdk-root</artifactId>
24-
<version>1.2.1-SNAPSHOT</version>
24+
<version>1.2.2-SNAPSHOT</version>
2525
<relativePath>../pom.xml</relativePath>
2626
</parent>
2727

‎examples/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@
2121
<parent>
2222
<groupId>com.stormpath.sdk</groupId>
2323
<artifactId>stormpath-sdk-root</artifactId>
24-
<version>1.2.1-SNAPSHOT</version>
24+
<version>1.2.2-SNAPSHOT</version>
2525
<relativePath>../pom.xml</relativePath>
2626
</parent>
2727

2828
<artifactId>stormpath-sdk-examples</artifactId>
2929
<groupId>com.stormpath.sdk</groupId>
30-
<version>1.2.1-SNAPSHOT</version>
30+
<version>1.2.2-SNAPSHOT</version>
3131
<name>Stormpath Java SDK :: Examples</name>
3232
<packaging>pom</packaging>
3333

‎examples/quickstart/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
<parent>
66
<groupId>com.stormpath.sdk</groupId>
77
<artifactId>stormpath-sdk-examples</artifactId>
8-
<version>1.2.1-SNAPSHOT</version>
8+
<version>1.2.2-SNAPSHOT</version>
99
<relativePath>../pom.xml</relativePath>
1010
</parent>
1111

1212
<groupId>com.stormpath.sdk</groupId>
1313
<artifactId>stormpath-sdk-examples-quickstart</artifactId>
14-
<version>1.2.1-SNAPSHOT</version>
14+
<version>1.2.2-SNAPSHOT</version>
1515

1616
<name>Stormpath Java SDK :: Examples :: Quickstart Code</name>
1717
<description>A simple (non-web) application to demonstrate the example code in the Stormpath Java Quickstart</description>

‎examples/servlet/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
<parent>
2222
<groupId>com.stormpath.sdk</groupId>
2323
<artifactId>stormpath-sdk-examples</artifactId>
24-
<version>1.2.1-SNAPSHOT</version>
24+
<version>1.2.2-SNAPSHOT</version>
2525
<relativePath>../pom.xml</relativePath>
2626
</parent>
2727

2828
<artifactId>stormpath-sdk-examples-servlet</artifactId>
29-
<version>1.2.1-SNAPSHOT</version>
29+
<version>1.2.2-SNAPSHOT</version>
3030
<name>Stormpath Java SDK :: Examples :: Servlet Container-based Webapp</name>
3131
<description>A simple example webapp deployed in a servlet container.</description>
3232
<packaging>war</packaging>

‎examples/spring-boot-default/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@
2121
<parent>
2222
<groupId>com.stormpath.sdk</groupId>
2323
<artifactId>stormpath-sdk-examples</artifactId>
24-
<version>1.2.1-SNAPSHOT</version>
24+
<version>1.2.2-SNAPSHOT</version>
2525
<relativePath>../pom.xml</relativePath>
2626
</parent>
2727

2828
<groupId>com.stormpath.spring</groupId>
2929
<artifactId>stormpath-sdk-examples-spring-boot-default</artifactId>
30-
<version>1.2.1-SNAPSHOT</version>
30+
<version>1.2.2-SNAPSHOT</version>
3131

3232
<name>Stormpath Java SDK :: Examples :: Spring Boot Default</name>
3333
<description>A simple Spring Boot Web MVC application with out-of-the-box login and self-service screens!</description>

‎examples/spring-boot-webmvc-angular/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@
2121
<parent>
2222
<groupId>com.stormpath.sdk</groupId>
2323
<artifactId>stormpath-sdk-examples</artifactId>
24-
<version>1.2.1-SNAPSHOT</version>
24+
<version>1.2.2-SNAPSHOT</version>
2525
<relativePath>../pom.xml</relativePath>
2626
</parent>
2727

2828
<groupId>com.stormpath.spring</groupId>
2929
<artifactId>stormpath-sdk-examples-spring-boot-web-angular</artifactId>
30-
<version>1.2.1-SNAPSHOT</version>
30+
<version>1.2.2-SNAPSHOT</version>
3131

3232
<name>Stormpath Java SDK :: Examples :: Spring Boot + Angular Webapp</name>
3333
<description>A Spring Boot web application that uses Stormpath.</description>

0 commit comments

Comments
 (0)