Merge pull request #1696 from AzureAD/amgusain/merge-release-4.1.0-to-dev

iamgusain · web-flow · commit 9c69ae723f94 · 2022-06-30T13:32:42.000-07:00
Merge release/4.1.0 to dev
diff --git a/adal/versioning/version.properties b/adal/versioning/version.properties
@@ -1,3 +1,3 @@
 #Wed Aug 01 15:24:11 PDT 2018
-versionName=4.0.2
+versionName=4.1.0
 versionCode=1
diff --git a/azure-pipelines/maven-release/adal-maven-release.yml b/azure-pipelines/maven-release/adal-maven-release.yml
@@ -30,10 +30,10 @@ jobs:
     envVstsMvnAndroidAccessTokenVar: ENV_VSTS_MVN_ANDROIDADAL_ACCESSTOKEN
     gradleAssembleReleaseTask: adal:clean adal:assembleDist adal:javadocJar
     gradleGeneratePomFiletask: adal:generatePomFileForAdalPublication
-    aarSourceFolder: C:\Temp\s\adal\outputs\aar
-    jarSourceFolder: C:\Temp\s\adal\outputs\jar
-    pomSourceFolder: C:\Temp\s\adal\publications\adal
+    aarSourceFolder: adal/build/outputs/aar
+    jarSourceFolder: adal/build/outputs/jar
+    pomSourceFolder: adal/build/publications/adal
     gpgAar: true
-    gpgSourcesJar: true
+    gpgSourcesJar: false
     gpgJavadocJar: true
     gpgJar: false
diff --git a/changelog.txt b/changelog.txt
@@ -2,7 +2,11 @@ v.Next
 ----------
 - [PATCH] Update androidx appcompat version from 1.0.2 -> 1.1.0 (#1691)
 - [MAJOR] Added YubiKit SDK to common, which requires host apps that use ADAL to upgrade to Java Version 8 (#1689)
-- [PATCH] Update gson version to 2.8.9
+
+Version 4.1.0
+-------------
+- [PATCH] Update common@4.2.0
+- [PATCH] Update gson version to 2.8.9 (#1680)
 - [MINOR] Remove PKeyAuth support from ADAL (#1685)
 
 Version 4.0.2
diff --git a/common b/common
@@ -1 +1 @@
-Subproject commit 4bf1dfd1b67a0e1f2bc65ecda0af7d6c73b9fa1a
+Subproject commit 990c353bb7e4cc3896857e7fb76e217f0ad34d43
