diff --git a/agent-dispatchers/kinesis/pom.xml b/agent-dispatchers/kinesis/pom.xml index 8506eb6..e523f11 100644 --- a/agent-dispatchers/kinesis/pom.xml +++ b/agent-dispatchers/kinesis/pom.xml @@ -13,7 +13,7 @@ haystack-agent-kinesis-dispatcher - 0.14.0 + 0.15.12 diff --git a/agent-dispatchers/kinesis/src/main/java/com/expedia/www/haystack/agent/dispatcher/KinesisDispatcher.java b/agent-dispatchers/kinesis/src/main/java/com/expedia/www/haystack/agent/dispatcher/KinesisDispatcher.java index 40f084f..86a7db7 100644 --- a/agent-dispatchers/kinesis/src/main/java/com/expedia/www/haystack/agent/dispatcher/KinesisDispatcher.java +++ b/agent-dispatchers/kinesis/src/main/java/com/expedia/www/haystack/agent/dispatcher/KinesisDispatcher.java @@ -34,6 +34,7 @@ import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; +import com.google.common.util.concurrent.MoreExecutors; import com.typesafe.config.Config; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.Validate; @@ -194,7 +195,7 @@ public void onFailure(final Throwable throwable) { formatAttempts(result.getAttempts()), e); } } - }); + }, MoreExecutors.directExecutor()); } private String formatAttempts(final List attempts) { diff --git a/agent-providers/span/pom.xml b/agent-providers/span/pom.xml index 727efd6..953b3b2 100644 --- a/agent-providers/span/pom.xml +++ b/agent-providers/span/pom.xml @@ -11,6 +11,10 @@ ../../pom.xml + + 2.7.5 + + com.expedia.www @@ -33,6 +37,12 @@ commons-io commons-io + + com.squareup.okhttp + okhttp + ${okhttp.version} + test + diff --git a/api/pom.xml b/api/pom.xml index 2d4022f..a9b7b47 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -60,7 +60,7 @@ run - com.google.protobuf:protoc:3.0.0 + com.google.protobuf:protoc:${protobuf.version} ${project.basedir}/../haystack-idl/proto ${project.basedir}/../haystack-idl/proto/api @@ -75,7 +75,7 @@ grpc-java - io.grpc:protoc-gen-grpc-java:1.0.1 + io.grpc:protoc-gen-grpc-java:1.68.2 diff --git a/bundlers/haystack-agent/pom.xml b/bundlers/haystack-agent/pom.xml index d487f69..18acfe9 100644 --- a/bundlers/haystack-agent/pom.xml +++ b/bundlers/haystack-agent/pom.xml @@ -51,11 +51,23 @@ com.expedia.www blobs-agent-dispatchers ${blobs.version} + + + com.expedia.www + haystack-agent-api + + com.expedia.www blobs-agent-server ${blobs.version} + + + com.expedia.www + haystack-agent-api + + diff --git a/pom.xml b/pom.xml index 578d25d..96785f6 100644 --- a/pom.xml +++ b/pom.xml @@ -68,20 +68,19 @@ UTF-8 1.8 - 3.4.0 - 1.2.3 - 1.7.25 - 2.9.10.4 - 2.9.10 - 3.4 - 1.9.0 + 3.25.5 + 1.2.13 + 1.7.36 + 2.13.5 + 3.17.0 + 1.68.2 3.2.5 2.3.0 1.1.1 1.0.3 - 9.4.18.v20190429 - 2.15.0 + 9.4.56.v20240826 + 2.27.1 2 12 6 @@ -93,9 +92,9 @@ 3.6 4.12 - 1.11.128 + 1.12.779 1.3.1 - 2.6 + 2.18.0 3.0.1 5.1.3 @@ -180,30 +179,25 @@ - com.fasterxml.jackson.dataformat - jackson-dataformat-yaml - ${jackson-dataformat.version} - - - com.fasterxml.jackson.core - jackson-databind + com.fasterxml.jackson + jackson-bom ${jackson.version} + import + pom com.amazonaws - aws-java-sdk-sts + aws-java-sdk-bom ${aws-sdk.version} - - - - org.eclipse.jetty - jetty-server - ${jetty.version} + import + pom org.eclipse.jetty - jetty-servlet + jetty-bom ${jetty.version} + import + pom io.zipkin.zipkin2