From 107743ba1a87bb1ac771f146a918ba81f4291710 Mon Sep 17 00:00:00 2001 From: ramsessanchez <63934382+ramsessanchez@users.noreply.github.com> Date: Wed, 20 May 2026 16:33:53 -0700 Subject: [PATCH 1/2] refactor: consolidate Dependabot dependency groups and clean up pom.xml references - Consolidate 3 Dependabot entries into 2 (single gradle + github-actions) - Merge gradle directories (/, /java-8, /android) into one entry - Remove maven ecosystem entry (no pom.xml exists) - Add dependency groups: microsoft-graph, android-build-tools, all-actions - Add Gradle dependency submission job to gradle-build.yml - Remove pom.xml references from build.gradle and release-please-config.json Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- .github/dependabot.yml | 42 +++++++----------------------- .github/workflows/gradle-build.yml | 16 ++++++++++++ build.gradle | 1 - release-please-config.json | 7 +---- 4 files changed, 27 insertions(+), 39 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 403bc1c6ec6..31387790d56 100644 --- a/.github/dependabot.yml +++ b/.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/*" + - "*" diff --git a/.github/workflows/gradle-build.yml b/.github/workflows/gradle-build.yml index 068c32ee27c..7fa7c011de3 100644 --- a/.github/workflows/gradle-build.yml +++ b/.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 diff --git a/build.gradle b/build.gradle index 69fe2303dc9..3d998a50258 100644 --- a/build.gradle +++ b/build.gradle @@ -24,7 +24,6 @@ java { sourceSets { main { java { - exclude 'pom.xml' } } } diff --git a/release-please-config.json b/release-please-config.json index 1a60c92488b..6a3b4c5039a 100644 --- a/release-please-config.json +++ b/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" ] } }, From 3679a0f1ad5efe7aaefa12d99fd585cfe274e7bb Mon Sep 17 00:00:00 2001 From: ramsessanchez <63934382+ramsessanchez@users.noreply.github.com> Date: Wed, 27 May 2026 12:01:38 -0700 Subject: [PATCH 2/2] fix: configure daily-ci for 1ES/CFS network-isolated build - Add image property to pool configuration - Switch to Gradle@4 ADO task for build and test - Add CFS upstream Azure Artifacts feed to build.gradle, settings.gradle - Add feed credentials to gradle.properties - Strip mavenCentral/gradlePluginPortal in pipeline for network isolation Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- .azure-pipelines/daily-ci-build.yml | 29 +++++++++++++++++------------ build.gradle | 16 ++++++++++++++++ gradle.properties | 4 ++++ settings.gradle | 15 +++++++++++++++ 4 files changed, 52 insertions(+), 12 deletions(-) diff --git a/.azure-pipelines/daily-ci-build.yml b/.azure-pipelines/daily-ci-build.yml index 71bcbb53b04..b5e251bd5b9 100644 --- a/.azure-pipelines/daily-ci-build.yml +++ b/.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) diff --git a/build.gradle b/build.gradle index 3d998a50258..807d7d00d47 100644 --- a/build.gradle +++ b/build.gradle @@ -32,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" @@ -84,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) + } + } } } diff --git a/gradle.properties b/gradle.properties index 3aa314c33b4..7eb48290c61 100644 --- a/gradle.properties +++ b/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 diff --git a/settings.gradle b/settings.gradle index 80f938c581f..64054d030a0 100644 --- a/settings.gradle +++ b/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. *