diff --git a/.github/dependabot.yml b/.github/dependabot.yml index f8da7250..d5767d67 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -4,6 +4,7 @@ updates: directories: - "/" - "/java-8" + - "/android" schedule: interval: daily time: "09:00" # 9am UTC @@ -18,39 +19,18 @@ updates: open-telemetry: patterns: - "*opentelemetry*" -- package-ecosystem: gradle - directory: "/android" - schedule: - interval: daily - time: "10:00" # 10am UTC. After core dependencies are updated to prevent duplicates. - open-pull-requests-limit: 10 - groups: - kiota-dependencies: - patterns: - - "*kiota*" - junit-dependencies: + android-build-tools: patterns: - - "*junit*" - open-telemetry: - patterns: - - "*opentelemetry*" -- package-ecosystem: maven + - "*android*" + - "*gradle-enterprise*" + - "*gradle-util*" + - "*gradle-versions*" +- package-ecosystem: github-actions directory: "/" schedule: interval: daily open-pull-requests-limit: 10 groups: - kiota-dependencies: - patterns: - - "*kiota*" - junit-dependencies: - patterns: - - "*junit*" - open-telemetry: + all-actions: patterns: - - "*opentelemetry*" -- package-ecosystem: github-actions - directory: "/" - schedule: - interval: daily - open-pull-requests-limit: 10 + - "*" diff --git a/.github/workflows/gradle-build.yml b/.github/workflows/gradle-build.yml index 725e9d38..d35629a4 100644 --- a/.github/workflows/gradle-build.yml +++ b/.github/workflows/gradle-build.yml @@ -1,6 +1,8 @@ name: Java CI with Gradle on: + push: + branches: [main] pull_request: branches: [main, support/2.x.x] workflow_dispatch: @@ -38,3 +40,19 @@ jobs: gradle.properties **/gradle/** Scripts/** + + 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 6dc986e8..06ea1609 100644 --- a/build.gradle +++ b/build.gradle @@ -60,7 +60,6 @@ jacocoTestReport { sourceSets { main { java { - exclude 'pom.xml' } } } diff --git a/pom.xml b/pom.xml deleted file mode 100644 index 3d5d9442..00000000 --- a/pom.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - 4.0.0 - - com.microsoft.graph - microsoft-graph-core - - 3.6.6 - - pom - - - 1.8 - 1.8 - - - - - com.google.code.gson - gson - 2.14.0 - - - com.squareup.okhttp3 - okhttp - 4.12.0 - - - com.azure - azure-core - 1.58.0 - - - org.junit.jupiter - junit-jupiter-api - 6.0.3 - test - - - org.junit.jupiter - junit-jupiter-params - 6.0.3 - test - - - org.mockito - mockito-inline - 5.2.0 - test - - - com.github.spotbugs - spotbugs-annotations - 4.9.8 - - - diff --git a/release-please-config.json b/release-please-config.json index 2323fdde..5ea87cde 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/core/CoreConstants.java", - { - "type": "xml", - "path": "pom.xml", - "xpath": "//project/version" - } + "src/main/java/com/microsoft/graph/core/CoreConstants.java" ] } },