Merging Working/release/6.0.0 to release branch (#2272)

somalaya · Azure DevOps Pipeline · web-flow · commit cbabc1a4bd87 · 2025-04-03T15:06:01.000-07:00
Co-authored-by: Azure DevOps Pipeline &lt;build-agent@azuredevops.com&gt;
diff --git a/changelog b/changelog
@@ -2,8 +2,16 @@ MSAL Wiki : https://github.com/AzureAD/microsoft-authentication-library-for-andr
 
 vNext
 ----------
+
+Version 6.0.0
+----------
+- [PATCH] Update common @21.0.0
 - [MAJOR] Update minSDK to 21
 
+Version 5.10.2
+----------
+- [PATCH] Update common @20.1.1
+
 Version 5.10.0
 ----------
 - [PATCH] Update common @20.0.0
diff --git a/common b/common
@@ -1 +1 @@
-Subproject commit d6ab70af66e7a8f946dd40c89f12639fc1fc481c
+Subproject commit dbd8fc88423eee3ca3a8ffbb2dda9b64d859f1d2
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 = "21.0.0"
 if (project.hasProperty("distCommonVersion")) {
     commonVersion = project.distCommonVersion
 }
 // Used for testfixtures
-def common4jVersion = "1.0.+"
+def common4jVersion = "21.0.0"
 if (project.hasProperty("distCommon4jVersion")) {
     distCommon4jVersion = project.distCommon4jVersion
 }
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.10.0
+versionName=6.0.0
 versionCode=0

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 = "21.0.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 = "21.0.0"`
`197`	`197`	`if (project.hasProperty("distCommon4jVersion")) {`
`198`	`198`	`distCommon4jVersion = project.distCommon4jVersion`
`199`	`199`	`}`