Update JDK compiling level to 8, and remove zip dist. (#4119)

* Update JDK compiling level to 8, and remove zip dist.

* Exclude annotation and shade API.

* Fix more exclusion.

* 1. Update grava and gson 2. Fix compile issue. 3. Keep protoc and maven plugin in old version. Some incompatible of 3rd party grpc proto.

* Fix dependency conflicts, license and notice issue, and dependency check script issue

Co-authored-by: kezhenxu94 <kezhenxu94@163.com>

apm-commons/apm-util/src/main/java/org/apache/skywalking/apm/util/StringUtil.java

@@ -23,6 +23,10 @@ public final class StringUtil {
         return str == null || str.length() == 0;
     }
 
+    public static boolean isNotEmpty(String str) {
+        return !isEmpty(str);
+    }
+
     public static String join(final char delimiter, final String... strings) {
         if (strings.length == 0) {
             return null;

apm-dist-es7/pom.xml

@@ -108,7 +108,6 @@
                         <configuration>
                             <tasks>
                                 <copy file="${project.build.directory}/apache-skywalking-apm-bin-es7.tar.gz" tofile="${project.basedir}/../dist/apache-skywalking-apm-bin-es7.tar.gz" overwrite="true" />
-                                <copy file="${project.build.directory}/apache-skywalking-apm-bin-es7.zip" tofile="${project.basedir}/../dist/apache-skywalking-apm-bin-es7.zip" overwrite="true" />
                             </tasks>
                         </configuration>
                     </execution>

apm-dist-es7/src/main/assembly/binary-es7.xml

@@ -22,7 +22,6 @@
         xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
     <id>dist</id>
     <formats>
-        <format>zip</format>
         <format>tar.gz</format>
     </formats>
     <fileSets>

apm-dist/pom.xml

@@ -108,7 +108,6 @@
                         <configuration>
                             <tasks>
                                 <copy file="${project.build.directory}/apache-skywalking-apm-bin.tar.gz" tofile="${project.basedir}/../dist/apache-skywalking-apm-bin.tar.gz" overwrite="true" />
-                                <copy file="${project.build.directory}/apache-skywalking-apm-bin.zip" tofile="${project.basedir}/../dist/apache-skywalking-apm-bin.zip" overwrite="true" />
                             </tasks>
                         </configuration>
                     </execution>

apm-dist/src/main/assembly/binary.xml

@@ -22,7 +22,6 @@
     xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
     <id>dist</id>
     <formats>
-        <format>zip</format>
         <format>tar.gz</format>
     </formats>
     <fileSets>

apm-protocol/apm-network/pom.xml

@@ -29,12 +29,6 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <compiler.version>1.6</compiler.version>
-        <grpc.version>1.14.0</grpc.version>
-        <netty.version>4.1.27.Final</netty.version>
-        <netty-tcnative-boringssl-static.version>2.0.7.Final</netty-tcnative-boringssl-static.version>
-        <os-maven-plugin.version>1.5.0.Final</os-maven-plugin.version>
-        <protobuf-maven-plugin.version>0.5.0</protobuf-maven-plugin.version>
     </properties>
 
     <dependencies>
@@ -42,36 +36,26 @@
             <groupId>io.grpc</groupId>
             <artifactId>grpc-netty</artifactId>
             <version>${grpc.version}</version>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>io.grpc</groupId>
             <artifactId>grpc-protobuf</artifactId>
             <version>${grpc.version}</version>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>io.grpc</groupId>
             <artifactId>grpc-stub</artifactId>
             <version>${grpc.version}</version>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-tcnative-boringssl-static</artifactId>
             <version>${netty-tcnative-boringssl-static.version}</version>
-            <scope>provided</scope>
         </dependency>
     </dependencies>
 
     <build>
-        <extensions>
+
-            <extension>
-                <groupId>kr.motd.maven</groupId>
-                <artifactId>os-maven-plugin</artifactId>
-                <version>${os-maven-plugin.version}</version>
-            </extension>
-        </extensions>
         <plugins>
             <plugin>
                 <groupId>org.xolstice.maven.plugins</groupId>
@@ -83,10 +67,10 @@
                       protobuf-java directly, you will be transitively depending on the
                       protobuf-java version that grpc depends on.
                     -->
-                    <protocArtifact>com.google.protobuf:protoc:3.3.0:exe:${os.detected.classifier}
+                    <protocArtifact>com.google.protobuf:protoc:${com.google.protobuf.protoc.version}:exe:${os.detected.classifier}
                     </protocArtifact>
                     <pluginId>grpc-java</pluginId>
-                    <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.8.0:exe:${os.detected.classifier}
+                    <pluginArtifact>io.grpc:protoc-gen-grpc-java:${protoc-gen-grpc-java.plugin.version}:exe:${os.detected.classifier}
                     </pluginArtifact>
                 </configuration>
                 <executions>

apm-protocol/apm-network/src/test/java/org/apache/skywalking/apm/network/trace/proto/GRPCNoServerTest.java

@@ -40,7 +40,7 @@ public class GRPCNoServerTest {
             NettyChannelBuilder.forAddress("127.0.0.1", 8080)
                 .nameResolverFactory(new DnsNameResolverProvider())
                 .maxInboundMessageSize(1024 * 1024 * 50)
-                .usePlaintext(true);
+                .usePlaintext();
         ManagedChannel channel = channelBuilder.build();
         TraceSegmentServiceGrpc.TraceSegmentServiceStub serviceStub = TraceSegmentServiceGrpc.newStub(channel);
         final Status[] status = {null};

apm-sniffer/apm-agent-core/pom.xml

@@ -34,7 +34,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jetty.version>9.4.2.v20170220</jetty.version>
-        <grpc.version>1.14.0</grpc.version>
+        <grpc.version>1.26.0</grpc.version>
         <guava.version>20.0</guava.version>
         <bytebuddy.version>1.10.1</bytebuddy.version>
         <wiremock.version>2.6.0</wiremock.version>
@@ -49,6 +49,8 @@
         <shade.io.netty.target>${shade.package}.${shade.io.netty.source}</shade.io.netty.target>
         <shade.io.opencensus.source>io.opencensus</shade.io.opencensus.source>
         <shade.io.opencensus.target>${shade.package}.${shade.io.opencensus.source}</shade.io.opencensus.target>
+        <shade.io.perfmark.source>io.perfmark</shade.io.perfmark.source>
+        <shade.io.perfmark.target>${shade.package}.${shade.io.perfmark.source}</shade.io.perfmark.target>
         <ststem-rules.version>1.18.0</ststem-rules.version>
     </properties>
 
@@ -68,26 +70,7 @@
             <artifactId>byte-buddy</artifactId>
             <version>${bytebuddy.version}</version>
         </dependency>
-        <dependency>
+
-            <groupId>io.grpc</groupId>
-            <artifactId>grpc-netty</artifactId>
-            <version>${grpc.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>io.grpc</groupId>
-            <artifactId>grpc-protobuf</artifactId>
-            <version>${grpc.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>io.grpc</groupId>
-            <artifactId>grpc-stub</artifactId>
-            <version>${grpc.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>io.netty</groupId>
-            <artifactId>netty-tcnative-boringssl-static</artifactId>
-            <version>${netty-tcnative-boringssl-static.version}</version>
-        </dependency>
         <dependency>
             <groupId>net.bytebuddy</groupId>
             <artifactId>byte-buddy-agent</artifactId>
@@ -168,6 +151,10 @@
                                     <exclude>net.bytebuddy:byte-buddy:jar:</exclude>
                                     <exclude>com.google.errorprone:error_prone_annotations:jar:</exclude>
                                     <exclude>com.google.code.findbugs:jsr305:jar:</exclude>
+                                    <exclude>com.google.android:annotations:jar:</exclude>
+                                    <exclude>com.google.api.grpc:proto-google-common-protos:jar:</exclude>
+                                    <exclude>org.checkerframework:checker-compat-qual:jar:</exclude>
+                                    <exclude>org.codehaus.mojo:animal-sniffer-annotations:jar:</exclude>
                                 </excludes>
                             </artifactSet>
                             <relocations>
@@ -187,6 +174,10 @@
                                     <pattern>${shade.io.opencensus.source}</pattern>
                                     <shadedPattern>${shade.io.opencensus.target}</shadedPattern>
                                 </relocation>
+                                <relocation>
+                                    <pattern>${shade.io.perfmark.source}</pattern>
+                                    <shadedPattern>${shade.io.perfmark.target}</shadedPattern>
+                                </relocation>
                             </relocations>
                             <filters>
                                 <filter>

apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/StandardChannelBuilder.java

@@ -26,11 +26,10 @@ import io.grpc.internal.DnsNameResolverProvider;
  */
 public class StandardChannelBuilder implements ChannelBuilder {
     private final static int MAX_INBOUND_MESSAGE_SIZE = 1024 * 1024 * 50;
-    private final static boolean USE_PLAIN_TEXT = true;
 
     @Override public ManagedChannelBuilder build(ManagedChannelBuilder managedChannelBuilder) throws Exception {
         return managedChannelBuilder.nameResolverFactory(new DnsNameResolverProvider())
             .maxInboundMessageSize(MAX_INBOUND_MESSAGE_SIZE)
-            .usePlaintext(USE_PLAIN_TEXT);
+            .usePlaintext();
     }
 }

apm-sniffer/apm-agent/pom.xml

@@ -82,6 +82,9 @@
                                     <exclude>io.opencensus:*</exclude>
                                     <exclude>com.google.*:*</exclude>
                                     <exclude>com.google.guava:guava</exclude>
+                                    <exclude>org.checkerframework:checker-compat-qual</exclude>
+                                    <exclude>org.codehaus.mojo:animal-sniffer-annotations</exclude>
+                                    <exclude>io.perfmark:*</exclude>
                                 </excludes>
                             </artifactSet>
                             <relocations>

apm-sniffer/pom.xml

@@ -39,7 +39,6 @@
     </modules>
 
     <properties>
-        <compiler.version>1.6</compiler.version>
         <shade.package>org.apache.skywalking.apm.dependencies</shade.package>
     </properties>
 </project>

dist-material/release-docs/LICENSE

@@ -215,7 +215,6 @@ Apache 2.0 licenses
 The following components are provided under the Apache License. See project link for details.
 The text of each license is also included at licenses/LICENSE-[project].txt.
 
-    Apache: groovy 2.4.5-indy: https://github.com/apache/groovy, Apache 2.0
     Apache: httpcomponents 4.x.x: http://hc.apache.org/index.html, Apache 2.0
     Apache: fastjson 1.2.47:  https://github.com/alibaba/fastjson, Apache 2.0
 
@@ -227,16 +226,13 @@ The following components are provided under the Apache License. See project link
 The text of each license is the standard Apache 2.0 license.
 
     raphw (byte-buddy) 1.9.2: http://bytebuddy.net/ , Apache 2.0
-    Google: grpc 1.14.0: https://grpc.io/ , Apache 2.0
+    Google: gprc-java 1.26.0: https://github.com/grpc/grpc-java, Apache 2.0
-    Google: grpc 1.15.1: https://grpc.io/ , Apache 2.0
+    Google: guava 28.1: https://github.com/google/guava , Apache 2.0
-    Google: gprc-java 1.14.0: https://github.com/grpc/grpc-java, Apache 2.0
-    Google: gprc-java 1.15.1: https://github.com/grpc/grpc-java, Apache 2.0
-    Google: guava 23.1: https://github.com/google/guava , Apache 2.0
     Google: guice 4.1.0: https://github.com/google/guice , Apache 2.0
-    Google: gson 2.8.1: https://github.com/google/gson , Apache 2.0
+    Google: gson 2.8.6: https://github.com/google/gson , Apache 2.0
-    Google: opencensus-java 0.12.3: https://github.com/census-instrumentation/opencensus-java , Apache 2.0
+    Google: opencensus-java 0.24.0: https://github.com/census-instrumentation/opencensus-java , Apache 2.0
-    Google: proto-google-common-protos 0.1.9: https://github.com/googleapis/googleapis , Apache 2.0
+    Google: proto-google-common-protos 1.12.0: https://github.com/googleapis/googleapis , Apache 2.0
-    Google: jsr305 3.0.0: http://central.maven.org/maven2/com/google/code/findbugs/jsr305/3.0.0/jsr305-3.0.0.pom , Apache 2.0
+    Google: jsr305 3.0.2: http://central.maven.org/maven2/com/google/code/findbugs/jsr305/3.0.0/jsr305-3.0.0.pom , Apache 2.0
     Elasticsearch BV (Elasticsearch) 6.3.2: https://www.elastic.co/products/elasticsearch , Apache 2.0
     Elasticsearch BV (Elasticsearch) 7.0.0: https://www.elastic.co/products/elasticsearch , Apache 2.0
     lang-mustache-client 5.5.0: https://github.com/elastic/elasticsearch/tree/master/modules/lang-mustache , Apache 2.0
@@ -276,7 +272,7 @@ The text of each license is the standard Apache 2.0 license.
     netty 5.5.0: https://github.com/netty/netty/blob/4.1/LICENSE.txt, Apache 2.0
     annotations 13.0: http://www.jetbrains.org, Apache 2.0
     compiler 0.9.3: https://github.com/spullara/mustache.java, Apache 2.0
-    error_prone_annotations 2.0.18: https://github.com/google/error-prone, Apache 2.0
+    error_prone_annotations 2.3.2: https://github.com/google/error-prone, Apache 2.0
     hppc 0.7.1: https://github.com/carrotsearch/hppc, Apache 2.0
     instrumentation-api 0.4.3: https://github.com/google/instrumentation-java, Apache 2.0
     jackson-annotations 2.8.0: https://github.com/FasterXML/jackson-annotations, Apache 2.0
@@ -327,6 +323,7 @@ The text of each license is the standard Apache 2.0 license.
     etcd4j 2.17.0: https://github.com/jurmous/etcd4j Apache 2.0
     javaassist 3.25.0-GA: https://github.com/jboss-javassist/javassist Apache 2.0
     jackson-module-afterburner 2.9.5: https://github.com/FasterXML/jackson-modules-base, Apache 2.0
+    perfmark-api 0.19.0: https://github.com/perfmark/perfmark
 
 ========================================================================
 MIT licenses
@@ -343,6 +340,15 @@ The text of each license is also included at licenses/LICENSE-[project].txt.
     bcpkix-jdk15on 1.55: http://www.bouncycastle.org/licence.html , MIT
     bcprov-jdk15on 1.55: http://www.bouncycastle.org/licence.html , MIT
     minimal-json 0.9.5:  https://github.com/ralfstx/minimal-json, MIT
+    checker-qual 2.8.1: https://github.com/typetools/checker-framework, MIT
+
+========================================================================
+MIT licenses
+========================================================================
+
+The following components are provided under the standard MIT License. See project link for details.
+
+    animal-sniffer-annotations 1.18: https://www.mojohaus.org/animal-sniffer/animal-sniffer-annotations/license.html, MIT
 
 ========================================================================
 BSD licenses

dist-material/release-docs/NOTICE

@@ -640,22 +640,6 @@ http://www.oracle.com/webfolder/technetwork/jsc/xml/ns/javaee/index.html
 
 ========================================================================
 
-Apache groovy NOTICE
-
-========================================================================
-Apache Groovy
-Copyright 2003-2018 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-This product bundles icons from the famfamfam.com silk icons set
-http://www.famfamfam.com/lab/icons/silk/
-Licensed under the Creative Commons Attribution Licence v2.5
-http://creativecommons.org/licenses/by/2.5/
-
-========================================================================
-
 Apache lucene NOTICE
 
 ========================================================================
@@ -892,3 +876,33 @@ the 'license' directory of the distribution file, for the license terms of the
 components that this product depends on.
 
 ------
+
+===========================================================================
+Perfmark Notice
+===========================================================================
+Copyright 2019 Google LLC
+
+Licensed 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.
+
+-----------------------------------------------------------------------
+
+This product contains a modified portion of 'Catapult', an open source
+Trace Event viewer for Chome, Linux, and Android applications, which can
+be obtained at:
+
+  * LICENSE:
+    * traceviewer/src/main/resources/io/perfmark/traceviewer/third_party/catapult/LICENSE (New BSD License)
+  * HOMEPAGE:
+    * https://github.com/catapult-project/catapult
+
+------

dist-material/release-docs/licenses/LICENSE-checker-qual.txt

@@ -0,0 +1,19 @@
+MIT License:
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

dist-material/release-docs/licenses/LICENSE-groovy.txt

@@ -1,215 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-------------------------------------------------------------------------
-
-ANTLR 2 License
-
-Antlr2 is released in the public domain.
-See licenses/antlr2-license.txt for details.
-
-------------------------------------------------------------------------
-
-ASM 4 License
-
-ASM 4 uses a 3-clause BSD license. For details, see licenses/asm-license.txt.

docs/en/setup/service-agent/java-agent/README.md

@@ -1,5 +1,5 @@
 # Setup java agent
-1. Agent is available for JDK 1.6 - 12.
+1. Agent is available for JDK 8 - 12 in 7.x releases. JDK 1.6 - JDK 12 are supported in all 6.x releases [NOTICE¹](#notice)
 1. Find `agent` folder in SkyWalking release package
 1. Set `agent.service_name` in `config/agent.config`. Could be any String in English.
 1. Set `collector.backend_service` in `config/agent.config`. Default point to `127.0.0.1:11800`, only works for local backend.
@@ -168,3 +168,7 @@ and consider to add this feature.
 If you are interested in plugin compatible tests or agent performance, see the following reports.
 * [Plugin Test in every Pull Request](https://github.com/apache/skywalking/actions?query=workflow%3APluginsTest)
 * [Java Agent Performance Test](https://skyapmtest.github.io/Agent-Benchmarks/)
+
+# Notice
+¹ Due to gRPC didn't support JDK 1.6 since 2018, SkyWalking abandoned the JDK 6/7 supports in all 7.x releases. 
+But, with gRPC back forward compatibility(at least for now), all SkyWalking 6.x agents could work with 7.x, including the agent and backend.

oap-server/exporter/pom.xml

@@ -44,17 +44,17 @@
             <plugin>
                 <groupId>org.xolstice.maven.plugins</groupId>
                 <artifactId>protobuf-maven-plugin</artifactId>
-                <version>0.5.0</version>
+                <version>${protobuf-maven-plugin.version}</version>
                 <configuration>
                     <!--
                       The version of protoc must match protobuf-java. If you don't depend on
                       protobuf-java directly, you will be transitively depending on the
                       protobuf-java version that grpc depends on.
                     -->
-                    <protocArtifact>com.google.protobuf:protoc:3.3.0:exe:${os.detected.classifier}
+                    <protocArtifact>com.google.protobuf:protoc:${com.google.protobuf.protoc.version}:exe:${os.detected.classifier}
                     </protocArtifact>
                     <pluginId>grpc-java</pluginId>
-                    <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.8.0:exe:${os.detected.classifier}
+                    <pluginArtifact>io.grpc:protoc-gen-grpc-java:${protoc-gen-grpc-java.plugin.version}:exe:${os.detected.classifier}
                     </pluginArtifact>
                 </configuration>
                 <executions>

oap-server/pom.xml

@@ -50,18 +50,16 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <slf4j.version>1.7.25</slf4j.version>
         <log4j.version>2.9.0</log4j.version>
-        <guava.version>23.1-jre</guava.version>
+        <guava.version>28.1-jre</guava.version>
         <snakeyaml.version>1.18</snakeyaml.version>
-        <gson.version>2.8.1</gson.version>
+        <gson.version>2.8.6</gson.version>
         <graphql-java-tools.version>5.2.3</graphql-java-tools.version>
         <graphql-java.version>8.0</graphql-java.version>
         <zookeeper.version>3.4.10</zookeeper.version>
-        <grpc.version>1.15.1</grpc.version>
         <netty-tcnative-boringssl-static.version>2.0.7.Final</netty-tcnative-boringssl-static.version>
         <jetty.version>9.4.2.v20170220</jetty.version>
         <lombok.version>1.18.0</lombok.version>
         <h2.version>1.4.196</h2.version>
-        <shardingjdbc.version>2.0.3</shardingjdbc.version>
         <commons-dbcp.version>1.4</commons-dbcp.version>
         <commons-io.version>2.6</commons-io.version>
         <elasticsearch.version>6.3.2</elasticsearch.version>
@@ -84,7 +82,7 @@
         <curator-test.version>2.12.0</curator-test.version>
         <etcd4j.version>2.17.0</etcd4j.version>
         <etcd.version>v3.2.3</etcd.version>
-        <netty.version>4.1.27.Final</netty.version>
+        <netty.version>4.1.42.Final</netty.version>
         <jackson-module-afterburner.version>2.9.5</jackson-module-afterburner.version>
         <antlr.version>4.7.1</antlr.version>
         <freemarker.version>2.3.28</freemarker.version>
@@ -251,6 +249,12 @@
                 <groupId>io.grpc</groupId>
                 <artifactId>grpc-core</artifactId>
                 <version>${grpc.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>com.google.android</groupId>
+                        <artifactId>annotations</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>io.grpc</groupId>
@@ -312,11 +316,6 @@
                 <version>${lombok.version}</version>
                 <scope>provided</scope>
             </dependency>
-            <dependency>
-                <groupId>io.shardingjdbc</groupId>
-                <artifactId>sharding-jdbc-core</artifactId>
-                <version>${shardingjdbc.version}</version>
-            </dependency>
             <dependency>
                 <groupId>commons-dbcp</groupId>
                 <artifactId>commons-dbcp</artifactId>

oap-server/server-cluster-plugin/cluster-kubernetes-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/kubernetes/KubernetesCoordinator.java

@@ -60,27 +60,29 @@ public class KubernetesCoordinator implements ClusterRegister, ClusterNodesQuery
     }
 
     public void start() {
-        submitTask(MoreExecutors.listeningDecorator(Executors.newSingleThreadExecutor(new ThreadFactoryBuilder()
+        ExecutorService executorService = Executors.newSingleThreadExecutor(new ThreadFactoryBuilder()
-            .setDaemon(true).setNameFormat("Kubernetes-ApiServer-%s").build())));
+            .setDaemon(true).setNameFormat("Kubernetes-ApiServer-%s").build());
+        submitTask(MoreExecutors.listeningDecorator(executorService), executorService);
     }
 
     @Override public void registerRemote(RemoteInstance remoteInstance) throws ServiceRegisterException {
         this.port = remoteInstance.getAddress().getPort();
     }
 
-    private void submitTask(final ListeningExecutorService service) {
+    private void submitTask(final ListeningExecutorService service, final ExecutorService executorService) {
         watch.initOrReset();
+
         ListenableFuture<?> watchFuture = service.submit(newWatch());
         Futures.addCallback(watchFuture, new FutureCallback<Object>() {
             @Override public void onSuccess(@Nullable Object ignored) {
-                submitTask(service);
+                submitTask(service, executorService);
             }
 
             @Override public void onFailure(@Nullable Throwable throwable) {
                 logger.debug("Generate remote nodes error", throwable);
-                submitTask(service);
+                submitTask(service, executorService);
             }
-        });
+        }, executorService);
     }
 
     private Callable<Object> newWatch() {

oap-server/server-configuration/grpc-configuration-sync/pom.xml

@@ -17,7 +17,8 @@
   ~
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>server-configuration</artifactId>
         <groupId>org.apache.skywalking</groupId>
@@ -76,17 +77,17 @@
             <plugin>
                 <groupId>org.xolstice.maven.plugins</groupId>
                 <artifactId>protobuf-maven-plugin</artifactId>
-                <version>0.5.0</version>
+                <version>${protobuf-maven-plugin.version}</version>
                 <configuration>
                     <!--
                       The version of protoc must match protobuf-java. If you don't depend on
                       protobuf-java directly, you will be transitively depending on the
                       protobuf-java version that grpc depends on.
                     -->
-                    <protocArtifact>com.google.protobuf:protoc:3.3.0:exe:${os.detected.classifier}
+                    <protocArtifact>com.google.protobuf:protoc:${com.google.protobuf.protoc.version}:exe:${os.detected.classifier}
                     </protocArtifact>
                     <pluginId>grpc-java</pluginId>
-                    <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.4.0:exe:${os.detected.classifier}
+                    <pluginArtifact>io.grpc:protoc-gen-grpc-java:${protoc-gen-grpc-java.plugin.version}:exe:${os.detected.classifier}
                     </pluginArtifact>
                 </configuration>
                 <executions>

oap-server/server-core/pom.xml

@@ -74,6 +74,7 @@
             <artifactId>apm-network</artifactId>
             <version>${project.version}</version>
         </dependency>
+
         <dependency>
             <groupId>org.apache.skywalking</groupId>
             <artifactId>server-testing</artifactId>
@@ -112,17 +113,17 @@
             <plugin>
                 <groupId>org.xolstice.maven.plugins</groupId>
                 <artifactId>protobuf-maven-plugin</artifactId>
-                <version>0.5.0</version>
+                <version>${protobuf-maven-plugin.version}</version>
                 <configuration>
                     <!--
                       The version of protoc must match protobuf-java. If you don't depend on
                       protobuf-java directly, you will be transitively depending on the
                       protobuf-java version that grpc depends on.
                     -->
-                    <protocArtifact>com.google.protobuf:protoc:3.3.0:exe:${os.detected.classifier}
+                    <protocArtifact>com.google.protobuf:protoc:${com.google.protobuf.protoc.version}:exe:${os.detected.classifier}
                     </protocArtifact>
                     <pluginId>grpc-java</pluginId>
-                    <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.4.0:exe:${os.detected.classifier}
+                    <pluginArtifact>io.grpc:protoc-gen-grpc-java:${protoc-gen-grpc-java.plugin.version}:exe:${os.detected.classifier}
                     </pluginArtifact>
                 </configuration>
                 <executions>

oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/ServiceInstanceTopologyBuilder.java

@@ -18,7 +18,7 @@
 
 package org.apache.skywalking.oap.server.core.query;
 
-import groovy.util.logging.Slf4j;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.skywalking.oap.server.core.Const;
 import org.apache.skywalking.oap.server.core.CoreModule;
 import org.apache.skywalking.oap.server.core.cache.ServiceInstanceInventoryCache;

oap-server/server-library/library-buffer/pom.xml

@@ -37,21 +37,5 @@
             <groupId>org.apache.skywalking</groupId>
             <artifactId>apm-network</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.grpc</groupId>
-            <artifactId>grpc-netty</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.grpc</groupId>
-            <artifactId>grpc-protobuf</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.grpc</groupId>
-            <artifactId>grpc-stub</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.netty</groupId>
-            <artifactId>netty-tcnative-boringssl-static</artifactId>
-        </dependency>
     </dependencies>
 </project>

oap-server/server-library/library-client/pom.xml

@@ -34,12 +34,12 @@
             <artifactId>grpc-core</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.zaxxer</groupId>
+            <groupId>com.google.code.gson</groupId>
-            <artifactId>HikariCP</artifactId>
+            <artifactId>gson</artifactId>
         </dependency>
         <dependency>
-            <groupId>io.shardingjdbc</groupId>
+            <groupId>com.zaxxer</groupId>
-            <artifactId>sharding-jdbc-core</artifactId>
+            <artifactId>HikariCP</artifactId>
         </dependency>
         <dependency>
             <groupId>commons-dbcp</groupId>

oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/elasticsearch/ElasticSearchClient.java

@@ -38,7 +38,6 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import javax.net.ssl.SSLContext;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpHost;
 import org.apache.http.HttpStatus;
@@ -55,6 +54,7 @@ import org.apache.http.impl.client.BasicCredentialsProvider;
 import org.apache.http.nio.entity.NStringEntity;
 import org.apache.http.ssl.SSLContextBuilder;
 import org.apache.http.ssl.SSLContexts;
+import org.apache.skywalking.apm.util.StringUtil;
 import org.apache.skywalking.oap.server.library.client.Client;
 import org.apache.skywalking.oap.server.library.client.request.InsertRequest;
 import org.apache.skywalking.oap.server.library.client.request.UpdateRequest;
@@ -123,11 +123,11 @@ public class ElasticSearchClient implements Client {
 
     protected RestHighLevelClient createClient(final List<HttpHost> pairsList) throws KeyStoreException, IOException, NoSuchAlgorithmException, CertificateException, KeyManagementException {
         RestClientBuilder builder;
-        if (StringUtils.isNotBlank(user) && StringUtils.isNotBlank(password)) {
+        if (StringUtil.isNotEmpty(user) && StringUtil.isNotEmpty(password)) {
             final CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
             credentialsProvider.setCredentials(AuthScope.ANY, new UsernamePasswordCredentials(user, password));
 
-            if (StringUtils.isBlank(trustStorePath)) {
+            if (StringUtil.isEmpty(trustStorePath)) {
                 builder = RestClient.builder(pairsList.toArray(new HttpHost[0]))
                     .setHttpClientConfigCallback(httpClientBuilder -> httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider));
             } else {
@@ -399,7 +399,7 @@ public class ElasticSearchClient implements Client {
     }
 
     public String formatIndexName(String indexName) {
-        if (StringUtils.isNotEmpty(namespace)) {
+        if (StringUtil.isNotEmpty(namespace)) {
             return namespace + "_" + indexName;
         }
         return indexName;

oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/grpc/GRPCClient.java

@@ -42,7 +42,7 @@ public class GRPCClient implements Client {
     }
 
     @Override public void connect() {
-        channel = ManagedChannelBuilder.forAddress(host, port).usePlaintext(true).build();
+        channel = ManagedChannelBuilder.forAddress(host, port).usePlaintext().build();
     }
 
     @Override public void shutdown() {

oap-server/server-library/library-client/src/test/java/org/apache/skywalking/oap/server/library/client/elasticsearch/ITElasticSearchClient.java

@@ -26,8 +26,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.http.client.methods.HttpGet;
+import org.apache.skywalking.apm.util.StringUtil;
 import org.elasticsearch.action.admin.indices.get.GetIndexRequest;
 import org.elasticsearch.action.bulk.BulkProcessor;
 import org.elasticsearch.action.get.GetResponse;
@@ -247,7 +247,7 @@ public class ITElasticSearchClient {
     }
 
     private JsonObject undoFormatIndexName(JsonObject index) {
-        if (StringUtils.isNotEmpty(namespace) && index != null && index.size() > 0) {
+        if (StringUtil.isNotEmpty(namespace) && index != null && index.size() > 0) {
             logger.info("UndoFormatIndexName before " + index.toString());
             String namespacePrefix = namespace + "_";
             index.entrySet().forEach(entry -> {

oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/envoy/MetricServiceGRPCHandlerTestMain.java

@@ -32,7 +32,7 @@ import java.util.concurrent.*;
 public class MetricServiceGRPCHandlerTestMain {
 
     public static void main(String[] args) throws InterruptedException {
-        ManagedChannel channel = ManagedChannelBuilder.forAddress("localhost", 11800).usePlaintext(true).build();
+        ManagedChannel channel = ManagedChannelBuilder.forAddress("localhost", 11800).usePlaintext().build();
 
         MetricsServiceGrpc.MetricsServiceStub stub = MetricsServiceGrpc.newStub(channel);
 

oap-server/server-receiver-plugin/receiver-proto/pom.xml

@@ -33,17 +33,17 @@
             <plugin>
                 <groupId>org.xolstice.maven.plugins</groupId>
                 <artifactId>protobuf-maven-plugin</artifactId>
-                <version>0.5.0</version>
+                <version>${protobuf-maven-plugin.version}</version>
                 <configuration>
                     <!--
                       The version of protoc must match protobuf-java. If you don't depend on
                       protobuf-java directly, you will be transitively depending on the
                       protobuf-java version that grpc depends on.
                     -->
-                    <protocArtifact>com.google.protobuf:protoc:3.3.0:exe:${os.detected.classifier}
+                    <protocArtifact>com.google.protobuf:protoc:${com.google.protobuf.protoc.version}:exe:${os.detected.classifier}
                     </protocArtifact>
                     <pluginId>grpc-java</pluginId>
-                    <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.8.0:exe:${os.detected.classifier}
+                    <pluginArtifact>io.grpc:protoc-gen-grpc-java:${protoc-gen-grpc-java.plugin.version}:exe:${os.detected.classifier}
                     </pluginArtifact>
                 </configuration>
                 <executions>

oap-server/server-receiver-plugin/skywalking-istio-telemetry-receiver-plugin/pom.xml

@@ -54,17 +54,17 @@
             <plugin>
                 <groupId>org.xolstice.maven.plugins</groupId>
                 <artifactId>protobuf-maven-plugin</artifactId>
-                <version>0.5.0</version>
+                <version>${protobuf-maven-plugin.version}</version>
                 <configuration>
                     <!--
                       The version of protoc must match protobuf-java. If you don't depend on
                       protobuf-java directly, you will be transitively depending on the
                       protobuf-java version that grpc depends on.
                     -->
-                    <protocArtifact>com.google.protobuf:protoc:3.3.0:exe:${os.detected.classifier}
+                    <protocArtifact>com.google.protobuf:protoc:${com.google.protobuf.protoc.version}:exe:${os.detected.classifier}
                     </protocArtifact>
                     <pluginId>grpc-java</pluginId>
-                    <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.8.0:exe:${os.detected.classifier}
+                    <pluginArtifact>io.grpc:protoc-gen-grpc-java:${protoc-gen-grpc-java.plugin.version}:exe:${os.detected.classifier}
                     </pluginArtifact>
                 </configuration>
                 <executions>

oap-server/server-receiver-plugin/skywalking-istio-telemetry-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/istio/telemetry/handler/IstioTelemetryHandlerMainTest.java

@@ -35,7 +35,7 @@ import java.util.concurrent.TimeUnit;
 public class IstioTelemetryHandlerMainTest {
 
     public static void main(String[] args) throws InterruptedException {
-        ManagedChannel channel = ManagedChannelBuilder.forAddress("localhost", 11800).usePlaintext(true).build();
+        ManagedChannel channel = ManagedChannelBuilder.forAddress("localhost", 11800).usePlaintext().build();
 
         HandleMetricServiceGrpc.HandleMetricServiceBlockingStub stub = HandleMetricServiceGrpc.newBlockingStub(channel);
 

oap-server/server-receiver-plugin/skywalking-jvm-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/jvm/provider/handler/JVMMetricsServiceHandlerMainTest.java

@@ -29,7 +29,7 @@ import org.apache.skywalking.apm.network.language.agent.*;
 public class JVMMetricsServiceHandlerMainTest {
 
     public static void main(String[] args) {
-        ManagedChannel channel = ManagedChannelBuilder.forAddress("localhost", 11800).usePlaintext(true).build();
+        ManagedChannel channel = ManagedChannelBuilder.forAddress("localhost", 11800).usePlaintext().build();
 
         JVMMetricsServiceGrpc.JVMMetricsServiceBlockingStub stub = JVMMetricsServiceGrpc.newBlockingStub(channel);
 

oap-server/server-receiver-plugin/skywalking-register-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/register/provider/handler/v5/ApplicationRegisterHandlerTestCase.java

@@ -31,7 +31,7 @@ public class ApplicationRegisterHandlerTestCase {
     private static final Logger logger = LoggerFactory.getLogger(ApplicationRegisterHandlerTestCase.class);
 
     public static void main(String[] args) {
-        ManagedChannel channel = ManagedChannelBuilder.forAddress("localhost", 11800).usePlaintext(true).build();
+        ManagedChannel channel = ManagedChannelBuilder.forAddress("localhost", 11800).usePlaintext().build();
 
         ApplicationRegisterServiceGrpc.ApplicationRegisterServiceBlockingStub stub = ApplicationRegisterServiceGrpc.newBlockingStub(channel);
 

oap-server/server-receiver-plugin/skywalking-register-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/register/provider/handler/v5/InstanceDiscoveryServiceHandlerTestCase.java

@@ -30,7 +30,7 @@ public class InstanceDiscoveryServiceHandlerTestCase {
     private static final Logger logger = LoggerFactory.getLogger(InstanceDiscoveryServiceHandlerTestCase.class);
 
     public static void main(String[] args) {
-        ManagedChannel channel = ManagedChannelBuilder.forAddress("localhost", 11800).usePlaintext(true).build();
+        ManagedChannel channel = ManagedChannelBuilder.forAddress("localhost", 11800).usePlaintext().build();
 
         InstanceDiscoveryServiceGrpc.InstanceDiscoveryServiceBlockingStub stub = InstanceDiscoveryServiceGrpc.newBlockingStub(channel);
 

oap-server/server-receiver-plugin/skywalking-register-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/register/provider/handler/v5/InstanceHeartBeatTestCase.java

@@ -27,7 +27,7 @@ import org.apache.skywalking.apm.network.language.agent.*;
 public class InstanceHeartBeatTestCase {
 
     public static void main(String[] args) {
-        ManagedChannel channel = ManagedChannelBuilder.forAddress("localhost", 11800).usePlaintext(true).build();
+        ManagedChannel channel = ManagedChannelBuilder.forAddress("localhost", 11800).usePlaintext().build();
 
         InstanceDiscoveryServiceGrpc.InstanceDiscoveryServiceBlockingStub stub = InstanceDiscoveryServiceGrpc.newBlockingStub(channel);
 

oap-server/server-receiver-plugin/skywalking-register-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/register/provider/handler/v5/NetworkAddressRegisterServiceHandlerTestCase.java

@@ -30,7 +30,7 @@ public class NetworkAddressRegisterServiceHandlerTestCase {
     private static final Logger logger = LoggerFactory.getLogger(NetworkAddressRegisterServiceHandlerTestCase.class);
 
     public static void main(String[] args) {
-        ManagedChannel channel = ManagedChannelBuilder.forAddress("localhost", 11800).usePlaintext(true).build();
+        ManagedChannel channel = ManagedChannelBuilder.forAddress("localhost", 11800).usePlaintext().build();
 
         NetworkAddressRegisterServiceGrpc.NetworkAddressRegisterServiceBlockingStub stub = NetworkAddressRegisterServiceGrpc.newBlockingStub(channel);
 

oap-server/server-receiver-plugin/skywalking-register-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/register/provider/handler/v5/ServiceNameDiscoveryHandlerTestCase.java

@@ -30,7 +30,7 @@ public class ServiceNameDiscoveryHandlerTestCase {
     private static final Logger logger = LoggerFactory.getLogger(ServiceNameDiscoveryHandlerTestCase.class);
 
     public static void main(String[] args) {
-        ManagedChannel channel = ManagedChannelBuilder.forAddress("localhost", 11800).usePlaintext(true).build();
+        ManagedChannel channel = ManagedChannelBuilder.forAddress("localhost", 11800).usePlaintext().build();
         ServiceNameDiscoveryServiceGrpc.ServiceNameDiscoveryServiceBlockingStub stub = ServiceNameDiscoveryServiceGrpc.newBlockingStub(channel);
 
         ServiceNameCollection.Builder serviceNameCollection = ServiceNameCollection.newBuilder();

oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/trace/mock/AgentDataMock.java

@@ -35,7 +35,7 @@ public class AgentDataMock {
     private static boolean IS_COMPLETED = false;
 
     public static void main(String[] args) throws InterruptedException {
-        ManagedChannel channel = ManagedChannelBuilder.forAddress("localhost", 11800).usePlaintext(true).build();
+        ManagedChannel channel = ManagedChannelBuilder.forAddress("localhost", 11800).usePlaintext().build();
 
         RegisterMock registerMock = new RegisterMock(channel);
 
@@ -85,7 +85,7 @@ public class AgentDataMock {
     }
 
     private static StreamObserver<UpstreamSegment> createStreamObserver() {
-        ManagedChannel channel = ManagedChannelBuilder.forAddress("localhost", 11800).usePlaintext(true).build();
+        ManagedChannel channel = ManagedChannelBuilder.forAddress("localhost", 11800).usePlaintext().build();
         TraceSegmentServiceGrpc.TraceSegmentServiceStub stub = TraceSegmentServiceGrpc.newStub(channel);
         return stub.collect(new StreamObserver<Downstream>() {
             @Override public void onNext(Downstream downstream) {

pom.xml

@@ -187,6 +187,14 @@
         <junit.version>4.12</junit.version>
         <mockito-all.version>1.10.19</mockito-all.version>
 
+        <!-- core lib dependency -->
+        <grpc.version>1.26.0</grpc.version>
+        <os-maven-plugin.version>1.6.2</os-maven-plugin.version>
+        <protobuf-maven-plugin.version>0.6.1</protobuf-maven-plugin.version>
+        <com.google.protobuf.protoc.version>3.3.0</com.google.protobuf.protoc.version>
+        <protoc-gen-grpc-java.plugin.version>1.8.0</protoc-gen-grpc-java.plugin.version>
+        <netty-tcnative-boringssl-static.version>2.0.25.Final</netty-tcnative-boringssl-static.version>
+
         <!-- Plugin versions -->
         <docker.plugin.version>0.4.13</docker.plugin.version>
         <takari-maven-plugin.version>0.6.1</takari-maven-plugin.version>
@@ -271,6 +279,13 @@
     </dependencyManagement>
 
     <build>
+        <extensions>
+            <extension>
+                <groupId>kr.motd.maven</groupId>
+                <artifactId>os-maven-plugin</artifactId>
+                <version>${os-maven-plugin.version}</version>
+            </extension>
+        </extensions>
         <pluginManagement>
             <plugins>
                 <!-- mvn -N io.takari:maven:wrapper -Dmaven=3.5.4 -->

tools/dependencies/check-LICENSE.sh

@@ -36,7 +36,9 @@ grep -vf self-modules.txt all-dependencies.txt > third-party-dependencies.txt
 # i.e. "sort the two file using the same command (and default arguments)"
 diff -w -B -U0 <(cat tools/dependencies/known-oap-backend-dependencies.txt | sort) <(cat third-party-dependencies.txt | sort)
 
-[[ $? -ne 0 ]] && exit $?
+status=$?
+
+[[ ${status} -ne 0 ]] && exit ${status}
 
 # Check ES7 distribution package
 

tools/dependencies/known-oap-backend-dependencies-es7.txt

@@ -1,5 +1,5 @@
 aggs-matrix-stats-client-7.0.0.jar
-animal-sniffer-annotations-1.14.jar
+animal-sniffer-annotations-1.18.jar
 annotations-13.0.jar
 antlr4-runtime-4.7.1.jar
 aopalliance-1.0.jar
@@ -9,6 +9,7 @@ bcpkix-jdk15on-1.59.jar
 bcprov-ext-jdk15on-1.59.jar
 bcprov-jdk15on-1.59.jar
 builder-annotations-0.9.2.jar
+checker-qual-2.8.1.jar
 client-java-4.0.0.jar
 client-java-api-4.0.0.jar
 client-java-proto-4.0.0.jar
@@ -34,21 +35,22 @@ elasticsearch-rest-client-7.0.0.jar
 elasticsearch-rest-high-level-client-7.0.0.jar
 elasticsearch-secure-sm-7.0.0.jar
 elasticsearch-x-content-7.0.0.jar
-error_prone_annotations-2.0.18.jar
+error_prone_annotations-2.3.2.jar
 etcd4j-2.17.0.jar
+failureaccess-1.0.1.jar
 fastjson-1.2.47.jar
 freemarker-2.3.28.jar
 graphql-java-8.0.jar
 graphql-java-tools-5.2.3.jar
-groovy-2.4.5-indy.jar
+grpc-api-1.26.0.jar
-grpc-context-1.15.1.jar
+grpc-context-1.26.0.jar
-grpc-core-1.15.1.jar
+grpc-core-1.26.0.jar
-grpc-netty-1.15.1.jar
+grpc-netty-1.26.0.jar
-grpc-protobuf-1.15.1.jar
+grpc-protobuf-1.26.0.jar
-grpc-protobuf-lite-1.15.1.jar
+grpc-protobuf-lite-1.26.0.jar
-grpc-stub-1.15.1.jar
+grpc-stub-1.26.0.jar
-gson-2.8.1.jar
+gson-2.8.6.jar
-guava-23.1-jre.jar
+guava-28.1-jre.jar
 guice-4.1.0.jar
 h2-1.4.196.jar
 HdrHistogram-2.1.9.jar
@@ -87,10 +89,11 @@ joda-convert-1.2.jar
 joda-time-2.10.5.jar
 jopt-simple-4.6.jar
 json-flattener-0.6.0.jar
-jsr305-1.3.9.jar
+jsr305-3.0.2.jar
 kotlin-reflect-1.1.1.jar
 kotlin-stdlib-1.1.60.jar
 lang-mustache-client-7.0.0.jar
+listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar
 log4j-1.2.16.jar
 log4j-api-2.9.0.jar
 log4j-core-2.9.0.jar
@@ -117,34 +120,34 @@ nacos-api-1.0.0.jar
 nacos-client-1.0.0.jar
 nacos-common-1.0.0.jar
 netty-3.10.5.Final.jar
-netty-buffer-4.1.27.Final.jar
+netty-buffer-4.1.42.Final.jar
-netty-codec-4.1.27.Final.jar
+netty-codec-4.1.42.Final.jar
-netty-codec-dns-4.1.27.Final.jar
+netty-codec-dns-4.1.42.Final.jar
-netty-codec-http-4.1.27.Final.jar
+netty-codec-http-4.1.42.Final.jar
-netty-codec-http2-4.1.27.Final.jar
+netty-codec-http2-4.1.42.Final.jar
-netty-codec-socks-4.1.27.Final.jar
+netty-codec-socks-4.1.42.Final.jar
-netty-common-4.1.27.Final.jar
+netty-common-4.1.42.Final.jar
-netty-handler-4.1.27.Final.jar
+netty-handler-4.1.42.Final.jar
-netty-handler-proxy-4.1.27.Final.jar
+netty-handler-proxy-4.1.42.Final.jar
-netty-resolver-4.1.27.Final.jar
+netty-resolver-4.1.42.Final.jar
-netty-resolver-dns-4.1.27.Final.jar
+netty-resolver-dns-4.1.42.Final.jar
 netty-tcnative-boringssl-static-2.0.7.Final.jar
-netty-transport-4.1.27.Final.jar
+netty-transport-4.1.42.Final.jar
 okhttp-2.7.5.jar
 okhttp-3.9.0.jar
 okhttp-ws-2.7.5.jar
 okio-1.13.0.jar
-opencensus-api-0.12.3.jar
+opencensus-api-0.24.0.jar
-opencensus-contrib-grpc-metrics-0.12.3.jar
+opencensus-contrib-grpc-metrics-0.24.0.jar
 parent-join-client-7.0.0.jar
-proto-google-common-protos-1.0.0.jar
+perfmark-api-0.19.0.jar
+proto-google-common-protos-1.12.0.jar
 protobuf-java-3.4.0.jar
 rank-eval-client-7.0.0.jar
 reactive-streams-1.0.2.jar
 reflectasm-1.11.7.jar
 resourcecify-annotations-0.9.2.jar
 retrofit-2.3.0.jar
-sharding-jdbc-core-2.0.3.jar
 simpleclient-0.6.0.jar
 simpleclient_common-0.6.0.jar
 simpleclient_hotspot-0.6.0.jar

tools/dependencies/known-oap-backend-dependencies.txt

@@ -1,5 +1,5 @@
 aggs-matrix-stats-client-6.3.2.jar
-animal-sniffer-annotations-1.14.jar
+animal-sniffer-annotations-1.18.jar
 annotations-13.0.jar
 antlr4-runtime-4.7.1.jar
 aopalliance-1.0.jar
@@ -10,6 +10,7 @@ bcprov-ext-jdk15on-1.59.jar
 bcprov-jdk15on-1.59.jar
 builder-annotations-0.9.2.jar
 caffeine-2.6.2.jar
+checker-qual-2.8.1.jar
 client-java-4.0.0.jar
 client-java-api-4.0.0.jar
 client-java-proto-4.0.0.jar
@@ -33,21 +34,22 @@ elasticsearch-rest-client-6.3.2.jar
 elasticsearch-rest-high-level-client-6.3.2.jar
 elasticsearch-secure-sm-6.3.2.jar
 elasticsearch-x-content-6.3.2.jar
-error_prone_annotations-2.0.18.jar
+error_prone_annotations-2.3.2.jar
 etcd4j-2.17.0.jar
+failureaccess-1.0.1.jar
 fastjson-1.2.47.jar
 freemarker-2.3.28.jar
 graphql-java-8.0.jar
 graphql-java-tools-5.2.3.jar
-groovy-2.4.5-indy.jar
+grpc-api-1.26.0.jar
-grpc-context-1.15.1.jar
+grpc-context-1.26.0.jar
-grpc-core-1.15.1.jar
+grpc-core-1.26.0.jar
-grpc-netty-1.15.1.jar
+grpc-netty-1.26.0.jar
-grpc-protobuf-1.15.1.jar
+grpc-protobuf-1.26.0.jar
-grpc-protobuf-lite-1.15.1.jar
+grpc-protobuf-lite-1.26.0.jar
-grpc-stub-1.15.1.jar
+grpc-stub-1.26.0.jar
-gson-2.8.1.jar
+gson-2.8.6.jar
-guava-23.1-jre.jar
+guava-28.1-jre.jar
 guice-4.1.0.jar
 h2-1.4.196.jar
 HdrHistogram-2.1.9.jar
@@ -86,9 +88,10 @@ joda-convert-1.2.jar
 joda-time-2.10.5.jar
 jopt-simple-4.6.jar
 json-flattener-0.6.0.jar
-jsr305-1.3.9.jar
+jsr305-3.0.2.jar
 kotlin-reflect-1.1.1.jar
 kotlin-stdlib-1.1.60.jar
+listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar
 log4j-1.2.16.jar
 log4j-api-2.9.0.jar
 log4j-core-2.9.0.jar
@@ -115,34 +118,34 @@ nacos-api-1.0.0.jar
 nacos-client-1.0.0.jar
 nacos-common-1.0.0.jar
 netty-3.10.5.Final.jar
-netty-buffer-4.1.27.Final.jar
+netty-buffer-4.1.42.Final.jar
-netty-codec-4.1.27.Final.jar
+netty-codec-4.1.42.Final.jar
-netty-codec-dns-4.1.27.Final.jar
+netty-codec-dns-4.1.42.Final.jar
-netty-codec-http-4.1.27.Final.jar
+netty-codec-http-4.1.42.Final.jar
-netty-codec-http2-4.1.27.Final.jar
+netty-codec-http2-4.1.42.Final.jar
-netty-codec-socks-4.1.27.Final.jar
+netty-codec-socks-4.1.42.Final.jar
-netty-common-4.1.27.Final.jar
+netty-common-4.1.42.Final.jar
-netty-handler-4.1.27.Final.jar
+netty-handler-4.1.42.Final.jar
-netty-handler-proxy-4.1.27.Final.jar
+netty-handler-proxy-4.1.42.Final.jar
-netty-resolver-4.1.27.Final.jar
+netty-resolver-4.1.42.Final.jar
-netty-resolver-dns-4.1.27.Final.jar
+netty-resolver-dns-4.1.42.Final.jar
 netty-tcnative-boringssl-static-2.0.7.Final.jar
-netty-transport-4.1.27.Final.jar
+netty-transport-4.1.42.Final.jar
 okhttp-2.7.5.jar
 okhttp-3.9.0.jar
 okhttp-ws-2.7.5.jar
 okio-1.13.0.jar
-opencensus-api-0.12.3.jar
+opencensus-api-0.24.0.jar
-opencensus-contrib-grpc-metrics-0.12.3.jar
+opencensus-contrib-grpc-metrics-0.24.0.jar
 parent-join-client-6.3.2.jar
-proto-google-common-protos-1.0.0.jar
+perfmark-api-0.19.0.jar
+proto-google-common-protos-1.12.0.jar
 protobuf-java-3.4.0.jar
 rank-eval-client-6.3.2.jar
 reactive-streams-1.0.2.jar
 reflectasm-1.11.7.jar
 resourcecify-annotations-0.9.2.jar
 retrofit-2.3.0.jar
-sharding-jdbc-core-2.0.3.jar
 simpleclient-0.6.0.jar
 simpleclient_common-0.6.0.jar
 simpleclient_hotspot-0.6.0.jar