Skip to content

Commit 7a72784

Browse files
Remove dependency on vulnerable version of jackson, upgrade to jackson2 (#3724)
1 parent 2c284dd commit 7a72784

File tree

10 files changed

+8
-24
lines changed

10 files changed

+8
-24
lines changed

google-cloud-clients/google-cloud-bigquery/src/benchmark/java/com/google/cloud/bigquery/benchmark/Benchmark.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package com.google.cloud.bigquery.benchmark;
1818

19-
import com.google.api.client.json.jackson.JacksonFactory;
19+
import com.google.api.client.json.jackson2.JacksonFactory;
2020
import com.google.cloud.bigquery.BigQuery;
2121
import com.google.cloud.bigquery.BigQueryOptions;
2222
import com.google.cloud.bigquery.FieldValue;

google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/spi/v2/HttpBigQueryRpc.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import com.google.api.client.http.HttpTransport;
3131
import com.google.api.client.http.json.JsonHttpContent;
3232
import com.google.api.client.json.JsonFactory;
33-
import com.google.api.client.json.jackson.JacksonFactory;
33+
import com.google.api.client.json.jackson2.JacksonFactory;
3434
import com.google.api.core.InternalApi;
3535
import com.google.api.core.InternalExtensionOnly;
3636
import com.google.api.services.bigquery.Bigquery;

google-cloud-clients/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/spi/v1/HttpComputeRpc.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
import com.google.api.client.http.HttpRequestInitializer;
2222
import com.google.api.client.http.HttpTransport;
23-
import com.google.api.client.json.jackson.JacksonFactory;
23+
import com.google.api.client.json.jackson2.JacksonFactory;
2424
import com.google.api.services.compute.Compute;
2525
import com.google.api.services.compute.model.AccessConfig;
2626
import com.google.api.services.compute.model.Address;

google-cloud-clients/google-cloud-core-http/pom.xml

-11
Original file line numberDiff line numberDiff line change
@@ -66,17 +66,6 @@
6666
</exclusion>
6767
</exclusions>
6868
</dependency>
69-
<dependency>
70-
<groupId>com.google.http-client</groupId>
71-
<artifactId>google-http-client-jackson</artifactId>
72-
<scope>compile</scope>
73-
<exclusions>
74-
<exclusion>
75-
<artifactId>guava-jdk5</artifactId>
76-
<groupId>com.google.guava</groupId>
77-
</exclusion>
78-
</exclusions>
79-
</dependency>
8069
<dependency>
8170
<groupId>com.google.http-client</groupId>
8271
<artifactId>google-http-client-jackson2</artifactId>

google-cloud-clients/google-cloud-dns/src/main/java/com/google/cloud/dns/spi/v1/HttpDnsRpc.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import com.google.api.client.http.HttpHeaders;
2525
import com.google.api.client.http.HttpRequestInitializer;
2626
import com.google.api.client.http.HttpTransport;
27-
import com.google.api.client.json.jackson.JacksonFactory;
27+
import com.google.api.client.json.jackson2.JacksonFactory;
2828
import com.google.api.services.dns.Dns;
2929
import com.google.api.services.dns.model.Change;
3030
import com.google.api.services.dns.model.ChangesListResponse;

google-cloud-clients/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/spi/v1beta1/HttpResourceManagerRpc.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import com.google.api.client.http.HttpRequestInitializer;
2525
import com.google.api.client.http.HttpTransport;
2626
import com.google.api.client.json.JsonFactory;
27-
import com.google.api.client.json.jackson.JacksonFactory;
27+
import com.google.api.client.json.jackson2.JacksonFactory;
2828
import com.google.api.core.ApiClock;
2929
import com.google.api.gax.retrying.ResultRetryAlgorithm;
3030
import com.google.api.gax.retrying.RetrySettings;

google-cloud-clients/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/testing/LocalResourceManagerHelper.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
public class LocalResourceManagerHelper {
9393
private static final Logger log = Logger.getLogger(LocalResourceManagerHelper.class.getName());
9494
private static final JsonFactory jsonFactory =
95-
new com.google.api.client.json.jackson.JacksonFactory();
95+
new com.google.api.client.json.jackson2.JacksonFactory();
9696
private static final Random PROJECT_NUMBER_GENERATOR = new Random();
9797
private static final String VERSION = "v1";
9898
private static final String CONTEXT = "/" + VERSION + "/projects";

google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/HttpStorageRpc.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
import com.google.api.client.http.LowLevelHttpResponse;
3737
import com.google.api.client.http.json.JsonHttpContent;
3838
import com.google.api.client.json.JsonFactory;
39-
import com.google.api.client.json.jackson.JacksonFactory;
39+
import com.google.api.client.json.jackson2.JacksonFactory;
4040
import com.google.api.client.util.IOUtils;
4141
import com.google.api.services.storage.Storage;
4242
import com.google.api.services.storage.Storage.Objects.Get;

google-cloud-clients/google-cloud-translate/src/main/java/com/google/cloud/translate/spi/v2/HttpTranslateRpc.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import com.google.api.client.http.HttpRequestInitializer;
2424
import com.google.api.client.http.HttpTransport;
2525
import com.google.api.client.http.json.JsonHttpContent;
26-
import com.google.api.client.json.jackson.JacksonFactory;
26+
import com.google.api.client.json.jackson2.JacksonFactory;
2727
import com.google.api.services.translate.Translate;
2828
import com.google.api.services.translate.model.DetectionsListResponse;
2929
import com.google.api.services.translate.model.DetectionsResourceItems;

google-cloud-clients/pom.xml

-5
Original file line numberDiff line numberDiff line change
@@ -310,11 +310,6 @@
310310
<artifactId>google-http-client-jackson2</artifactId>
311311
<version>${http-client.version}</version>
312312
</dependency>
313-
<dependency>
314-
<groupId>com.google.http-client</groupId>
315-
<artifactId>google-http-client-jackson</artifactId>
316-
<version>${http-client.version}</version>
317-
</dependency>
318313
<dependency>
319314
<groupId>com.google.oauth-client</groupId>
320315
<artifactId>google-oauth-client</artifactId>

0 commit comments

Comments
 (0)