You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ke...@apache.org on 2024/09/07 11:35:43 UTC
(skywalking) branch master updated: Clean up #12393 (#12600)
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new 21e0830d82 Clean up #12393 (#12600)
21e0830d82 is described below
commit 21e0830d8298abb8aa0f8da149522a0ec4627ca6
Author: kezhenxu94 <ke...@apache.org>
AuthorDate: Sat Sep 7 19:35:37 2024 +0800
Clean up #12393 (#12600)
---
LICENSE | 1 +
dist-material/release-docs/LICENSE | 1 -
dist-material/release-docs/LICENSE.tpl | 3 -
oap-server-bom/pom.xml | 5 ++
.../server/fetcher/cilium/nodes/CiliumNode.java | 1 -
.../server-fetcher-plugin/fetcher-proto/pom.xml | 77 +---------------------
.../oap/server/library/util/FieldsHelper.java | 1 -
7 files changed, 7 insertions(+), 82 deletions(-)
diff --git a/LICENSE b/LICENSE
index dc8c998781..8f72b148ab 100644
--- 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
index 0dbac0c6de..b4e30ed392 100644
--- 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
index 738f07ec23..5479740ec7 100644
--- 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
index 2c548e698d..f5385435d8 100644
--- 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/oap-server/server-fetcher-plugin/cilium-fetcher-plugin/src/main/java/org/apache/skywalking/oap/server/fetcher/cilium/nodes/CiliumNode.java b/oap-server/server-fetcher-plugin/cilium-fetcher-plugin/src/main/java/org/apache/skywalking/oap/server/fetcher/cilium/nodes/CiliumNode.java
index 7a79f2e775..a82cdf7bae 100644
--- a/oap-server/server-fetcher-plugin/cilium-fetcher-plugin/src/main/java/org/apache/skywalking/oap/server/fetcher/cilium/nodes/CiliumNode.java
+++ b/oap-server/server-fetcher-plugin/cilium-fetcher-plugin/src/main/java/org/apache/skywalking/oap/server/fetcher/cilium/nodes/CiliumNode.java
@@ -42,7 +42,6 @@ import java.util.concurrent.CopyOnWriteArrayList;
})
@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
index 331b46099c..4eaa47998e 100644
--- 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>
\ No newline at end of file
+</project>
diff --git a/oap-server/server-library/library-util/src/main/java/org/apache/skywalking/oap/server/library/util/FieldsHelper.java b/oap-server/server-library/library-util/src/main/java/org/apache/skywalking/oap/server/library/util/FieldsHelper.java
index 9e3306ee72..d5dcf38252 100644
--- a/oap-server/server-library/library-util/src/main/java/org/apache/skywalking/oap/server/library/util/FieldsHelper.java
+++ b/oap-server/server-library/library-util/src/main/java/org/apache/skywalking/oap/server/library/util/FieldsHelper.java
@@ -84,7 +84,6 @@ public class FieldsHelper {
init(ResourceUtils.readToStream(file));
}
- @SuppressWarnings("unchecked")
public void init(final InputStream inputStream) {
if (initialized) {
return;