You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@skywalking.apache.org by wu...@apache.org on 2018/08/09 12:15:48 UTC
[incubator-skywalking] 02/02: Update NOTICE proto files
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch 6.0
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
commit 48a37c89f520fe008c827c58afb12637ac11b0b0
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Thu Aug 9 20:15:38 2018 +0800
Update NOTICE proto files
---
NOTICE | 12 ++++++------
apm-dist/release-docs/NOTICE | 12 ++++++------
pom.xml | 4 +---
3 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/NOTICE b/NOTICE
index a502335..7be04fc 100644
--- a/NOTICE
+++ b/NOTICE
@@ -11,18 +11,18 @@ Licensed under the MIT license, confirmed by ant-design team member.
https://github.com/ant-design/ant-design/issues/10243
This product bundles the following proto files
-1. apm-protocol/apm-network/src/main/proto/service-mesh-probe/istio-metric.proto
-2. apm-protocol/apm-network/src/main/proto/policy/v1beta1/type.proto
-3. apm-protocol/apm-network/src/main/proto/policy/v1beta1/value_type.proto
-4. apm-protocol/apm-network/src/main/proto/mixer/adapter/model/v1beta1/extensions.proto
-5. apm-protocol/apm-network/src/main/proto/mixer/adapter/model/v1beta1/report.proto
+1. oap-server/server-receiver-plugin/istio-telemetry-receiver-provider/src/main/proto/istio-metric.proto
+2. oap-server/server-receiver-plugin/istio-telemetry-receiver-provider/src/main/proto/policy/v1beta1/type.proto
+3. oap-server/server-receiver-plugin/istio-telemetry-receiver-provider/src/main/proto/policy/v1beta1/value_type.proto
+4. oap-server/server-receiver-plugin/istio-telemetry-receiver-provider/src/main/proto/mixer/adapter/model/v1beta1/extensions.proto
+5. oap-server/server-receiver-plugin/istio-telemetry-receiver-provider/src/main/proto/mixer/adapter/model/v1beta1/report.proto
from the istio projects,
https://github.com/istio/istio
https://github.com/istio/api
Licensed under the Apache 2.0 license.
This product bundles the following proto file
-1. apm-protocol/apm-network/src/main/proto/gogoproto/gogo.proto
+1. oap-server/server-receiver-plugin/istio-telemetry-receiver-provider/src/main/proto/gogoproto/gogo.proto
from the gogo/protobuf project,
https://github.com/gogo/protobuf
Licensed under the BSD-3-Clause license.
\ No newline at end of file
diff --git a/apm-dist/release-docs/NOTICE b/apm-dist/release-docs/NOTICE
index c1e377c..5ef09ee 100644
--- a/apm-dist/release-docs/NOTICE
+++ b/apm-dist/release-docs/NOTICE
@@ -10,18 +10,18 @@ Licensed under the MIT license, confirmed by ant-design team member.
https://github.com/ant-design/ant-design/issues/10243
This product bundles the following proto files
-1. apm-protocol/apm-network/src/main/proto/service-mesh-probe/istio-metric.proto
-2. apm-protocol/apm-network/src/main/proto/policy/v1beta1/type.proto
-3. apm-protocol/apm-network/src/main/proto/policy/v1beta1/value_type.proto
-4. apm-protocol/apm-network/src/main/proto/mixer/adapter/model/v1beta1/extensions.proto
-5. apm-protocol/apm-network/src/main/proto/mixer/adapter/model/v1beta1/report.proto
+1. oap-server/server-receiver-plugin/istio-telemetry-receiver-provider/src/main/proto/istio-metric.proto
+2. oap-server/server-receiver-plugin/istio-telemetry-receiver-provider/src/main/proto/policy/v1beta1/type.proto
+3. oap-server/server-receiver-plugin/istio-telemetry-receiver-provider/src/main/proto/policy/v1beta1/value_type.proto
+4. oap-server/server-receiver-plugin/istio-telemetry-receiver-provider/src/main/proto/mixer/adapter/model/v1beta1/extensions.proto
+5. oap-server/server-receiver-plugin/istio-telemetry-receiver-provider/src/main/proto/mixer/adapter/model/v1beta1/report.proto
from the istio projects,
https://github.com/istio/istio
https://github.com/istio/api
Licensed under the Apache 2.0 license.
This product bundles the following proto file
-1. apm-protocol/apm-network/src/main/proto/gogoproto/gogo.proto
+1. oap-server/server-receiver-plugin/istio-telemetry-receiver-provider/src/main/proto/gogoproto/gogo.proto
from the gogo/protobuf project,
https://github.com/gogo/protobuf
Licensed under the BSD-3-Clause license.
diff --git a/pom.xml b/pom.xml
index ad4f5b7..344aca9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -231,9 +231,7 @@
<exclude>skywalking-ui/package.json</exclude>
<exclude>skywalking-ui/package-lock.json</exclude>
- <exclude>apm-protocols/apm-network/src/main/proto/gogoproto/*.proto</exclude>
- <exclude>apm-protocols/apm-network/src/main/proto/mixer/*.proto</exclude>
- <exclude>apm-protocols/apm-network/src/main/proto/mixer/*.proto</exclude>
+ <exclude>oap-server/server-receiver-plugin/istio-telemetry-receiver-provider/src/main/proto/**/*.proto</exclude>
</excludes>
</configuration>
<executions>