Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update all deps #820

Merged
merged 26 commits into from
Mar 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
e26dc33
Bump assertj-core from 3.24.1 to 3.24.2 in /java
dependabot[bot] Jan 23, 2023
b094e2d
Bump grpc-bom from 1.51.1 to 1.53.0 in /java
dependabot[bot] Feb 13, 2023
f1bce5f
Bump maven-javadoc-plugin from 3.4.1 to 3.5.0 in /java
dependabot[bot] Feb 20, 2023
8459b14
Bump versions-maven-plugin from 2.14.2 to 2.15.0 in /java
dependabot[bot] Feb 27, 2023
8771571
Bump maven-compiler-plugin from 3.10.1 to 3.11.0 in /java
dependabot[bot] Feb 27, 2023
67a5619
Bump google.protobuf.version from 3.21.12 to 3.22.2 in /java
dependabot[bot] Mar 13, 2023
cb56c17
Bump proto-google-common-protos from 2.12.0 to 2.14.3 in /java
dependabot[bot] Mar 20, 2023
1c03612
Bump maven-release-plugin from 2.5.3 to 3.0.0 in /java
dependabot[bot] Mar 20, 2023
b6cf622
Bump maven-surefire-plugin from 2.22.2 to 3.0.0 in /java
dependabot[bot] Mar 20, 2023
e796572
update all deps
elliotmjackson Mar 20, 2023
6b22de1
update go version
elliotmjackson Mar 20, 2023
c656811
update deops
elliotmjackson Mar 20, 2023
88c2a31
update bzl deps
elliotmjackson Mar 20, 2023
c739761
update tests
elliotmjackson Mar 20, 2023
af659e1
update gazelle
elliotmjackson Mar 20, 2023
6874c80
downgrade go to 1.19
elliotmjackson Mar 20, 2023
91c7c88
Merge remote-tracking branch 'origin/dependabot/maven/java/org.assert…
elliotmjackson Mar 20, 2023
74e77da
Merge remote-tracking branch 'origin/dependabot/maven/java/io.grpc-gr…
elliotmjackson Mar 20, 2023
f0525dc
Merge remote-tracking branch 'origin/dependabot/maven/java/org.apache…
elliotmjackson Mar 20, 2023
5d034f0
Merge remote-tracking branch 'origin/dependabot/maven/java/org.codeha…
elliotmjackson Mar 20, 2023
2fcaefa
Merge remote-tracking branch 'origin/dependabot/maven/java/org.apache…
elliotmjackson Mar 20, 2023
a5432c8
Merge remote-tracking branch 'origin/dependabot/maven/java/google.pro…
elliotmjackson Mar 20, 2023
efcf4ff
Merge remote-tracking branch 'origin/dependabot/maven/java/com.google…
elliotmjackson Mar 20, 2023
dead47c
Merge remote-tracking branch 'origin/dependabot/maven/java/org.apache…
elliotmjackson Mar 20, 2023
7e3bde2
Merge remote-tracking branch 'origin/dependabot/maven/java/org.apache…
elliotmjackson Mar 20, 2023
8d546f3
update gazelle checksum
elliotmjackson Mar 20, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .bazelversion
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5.3.2
6.1.1
2 changes: 1 addition & 1 deletion .github/actions/github-tag-action/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
set -o pipefail

# config
default_semvar_bump=${DEFAULT_BUMP:-minor}
default_semvar_bump=${DEFAULT_BUMP:-patch}
with_v=${WITH_V:-true}
release_branches=${RELEASE_BRANCHES:-}
custom_tag=${CUSTOM_TAG:-}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ on:

env:
# Keep these versions in sync with the Dockerfile
BDR_VER: '5.1.0'
GO_VER: '1.19.3'
PGG_VER: 'v1.28.1'
PROTOC_VER: '21.9'
BDR_VER: '6.0.1'
GO_VER: '1.19.x'
PGG_VER: 'v1.30.0'
PROTOC_VER: '22.2'
PYTHON_VER: '3.8'
TEST_TAG: protoc-gen-validate:${{ github.sha }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/commit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:

- uses: actions/setup-go@v3
with:
go-version: "1.19.3"
go-version: "1.19.x"
cache: true

- uses: actions/setup-python@v4
Expand Down
10 changes: 5 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ RUN apt update \
&& apt clean

# bazel
ENV BAZEL_VER=5.3.2
ENV BAZEL_VER=6.1.1
RUN wget -q -O bazel https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VER}/bazel-${BAZEL_VER}-linux-$([ $(uname -m) = "aarch64" ] && echo "arm64" || echo "x86_64") \
&& chmod +x bazel \
&& mv bazel usr/local/bin/bazel

# protoc
ENV PROTOC_VER=21.9
ENV PROTOC_VER=22.2
RUN export PROTOC_REL=protoc-${PROTOC_VER}-linux-$([ $(uname -m) = "aarch64" ] && echo "aarch" || echo "x86")_64.zip \
&& wget -q https://github.com/protocolbuffers/protobuf/releases/download/v${PROTOC_VER}/${PROTOC_REL} \
&& unzip ${PROTOC_REL} -d protoc \
Expand All @@ -43,20 +43,20 @@ RUN export PROTOC_REL=protoc-${PROTOC_VER}-linux-$([ $(uname -m) = "aarch64" ] &
ENV GOROOT /usr/local/go
ENV GOPATH /go
ENV PATH $GOPATH/bin:$GOROOT/bin:$PATH
RUN export GORELEASE=go1.19.3.linux-$([ $(uname -m) = "aarch64" ] && echo "arm64" || echo "amd64").tar.gz \
RUN export GORELEASE=go1.19.5.linux-$([ $(uname -m) = "aarch64" ] && echo "arm64" || echo "amd64").tar.gz \
&& wget -q https://dl.google.com/go/$GORELEASE \
&& tar -C $(dirname $GOROOT) -xzf $GORELEASE \
&& rm $GORELEASE \
&& mkdir -p $GOPATH/{src,bin,pkg}

# protoc-gen-go
ENV PGG_VER=v1.28.1
ENV PGG_VER=v1.30.0
RUN go install google.golang.org/protobuf/cmd/protoc-gen-go@${PGG_VER} \
&& rm -rf $(go env GOCACHE) \
&& rm -rf $(go env GOMODCACHE)

# buildozer
ENV BDR_VER=5.1.0
ENV BDR_VER=6.0.1
RUN go install github.com/bazelbuild/buildtools/buildozer@${BDR_VER} \
&& rm -rf $(go env GOCACHE) \
&& rm -rf $(go env GOMODCACHE)
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ bin/golint:
GOBIN=$(shell pwd)/bin go install golang.org/x/lint/golint

bin/protoc-gen-go:
GOBIN=$(shell pwd)/bin go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.28.1
GOBIN=$(shell pwd)/bin go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.30.0

bin/harness:
cd tests && go build -o ../bin/harness ./harness/executor
Expand Down
4 changes: 2 additions & 2 deletions Tools.mk
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Licensed under the Apache License, Version 2.0 (the "License")

bazelisk@v := github.com/bazelbuild/bazelisk@v1.15.0
protoc@v := github.com/protocolbuffers/protobuf@v21.9
protoc-gen-go@v := google.golang.org/protobuf/cmd/protoc-gen-go@v1.28.1
protoc@v := github.com/protocolbuffers/protobuf@v22.2
protoc-gen-go@v := google.golang.org/protobuf/cmd/protoc-gen-go@v1.30.0
2 changes: 1 addition & 1 deletion bazel/dependency_imports.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ def _pgv_pip_dependencies():
def _pgv_go_dependencies():
go_rules_dependencies()
go_register_toolchains(
version = "1.19.3",
version = "1.19.5",
)
gazelle_dependencies()

Expand Down
12 changes: 6 additions & 6 deletions bazel/repositories.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,20 @@ def pgv_dependencies(maven_repos = _DEFAULT_REPOSITORIES):
if not native.existing_rule("io_bazel_rules_go"):
http_archive(
name = "io_bazel_rules_go",
sha256 = "685052b498b6ddfe562ca7a97736741d87916fe536623afb7da2824c0211c369",
sha256 = "dd926a88a564a9246713a9c00b35315f54cbd46b31a26d5d8fb264c07045f05d",
urls = [
"https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.33.0/rules_go-v0.33.0.zip",
"https://github.com/bazelbuild/rules_go/releases/download/v0.33.0/rules_go-v0.33.0.zip",
"https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.38.1/rules_go-v0.38.1.zip",
"https://github.com/bazelbuild/rules_go/releases/download/v0.38.1/rules_go-v0.38.1.zip",
],
)

if not native.existing_rule("bazel_gazelle"):
http_archive(
name = "bazel_gazelle",
sha256 = "5982e5463f171da99e3bdaeff8c0f48283a7a5f396ec5282910b9e8a49c0dd7e",
sha256 = "ecba0f04f96b4960a5b250c8e8eeec42281035970aa8852dda73098274d14a1d",
urls = [
"https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.25.0/bazel-gazelle-v0.25.0.tar.gz",
"https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.25.0/bazel-gazelle-v0.25.0.tar.gz",
"https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.29.0/bazel-gazelle-v0.29.0.tar.gz",
"https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.29.0/bazel-gazelle-v0.29.0.tar.gz",
],
)

Expand Down
4 changes: 2 additions & 2 deletions dependencies.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -392,8 +392,8 @@ def go_third_party():
go_repository(
name = "org_golang_google_protobuf",
importpath = "google.golang.org/protobuf",
sum = "h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=",
version = "v1.28.1",
sum = "h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng=",
version = "v1.30.0",
)
go_repository(
name = "org_golang_x_crypto",
Expand Down
4 changes: 2 additions & 2 deletions example-workspace/dependencies.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -392,8 +392,8 @@ def go_third_party():
go_repository(
name = "org_golang_google_protobuf",
importpath = "google.golang.org/protobuf",
sum = "h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=",
version = "v1.28.1",
sum = "h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng=",
version = "v1.30.0",
)
go_repository(
name = "org_golang_x_crypto",
Expand Down
17 changes: 8 additions & 9 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,22 +1,21 @@
module github.com/envoyproxy/protoc-gen-validate

go 1.17
go 1.19

require (
github.com/iancoleman/strcase v0.2.0
github.com/lyft/protoc-gen-star/v2 v2.0.1
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616
golang.org/x/net v0.7.0
golang.org/x/tools v0.4.0
google.golang.org/protobuf v1.28.1
golang.org/x/net v0.8.0
golang.org/x/tools v0.7.0
google.golang.org/protobuf v1.30.0
)

require (
github.com/spf13/afero v1.9.2 // indirect
golang.org/x/mod v0.7.0 // indirect
golang.org/x/sys v0.5.0 // indirect
golang.org/x/text v0.7.0 // indirect
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
github.com/spf13/afero v1.3.3 // indirect
golang.org/x/mod v0.9.0 // indirect
golang.org/x/sys v0.6.0 // indirect
golang.org/x/text v0.8.0 // indirect
)

retract [v0.6.9, v0.6.12] // Published accidentally