Skip to content

Commit 398e991

Browse files
author
mkiran
committed
fix: update vulnerable dependency to resolve CVE
1 parent 4cee11c commit 398e991

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+328
-350
lines changed

ipp-v3-java-data/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<dependency>
3131
<groupId>com.fasterxml.jackson.core</groupId>
3232
<artifactId>jackson-annotations</artifactId>
33-
<version>2.9.10</version>
33+
<version>2.18.3</version>
3434
</dependency>
3535
<dependency>
3636
<groupId>org.glassfish.jaxb</groupId>
@@ -192,7 +192,7 @@
192192
<dependency>
193193
<groupId>org.apache.commons</groupId>
194194
<artifactId>commons-lang3</artifactId>
195-
<version>3.9</version>
195+
<version>3.17.0</version>
196196
</dependency>
197197
</dependencies>
198198
</dependencyManagement>

ipp-v3-java-data/src/main/java/com/intuit/ipp/data/MonthEnum.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
@XmlEnum
4242
public enum MonthEnum {
4343

44-
@XmlEnumValue("January")
44+
@XmlEnumValue("JANUARY")
4545
JANUARY("January"),
4646
@XmlEnumValue("February")
4747
FEBRUARY("February"),

ipp-v3-java-devkit/pom.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
<dependency>
6464
<groupId>com.google.code.gson</groupId>
6565
<artifactId>gson</artifactId>
66-
<version>2.8.1</version>
66+
<version>2.12.1</version>
6767
</dependency>
6868
<dependency>
6969
<groupId>oauth.signpost</groupId>
@@ -76,10 +76,10 @@
7676
<version>1.2</version>
7777
</dependency>
7878
<!-- Exclude commons-collection 3.2.1 due to security vulnerability and bring in 3.2.2 below that has the fix -->
79-
<dependency>
80-
<groupId>commons-configuration</groupId>
81-
<artifactId>commons-configuration</artifactId>
82-
<version>1.6</version>
79+
<dependency>
80+
<groupId>org.apache.commons</groupId>
81+
<artifactId>commons-configuration2</artifactId>
82+
<version>2.12.0</version>
8383
<exclusions>
8484
<exclusion>
8585
<groupId>commons-collections</groupId>
@@ -104,7 +104,7 @@
104104
<dependency>
105105
<groupId>commons-beanutils</groupId>
106106
<artifactId>commons-beanutils</artifactId>
107-
<version>1.9.4</version>
107+
<version>1.11.0</version>
108108
</dependency>
109109
<dependency>
110110
<groupId>commons-io</groupId>
@@ -119,7 +119,7 @@
119119
<dependency>
120120
<groupId>com.fasterxml.jackson.jaxrs</groupId>
121121
<artifactId>jackson-jaxrs-json-provider</artifactId>
122-
<version>2.9.10</version>
122+
<version>2.18.3</version>
123123
</dependency>
124124
<dependency>
125125
<groupId>org.jmockit</groupId>
@@ -314,12 +314,12 @@
314314
<dependency>
315315
<groupId>com.fasterxml.jackson.jaxrs</groupId>
316316
<artifactId>jackson-jaxrs-base</artifactId>
317-
<version>2.9.10</version>
317+
<version>2.18.3</version>
318318
</dependency>
319319
<dependency>
320320
<groupId>org.apache.commons</groupId>
321-
<artifactId>commons-lang3</artifactId>
322-
<version>3.9</version>
321+
<artifactId>commons-lang3</artifactId>
322+
<version>3.17.0</version>
323323
</dependency>
324324
<dependency>
325325
<groupId>org.jvnet.staxex</groupId>

ipp-v3-java-devkit/src/main/java/com/intuit/ipp/interceptors/HTTPBatchClientConnectionInterceptor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
import javax.net.ssl.SSLContext;
3535

3636
import org.apache.commons.io.IOUtils;
37-
import org.apache.commons.lang.ArrayUtils;
37+
import org.apache.commons.lang3.ArrayUtils;
3838
import org.apache.http.HttpEntity;
3939
import org.apache.http.HttpHost;
4040
import org.apache.http.HttpResponse;

ipp-v3-java-devkit/src/main/java/com/intuit/ipp/interceptors/IntuitInterceptorProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import com.intuit.ipp.util.Config;
2828
import com.intuit.ipp.util.Logger;
2929
import com.intuit.ipp.util.StringUtils;
30-
import org.apache.commons.configuration.Configuration;
30+
import org.apache.commons.configuration2.Configuration;
3131

3232
/**
3333
* Class to provide the provision to add interceptors in the order those have to be executed.

ipp-v3-java-devkit/src/main/java/com/intuit/ipp/serialization/AttachableResponseDeserializer.java

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,11 @@
1818
import java.io.IOException;
1919
import java.util.Iterator;
2020

21-
import com.fasterxml.jackson.databind.JsonNode;
21+
import com.fasterxml.jackson.databind.*;
2222
import com.fasterxml.jackson.core.JsonParser;
23-
import com.fasterxml.jackson.databind.AnnotationIntrospector;
24-
import com.fasterxml.jackson.databind.DeserializationConfig;
25-
import com.fasterxml.jackson.databind.DeserializationContext;
26-
import com.fasterxml.jackson.databind.JsonDeserializer;
27-
import com.fasterxml.jackson.databind.ObjectMapper;
2823
import com.fasterxml.jackson.databind.introspect.JacksonAnnotationIntrospector;
2924
import com.fasterxml.jackson.module.jaxb.JaxbAnnotationIntrospector;
3025
import com.fasterxml.jackson.databind.introspect.AnnotationIntrospectorPair;
31-
import com.fasterxml.jackson.databind.DeserializationFeature;
3226

3327
import com.intuit.ipp.data.Attachable;
3428
import com.intuit.ipp.data.AttachableResponse;
@@ -57,7 +51,7 @@ public class AttachableResponseDeserializer extends JsonDeserializer<AttachableR
5751
@Override
5852
public AttachableResponse deserialize(JsonParser jp, DeserializationContext desContext) throws IOException {
5953
ObjectMapper mapper = new ObjectMapper();
60-
54+
mapper.configure(MapperFeature.ACCEPT_CASE_INSENSITIVE_ENUMS,true);
6155
//Make the mapper JAXB annotations aware
6256
AnnotationIntrospector primary = new JaxbAnnotationIntrospector();
6357
AnnotationIntrospector secondary = new JacksonAnnotationIntrospector();

ipp-v3-java-devkit/src/main/java/com/intuit/ipp/serialization/BatchItemResponseDeserializer.java

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,13 @@
2020

2121
import javax.xml.bind.JAXBElement;
2222

23-
import com.fasterxml.jackson.databind.JsonNode;
23+
import com.fasterxml.jackson.databind.*;
2424
import com.fasterxml.jackson.core.JsonParser;
2525
import com.fasterxml.jackson.core.Version;
26-
import com.fasterxml.jackson.databind.AnnotationIntrospector;
27-
import com.fasterxml.jackson.databind.DeserializationConfig;
28-
import com.fasterxml.jackson.databind.DeserializationContext;
29-
import com.fasterxml.jackson.databind.JsonDeserializer;
30-
import com.fasterxml.jackson.databind.ObjectMapper;
3126
import com.fasterxml.jackson.databind.introspect.JacksonAnnotationIntrospector;
3227
import com.fasterxml.jackson.databind.module.SimpleModule;
3328
import com.fasterxml.jackson.module.jaxb.JaxbAnnotationIntrospector;
3429
import com.fasterxml.jackson.databind.introspect.AnnotationIntrospectorPair;
35-
import com.fasterxml.jackson.databind.DeserializationFeature;
3630

3731
import com.intuit.ipp.data.BatchItemResponse;
3832
import com.intuit.ipp.data.CDCResponse;
@@ -96,7 +90,7 @@ public class BatchItemResponseDeserializer extends JsonDeserializer<BatchItemRes
9690
@Override
9791
public BatchItemResponse deserialize(JsonParser jp, DeserializationContext desContext) throws IOException {
9892
ObjectMapper mapper = new ObjectMapper();
99-
93+
mapper.configure(MapperFeature.ACCEPT_CASE_INSENSITIVE_ENUMS,true);
10094
//Make the mapper JAXB annotations aware
10195
AnnotationIntrospector primary = new JaxbAnnotationIntrospector();
10296
AnnotationIntrospector secondary = new JacksonAnnotationIntrospector();

ipp-v3-java-devkit/src/main/java/com/intuit/ipp/serialization/CDCQueryResponseDeserializer.java

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,13 @@
2020
import java.util.Iterator;
2121
import java.util.List;
2222

23-
import com.fasterxml.jackson.databind.JsonNode;
23+
import com.fasterxml.jackson.databind.*;
2424
import com.fasterxml.jackson.core.JsonParser;
2525
import com.fasterxml.jackson.core.Version;
26-
import com.fasterxml.jackson.databind.AnnotationIntrospector;
27-
import com.fasterxml.jackson.databind.DeserializationConfig;
28-
import com.fasterxml.jackson.databind.DeserializationContext;
29-
import com.fasterxml.jackson.databind.JsonDeserializer;
30-
import com.fasterxml.jackson.databind.ObjectMapper;
3126
import com.fasterxml.jackson.databind.introspect.JacksonAnnotationIntrospector;
3227
import com.fasterxml.jackson.databind.module.SimpleModule;
3328
import com.fasterxml.jackson.module.jaxb.JaxbAnnotationIntrospector;
3429
import com.fasterxml.jackson.databind.introspect.AnnotationIntrospectorPair;
35-
import com.fasterxml.jackson.databind.DeserializationFeature;
3630

3731
import com.intuit.ipp.data.CDCResponse;
3832
import com.intuit.ipp.data.Fault;
@@ -69,7 +63,7 @@ public class CDCQueryResponseDeserializer extends JsonDeserializer<CDCResponse>
6963
@Override
7064
public CDCResponse deserialize(JsonParser jp, DeserializationContext desContext) throws IOException {
7165
ObjectMapper mapper = new ObjectMapper();
72-
66+
mapper.configure(MapperFeature.ACCEPT_CASE_INSENSITIVE_ENUMS,true);
7367
//Make the mapper JAXB annotations aware
7468
AnnotationIntrospector primary = new JaxbAnnotationIntrospector();
7569
AnnotationIntrospector secondary = new JacksonAnnotationIntrospector();

ipp-v3-java-devkit/src/main/java/com/intuit/ipp/serialization/CustomFieldDefinitionDeserializer.java

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,11 @@
2020
import java.util.Iterator;
2121
import java.util.List;
2222

23-
import com.fasterxml.jackson.databind.JsonNode;
23+
import com.fasterxml.jackson.databind.*;
2424
import com.fasterxml.jackson.core.JsonParser;
25-
import com.fasterxml.jackson.databind.AnnotationIntrospector;
26-
import com.fasterxml.jackson.databind.DeserializationConfig;
27-
import com.fasterxml.jackson.databind.DeserializationContext;
28-
import com.fasterxml.jackson.databind.JsonDeserializer;
29-
import com.fasterxml.jackson.databind.ObjectMapper;
3025
import com.fasterxml.jackson.databind.introspect.JacksonAnnotationIntrospector;
3126
import com.fasterxml.jackson.module.jaxb.JaxbAnnotationIntrospector;
3227
import com.fasterxml.jackson.databind.introspect.AnnotationIntrospectorPair;
33-
import com.fasterxml.jackson.databind.DeserializationFeature;
3428

3529
import com.intuit.ipp.data.CustomField;
3630
import com.intuit.ipp.data.CustomFieldDefinition;
@@ -61,7 +55,7 @@ public class CustomFieldDefinitionDeserializer extends JsonDeserializer<CustomFi
6155
@Override
6256
public CustomFieldDefinition deserialize(JsonParser jp, DeserializationContext desContext) throws IOException {
6357
ObjectMapper mapper = new ObjectMapper();
64-
58+
mapper.configure(MapperFeature.ACCEPT_CASE_INSENSITIVE_ENUMS,true);
6559
//Make the mapper JAXB annotations aware
6660
AnnotationIntrospector primary = new JaxbAnnotationIntrospector();
6761
AnnotationIntrospector secondary = new JacksonAnnotationIntrospector();

ipp-v3-java-devkit/src/main/java/com/intuit/ipp/serialization/IntuitResponseDeserializer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ public IntuitResponse deserialize(JsonParser jp, DeserializationContext desConte
144144
throws IOException {
145145
ObjectMapper mapper = new ObjectMapper();
146146
Report report = new Report();
147-
147+
mapper.configure(MapperFeature.ACCEPT_CASE_INSENSITIVE_ENUMS,true);
148148
//Make the mapper JAXB annotations aware
149149
AnnotationIntrospector primary = new JaxbAnnotationIntrospector();
150150
AnnotationIntrospector secondary = new JacksonAnnotationIntrospector();

0 commit comments

Comments
 (0)