You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2022/08/24 13:27:27 UTC
[skywalking] branch master updated: Fix dependency license's NOTICE and binary jar included issues in the source release. (#9513)
This is an automated email from the ASF dual-hosted git repository.
wusheng 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 ebe0078c34 Fix dependency license's NOTICE and binary jar included issues in the source release. (#9513)
ebe0078c34 is described below
commit ebe0078c347c34cbcc4877d29db915f3ddfea993
Author: Kirs <ki...@apache.org>
AuthorDate: Wed Aug 24 21:27:13 2022 +0800
Fix dependency license's NOTICE and binary jar included issues in the source release. (#9513)
---
LICENSE | 1 +
NOTICE | 21 +++++++++++++++++++++
docs/en/changes/changes.md | 1 +
tools/releasing/create_source_release.sh | 1 +
4 files changed, 24 insertions(+)
diff --git a/LICENSE b/LICENSE
index 270a4ffd45..b073d89776 100644
--- a/LICENSE
+++ b/LICENSE
@@ -217,6 +217,7 @@ The text of each license is the standard Apache 2.0 license.
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 opencensus: https://github.com/census-instrumentation/opencensus-proto/tree/master/gen-go Apache 2.0
proto files from prometheus/client_model: https://github.com/prometheus/client_model Apache 2.0
proto files from opentelemetry: https://github.com/open-telemetry/opentelemetry-proto/tree/main/opentelemetry/proto Apache 2.0
flatbuffers files from istio/proxy: https://github.com/istio/proxy Apache 2.0
diff --git a/NOTICE b/NOTICE
index cf67c8dff0..a269ddcd4c 100644
--- a/NOTICE
+++ b/NOTICE
@@ -3,3 +3,24 @@ Copyright 2017-2022 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
+
+-----------------------------------------------------------------------
+This product contains code form the Prometheus Project:
+
+Data model artifacts for Prometheus.
+Copyright 2012-2015 The Prometheus Authors
+
+This product includes software developed at
+SoundCloud Ltd. (http://soundcloud.com/).
+-----------------------------------------------------------------------
+This product contains code form the Apache Maven Wrapper Project:
+
+Apache Maven Wrapper
+Copyright 2013-2022 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+The original idea and initial implementation of the maven-wrapper module is derived
+from the Gradle Wrapper which was written originally by Hans Dockter and Adam Murdoch.
+Copyright 2007 the original author or authors.
\ No newline at end of file
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index d9e88d528d..174f8d9b85 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -110,5 +110,6 @@
* Add an explanation for alerting kernel and its in-memory window mechanism.
* Add more docs for widget details.
* Update alarm doc introduce configuration property key
+* Fix dependency license's NOTICE and binary jar included issues in the source release.
All issues and pull requests are [here](https://github.com/apache/skywalking/milestone/136?closed=1)
diff --git a/tools/releasing/create_source_release.sh b/tools/releasing/create_source_release.sh
index b5918a9743..ec91df641e 100755
--- a/tools/releasing/create_source_release.sh
+++ b/tools/releasing/create_source_release.sh
@@ -71,6 +71,7 @@ tar czf ${PRODUCT_NAME}-src.tgz \
--exclude .github \
--exclude .gitignore \
--exclude .gitmodules \
+ --exclude .mvn/wrapper/maven-wrapper.jar \
${PRODUCT_NAME}
gpg --armor --detach-sig ${PRODUCT_NAME}-src.tgz