Bump up net module (#166)
diff --git a/.github/workflows/license-checker.yml b/.github/workflows/license-checker.yml
index ea9eb18..4a76c83 100644
--- a/.github/workflows/license-checker.yml
+++ b/.github/workflows/license-checker.yml
@@ -39,11 +39,4 @@
with:
go-version: "1.16"
- name: Check Dependencies License
- run: |
- go install github.com/apache/skywalking-eyes/cmd/license-eye@d38fe0561d1140b010bddccb5fbfa3db7c12caf1
- license-eye dependency resolve --summary ./dist/LICENSE.tpl --output ./dist/licenses || exit 1
- if [ ! -z "$(git diff -U0 ./dist)" ]; then
- echo "LICENSE file is not updated correctly"
- git diff -U0 ./dist
- exit 1
- fi
+ run: make dependency-license
diff --git a/Makefile b/Makefile
index 6971629..2523a8d 100644
--- a/Makefile
+++ b/Makefile
@@ -60,7 +60,7 @@
$(GO_LINT):
@$(GO_LINT) version > /dev/null 2>&1 || go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest
$(LICENSE_EYE):
- @$(LICENSE_EYE) --version > /dev/null 2>&1 || go install github.com/apache/skywalking-eyes/cmd/license-eye@latest
+ @$(LICENSE_EYE) --version > /dev/null 2>&1 || go install github.com/apache/skywalking-eyes/cmd/license-eye@d38fe05
.PHONY: lint
lint: $(GO_LINT)
@@ -69,13 +69,30 @@
fix-lint: $(GO_LINT)
$(GO_LINT) run -v --fix ./...
-.PHONY: license
-license: clean $(LICENSE_EYE)
+.PHONY: license-header
+license-header: clean $(LICENSE_EYE)
@$(LICENSE_EYE) header check
-.PHONY: fix-license
-fix-license: clean $(LICENSE_EYE)
+
+.PHONY: fix-license-header
+fix-license-header: clean $(LICENSE_EYE)
@$(LICENSE_EYE) header fix
+.PHONY: dependency-license
+dependency-license: clean $(LICENSE_EYE)
+ @$(LICENSE_EYE) dependency resolve --summary ./dist/LICENSE.tpl --output ./dist/licenses || exit 1
+ @if [ ! -z "`git diff -U0 ./dist`" ]; then \
+ echo "LICENSE file is not updated correctly"; \
+ git diff -U0 ./dist; \
+ exit 1; \
+ fi
+
+.PHONY: fix-dependency-license
+fix-dependency-license: clean $(LICENSE_EYE)
+ @$(LICENSE_EYE) dependency resolve --summary ./dist/LICENSE.tpl --output ./dist/licenses
+
+.PHONY: fix-license
+fix-license: fix-license-header fix-dependency-license
+
.PHONY: fix
fix: fix-lint fix-license
diff --git a/dist/LICENSE b/dist/LICENSE
index 308b9e8..5e1fdb0 100644
--- a/dist/LICENSE
+++ b/dist/LICENSE
@@ -357,10 +357,10 @@
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 BSD-3-Clause
golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028 BSD-3-Clause
golang.org/x/mod v0.4.2 BSD-3-Clause
- golang.org/x/net v0.0.0-20220421235706-1d1ef9303861 BSD-3-Clause
+ golang.org/x/net v0.0.0-20220909164309-bea034e7d591 BSD-3-Clause
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d BSD-3-Clause
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c BSD-3-Clause
- golang.org/x/sys v0.0.0-20220422013727-9388b58f7150 BSD-3-Clause
+ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 BSD-3-Clause
golang.org/x/term v0.0.0-20220411215600-e5f449aeb171 BSD-3-Clause
golang.org/x/text v0.3.7 BSD-3-Clause
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac BSD-3-Clause
diff --git a/go.mod b/go.mod
index 5efc4a0..b023557 100644
--- a/go.mod
+++ b/go.mod
@@ -19,8 +19,7 @@
github.com/spf13/viper v1.7.0
github.com/urfave/cli/v2 v2.3.0
golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 // indirect
- golang.org/x/net v0.0.0-20220421235706-1d1ef9303861 // indirect
- golang.org/x/sys v0.0.0-20220422013727-9388b58f7150 // indirect
+ golang.org/x/net v0.0.0-20220909164309-bea034e7d591 // indirect
golang.org/x/term v0.0.0-20220411215600-e5f449aeb171 // indirect
golang.org/x/text v0.3.7
google.golang.org/grpc v1.40.0
diff --git a/go.sum b/go.sum
index 4336304..b0f2554 100644
--- a/go.sum
+++ b/go.sum
@@ -574,8 +574,8 @@
golang.org/x/net v0.0.0-20210520170846-37e1c6afe023/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20220421235706-1d1ef9303861 h1:yssD99+7tqHWO5Gwh81phT+67hg+KttniBr6UnEXOY8=
-golang.org/x/net v0.0.0-20220421235706-1d1ef9303861/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
+golang.org/x/net v0.0.0-20220909164309-bea034e7d591 h1:D0B/7al0LLrVC8aWF4+oxpv/m8bc7ViFfVS8/gXGdqI=
+golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -641,9 +641,8 @@
golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220422013727-9388b58f7150 h1:xHms4gcpe1YE7A3yIllJXP16CMAGuqwO2lX1mTyyRRc=
-golang.org/x/sys v0.0.0-20220422013727-9388b58f7150/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 h1:WIoqL4EROvwiPdUtaip4VcDdpZ4kha7wBWZrbVKCIZg=
+golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
