merging alias branch in release (#2100)

tanmaymanolkar1 · somalaya · web-flow · commit 6459e4224e20 · 2024-05-14T16:37:11.000-07:00
Co-authored-by: Sowmya Malayanur &lt;69237821+somalaya@users.noreply.github.com&gt;
diff --git a/azure-pipelines/pull-request-validation/pr-msal.yml b/azure-pipelines/pull-request-validation/pr-msal.yml
@@ -45,6 +45,7 @@ jobs:
     clean: true
     submodules: recursive
     persistCredentials: True
+  - template: azure-pipelines/templates/steps/automation-cert.yml@common
   - task: JavaToolInstaller@0
     displayName: Use Java 11
     inputs:
@@ -66,7 +67,7 @@ jobs:
   - task: Gradle@2
     displayName: Run Unit tests
     inputs:
-      tasks: msal:testLocalDebugUnitTest -Plabtest -PlabSecret=$(LabVaultAppSecret) -ProbolectricSdkVersion=${{variables.robolectricSdkVersion}}
+      tasks: msal:testLocalDebugUnitTest -Plabtest -PlabSecret=$(LabVaultAppCert) -ProbolectricSdkVersion=${{variables.robolectricSdkVersion}}
       javaHomeSelection: $(BuildParameters.javaHomeSelection)
       jdkVersion: 1.11
 - job: spotbugs
diff --git a/changelog b/changelog
@@ -2,6 +2,9 @@ MSAL Wiki : https://github.com/AzureAD/microsoft-authentication-library-for-andr
 
 vNext
 ----------
+
+Version 5.3.1
+---------
 - [PATCH] Safe logging of Kotlin data classes through ILoggable interface (#2081)
 - [PATCH] Update nimbus-jose-jwt 9.37.3 and junit 4.13.2 (#2084)
 
diff --git a/common b/common
@@ -1 +1 @@
-Subproject commit 75763e346d99b641d51a44028cc43577987fb9a2
+Subproject commit 2a856a32e7a3738f31abc74421c08803dc5f9693
diff --git a/msal/build.gradle b/msal/build.gradle
@@ -188,12 +188,12 @@ task sourcesJar(type: Jar) {
 
 // In dev, we want to keep the dependencies (common4j, common) to 1.0.+ to be able to be consumed by daily dev pipeline.
 // In release/*, we change these to specific versions being consumed.
-def commonVersion = "1.0.+"
+def commonVersion = "17.4.0"
 if (project.hasProperty("distCommonVersion")) {
     commonVersion = project.distCommonVersion
 }
 // Used for testfixtures
-def common4jVersion = "1.0.+"
+def common4jVersion = "14.4.0"
 if (project.hasProperty("distCommon4jVersion")) {
     distCommon4jVersion = project.distCommon4jVersion
 }
diff --git a/msal/src/test/java/com/microsoft/identity/client/e2e/tests/network/AcquireTokenCIAMTest.java b/msal/src/test/java/com/microsoft/identity/client/e2e/tests/network/AcquireTokenCIAMTest.java
@@ -32,6 +32,7 @@
 import com.microsoft.identity.internal.testutils.labutils.LabUserQuery;
 
 import org.junit.Assert;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import java.util.Arrays;
@@ -91,6 +92,7 @@ public void onCancel() {
         };
     }
 
+    @Ignore
     public static class CiamTenantGUID extends AcquireTokenCIAMTest {
         @Override
         public String getConfigFilePath() {
@@ -112,6 +114,7 @@ public void testAcquireTokenSuccessVerifyIssuer() {
         }
     }
 
+    @Ignore
     public static class CiamTenantDomain extends AcquireTokenCIAMTest {
         @Override
         public String getConfigFilePath() {
@@ -133,6 +136,7 @@ public void testAcquireTokenSuccessVerifyIssuer() {
         }
     }
 
+    @Ignore
     public static class CiamTenantNoPath extends AcquireTokenCIAMTest {
         @Override
         public String getConfigFilePath() {
diff --git a/msal/versioning/version.properties b/msal/versioning/version.properties
@@ -1,3 +1,3 @@
 #Wed Aug 01 15:24:11 PDT 2018
-versionName=5.3.0
+versionName=5.3.1
 versionCode=0
diff --git a/msalautomationapp/build.gradle b/msalautomationapp/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 
-def msalVersion = "5.3.0"
+def msalVersion = "5.+"
 
 if (project.hasProperty("distMsalVersion")) {
     msalVersion = distMsalVersion

Original file line number	Diff line number	Diff line change
`@@ -188,12 +188,12 @@ task sourcesJar(type: Jar) {`
`188`	`188`
`189`	`189`	`// In dev, we want to keep the dependencies (common4j, common) to 1.0.+ to be able to be consumed by daily dev pipeline.`
`190`	`190`	`// In release/*, we change these to specific versions being consumed.`
`191`		`-def commonVersion = "1.0.+"`
	`191`	`+def commonVersion = "17.4.0"`
`192`	`192`	`if (project.hasProperty("distCommonVersion")) {`
`193`	`193`	`commonVersion = project.distCommonVersion`
`194`	`194`	`}`
`195`	`195`	`// Used for testfixtures`
`196`		`-def common4jVersion = "1.0.+"`
	`196`	`+def common4jVersion = "14.4.0"`
`197`	`197`	`if (project.hasProperty("distCommon4jVersion")) {`
`198`	`198`	`distCommon4jVersion = project.distCommon4jVersion`
`199`	`199`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@`
`32`	`32`	`import com.microsoft.identity.internal.testutils.labutils.LabUserQuery;`
`33`	`33`
`34`	`34`	`import org.junit.Assert;`
	`35`	`+import org.junit.Ignore;`
`35`	`36`	`import org.junit.Test;`
`36`	`37`
`37`	`38`	`import java.util.Arrays;`
`@@ -91,6 +92,7 @@ public void onCancel() {`
`91`	`92`	`};`
`92`	`93`	`}`
`93`	`94`
	`95`	`+ @Ignore`
`94`	`96`	`public static class CiamTenantGUID extends AcquireTokenCIAMTest {`
`95`	`97`	`@Override`
`96`	`98`	`public String getConfigFilePath() {`
`@@ -112,6 +114,7 @@ public void testAcquireTokenSuccessVerifyIssuer() {`
`112`	`114`	`}`
`113`	`115`	`}`
`114`	`116`
	`117`	`+ @Ignore`
`115`	`118`	`public static class CiamTenantDomain extends AcquireTokenCIAMTest {`
`116`	`119`	`@Override`
`117`	`120`	`public String getConfigFilePath() {`
`@@ -133,6 +136,7 @@ public void testAcquireTokenSuccessVerifyIssuer() {`
`133`	`136`	`}`
`134`	`137`	`}`
`135`	`138`
	`139`	`+ @Ignore`
`136`	`140`	`public static class CiamTenantNoPath extends AcquireTokenCIAMTest {`
`137`	`141`	`@Override`
`138`	`142`	`public String getConfigFilePath() {`