Fix/daily ci pool image

.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,21 @@ extends:
               - checkout: self
                 submodules: recursive
 
-              - task: JavaToolInstaller@0
-                displayName: Set up Java
+              - script: |
+                  sed -i "/mavenCentral()/d" build.gradle
+                  sed -i "/gradlePluginPortal()/d" settings.gradle
+                  sed -i "/mavenCentral()/d" settings.gradle
+                displayName: Strip 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)

.github/dependabot.yml

@@ -4,6 +4,7 @@ updates:
   directories:
   - "/"
   - "/java-8"
+  - "/android"
   schedule:
     interval: weekly
     time: "09:00" # 9am UTC
@@ -12,51 +13,28 @@ updates:
     kiota-dependencies:
       patterns:
         - "*kiota*"
-    junit-dependencies:
-      patterns:
-        - "*junit*"
-    open-telemetry:
+    microsoft-graph:
       patterns:
-        - "*opentelemetry*"
-
-- package-ecosystem: gradle
-  directory: "/android"
-  schedule:
-    interval: weekly
-    time: "10:00" # 10am UTC. Scheduled after core java dependencies to prevent duplicate PRs
-  open-pull-requests-limit: 10
-  groups:
-    kiota-dependencies:
-      patterns:
-        - "*kiota*"
+        - "*microsoft-graph*"
     junit-dependencies:
       patterns:
         - "*junit*"
     open-telemetry:
       patterns:
         - "*opentelemetry*"
-- package-ecosystem: maven
-  directory: "/"
-  schedule:
-    interval: weekly
-  open-pull-requests-limit: 10
-  groups:
-    kiota-dependencies:
+    android-build-tools:
       patterns:
-        - "*kiota*"
-    junit-dependencies:
-      patterns:
-        - "*junit*"
-    open-telemetry:
-      patterns:
-        - "*opentelemetry*"
+        - "*android*"
+        - "*gradle-enterprise*"
+        - "*gradle-util*"
+        - "*gradle-versions*"
 - package-ecosystem: github-actions
   directory: "/"
   schedule:
     interval: weekly
   open-pull-requests-limit: 10
   groups:
-    github-actions-dependencies:
+    all-actions:
       patterns:
-        - "actions/*"
+        - "*"
 

.github/workflows/gradle-build.yml

@@ -83,3 +83,19 @@ jobs:
           else
             exit 1
           fi
+
+  dependency-submission:
+    runs-on: ubuntu-latest
+    if: github.event_name == 'push'
+    permissions:
+      contents: write
+    steps:
+      - uses: actions/checkout@v6
+      - name: Set up JDK
+        uses: actions/setup-java@v5
+        with:
+          java-version: 21
+          distribution: 'temurin'
+          cache: gradle
+      - name: Generate and submit dependency graph
+        uses: gradle/actions/dependency-submission@v4

build.gradle

@@ -24,7 +24,6 @@ java {
 sourceSets {
     main {
         java {
-            exclude 'pom.xml'
         }
     }
 }
@@ -33,6 +32,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"
@@ -85,6 +92,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

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

release-please-config.json

@@ -16,12 +16,7 @@
             "extra-files": [
                 "gradle.properties",
                 "README.md",
-                "src/main/java/com/microsoft/graph/beta/info/Constants.java",
-                {
-                    "type": "xml",
-                    "path": "pom.xml",
-                    "xpath": "//project/version"
-                }
+                "src/main/java/com/microsoft/graph/beta/info/Constants.java"
             ]
         }
     },

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.
  *