Clean up apache#12393

kezhenxu94 · Sep 7, 2024 · 71fcb22 · 71fcb22
1 parent 7848399
commit 71fcb22
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 82 deletions.
diff --git a/LICENSE b/LICENSE
@@ -215,6 +215,7 @@ Apache 2.0 licenses
 The following components are provided under the Apache License. See project link for details.
 The text of each license is the standard Apache 2.0 license.
 
+   proto files from cilium: https://github.com/cilium/cilium/tree/v1.15.6/api/v1 Apache 2.0
    proto files from cncf/udpa: https://github.com/cncf/udpa Apache 2.0
    proto files from envoyproxy/data-plane-api: https://github.com/envoyproxy/data-plane-api  Apache 2.0
    proto files from prometheus/client_model: https://github.com/prometheus/client_model Apache 2.0

diff --git a/dist-material/release-docs/LICENSE b/dist-material/release-docs/LICENSE
@@ -373,7 +373,6 @@ The text of each license is the standard Apache 2.0 license.
     https://mvnrepository.com/artifact/org.xerial.snappy/snappy-java/1.1.8.4 Apache-2.0
     https://mvnrepository.com/artifact/org.yaml/snakeyaml/2.0 Apache-2.0
     https://npmjs.com/package/typescript/v/4.7.4 4.7.4 Apache-2.0
-    https://github.com/cilium/cilium/tree/v1.15.6/api/v1 Apache-2.0
 
 ========================================================================
 BSD-2-Clause licenses

diff --git a/dist-material/release-docs/LICENSE.tpl b/dist-material/release-docs/LICENSE.tpl
@@ -30,9 +30,6 @@ The text of each license is also included in licenses/LICENSE-[project].txt.
     https://npmjs.com/package/{{ .Name }}/v/{{ .Version }} {{ .Version }} {{ .LicenseID }}
       {{- end }}
     {{- end }}
-    {{- if eq .LicenseID "Apache-2.0" }}
-    https://github.com/cilium/cilium/tree/v1.15.6/api/v1 Apache-2.0
-    {{- end }}
 {{ end }}
 =======================================================================
 The zipkin-lens.jar dependency has more front-end dependencies in it and the front-end dependencies' licenses

diff --git a/oap-server-bom/pom.xml b/oap-server-bom/pom.xml
@@ -215,6 +215,11 @@
                     </exclusion>
                 </exclusions>
             </dependency>
+            <dependency>
+                <groupId>io.grpc</groupId>
+                <artifactId>grpc-api</artifactId>
+                <version>${grpc.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.grpc</groupId>
                 <artifactId>grpc-netty</artifactId>

diff --git a/...lugin/src/main/java/org/apache/skywalking/oap/server/fetcher/cilium/nodes/CiliumNode.java b/...lugin/src/main/java/org/apache/skywalking/oap/server/fetcher/cilium/nodes/CiliumNode.java
@@ -42,7 +42,6 @@
 })
 @ToString(of = {
     "address",
-    "connected"
 })
 public class CiliumNode {
     private final String address;

diff --git a/oap-server/server-fetcher-plugin/fetcher-proto/pom.xml b/oap-server/server-fetcher-plugin/fetcher-proto/pom.xml
@@ -26,43 +26,14 @@
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>fetcher-proto</artifactId>
-  <packaging>jar</packaging>
-
-  <properties>
-    <fbs.sources>${basedir}/src/main/fbs</fbs.sources>
-    <fbs.generated.sources>${project.build.directory}/generated-sources/fbs/java</fbs.generated.sources>
-    <fbs.compiler>${project.build.directory}/bin/flatc</fbs.compiler>
-    <fbs.compiler.artifact.type>tar.gz</fbs.compiler.artifact.type>
-  </properties>
 
   <dependencies>
-    <dependency>
-      <groupId>com.google.flatbuffers</groupId>
-      <artifactId>flatbuffers-java</artifactId>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <groupId>io.grpc</groupId>
       <artifactId>grpc-api</artifactId>
-      <version>1.63.0</version>
-      <scope>compile</scope>
     </dependency>
   </dependencies>
 
-  <profiles>
-    <profile>
-      <id>windows</id>
-      <activation>
-        <os>
-          <family>Windows</family>
-        </os>
-      </activation>
-      <properties>
-        <fbs.compiler.artifact.type>zip</fbs.compiler.artifact.type>
-      </properties>
-    </profile>
-  </profiles>
-
   <build>
     <extensions>
       <extension>
@@ -113,52 +84,6 @@
           </execution>
         </executions>
       </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>unpack</id>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>unpack</goal>
-            </goals>
-            <configuration>
-              <artifactItems>
-                <artifactItem>
-                  <groupId>com.github.davidmoten</groupId>
-                  <artifactId>flatbuffers-compiler</artifactId>
-                  <version>1.12.0.1</version>
-                  <type>${fbs.compiler.artifact.type}</type>
-                  <classifier>distribution-${os.detected.name}</classifier>
-                  <overWrite>true</overWrite>
-                  <outputDirectory>${project.build.directory}</outputDirectory>
-                </artifactItem>
-              </artifactItems>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <version>${build-helper-maven-plugin.version}</version>
-        <executions>
-          <execution>
-            <id>add-source</id>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>add-source</goal>
-            </goals>
-            <configuration>
-              <sources>
-                <source>${fbs.generated.sources}</source>
-              </sources>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
-</project>
+</project>
diff --git a/...ibrary-util/src/main/java/org/apache/skywalking/oap/server/library/util/FieldsHelper.java b/...ibrary-util/src/main/java/org/apache/skywalking/oap/server/library/util/FieldsHelper.java
@@ -84,7 +84,6 @@ public void init(final String file) throws Exception {
         init(ResourceUtils.readToStream(file));
     }
 
-    @SuppressWarnings("unchecked")
     public void init(final InputStream inputStream) {
         if (initialized) {
             return;