version update for 1.1.18 hotfix release

AzureAD · Apr 25, 2016 · 2da7ad7 · 2da7ad7
1 parent eb38056
commit 2da7ad7
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@ A Work Account is an identity you use to get work done no matter if at your busi
 ## ADAL for Android 1.0 Released!
 
 Thanks to all your great feedback over the preview period, we have released 1.0 (GA) of the Microsoft Azure Active Directory Library for Android! 
-Recent version is 1.1.17
+Recent version is 1.1.18
 
 ## Features
 * Industry standard Oauth2 protocol support.

diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,7 @@
+Version 1.1.18
+--------------
+(Hotfix) Revert the checking for private key before unwrapping
+
 Version 1.1.17
 --------------
 Fix for checking retrieved private key before unwrapping symmetric key, avoid the crash for InvalidArgumentException when key data is wiped by keystore but not alias

diff --git a/pom.xml b/pom.xml
@@ -17,7 +17,7 @@
   <properties>
     <scm.branch>master</scm.branch>
     <maven.version>3.1.1</maven.version>
-    <adal.version>1.1.17</adal.version>
+    <adal.version>1.1.18</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>

diff --git a/src/pom.xml b/src/pom.xml
@@ -4,13 +4,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.microsoft.aad</groupId>
   <artifactId>adal</artifactId>
-  <version>1.1.17</version>
+  <version>1.1.18</version>
   <packaging>aar</packaging>
   <name>adal</name>
   <properties>
     <scm.branch>master</scm.branch>
     <maven.version>3.1.1</maven.version>
-    <adal.version>1.1.17</adal.version>
+    <adal.version>1.1.18</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>

diff --git a/src/src/com/microsoft/aad/adal/AuthenticationContext.java b/src/src/com/microsoft/aad/adal/AuthenticationContext.java
@@ -2222,7 +2222,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.1.17";
+        return "1.1.18";
     }
 
     /**