Skip to content

Commit

Permalink
Merge branch 'servicing'
Browse files Browse the repository at this point in the history
  • Loading branch information
weijjia committed Aug 11, 2016
2 parents f48cf4d + 5d8cec8 commit 3440a5f
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 5 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ A Work Account is an identity you use to get work done no matter if at your busi

## ADAL for Android 1.2 Released!

Recent version is 1.2.1
Recent version is 1.2.2

## Features
* Industry standard Oauth2 protocol support.
Expand Down
4 changes: 4 additions & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
Version 1.2.2
--------------
Fix for silent RT request, if TokenCacheItem desn't contain RT, don't continue with RT request.

Version 1.2.1
--------------
Add certificate chain validation
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<properties>
<scm.branch>master</scm.branch>
<maven.version>3.1.1</maven.version>
<adal.version>1.2.1</adal.version>
<adal.version>1.2.2</adal.version>
<android.platform.maven.plugin>21</android.platform.maven.plugin>
<android.version>[4.1.1.4,)</android.version>
<android.support.version>[21,)</android.support.version>
Expand Down
4 changes: 2 additions & 2 deletions src/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.microsoft.aad</groupId>
<artifactId>adal</artifactId>
<version>1.2.1</version>
<version>1.2.2</version>
<packaging>aar</packaging>
<name>adal</name>
<properties>
<scm.branch>master</scm.branch>
<maven.version>3.1.1</maven.version>
<adal.version>1.2.1</adal.version>
<adal.version>1.2.2</adal.version>
<android.platform.maven.plugin>21</android.platform.maven.plugin>
<android.version>[4.1.1.4,)</android.version>
<android.support.version>[21,)</android.support.version>
Expand Down
2 changes: 1 addition & 1 deletion src/src/com/microsoft/aad/adal/AuthenticationContext.java
Original file line number Diff line number Diff line change
Expand Up @@ -1936,7 +1936,7 @@ public static String getVersionName() {
// Package manager does not report for ADAL
// AndroidManifest files are not merged, so it is returning hard coded
// value
return "1.2.1";
return "1.2.2";
}

/**
Expand Down

0 comments on commit 3440a5f

Please sign in to comment.