From 48a37c89f520fe008c827c58afb12637ac11b0b0 Mon Sep 17 00:00:00 2001 From: Wu Sheng Date: Thu, 9 Aug 2018 20:15:38 +0800 Subject: [PATCH] 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 a502335e7..7be04fc06 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 c1e377cc4..5ef09eede 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 ad4f5b7c1..344aca97a 100644 --- a/pom.xml +++ b/pom.xml @@ -231,9 +231,7 @@ skywalking-ui/package.json skywalking-ui/package-lock.json - apm-protocols/apm-network/src/main/proto/gogoproto/*.proto - apm-protocols/apm-network/src/main/proto/mixer/*.proto - apm-protocols/apm-network/src/main/proto/mixer/*.proto + oap-server/server-receiver-plugin/istio-telemetry-receiver-provider/src/main/proto/**/*.proto