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 2025/02/21 12:03:52 UTC

(skywalking-swck) 06/06: remove redundant licenses

This is an automated email from the ASF dual-hosted git repository.

kezhenxu94 pushed a commit to branch license
in repository https://gitbox.apache.org/repos/asf/skywalking-swck.git

commit da34e88f0797d1cea2af9b0ad87e2876f417a5bb
Author: kezhenxu94 <ke...@apache.org>
AuthorDate: Fri Feb 21 19:51:09 2025 +0800

    remove redundant licenses
---
 adapter/.dep.licenserc.yaml  | 15 +++------------
 adapter/Makefile             |  5 ++++-
 operator/.dep.licenserc.yaml | 15 +++------------
 3 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/adapter/.dep.licenserc.yaml b/adapter/.dep.licenserc.yaml
index 111c00a..52e524f 100644
--- a/adapter/.dep.licenserc.yaml
+++ b/adapter/.dep.licenserc.yaml
@@ -20,7 +20,8 @@ header: # `header` section is configurations for source codes license header.
   license:
     spdx-id: Apache-2.0 # the spdx id of the license, it's convenient when your license is standard SPDX license.
     copyright-owner: Apache Software Foundation # the copyright owner to replace the [owner] in the `spdx-id` template.
-    content: | # `license` will be used as the content when `fix` command needs to insert a license header.
+    content:
+      | # `license` will be used as the content when `fix` command needs to insert a license header.
       Licensed to Apache Software Foundation (ASF) under one or more contributor
       license agreements. See the NOTICE file distributed with
       this work for additional information regarding copyright
@@ -58,20 +59,10 @@ header: # `header` section is configurations for source codes license header.
       under the License.
 
   paths: # `paths` are the path list that will be checked (and fixed) by license-eye, default is ['**'].
-    - 'config/'
+    - "config/"
 
   comment: on-failure # on what condition license-eye will comment on the pull request, `on-failure`, `always`, `never`.
 
 dependency:
   files:
     - go.mod
-  licenses:
-    - name: github.com/chzyer/logex
-      version: v1.1.10
-      license: MIT
-    - name: github.com/kr/logfmt
-      version: v0.0.0-20140226030751-b84e30acd515
-      license: MIT
-    - name: github.com/pascaldekloe/goe
-      version: v0.0.0-20180627143212-57f6aae5913c
-      license: CC0-1.0
diff --git a/adapter/Makefile b/adapter/Makefile
index 029caac..39695fb 100644
--- a/adapter/Makefile
+++ b/adapter/Makefile
@@ -59,13 +59,16 @@ docker-push: ## Push docker image with the adapter.
 
 ##@ Deployment
 
+binary-licenses: ## Generate licenses for binary
+	$(LICENSEEYE) dep resolve -c $(module_dir)/.dep.licenserc.yaml --summary $(module_dir)/dist/LICENSE.tpl -o $(module_dir)/dist/licenses
+
 .PHONY: deploy
 deploy: kustomize ## Deploy adapter controller to the K8s cluster specified in ~/.kube/config.
 	@echo "Deploy adapter"
 	-MOD=adapter DIR="./" IMG_PATH=namespaced/adapter IMG=metrics-adapter NEW_IMG=${ADAPTER_IMG} $(root_dir)/hack/deploy.sh d
 
 .PHONY: release-build
-release-build: ## Build binary for release
+release-build: binary-licenses ## Build binary for release
 	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=on go build -a -ldflags="-s -w" -o $(root_dir)/build/bin/adapter-linux-amd64
 	
 # Generation
diff --git a/operator/.dep.licenserc.yaml b/operator/.dep.licenserc.yaml
index 111c00a..52e524f 100644
--- a/operator/.dep.licenserc.yaml
+++ b/operator/.dep.licenserc.yaml
@@ -20,7 +20,8 @@ header: # `header` section is configurations for source codes license header.
   license:
     spdx-id: Apache-2.0 # the spdx id of the license, it's convenient when your license is standard SPDX license.
     copyright-owner: Apache Software Foundation # the copyright owner to replace the [owner] in the `spdx-id` template.
-    content: | # `license` will be used as the content when `fix` command needs to insert a license header.
+    content:
+      | # `license` will be used as the content when `fix` command needs to insert a license header.
       Licensed to Apache Software Foundation (ASF) under one or more contributor
       license agreements. See the NOTICE file distributed with
       this work for additional information regarding copyright
@@ -58,20 +59,10 @@ header: # `header` section is configurations for source codes license header.
       under the License.
 
   paths: # `paths` are the path list that will be checked (and fixed) by license-eye, default is ['**'].
-    - 'config/'
+    - "config/"
 
   comment: on-failure # on what condition license-eye will comment on the pull request, `on-failure`, `always`, `never`.
 
 dependency:
   files:
     - go.mod
-  licenses:
-    - name: github.com/chzyer/logex
-      version: v1.1.10
-      license: MIT
-    - name: github.com/kr/logfmt
-      version: v0.0.0-20140226030751-b84e30acd515
-      license: MIT
-    - name: github.com/pascaldekloe/goe
-      version: v0.0.0-20180627143212-57f6aae5913c
-      license: CC0-1.0