Skip to content

Commit b29dc60

Browse files
authored
deps: bring all dependencies up to date (#99)
Checkstyle needs to be updated to resolve a CVE (https://nvd.nist.gov/vuln/detail/CVE-2019-9658). In the process, I also went ahead and brought everything else up to date. Any dependencies that are shared transitively with grpc-java have been set to the version used by grpc-java, even if there is a newer stable version available. Also, grpc-java no longer transitively depends on protobuf-java-util, so we need to explicitly add it ourselves. Signed-off-by: Joey Bratton <[email protected]>
1 parent 3c84e2a commit b29dc60

File tree

3 files changed

+23
-8
lines changed

3 files changed

+23
-8
lines changed

cache/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,12 @@
3030
<version>${guava.version}</version>
3131
</dependency>
3232

33+
<dependency>
34+
<groupId>com.google.protobuf</groupId>
35+
<artifactId>protobuf-java-util</artifactId>
36+
<version>${protobuf.version}</version>
37+
</dependency>
38+
3339
<dependency>
3440
<groupId>io.envoyproxy.controlplane</groupId>
3541
<artifactId>api</artifactId>

cache/src/main/java/io/envoyproxy/controlplane/cache/Resources.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ public static Set<String> getResourceReferences(Collection<? extends Message> re
146146
try {
147147
HttpConnectionManager.Builder config = HttpConnectionManager.newBuilder();
148148

149+
// TODO: Filter#getConfig() is deprecated, migrate to use Filter#getTypedConfig().
149150
structAsMessage(filter.getConfig(), config);
150151

151152
if (config.getRouteSpecifierCase() == RDS && !isNullOrEmpty(config.getRds().getRouteConfigName())) {

pom.xml

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,17 @@
2323

2424
<!-- Dependency Versions -->
2525
<annotation-api.version>1.3.2</annotation-api.version>
26-
<assertj.version>3.10.0</assertj.version>
27-
<auto-value.version>1.6</auto-value.version>
28-
<awaitility.version>3.1.0</awaitility.version>
29-
<checkstyle.version>8.8</checkstyle.version>
30-
<grpc.version>1.12.0</grpc.version>
31-
<guava.version>20.0</guava.version>
26+
<assertj.version>3.12.2</assertj.version>
27+
<auto-value.version>1.6.3</auto-value.version>
28+
<awaitility.version>3.1.6</awaitility.version>
29+
<checkstyle.version>8.18</checkstyle.version>
30+
<grpc.version>1.19.0</grpc.version>
31+
<guava.version>26.0-android</guava.version><!-- Keep the Guava version in sync with grpc-java -->
3232
<junit.version>4.12</junit.version>
33+
<protobuf.version>3.6.1</protobuf.version><!-- Keep the Protobuf version in sync with grpc-java -->
3334
<rest-assured.version>3.1.0</rest-assured.version>
34-
<slf4j.version>1.7.25</slf4j.version>
35-
<testcontainers.version>1.7.3</testcontainers.version>
35+
<slf4j.version>1.7.26</slf4j.version>
36+
<testcontainers.version>1.10.7</testcontainers.version>
3637

3738
<!-- Maven Plugin Versions -->
3839
<jacoco-maven-plugin.version>0.8.2</jacoco-maven-plugin.version>
@@ -43,6 +44,7 @@
4344
<maven-release-plugin.version>2.5.3</maven-release-plugin.version>
4445
<maven-source-plugin.version>3.0.1</maven-source-plugin.version>
4546
<nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
47+
<versions-maven-plugin.version>2.7</versions-maven-plugin.version>
4648
</properties>
4749

4850
<name>java-control-plane</name>
@@ -211,6 +213,12 @@
211213
</configuration>
212214
</plugin>
213215

216+
<plugin>
217+
<groupId>org.codehaus.mojo</groupId>
218+
<artifactId>versions-maven-plugin</artifactId>
219+
<version>${versions-maven-plugin.version}</version>
220+
</plugin>
221+
214222
<plugin>
215223
<groupId>org.sonatype.plugins</groupId>
216224
<artifactId>nexus-staging-maven-plugin</artifactId>

0 commit comments

Comments
 (0)