Merge branch 'main' into refactor/consolidate-dependabot-remove-pom

Author: ramsessanchez

.azure-pipelines/daily-ci-build.yml

@@ -21,6 +21,7 @@ extends:
   parameters:
     pool:
       name: Azure-Pipelines-1ESPT-ExDShared
+      image: ubuntu-latest
       os: linux
     sdl:
       sourceAnalysisPool:
@@ -42,17 +43,26 @@ extends:
               - checkout: self
                 submodules: recursive
 
-              - task: JavaToolInstaller@0
-                displayName: Set up Java
+              - script: |
+                  sed -i "/com.github.spotbugs/d" build.gradle
+                  sed -i "/org.sonarqube/d" build.gradle
+                  sed -i "/spotbugsMain/,/^}/d" build.gradle
+                  sed -i "/spotbugsTest/,/^}/d" build.gradle
+                  sed -i "/sonarqube {/,/^}/d" build.gradle
+                  sed -i "/mavenCentral()/d" build.gradle
+                  sed -i "/gradlePluginPortal()/d" settings.gradle
+                  sed -i "/mavenCentral()/d" settings.gradle
+                displayName: Strip plugins and public repos for network-isolated build
+
+              - task: Gradle@4
+                displayName: Build and Test SDK
                 inputs:
-                  versionSpec: '17'
+                  gradleWrapperFile: 'gradlew'
+                  workingDirectory: '$(Build.SourcesDirectory)'
+                  tasks: 'assemble test'
+                  options: '--no-daemon -PGraphDeveloperExperiencesPublicPassword=$(ARTIFACTS_PAT)'
+                  publishJUnitResults: true
+                  testResultsFiles: '**/TEST-*.xml'
+                  javaHomeOption: 'JDKVersion'
+                  jdkVersionOption: '1.17'
                   jdkArchitectureOption: 'x64'
-                  jdkSourceOption: 'PreInstalled'
-
-              - script: chmod +x gradlew && ./gradlew assemble
-                displayName: Build SDK
-                workingDirectory: $(Build.SourcesDirectory)
-
-              - script: ./gradlew test
-                displayName: Run unit tests
-                workingDirectory: $(Build.SourcesDirectory)

build.gradle

@@ -5,8 +5,8 @@ plugins {
     id 'maven-publish'
     id 'signing'
     id 'jacoco'
-    id 'com.github.spotbugs' version '6.2.5'
-    id "org.sonarqube" version "7.2.2.6593"
+    id 'com.github.spotbugs' version '6.5.4'
+    id "org.sonarqube" version "7.3.0.8198"
 
 }
 
@@ -68,6 +68,14 @@ sourceSets {
 repositories {
     // You can declare any Maven/Ivy/file repository here.
     mavenCentral()
+    maven {
+        url 'https://microsoftgraph.pkgs.visualstudio.com/0985d294-5762-4bc2-a565-161ef349ca3e/_packaging/GraphDeveloperExperiences_Public/maven/v1'
+        name 'GraphDeveloperExperiencesPublic'
+        credentials(PasswordCredentials)
+        authentication {
+            basic(BasicAuthentication)
+        }
+    }
 }
 
 apply from: "gradle/dependencies.gradle"
@@ -118,6 +126,14 @@ publishing {
             name = "ADO"
             url = layout.buildDirectory.dir("publishing-repository")
         }
+        maven {
+            url 'https://microsoftgraph.pkgs.visualstudio.com/0985d294-5762-4bc2-a565-161ef349ca3e/_packaging/GraphDeveloperExperiences_Public/maven/v1'
+            name 'GraphDeveloperExperiencesPublic'
+            credentials(PasswordCredentials)
+            authentication {
+                basic(BasicAuthentication)
+            }
+        }
     }
 }
 

gradle.properties

@@ -37,3 +37,7 @@ mavenArtifactSuffix =
 #enable mavenCentralPublishingEnabled to publish to maven central
 mavenCentralSnapshotArtifactSuffix = -SNAPSHOT
 mavenCentralPublishingEnabled=false
+
+# Azure Artifacts CFS feed credentials
+GraphDeveloperExperiencesPublicUsername=microsoftgraph
+GraphDeveloperExperiencesPublicPassword=PERSONAL_ACCESS_TOKEN

settings.gradle

@@ -1,3 +1,18 @@
+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+        mavenCentral()
+        maven {
+            url 'https://microsoftgraph.pkgs.visualstudio.com/0985d294-5762-4bc2-a565-161ef349ca3e/_packaging/GraphDeveloperExperiences_Public/maven/v1'
+            name 'GraphDeveloperExperiencesPublic'
+            credentials(PasswordCredentials)
+            authentication {
+                basic(BasicAuthentication)
+            }
+        }
+    }
+}
+
 /*
  * This file was generated by the Gradle 'init' task.
  *