Merge pull request #1731 from microsoftgraph/1723-replace-mockito-inl…

…ine-by-mockito-core Updates Java version to 21 in workflows and Mockito from inline to core
microsoftgraph · Sep 4, 2024 · cbbcdb9 · cbbcdb9
2 parents b7cfbe0 + e4231a0
commit cbbcdb9
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/api-level-lint.yml b/.github/workflows/api-level-lint.yml
@@ -15,7 +15,7 @@ jobs:
       - uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: 20
+          java-version: 21
           cache: gradle
       - name: Setup Android SDK
         uses: android-actions/[email protected]

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -47,7 +47,7 @@ jobs:
     - name: Set up JDK
       uses: actions/setup-java@v4
       with:
-        java-version: 20
+        java-version: 21
         distribution: 'temurin'
         cache: gradle
 

diff --git a/.github/workflows/gradle-build.yml b/.github/workflows/gradle-build.yml
@@ -13,7 +13,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
-          java-version: 20
+          java-version: 21
           distribution: 'temurin'
           cache: gradle
       - name: Detect secrets

diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml
@@ -32,7 +32,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
-          java-version: 20
+          java-version: 21
           distribution: 'temurin'
           cache: gradle
       - name: Cache SonarCloud packages

diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
@@ -3,7 +3,7 @@ dependencies {
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.11.0'
     testImplementation 'org.junit.jupiter:junit-jupiter-params:5.11.0'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.11.0'
-    testImplementation 'org.mockito:mockito-inline:5.2.0'
+    testImplementation 'org.mockito:mockito-core:5.13.0'
     testImplementation 'io.opentelemetry:opentelemetry-api:1.41.0'
     testImplementation 'io.opentelemetry:opentelemetry-context:1.41.0'
     testImplementation 'io.github.std-uritemplate:std-uritemplate:1.0.6'