Skip to content

Commit

Permalink
updated go (1.22.3) and java dependencies to their latest releases (#…
Browse files Browse the repository at this point in the history 
…2611)

Signed-off-by: Henry Avetisyan <[email protected]>
Co-authored-by: Henry Avetisyan <[email protected]>
  • Loading branch information
@havetisyan
havetisyan and havetisyan authored May 8, 2024
1 parent af10881 commit 2ece8e8
Show file tree
Hide file tree
Showing 23 changed files with 104 additions and 101 deletions.
2 changes: 1 addition & 1 deletion docs/dev_environment.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ the git client is required.
#### Go
Install go 1.21.5 or newer version by following the directions at
Install go 1.22.3 or newer version by following the directions at
[Getting Started - The Go Programming Language](https://golang.org/doc/install).
Make sure you have set the [$GOPATH environment variable](https://pkg.go.dev/cmd/go#hdr-GOPATH_environment_variable)
Expand Down
50 changes: 26 additions & 24 deletions go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
go 1.21
go 1.22.0

toolchain go1.21.5
toolchain go1.22.3

module github.com/AthenZ/athenz

require (
cloud.google.com/go/secretmanager v1.12.0
cloud.google.com/go/secretmanager v1.13.0
github.com/ardielle/ardielle-go v1.5.2
github.com/aws/aws-sdk-go v1.51.21
github.com/aws/aws-sdk-go v1.52.4
github.com/cenkalti/backoff v2.2.1+incompatible
github.com/dimfeld/httptreemux v5.0.1+incompatible
github.com/envoyproxy/go-control-plane v0.12.0
Expand All @@ -20,23 +20,25 @@ require (
github.com/gorilla/mux v1.8.1
github.com/jawher/mow.cli v1.2.0
github.com/stretchr/testify v1.9.0
golang.org/x/crypto v0.22.0
golang.org/x/net v0.24.0
golang.org/x/crypto v0.23.0
golang.org/x/net v0.25.0
google.golang.org/grpc v1.63.2
google.golang.org/protobuf v1.33.0
google.golang.org/protobuf v1.34.1
gopkg.in/natefinch/lumberjack.v2 v2.2.1
gopkg.in/yaml.v2 v2.4.0
gopkg.in/yaml.v3 v3.0.1
inet.af/peercred v0.0.0-20210906144145-0893ea02156a
k8s.io/apimachinery v0.29.3
k8s.io/client-go v0.29.3
k8s.io/utils v0.0.0-20240310230437-4693a0247e57
k8s.io/apimachinery v0.30.0
k8s.io/client-go v0.30.0
k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0
)

require (
cloud.google.com/go/compute v1.24.0 // indirect
cloud.google.com/go/compute/metadata v0.2.3 // indirect
cloud.google.com/go/iam v1.1.6 // indirect
cloud.google.com/go/auth v0.3.0 // indirect
cloud.google.com/go/auth/oauth2adapt v0.2.2 // indirect
cloud.google.com/go/compute v1.25.1 // indirect
cloud.google.com/go/compute/metadata v0.3.0 // indirect
cloud.google.com/go/iam v1.1.7 // indirect
github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/envoyproxy/protoc-gen-validate v1.0.4 // indirect
Expand All @@ -49,7 +51,7 @@ require (
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/s2a-go v0.1.7 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
github.com/googleapis/gax-go/v2 v2.12.2 // indirect
github.com/googleapis/gax-go/v2 v2.12.3 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/kr/text v0.2.0 // indirect
Expand All @@ -62,19 +64,19 @@ require (
go.opentelemetry.io/otel v1.24.0 // indirect
go.opentelemetry.io/otel/metric v1.24.0 // indirect
go.opentelemetry.io/otel/trace v1.24.0 // indirect
golang.org/x/oauth2 v0.17.0 // indirect
golang.org/x/sync v0.6.0 // indirect
golang.org/x/sys v0.19.0 // indirect
golang.org/x/term v0.19.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/oauth2 v0.19.0 // indirect
golang.org/x/sync v0.7.0 // indirect
golang.org/x/sys v0.20.0 // indirect
golang.org/x/term v0.20.0 // indirect
golang.org/x/text v0.15.0 // indirect
golang.org/x/time v0.5.0 // indirect
google.golang.org/api v0.169.0 // indirect
google.golang.org/api v0.177.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240311132316-a219d84964c2 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240304161311-37d4d3c04a78 // indirect
google.golang.org/genproto v0.0.0-20240401170217-c3f982113cda // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240429193739-8cf5692501f6 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240429193739-8cf5692501f6 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
k8s.io/klog/v2 v2.110.1 // indirect
k8s.io/klog/v2 v2.120.1 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
)
96 changes: 49 additions & 47 deletions go.sum
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion libs/go/athenzconf/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ vet:
go vet .

fmt:
gofmt -l .
go fmt .

build:
@echo "Building athenzconf library..."
Expand Down
2 changes: 1 addition & 1 deletion libs/go/athenzutils/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ vet:
go vet .

fmt:
gofmt -l .
go fmt .

build:
@echo "Building athenzutils library..."
Expand Down
2 changes: 1 addition & 1 deletion libs/go/zmscli/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ vet:
go vet .

fmt:
gofmt -l .
go fmt .

build:
@echo "Building zmscli library..."
Expand Down
1 change: 0 additions & 1 deletion libs/go/zmscli/utils_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,4 +175,3 @@ func TestServiceName(t *testing.T) {
t.Error("coretech didn't return service name coretech")
}
}

2 changes: 1 addition & 1 deletion libs/go/zmssvctoken/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ vet:
go vet .

fmt:
gofmt -l .
go fmt .

build:
@echo "Building zmssvctoken library..."
Expand Down
2 changes: 1 addition & 1 deletion libs/go/ztsroletoken/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ vet:
go vet .

fmt:
gofmt -l .
go fmt .

build:
@echo "Building ztsroletoken library..."
Expand Down
2 changes: 1 addition & 1 deletion libs/java/client_common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<packaging>jar</packaging>

<properties>
<commons.codec.version>1.16.1</commons.codec.version>
<commons.codec.version>1.17.0</commons.codec.version>
<code.coverage.min>1.00</code.coverage.min>
</properties>

Expand Down
18 changes: 9 additions & 9 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,17 +72,17 @@

<properties>
<apache.httpclient.version>4.5.14</apache.httpclient.version>
<aws.version>1.12.701</aws.version>
<aws2.version>2.25.31</aws2.version>
<aws.version>1.12.716</aws.version>
<aws2.version>2.25.47</aws2.version>
<bouncycastle.version>1.78</bouncycastle.version>
<commons.daemon.version>1.3.4</commons.daemon.version>
<commons.logging.version>1.3.1</commons.logging.version>
<gcp.api-client.version>2.2.0</gcp.api-client.version>
<gcp.bom.version>26.37.0</gcp.bom.version>
<guava.version>33.1.0-jre</guava.version>
<gcp.bom.version>26.38.0</gcp.bom.version>
<guava.version>33.2.0-jre</guava.version>
<hamcrest.version>2.2</hamcrest.version>
<jackson-core.version>2.17.0</jackson-core.version>
<jackson-databind.version>2.17.0</jackson-databind.version>
<jackson-core.version>2.17.1</jackson-core.version>
<jackson-databind.version>2.17.1</jackson-databind.version>
<jakarta.activation.version>2.0.1</jakarta.activation.version>
<jakarta.annotation.version>2.1.1</jakarta.annotation.version>
<jakarta.servlet.version>5.0.0</jakarta.servlet.version>
Expand All @@ -94,16 +94,16 @@
<jjwt.version>0.11.5</jjwt.version>
<jna.version>5.14.0</jna.version>
<logback.client.version>1.2.13</logback.client.version>
<logback.server.version>1.5.5</logback.server.version>
<logback.server.version>1.5.6</logback.server.version>
<mockito.version>5.11.0</mockito.version>
<mysql.connector.version>8.3.0</mysql.connector.version>
<mysql.connector.version>8.4.0</mysql.connector.version>
<nimbus.jose.version>9.37.3</nimbus.jose.version>
<rdl.version>1.5.4</rdl.version>
<slf4j.client.version>1.7.36</slf4j.client.version>
<slf4j.server.version>2.0.13</slf4j.server.version>
<swagger.version>2.2.21</swagger.version>
<testcontainers.version>1.19.7</testcontainers.version>
<testng.version>7.10.1</testng.version>
<testng.version>7.10.2</testng.version>

<maven-assembly-plugin.version>3.6.0</maven-assembly-plugin.version>
<maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
Expand Down
4 changes: 2 additions & 2 deletions screwdriver/scripts/install_deps.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ apt-get install -y gcc
apt-get install -y g++

echo "-----------------Install golang: -----------------"
wget https://go.dev/dl/go1.21.5.linux-amd64.tar.gz
tar -C /usr/local -xzf go1.21.5.linux-amd64.tar.gz
wget https://go.dev/dl/go1.22.3.linux-amd64.tar.gz
tar -C /usr/local -xzf go1.22.3.linux-amd64.tar.gz
export PATH=$PATH:/usr/local/go/bin

echo "-----------------Install Docker: -----------------"
Expand Down
2 changes: 1 addition & 1 deletion utils/athenz-conf/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ vet:
go vet .

fmt:
gofmt -l .
go fmt .

darwin:
@echo "Building darwin client..."
Expand Down
2 changes: 1 addition & 1 deletion utils/hostdoc/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ vet:
go vet .

fmt:
gofmt -l .
go fmt .

darwin:
@echo "Building darwin client..."
Expand Down
2 changes: 1 addition & 1 deletion utils/msd-agent/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ vet:
go vet .

fmt:
gofmt -l .
go fmt .

unit: vet fmt
go test -v ./...
Expand Down
2 changes: 1 addition & 1 deletion utils/zms-cli/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ vet:
go vet .

fmt:
gofmt -l .
go fmt .

darwin:
@echo "Building darwin client..."
Expand Down
2 changes: 1 addition & 1 deletion utils/zms-svctoken/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ vet:
go vet .

fmt:
gofmt -l .
go fmt .

darwin:
@echo "Building darwin client..."
Expand Down
2 changes: 1 addition & 1 deletion utils/zpe-updater/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ vet:
go vet .

fmt:
gofmt -l .
go fmt .

tests:
go test .
Expand Down
2 changes: 1 addition & 1 deletion utils/zts-accesstoken/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ vet:
go vet .

fmt:
gofmt -l .
go fmt .

darwin:
@echo "Building darwin client..."
Expand Down
2 changes: 1 addition & 1 deletion utils/zts-idtoken/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ vet:
go vet .

fmt:
gofmt -l .
go fmt .

darwin:
@echo "Building darwin client..."
Expand Down
2 changes: 1 addition & 1 deletion utils/zts-rolecert/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ test:
go test .

fmt:
gofmt -l .
go fmt .

darwin:
@echo "Building darwin client..."
Expand Down
2 changes: 1 addition & 1 deletion utils/zts-roletoken/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ vet:
go vet .

fmt:
gofmt -l .
go fmt .

darwin:
@echo "Building darwin client..."
Expand Down
2 changes: 1 addition & 1 deletion utils/zts-svccert/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ vet:
go vet .

fmt:
gofmt -l .
go fmt .

darwin:
@echo "Building darwin client..."
Expand Down

0 comments on commit 2ece8e8

Please sign in to comment.