Skip to content

Upgrade dependencies with security vulnerabilities #106

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.

Sign up for GitHub

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

Open
chriscizek wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Upgrade dependencies with security vulnerabilities #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion agent-dispatchers/kinesis/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<artifactId>haystack-agent-kinesis-dispatcher</artifactId>

<properties>
<aws.kinesis.producer.lib.version>0.14.0</aws.kinesis.producer.lib.version>
<aws.kinesis.producer.lib.version>0.15.12</aws.kinesis.producer.lib.version>
</properties>

<dependencies>
Expand Down
3 changes: 2 additions & 1 deletion ...rs/kinesis/src/main/java/com/expedia/www/haystack/agent/dispatcher/KinesisDispatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -194,7 +195,7 @@ public void onFailure(final Throwable throwable) {
formatAttempts(result.getAttempts()), e);
}
}
});
}, MoreExecutors.directExecutor());
}

private String formatAttempts(final List<Attempt> attempts) {
Expand Down
10 changes: 10 additions & 0 deletions agent-providers/span/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@
<relativePath>../../pom.xml</relativePath>
</parent>

<properties>
<okhttp.version>2.7.5</okhttp.version>
</properties>

<dependencies>
<dependency>
<groupId>com.expedia.www</groupId>
Expand All @@ -33,6 +37,12 @@
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
<groupId>com.squareup.okhttp</groupId>
<artifactId>okhttp</artifactId>
<version>${okhttp.version}</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
Expand Down
4 changes: 2 additions & 2 deletions api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
<goal>run</goal>
</goals>
<configuration>
<protocArtifact>com.google.protobuf:protoc:3.0.0</protocArtifact>
<protocArtifact>com.google.protobuf:protoc:${protobuf.version}</protocArtifact>
<includeDirectories>
<include>${project.basedir}/../haystack-idl/proto</include>
<include>${project.basedir}/../haystack-idl/proto/api</include>
Expand All @@ -75,7 +75,7 @@
</outputTarget>
<outputTarget>
<type>grpc-java</type>
<pluginArtifact>io.grpc:protoc-gen-grpc-java:1.0.1</pluginArtifact>
<pluginArtifact>io.grpc:protoc-gen-grpc-java:1.68.2</pluginArtifact>
</outputTarget>
</outputTargets>
</configuration>
Expand Down
12 changes: 12 additions & 0 deletions bundlers/haystack-agent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,23 @@
<groupId>com.expedia.www</groupId>
<artifactId>blobs-agent-dispatchers</artifactId>
<version>${blobs.version}</version>
<exclusions>
<exclusion>
<groupId>com.expedia.www</groupId>
<artifactId>haystack-agent-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.expedia.www</groupId>
<artifactId>blobs-agent-server</artifactId>
<version>${blobs.version}</version>
<exclusions>
<exclusion>
<groupId>com.expedia.www</groupId>
<artifactId>haystack-agent-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- grpc -->
<dependency>
Expand Down
46 changes: 20 additions & 26 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,20 +68,19 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.jdk.version>1.8</project.jdk.version>
<protobuf.version>3.4.0</protobuf.version>
<logback.version>1.2.3</logback.version>
<slf4j-api.version>1.7.25</slf4j-api.version>
<jackson.version>2.9.10.4</jackson.version>
<jackson-dataformat.version>2.9.10</jackson-dataformat.version>
<commons-lang.version>3.4</commons-lang.version>
<grpc.version>1.9.0</grpc.version>
<protobuf.version>3.25.5</protobuf.version>
<logback.version>1.2.13</logback.version>
<slf4j-api.version>1.7.36</slf4j-api.version>
<jackson.version>2.13.5</jackson.version>
<commons-lang.version>3.17.0</commons-lang.version>
<grpc.version>1.68.2</grpc.version>
<metrics-core.version>3.2.5</metrics-core.version>
<jaxb.version>2.3.0</jaxb.version>
<javax.activation.version>1.1.1</javax.activation.version>
<blobs.version>1.0.3</blobs.version>

<jetty.version>9.4.18.v20190429</jetty.version>
<zipkin2.version>2.15.0</zipkin2.version>
<jetty.version>9.4.56.v20240826</jetty.version>
<zipkin2.version>2.27.1</zipkin2.version>
<scala.major.version>2</scala.major.version>
<scala.minor.version>12</scala.minor.version>
<scala.tiny.version>6</scala.tiny.version>
Expand All @@ -93,9 +92,9 @@
<easymock.version>3.6</easymock.version>
<junit.version>4.12</junit.version>

<aws-sdk.version>1.11.128</aws-sdk.version>
<aws-sdk.version>1.12.779</aws-sdk.version>
<typesafe-config.version>1.3.1</typesafe-config.version>
<commons-io.version>2.6</commons-io.version>
<commons-io.version>2.18.0</commons-io.version>

<maven-pmd-plugin.version>3.0.1</maven-pmd-plugin.version>
<pmd.version>5.1.3</pmd.version>
Expand Down Expand Up @@ -180,30 +179,25 @@
</dependency>

<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
<version>${jackson-dataformat.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>${jackson.version}</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-sts</artifactId>
<artifactId>aws-java-sdk-bom</artifactId>
<version>${aws-sdk.version}</version>
</dependency>

<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
<version>${jetty.version}</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
<artifactId>jetty-bom</artifactId>
<version>${jetty.version}</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>io.zipkin.zipkin2</groupId>
Expand Down