From 2a456092b153711aa9cb61d5748a7dd8fd4730f1 Mon Sep 17 00:00:00 2001
From: Justin Van Patten <jvp@justinvp.com>
Date: Tue, 24 Dec 2024 13:44:22 -0800
Subject: [PATCH] =?UTF-8?q?Revert=20"build(deps):=20bump=20grpcVersion=20f?=
 =?UTF-8?q?rom=201.57.2=20to=201.69.0=20in=20/sdk/j=E2=80=A6=20(#1523)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

…ava (#1522)"

This reverts commit 5e16376859b561728cfe261588b6d3bae0375663 because the
minimal example test is failing with:

```
Warning: WARNING]
        Dependency convergence error for com.google.errorprone:error_prone_annotations:jar:2.18.0:compile paths to dependency are:
        +-com.pulumi.example:minimal:jar:1.0-SNAPSHOT
          +-io.grpc:grpc-okhttp:jar:1.57.2:compile
            +-io.grpc:grpc-core:jar:1.57.2:compile
              +-io.grpc:grpc-api:jar:1.57.2:compile
                +-com.google.errorprone:error_prone_annotations:jar:2.18.0:compile
        and
        +-com.pulumi.example:minimal:jar:1.0-SNAPSHOT
          +-io.grpc:grpc-okhttp:jar:1.57.2:compile
            +-io.grpc:grpc-core:jar:1.57.2:compile
              +-com.google.errorprone:error_prone_annotations:jar:2.18.0:compile
        and
        +-com.pulumi.example:minimal:jar:1.0-SNAPSHOT
          +-com.pulumi:pulumi:jar:0.20.1-alpha.1735072535+5e163768:compile
            +-io.grpc:grpc-stub:jar:1.69.0:runtime
              +-com.google.errorprone:error_prone_annotations:jar:2.30.0:runtime

Warning: WARNING]
        Dependency convergence error for io.grpc:grpc-api:jar:1.57.2:compile paths to dependency are:
        +-com.pulumi.example:minimal:jar:1.0-SNAPSHOT
          +-io.grpc:grpc-okhttp:jar:1.57.2:compile
            +-io.grpc:grpc-core:jar:1.57.2:compile
              +-io.grpc:grpc-api:jar:1.57.2:compile
        and
        +-com.pulumi.example:minimal:jar:1.0-SNAPSHOT
          +-io.grpc:grpc-okhttp:jar:1.57.2:compile
            +-io.grpc:grpc-core:jar:1.57.2:compile
              +-io.grpc:grpc-context:jar:1.57.2:runtime
                +-io.grpc:grpc-api:jar:1.57.2:runtime
        and
        +-com.pulumi.example:minimal:jar:1.0-SNAPSHOT
          +-com.pulumi:pulumi:jar:0.20.1-alpha.1735072535+5e163768:compile
            +-io.grpc:grpc-protobuf:jar:1.69.0:runtime
              +-io.grpc:grpc-api:jar:1.69.0:runtime
        and
        +-com.pulumi.example:minimal:jar:1.0-SNAPSHOT
          +-com.pulumi:pulumi:jar:0.20.1-alpha.1735072535+5e163768:compile
            +-io.grpc:grpc-protobuf:jar:1.69.0:runtime
              +-io.grpc:grpc-protobuf-lite:jar:1.69.0:runtime
                +-io.grpc:grpc-api:jar:1.69.0:runtime
        and
        +-com.pulumi.example:minimal:jar:1.0-SNAPSHOT
          +-com.pulumi:pulumi:jar:0.20.1-alpha.1735072535+5e163768:compile
            +-io.grpc:grpc-stub:jar:1.69.0:runtime
              +-io.grpc:grpc-api:jar:1.69.0:runtime
```
---
 sdk/java/pulumi/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sdk/java/pulumi/build.gradle b/sdk/java/pulumi/build.gradle
index b9ff6d314a2..ae2751e10ee 100644
--- a/sdk/java/pulumi/build.gradle
+++ b/sdk/java/pulumi/build.gradle
@@ -22,7 +22,7 @@ repositories {
     mavenLocal()
 }
 
-def grpcVersion = "1.69.0"
+def grpcVersion = "1.57.2"
 def protobufVersion = "3.25.5"
 def protocVersion = protobufVersion
 def guavaVersion = "32.1.2-jre"