Shade Netty into r2.

Author: jpstewart

CHANGELOG.md

@@ -14,6 +14,9 @@ and what APIs have changed, if applicable.
 
 ## [Unreleased]
 
+## [29.38.0] - 2022-07-26
+- Introduce restli-netty, a shaded Netty dependency for use with r2.
+- 
 ## [29.37.3] - 2022-07-18
 - Add connection warm up support when a failout has been initiated
 
@@ -5273,7 +5276,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.3...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.3...v29.38.0
 [29.37.3]: https://github.com/linkedin/rest.li/compare/v29.37.2...v29.37.3
 [29.37.2]: https://github.com/linkedin/rest.li/compare/v29.37.1...v29.37.2
 [29.37.1]: https://github.com/linkedin/rest.li/compare/v29.37.0...v29.37.1

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') {
+        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

@@ -12,7 +12,6 @@ dependencies {
   compile externalDependency.commonsHttpClient
   compile externalDependency.zookeeper
   compile externalDependency.jdkTools
-  compile externalDependency.netty
   testCompile externalDependency.testng
   testCompile externalDependency.commonsIo
   testCompile project(path: ':d2', configuration: 'testArtifacts')

gradle.properties

@@ -1,4 +1,4 @@
-version=29.37.3
+version=29.38.0
 group=com.linkedin.pegasus
 org.gradle.configureondemand=true
 org.gradle.parallel=true

multipart-mime/build.gradle

@@ -4,6 +4,9 @@ dependencies {
   compile externalDependency.javaxActivation
   compile externalDependency.commonsLang
   testCompile project(':r2-int-test')
+  testCompile project(':r2-netty')
+  testCompile project(':r2-sample')
+  testCompile project(':test-util')
   testCompile externalDependency.testng
   testCompile externalDependency.mail
   testCompile externalDependency.easymock

r2-int-test/build.gradle

@@ -6,6 +6,7 @@ dependencies {
     testCompile externalDependency.testng
     testCompile externalDependency.junit
     compile externalDependency.commonsLang
+    implementation project(path: ':restli-netty', configuration: 'shadow')
 }
 
 tasks.withType(Test) {

r2-int-test/src/test/java/test/r2/integ/clientserver/TestHttpsEarlyHandshake.java

@@ -25,11 +25,11 @@
 import com.linkedin.r2.transport.http.client.common.ChannelPoolManagerFactoryImpl;
 import com.linkedin.r2.transport.http.client.common.ChannelPoolManagerKey;
 import com.linkedin.r2.transport.http.client.common.ChannelPoolManagerKeyBuilder;
-import io.netty.channel.Channel;
-import io.netty.channel.EventLoopGroup;
-import io.netty.channel.nio.NioEventLoopGroup;
-import io.netty.handler.ssl.SslHandler;
-import io.netty.util.concurrent.Future;
+import com.linkedin.pegasus.io.netty.channel.Channel;
+import com.linkedin.pegasus.io.netty.channel.EventLoopGroup;
+import com.linkedin.pegasus.io.netty.channel.nio.NioEventLoopGroup;
+import com.linkedin.pegasus.io.netty.handler.ssl.SslHandler;
+import com.linkedin.pegasus.io.netty.util.concurrent.Future;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;

r2-int-test/src/test/java/test/r2/integ/clientserver/providers/client/AbstractClientProvider.java

@@ -24,7 +24,7 @@
 import com.linkedin.r2.transport.common.Client;
 import com.linkedin.r2.transport.http.client.HttpClientFactory;
 import com.linkedin.r2.util.NamedThreadFactory;
-import io.netty.channel.nio.NioEventLoopGroup;
+import com.linkedin.pegasus.io.netty.channel.nio.NioEventLoopGroup;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;

r2-netty/build.gradle

@@ -4,9 +4,9 @@ dependencies {
   compile project(':r2-core')
   compile project(':r2-disruptor')
   compile project(':r2-filter-compression')
+  implementation project(path: ':restli-netty', configuration: 'shadow')
 
   compile externalDependency.commonsLang
-  compile externalDependency.netty
 
   testCompile project(path: ':r2-core', configuration: 'testArtifacts')
   testCompile externalDependency.mockito