From 659ec5c046b724eed158e2d9a0d71f0df7fdeaa1 Mon Sep 17 00:00:00 2001 From: Henry Avetisyan Date: Thu, 17 Oct 2024 12:36:36 -0700 Subject: [PATCH] update go/java dependencies to their latest release (#2769) Signed-off-by: Henry Avetisyan --- clients/java/zts/pom.xml | 19 ++ docker/setup-scripts/Dockerfile | 2 +- docker/util/athenz-mvn-base/Dockerfile | 2 +- docker/zms/Dockerfile | 2 +- docker/zts/Dockerfile | 2 +- go.mod | 20 +- go.sum | 36 +-- libs/java/dynamodb_client_factory/pom.xml | 12 + libs/java/gcp_zts_creds/pom.xml | 12 + libs/java/instance_provider/pom.xml | 12 + libs/java/server_aws_common/pom.xml | 12 + libs/java/server_common/pom.xml | 16 +- pom.xml | 67 ++--- syncers/auth_history_syncer/pom.xml | 346 +++++++++++----------- 14 files changed, 304 insertions(+), 256 deletions(-) diff --git a/clients/java/zts/pom.xml b/clients/java/zts/pom.xml index 4fabfc7b665..101c6108c88 100644 --- a/clients/java/zts/pom.xml +++ b/clients/java/zts/pom.xml @@ -31,6 +31,25 @@ 0.7752 + + + + software.amazon.awssdk + bom + ${aws2.version} + pom + import + + + com.amazonaws + aws-java-sdk-bom + ${aws.version} + pom + import + + + + org.slf4j diff --git a/docker/setup-scripts/Dockerfile b/docker/setup-scripts/Dockerfile index 916c66ab1fe..6403fb5e084 100644 --- a/docker/setup-scripts/Dockerfile +++ b/docker/setup-scripts/Dockerfile @@ -1,6 +1,6 @@ FROM athenz/athenz-cli-util AS athenz-utils -FROM eclipse-temurin:11-jre-focal +FROM eclipse-temurin:17-jre-focal # date -u +'%Y-%m-%dT%H:%M:%SZ' ARG BUILD_DATE # git rev-parse --short HEAD diff --git a/docker/util/athenz-mvn-base/Dockerfile b/docker/util/athenz-mvn-base/Dockerfile index 4529a56cd8f..e5428ed78aa 100644 --- a/docker/util/athenz-mvn-base/Dockerfile +++ b/docker/util/athenz-mvn-base/Dockerfile @@ -8,7 +8,7 @@ FROM athenz/rdl-athenz-go-model AS rdl-go-model FROM athenz/rdl-athenz-java-client AS rdl-java-client -FROM maven:3-eclipse-temurin-11-focal AS mvn +FROM maven:3-eclipse-temurin-17-focal AS mvn # date -u +'%Y-%m-%dT%H:%M:%SZ' ARG BUILD_DATE # git rev-parse --short HEAD diff --git a/docker/zms/Dockerfile b/docker/zms/Dockerfile index 83815914ee1..bbefe3a5a57 100644 --- a/docker/zms/Dockerfile +++ b/docker/zms/Dockerfile @@ -1,6 +1,6 @@ FROM athenz/athenz-builder AS builder -FROM eclipse-temurin:11-jre-focal +FROM eclipse-temurin:17-jre-focal # date -u +'%Y-%m-%dT%H:%M:%SZ' ARG BUILD_DATE # git rev-parse --short HEAD diff --git a/docker/zts/Dockerfile b/docker/zts/Dockerfile index 16856f6656e..3db758b502f 100644 --- a/docker/zts/Dockerfile +++ b/docker/zts/Dockerfile @@ -1,6 +1,6 @@ FROM athenz/athenz-builder AS builder -FROM eclipse-temurin:11-jre-focal +FROM eclipse-temurin:17-jre-focal # date -u +'%Y-%m-%dT%H:%M:%SZ' ARG BUILD_DATE # git rev-parse --short HEAD diff --git a/go.mod b/go.mod index 6bd973456c1..5582768062d 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/sts v1.30.4 github.com/cenkalti/backoff v2.2.1+incompatible github.com/dimfeld/httptreemux v5.0.1+incompatible - github.com/envoyproxy/go-control-plane v0.13.0 + github.com/envoyproxy/go-control-plane v0.13.1 github.com/go-jose/go-jose/v4 v4.0.4 github.com/golang-jwt/jwt v3.2.2+incompatible github.com/golang/mock v1.6.0 @@ -23,17 +23,18 @@ 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.27.0 - golang.org/x/net v0.29.0 - google.golang.org/grpc v1.67.0 - google.golang.org/protobuf v1.34.2 + golang.org/x/crypto v0.28.0 + golang.org/x/net v0.30.0 + golang.org/x/oauth2 v0.22.0 + google.golang.org/grpc v1.67.1 + google.golang.org/protobuf v1.35.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.31.1 k8s.io/client-go v0.31.1 - k8s.io/utils v0.0.0-20240902221715-702e33fdd3c3 + k8s.io/utils v0.0.0-20240921022957-49e7df575cb6 ) require ( @@ -81,11 +82,10 @@ require ( go.opentelemetry.io/otel v1.29.0 // indirect go.opentelemetry.io/otel/metric v1.29.0 // indirect go.opentelemetry.io/otel/trace v1.29.0 // indirect - golang.org/x/oauth2 v0.22.0 // indirect golang.org/x/sync v0.8.0 // indirect - golang.org/x/sys v0.25.0 // indirect - golang.org/x/term v0.24.0 // indirect - golang.org/x/text v0.18.0 // indirect + golang.org/x/sys v0.26.0 // indirect + golang.org/x/term v0.25.0 // indirect + golang.org/x/text v0.19.0 // indirect golang.org/x/time v0.6.0 // indirect google.golang.org/api v0.196.0 // indirect google.golang.org/appengine v1.6.8 // indirect diff --git a/go.sum b/go.sum index 184261032d2..f0a51899957 100644 --- a/go.sum +++ b/go.sum @@ -60,8 +60,8 @@ github.com/dimfeld/httptreemux v5.0.1+incompatible/go.mod h1:rbUlSV+CCpv/SuqUTP/ github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= -github.com/envoyproxy/go-control-plane v0.13.0 h1:HzkeUz1Knt+3bK+8LG1bxOO/jzWZmdxpwC51i202les= -github.com/envoyproxy/go-control-plane v0.13.0/go.mod h1:GRaKG3dwvFoTg4nj7aXdZnvMg4d7nvT/wl9WgVXn3Q8= +github.com/envoyproxy/go-control-plane v0.13.1 h1:vPfJZCkob6yTMEgS+0TwfTUfbHjfy/6vOJ8hUWX/uXE= +github.com/envoyproxy/go-control-plane v0.13.1/go.mod h1:X45hY0mufo6Fd0KW3rqsGvQMw58jvjymeCzBU3mWyHw= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/envoyproxy/protoc-gen-validate v1.1.0 h1:tntQDh69XqOCOZsDz0lVJQez/2L6Uu2PdjCQwWCJ3bM= github.com/envoyproxy/protoc-gen-validate v1.1.0/go.mod h1:sXRDRVmzEbkM7CVcM06s9shE/m23dg3wzjl0UWqJ2q4= @@ -177,8 +177,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A= -golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70= +golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw= +golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= @@ -199,8 +199,8 @@ golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo= -golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0= +golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4= +golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.22.0 h1:BzDx2FehcG7jJwgWLELCdmLuxk2i+x9UDpSiss2u0ZA= golang.org/x/oauth2 v0.22.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= @@ -224,18 +224,18 @@ golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34= -golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo= +golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.24.0 h1:Mh5cbb+Zk2hqqXNO7S1iTjEphVL+jb8ZWaqh/g+JWkM= -golang.org/x/term v0.24.0/go.mod h1:lOBK/LVxemqiMij05LGJ0tzNr8xlmwBRJ81PX6wVLH8= +golang.org/x/term v0.25.0 h1:WtHI/ltw4NvSUig5KARz9h521QvRC8RmF/cuYqifU24= +golang.org/x/term v0.25.0/go.mod h1:RPyXicDX+6vLxogjjRxjgD2TKtmAO6NZBsBRfrOLu7M= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= -golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224= -golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= +golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM= +golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U= golang.org/x/time v0.6.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -271,8 +271,8 @@ google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyac google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= -google.golang.org/grpc v1.67.0 h1:IdH9y6PF5MPSdAntIcpjQ+tXO41pcQsfZV2RxtQgVcw= -google.golang.org/grpc v1.67.0/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA= +google.golang.org/grpc v1.67.1 h1:zWnc1Vrcno+lHZCOofnIMvycFcc0QRGIzm9dhnDX68E= +google.golang.org/grpc v1.67.1/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -284,8 +284,8 @@ google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpAD google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= -google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= +google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA= +google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= @@ -309,8 +309,8 @@ k8s.io/client-go v0.31.1 h1:f0ugtWSbWpxHR7sjVpQwuvw9a3ZKLXX0u0itkFXufb0= k8s.io/client-go v0.31.1/go.mod h1:sKI8871MJN2OyeqRlmA4W4KM9KBdBUpDLu/43eGemCg= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= -k8s.io/utils v0.0.0-20240902221715-702e33fdd3c3 h1:b2FmK8YH+QEwq/Sy2uAEhmqL5nPfGYbJOcaqjeYYZoA= -k8s.io/utils v0.0.0-20240902221715-702e33fdd3c3/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +k8s.io/utils v0.0.0-20240921022957-49e7df575cb6 h1:MDF6h2H/h4tbzmtIKTuctcwZmY0tY9mD9fNT47QO6HI= +k8s.io/utils v0.0.0-20240921022957-49e7df575cb6/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4= diff --git a/libs/java/dynamodb_client_factory/pom.xml b/libs/java/dynamodb_client_factory/pom.xml index e051d88b56d..4cc69e7c931 100644 --- a/libs/java/dynamodb_client_factory/pom.xml +++ b/libs/java/dynamodb_client_factory/pom.xml @@ -36,6 +36,18 @@ 0.9417 + + + + software.amazon.awssdk + bom + ${aws2.version} + pom + import + + + + ${project.groupId} diff --git a/libs/java/gcp_zts_creds/pom.xml b/libs/java/gcp_zts_creds/pom.xml index e0d446e9d3e..5b1fe3e01f6 100644 --- a/libs/java/gcp_zts_creds/pom.xml +++ b/libs/java/gcp_zts_creds/pom.xml @@ -31,6 +31,18 @@ 4.5.14 + + + + com.google.cloud + libraries-bom + ${gcp.bom.version} + pom + import + + + + ${project.groupId} diff --git a/libs/java/instance_provider/pom.xml b/libs/java/instance_provider/pom.xml index 86a15096ef2..78d60039162 100644 --- a/libs/java/instance_provider/pom.xml +++ b/libs/java/instance_provider/pom.xml @@ -33,6 +33,18 @@ 0.9983 + + + + software.amazon.awssdk + bom + ${aws2.version} + pom + import + + + + org.slf4j diff --git a/libs/java/server_aws_common/pom.xml b/libs/java/server_aws_common/pom.xml index 6cde1d2c84b..6da6a1ea4dd 100644 --- a/libs/java/server_aws_common/pom.xml +++ b/libs/java/server_aws_common/pom.xml @@ -31,6 +31,18 @@ 2.0.2 + + + + software.amazon.awssdk + bom + ${aws2.version} + pom + import + + + + software.amazon.awssdk diff --git a/libs/java/server_common/pom.xml b/libs/java/server_common/pom.xml index 5b7752b86df..6d2f27b1155 100644 --- a/libs/java/server_common/pom.xml +++ b/libs/java/server_common/pom.xml @@ -32,12 +32,24 @@ 2.12.0 2.1.3 2.0.3 - 3.25.5 - 3.3.1 + 4.28.2 + 3.3.2 5.1.0 0.3 + + + + io.opentelemetry + opentelemetry-bom + ${opentelemetry.version} + pom + import + + + + org.apache.httpcomponents.client5 diff --git a/pom.xml b/pom.xml index ae1eb1d67ba..e0ca45f4134 100644 --- a/pom.xml +++ b/pom.xml @@ -72,42 +72,42 @@ 5.4 - 1.12.772 - 2.28.5 + 1.12.773 + 2.28.23 1.78.1 1.17.1 1.4.0 2.17.0 1.3.4 2.7.0 - 26.47.0 - 33.3.0-jre + 26.49.0 + 33.3.1-jre 3.0 - 2.17.2 - 2.17.2 - 2.0.1 + 2.18.0 + 2.18.0 + 2.1.3 2.1.1 6.0.0 4.0.0 4.0.2 4.0.5 - 3.1.8 - 12.0.13 + 3.1.9 + 12.0.14 0.11.5 5.15.0 - 21.0.1 + 21.0.2 1.2.13 - 1.5.8 - 5.13.0 - 9.0.0 - 9.41.1 + 1.5.11 + 5.14.2 + 9.1.0 + 9.41.2 4.12.0 - 1.42.1 + 1.43.0 1.5.4 1.7.36 2.0.16 - 2.2.23 - 1.20.1 + 2.2.25 + 1.20.2 7.10.2 3.7.1 @@ -381,39 +381,6 @@ - - - - software.amazon.awssdk - bom - ${aws2.version} - pom - import - - - com.amazonaws - aws-java-sdk-bom - ${aws.version} - pom - import - - - com.google.cloud - libraries-bom - ${gcp.bom.version} - pom - import - - - io.opentelemetry - opentelemetry-bom - ${opentelemetry.version} - pom - import - - - - org.testng diff --git a/syncers/auth_history_syncer/pom.xml b/syncers/auth_history_syncer/pom.xml index d6869873b98..8644ead2077 100644 --- a/syncers/auth_history_syncer/pom.xml +++ b/syncers/auth_history_syncer/pom.xml @@ -7,7 +7,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -18,180 +18,182 @@ --> - 4.0.0 + 4.0.0 - - com.yahoo.athenz - athenz - 1.12.2-SNAPSHOT - ../../pom.xml - + + com.yahoo.athenz + athenz + 1.12.2-SNAPSHOT + ../../pom.xml + - athenz-auth-history-syncer - athenz-auth-history-syncer - Authentication History Syncer (Cloudwatch logs to DynamoDB) + athenz-auth-history-syncer + athenz-auth-history-syncer + Authentication History Syncer (Cloudwatch logs to DynamoDB) - - 0.8593 - 2.5.2 - 1.0.392 - 4.13.2 - + + 0.8593 + 2.5.2 + 1.0.392 + 4.13.2 + + - - org.slf4j - slf4j-simple - ${slf4j.client.version} - - - org.slf4j - slf4j-api - ${slf4j.server.version} - - - com.fasterxml.jackson.core - jackson-core - ${jackson-core.version} - - - software.amazon.awssdk - cloudwatchlogs - - - software.amazon.awssdk - cloudwatch - - - software.amazon.awssdk - dynamodb - - - software.amazon.awssdk - dynamodb-enhanced - - - software.amazon.awssdk - url-connection-client - test - - - com.amazonaws - DynamoDBLocal - ${aws.dynamodb.local.version} - test - - - com.almworks.sqlite4java - sqlite4java - ${sqlite4java.version} - test - - - org.mockito - mockito-core - ${mockito.version} - test - - - org.testng - testng - ${testng.version} - test - - - com.google.guava - guava - ${guava.version} - - - com.fasterxml.jackson.core - jackson-databind - ${jackson-databind.version} - - - com.yahoo.athenz - athenz-cert-refresher - ${project.parent.version} - - - com.yahoo.athenz - athenz-syncer-common - ${project.parent.version} - - - com.yahoo.athenz - athenz-auth-core - ${project.parent.version} - - - com.yahoo.athenz - athenz-dynamodb-client-factory - ${project.parent.version} - + + software.amazon.awssdk + bom + ${aws2.version} + pom + import + - - - dynamodb-local-oregon - DynamoDB Local Release Repository - https://s3-us-west-2.amazonaws.com/dynamodb-local/release - - - - - - maven-assembly-plugin - - - - com.yahoo.athenz.syncer.auth.history.AuthHistorySyncer - - - - jar-with-dependencies - - - - - make-assembly - package - - single - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy - test-compile - - copy-dependencies - - - test - so,dll,dylib - ${project.build.directory}/native-libs - - - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - ${project.build.directory}/native-libs - - - - - - - \ No newline at end of file + + + + + org.slf4j + slf4j-simple + ${slf4j.client.version} + + + org.slf4j + slf4j-api + ${slf4j.server.version} + + + com.fasterxml.jackson.core + jackson-core + ${jackson-core.version} + + + software.amazon.awssdk + cloudwatchlogs + + + software.amazon.awssdk + cloudwatch + + + software.amazon.awssdk + dynamodb + + + software.amazon.awssdk + dynamodb-enhanced + + + software.amazon.awssdk + url-connection-client + test + + + com.amazonaws + DynamoDBLocal + ${aws.dynamodb.local.version} + test + + + com.almworks.sqlite4java + sqlite4java + ${sqlite4java.version} + test + + + com.google.guava + guava + ${guava.version} + + + com.fasterxml.jackson.core + jackson-databind + ${jackson-databind.version} + + + com.yahoo.athenz + athenz-cert-refresher + ${project.parent.version} + + + com.yahoo.athenz + athenz-syncer-common + ${project.parent.version} + + + com.yahoo.athenz + athenz-auth-core + ${project.parent.version} + + + com.yahoo.athenz + athenz-dynamodb-client-factory + ${project.parent.version} + + + + + + dynamodb-local-oregon + DynamoDB Local Release Repository + https://s3-us-west-2.amazonaws.com/dynamodb-local/release + + + + + + + maven-assembly-plugin + + + + com.yahoo.athenz.syncer.auth.history.AuthHistorySyncer + + + + jar-with-dependencies + + + + + make-assembly + package + + single + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy + test-compile + + copy-dependencies + + + test + so,dll,dylib + ${project.build.directory}/native-libs + + + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + ${project.build.directory}/native-libs + + + + + + +