From 4837a8c4e72ea7229be7da5405096935a7283716 Mon Sep 17 00:00:00 2001
From: Aman Khalid <aman.khalid@slu.edu>
Date: Thu, 19 Nov 2020 13:02:34 -0600
Subject: [PATCH 1/2] Remove deprecated javadoc options

---
 build.gradle | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/build.gradle b/build.gradle
index 0c3917aeef0..500a4815a71 100644
--- a/build.gradle
+++ b/build.gradle
@@ -275,15 +275,6 @@ subprojects {
         }
     }
 
-    // For jdk10 we must explicitly choose between html4 and html5, otherwise we get a warning
-    if (JavaVersion.current().isJava10Compatible()) {
-        allprojects {
-            tasks.withType(Javadoc) {
-                options.addBooleanOption('html4', true)
-            }
-        }
-    }
-
     jacoco { toolVersion = "0.8.2" }
 
     checkstyle {

From 6b6de258e7bc72a53bc496c6f73f2e7e2f9b2432 Mon Sep 17 00:00:00 2001
From: Aman Khalid <aman.khalid@slu.edu>
Date: Mon, 23 Nov 2020 03:36:33 -0600
Subject: [PATCH 2/2] netty shaded dependencies

---
 api/src/main/java/io/grpc/ServiceProviders.java |  3 ---
 netty/shaded/build.gradle                       | 12 ++++++++++++
 netty/shaded/native-image.properties            | 16 ++++++++++++++++
 3 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 netty/shaded/native-image.properties

diff --git a/api/src/main/java/io/grpc/ServiceProviders.java b/api/src/main/java/io/grpc/ServiceProviders.java
index 08837bcf5cc..7caece7efd8 100644
--- a/api/src/main/java/io/grpc/ServiceProviders.java
+++ b/api/src/main/java/io/grpc/ServiceProviders.java
@@ -25,9 +25,6 @@
 import java.util.ServiceLoader;
 
 final class ServiceProviders {
-  private ServiceProviders() {
-    // do not instantiate
-  }
 
   /**
    * If this is not Android, returns the highest priority implementation of the class via
diff --git a/netty/shaded/build.gradle b/netty/shaded/build.gradle
index 5226fb60ab2..0aad089b6b0 100644
--- a/netty/shaded/build.gradle
+++ b/netty/shaded/build.gradle
@@ -26,6 +26,18 @@ jar {
     classifier = 'original'
 }
 
+task readFile(){
+    doLast{
+        File file = file('native-image.properties')
+        println file.text
+        println ""
+        file.readLines().each{
+            println it
+        }
+
+    }
+}
+
 shadowJar {
     classifier = null
     dependencies {
diff --git a/netty/shaded/native-image.properties b/netty/shaded/native-image.properties
new file mode 100644
index 00000000000..9e491ab16e2
--- /dev/null
+++ b/netty/shaded/native-image.properties
@@ -0,0 +1,16 @@
+# Copyright 2019 The Netty Project
+#
+# The Netty Project licenses this file to you under the Apache License,
+# version 2.0 (the "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at:
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+Args = --initialize-at-build-time=io.grpc.netty.shaded.io.netty \
+       --initialize-at-run-time=io.grpc.netty.shaded.io.netty.handler.codec.http.HttpObjectEncoder,io.grpc.netty.shaded.io.netty.handler.codec.http.websocketx.WebSocket00FrameEncoder,io.grpc.netty.shaded.io.netty.handler.codec.http.websocketx.extensions.compression.DeflateDecoder
\ No newline at end of file