minor fixes

Author: fadidurah

azure-pipelines/pull-request-validation/build-consumers.yml

@@ -28,12 +28,12 @@ resources:
   - repository: msal
     type: github
     name: AzureAD/microsoft-authentication-library-for-android
-    ref: fadi/mavenCentral
+    ref: dev
     endpoint: ANDROID_GITHUB
   - repository: broker
     type: github
     name: AzureAD/ad-accounts-for-android
-    ref: fadi/mavenCentral
+    ref: dev
     endpoint: ANDROID_GITHUB
 
 stages:
@@ -257,4 +257,4 @@ stages:
         inputs:
           testResultsFormat: 'JUnit'
           testResultsFiles: '**/TEST-*.xml'
-          searchFolder: 'LinuxBroker'
+          searchFolder: 'LinuxBroker'

azure-pipelines/templates/steps/spotbugs.yml

@@ -12,7 +12,6 @@ parameters:
   default: $(Build.SourcesDirectory)
 - name: javaVersion
   default: "1.17"
-
 steps:
 - bash: |
     echo "##vso[task.setvariable variable=ENV_VSTS_MVN_CRED_USERNAME]VSTS"

azure-pipelines/templates/steps/vsts-release/vsts-release-template.yml

@@ -25,6 +25,11 @@ jobs:
     clean: true
     submodules: recursive
     persistCredentials: True
+  - task: CmdLine@1
+    displayName: Set MVN Username in Environment
+    inputs:
+      filename: echo
+      arguments: '##vso[task.setvariable variable=ENV_VSTS_MVN_CRED_USERNAME]VSTS'
   - task: CmdLine@1
     displayName: Set MVN AccessToken in Environment
     inputs:

common-java-root/build.gradle

@@ -1,6 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
-project.ext.vstsUsername = System.getenv("ENV_VSTS_MVN_ANDROIDCOMMON_USERNAME") != null ? System.getenv("ENV_VSTS_MVN_ANDROIDCOMMON_USERNAME") : project.findProperty("vstsUsername")
-project.ext.vstsMavenAccessToken = System.getenv("ENV_VSTS_MVN_ANDROIDCOMMON_ACCESSTOKEN") != null ? System.getenv("ENV_VSTS_MVN_ANDROIDCOMMON_ACCESSTOKEN") : project.findProperty("vstsMavenAccessToken")
+project.ext.vstsUsername = System.getenv("ENV_VSTS_MVN_CRED_USERNAME") != null ? System.getenv("ENV_VSTS_MVN_CRED_USERNAME") : project.findProperty("vstsUsername")
+project.ext.vstsMavenAccessToken = System.getenv("ENV_VSTS_MVN_CRED_ACCESSTOKEN") != null ? System.getenv("ENV_VSTS_MVN_CRED_ACCESSTOKEN") : project.findProperty("vstsMavenAccessToken")
 
 buildscript {
     apply from: rootProject.file("../gradle/versions.gradle")
@@ -19,10 +19,13 @@ allprojects {
     Order of repositories is important.
      */
     repositories {
+        // If you don't have access to the package feed uncomment these repositories
+        //  mavenCentral()
+
         /*
         This is the project main repository and contains all of the packages we publish.
         This azure devops feed also has an upstream to Maven Central as well as several other
-        internal azure devops respositories
+        internal azure devops repositories
 
         NOTE: This repository is not currently available to our public CI (Travis)
          */
@@ -34,13 +37,16 @@ allprojects {
                 password project.vstsMavenAccessToken
             }
         }
+        maven {
+            name "vsts-maven-adal-android"
+            url "https://identitydivision.pkgs.visualstudio.com/_packaging/NewAndroid/maven/v1"
+            credentials {
+                username project.ext.vstsUsername
+                password project.ext.vstsMavenAccessToken
+            }
+        }
         //Required for google published packages not published to maven central
         google()
-
-        /*
-         * Required for packages published to Maven Central.
-         */
-        mavenCentral()
     }
 }
 

common-java-root/settings.gradle

@@ -1,7 +1,8 @@
 pluginManagement {
     repositories {
+        // If you don't have access to the package feed uncomment these repositories
+        //  mavenCentral()
         google()
-        mavenCentral()
         gradlePluginPortal()
     }
 }