Shade Netty into r2, and shade ZooKeeper along with its transitive Netty dependency.

Author: jpstewart

CHANGELOG.md

@@ -14,6 +14,9 @@ and what APIs have changed, if applicable.
 
 ## [Unreleased]
 
+## [29.38.0] - 2022-08-25
+- Introduce restli-netty, a shaded Netty dependency for use with r2.
+
 ## [29.37.15] - 2022-08-23
 - Exclude transitive Netty dependency for ZooKeeper client.
 
@@ -5309,7 +5312,8 @@ patch operations can re-use these classes for generating patch messages.
 
 ## [0.14.1]
 
-[Unreleased]: https://github.com/linkedin/rest.li/compare/v29.37.15...master
+[Unreleased]: https://github.com/linkedin/rest.li/compare/v29.38.0...master
+[29.38.0]: https://github.com/linkedin/rest.li/compare/v29.37.15...v29.38.0
 [29.37.15]: https://github.com/linkedin/rest.li/compare/v29.37.14...v29.37.15
 [29.37.14]: https://github.com/linkedin/rest.li/compare/v29.37.13...v29.37.14
 [29.37.13]: https://github.com/linkedin/rest.li/compare/v29.37.12...v29.37.13

build.gradle

@@ -16,9 +16,11 @@
 
 buildscript {
   repositories {
+    gradlePluginPortal()
     jcenter()
   }
   dependencies {
+    classpath 'com.github.jengelman.gradle.plugins:shadow:5.2.0'
     classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:4.21.0'
     classpath 'org.jacoco:org.jacoco.core:0.8.7'
   }

build_script/publications.gradle

@@ -61,13 +61,21 @@ def manipulatePomXml = {
 publishing {
   publications {
     // Define the "release" publication
-    release(MavenPublication) {
-      from components.java
+    release(MavenPublication) { publication ->
+      if (project.name == 'restli-netty' || project.name == 'restli-zookeeper') {
+        apply plugin: 'com.github.johnrengelman.shadow'
+        project.shadow.component(publication)
+      } else {
+        from components.java
+      }
 
       afterEvaluate {
         // Add all extra archives (sources, javadoc, any custom archives e.g. all)
         project.configurations.archives.allArtifacts.forEach {
-          if (it.classifier) {
+          // Skip 'slim' identifier, otherwise this logic attemps to publish the disabled slim jar for restli-netty.
+          // This requirement is related to the workaround for IDEA-163411 in the restli-netty project. When that bug
+          // is resolved this can be simplified.
+          if (it.classifier && it.classifier != 'slim') {
             artifact it
           }
         }

d2-int-test/build.gradle

@@ -6,15 +6,12 @@ dependencies {
   compile project(':data')
   compile project(':pegasus-common')
   compile project(':li-jersey-uri')
+  implementation project(path: ':restli-zookeeper', configuration: 'shadow')
   compile fileTree(dir: 'lib', include: '*.jar')
   compile externalDependency.commonsCodec
   compile externalDependency.commonsIo
   compile externalDependency.commonsHttpClient
-  compile(externalDependency.zookeeper) {
-    exclude group: 'io.netty'
-  }
   compile externalDependency.jdkTools
-  compile externalDependency.netty
   testCompile externalDependency.testng
   testCompile externalDependency.commonsIo
   testCompile externalDependency.metricsCore

d2-int-test/src/test/java/com/linkedin/d2/quorum/ZKPeer.java

@@ -31,15 +31,15 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.apache.commons.io.FileUtils;
-import org.apache.zookeeper.server.NIOServerCnxnFactory;
-import org.apache.zookeeper.server.ZKDatabase;
-import org.apache.zookeeper.server.ZooKeeperServer;
-import org.apache.zookeeper.server.persistence.FileTxnSnapLog;
-import org.apache.zookeeper.server.quorum.Election;
-import org.apache.zookeeper.server.quorum.QuorumPeer;
-import org.apache.zookeeper.server.quorum.QuorumPeer.LearnerType;
-import org.apache.zookeeper.server.quorum.QuorumPeer.QuorumServer;
-import org.apache.zookeeper.server.quorum.flexible.QuorumMaj;
+import com.linkedin.pegasus.org.apache.zookeeper.server.NIOServerCnxnFactory;
+import com.linkedin.pegasus.org.apache.zookeeper.server.ZKDatabase;
+import com.linkedin.pegasus.org.apache.zookeeper.server.ZooKeeperServer;
+import com.linkedin.pegasus.org.apache.zookeeper.server.persistence.FileTxnSnapLog;
+import com.linkedin.pegasus.org.apache.zookeeper.server.quorum.Election;
+import com.linkedin.pegasus.org.apache.zookeeper.server.quorum.QuorumPeer;
+import com.linkedin.pegasus.org.apache.zookeeper.server.quorum.QuorumPeer.LearnerType;
+import com.linkedin.pegasus.org.apache.zookeeper.server.quorum.QuorumPeer.QuorumServer;
+import com.linkedin.pegasus.org.apache.zookeeper.server.quorum.flexible.QuorumMaj;
 
 import static org.testng.Assert.assertTrue;
 import static org.testng.Assert.fail;

d2-int-test/src/test/java/com/linkedin/d2/quorum/ZKQuorum.java

@@ -22,10 +22,10 @@
 import java.util.Iterator;
 import java.util.Map;
 
-import org.apache.zookeeper.server.quorum.QuorumPeer;
-import org.apache.zookeeper.server.quorum.QuorumPeer.LearnerType;
-import org.apache.zookeeper.server.quorum.QuorumPeer.QuorumServer;
-import org.apache.zookeeper.server.ZooKeeperServer;
+import com.linkedin.pegasus.org.apache.zookeeper.server.quorum.QuorumPeer;
+import com.linkedin.pegasus.org.apache.zookeeper.server.quorum.QuorumPeer.LearnerType;
+import com.linkedin.pegasus.org.apache.zookeeper.server.quorum.QuorumPeer.QuorumServer;
+import com.linkedin.pegasus.org.apache.zookeeper.server.ZooKeeperServer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

d2-test-api/build.gradle

@@ -1,5 +1,6 @@
 dependencies {
   compile project(':d2')
+  implementation project(path: ':restli-zookeeper', configuration: 'shadow')
   compile externalDependency.testng
   compile externalDependency.metricsCore
   compile externalDependency.xerialSnappy

d2-test-api/src/main/java/com/linkedin/d2/discovery/stores/zk/ZKServer.java

@@ -21,9 +21,9 @@
 import java.net.InetSocketAddress;
 import java.util.concurrent.CountDownLatch;
 import org.apache.commons.io.FileUtils;
-import org.apache.zookeeper.server.NIOServerCnxn;
-import org.apache.zookeeper.server.NIOServerCnxnFactory;
-import org.apache.zookeeper.server.ZooKeeperServer;
+import com.linkedin.pegasus.org.apache.zookeeper.server.NIOServerCnxn;
+import com.linkedin.pegasus.org.apache.zookeeper.server.NIOServerCnxnFactory;
+import com.linkedin.pegasus.org.apache.zookeeper.server.ZooKeeperServer;
 
 /**
  * Very simple wrapper around ZooKeeper server, intended only for TEST use.

d2-test-api/src/main/java/com/linkedin/d2/discovery/stores/zk/ZKTestUtil.java

@@ -16,8 +16,8 @@
 
 package com.linkedin.d2.discovery.stores.zk;
 
-import org.apache.zookeeper.WatchedEvent;
-import org.apache.zookeeper.Watcher;
+import com.linkedin.pegasus.org.apache.zookeeper.WatchedEvent;
+import com.linkedin.pegasus.org.apache.zookeeper.Watcher;
 import org.testng.Assert;
 
 import java.io.File;

d2/build.gradle

@@ -6,16 +6,14 @@ dependencies {
   compile project(':data')
   compile project(':pegasus-common')
   compile project(':li-jersey-uri')
+  implementation project(path: ':restli-zookeeper', configuration: 'shadow')
   compile externalDependency.commonsCodec
   compile externalDependency.commonsIo
   compile externalDependency.commonsCli
   compile externalDependency.commonsHttpClient
   compile externalDependency.httpclient
   compile externalDependency.httpcore
   compile externalDependency.hdrhistogram
-  compile(externalDependency.zookeeper) {
-    exclude group: 'io.netty'
-  }
   compile externalDependency.jacksonCore
   compile externalDependency.jacksonDataBind
   compile externalDependency.jdkTools