From c06c1e24894c0aca4cb338e47616a6d175511de4 Mon Sep 17 00:00:00 2001
From: Gladwin Johnson <90415114+gladjohn@users.noreply.github.com>
Date: Wed, 1 Jan 2025 11:13:00 -0800
Subject: [PATCH] Remove Java 11 (#5039)

* Update template-OneBranch-CI-libsandsamples.yaml

* pack-sign

* restore
---
 .../template-OneBranch-CI-libsandsamples.yaml | 24 -------------------
 build/template-pack-and-sign-packages.yaml    |  7 ------
 ...template-restore-build-libsandsamples.yaml |  7 ------
 3 files changed, 38 deletions(-)

diff --git a/build/template-OneBranch-CI-libsandsamples.yaml b/build/template-OneBranch-CI-libsandsamples.yaml
index 43835f85eb..0a23cc9ebe 100644
--- a/build/template-OneBranch-CI-libsandsamples.yaml
+++ b/build/template-OneBranch-CI-libsandsamples.yaml
@@ -66,30 +66,6 @@ steps:
       dotnet workload install maui --source "https://pkgs.dev.azure.com/IdentityDivision/_packaging/IDDP_PublicPackages/nuget/v3/index.json"
       dotnet workload install android --source "https://pkgs.dev.azure.com/IdentityDivision/_packaging/IDDP_PublicPackages/nuget/v3/index.json"
 
-- ${{ if eq(parameters.Mode, 'build') }}:
-  - task: PowerShell@2
-    displayName: Install Chocolatey
-    inputs:
-      targetType: 'inline'
-      script: |
-        Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://community.chocolatey.org/install.ps1'))      
-
-- ${{ if eq(parameters.Mode, 'build') }}:
-  - task: PowerShell@2
-    displayName: 'Install Java 11 for Build'
-    inputs:
-      targetType: 'inline'
-      script: |
-        choco install openjdk --version=11.0.2.01 -y
-        
-- ${{ if eq(parameters.Mode, 'test') }}:
-  - task: JavaToolInstaller@0
-    displayName: 'Use Java 11 for Test'
-    inputs:
-      versionSpec: 11
-      jdkArchitectureOption: x64
-      jdkSourceOption: PreInstalled
-
 - task: CmdLine@2
   displayName: 'Clear local NuGet cache'
   inputs:
diff --git a/build/template-pack-and-sign-packages.yaml b/build/template-pack-and-sign-packages.yaml
index 18c56073aa..c2d5e70616 100644
--- a/build/template-pack-and-sign-packages.yaml
+++ b/build/template-pack-and-sign-packages.yaml
@@ -29,13 +29,6 @@ steps:
     script: |
       dotnet nuget locals all --clear 
       dotnet workload install android ios macos maui --source "https://pkgs.dev.azure.com/IdentityDivision/_packaging/IDDP_PublicPackages/nuget/v3/index.json"
-
-- task: JavaToolInstaller@0
-  displayName: 'Use Java 11'
-  inputs:
-    versionSpec: 11
-    jdkArchitectureOption: x64
-    jdkSourceOption: PreInstalled
     
 - task: VSBuild@1
   displayName: 'NuGet restore'
diff --git a/build/template-restore-build-libsandsamples.yaml b/build/template-restore-build-libsandsamples.yaml
index 39930a1b88..c801d57d54 100644
--- a/build/template-restore-build-libsandsamples.yaml
+++ b/build/template-restore-build-libsandsamples.yaml
@@ -35,13 +35,6 @@ steps:
     script: |
       dotnet workload install android ios macos maui --source https://api.nuget.org/v3/index.json
 
-- task: JavaToolInstaller@0
-  displayName: 'Use Java 11'
-  inputs:
-    versionSpec: 11
-    jdkArchitectureOption: x64
-    jdkSourceOption: PreInstalled
-
 - task: VSBuild@1
   displayName: 'NuGet restore ${{ parameters.Solution }}'
   inputs: