Skip to content
This repository was archived by the owner on Oct 2, 2023. It is now read-only.

Commit f12781c

Browse files
aochsneraochsner
authored
Update dependencies (#159)
* update mongodb driver to 3.6 to support AWS DocumentDB * updating to Spring Boot 1.5.x, Spring Data Ingalls, and Guava 29.0-jre * update code/tests using RestOperationsSupplier * bump version * cleanup dependencies further.. put versions in properties * upgrade to commons-lang3 remove codehaus jackson libs update commons-codec 1.14 remove extraneous dependenc declarations * Standardizing versions of dependencies across the components * Add commons-beansutils version * Update compile issues w/ updated core component * Uplift Jasypt spring boot starter to 1.18 to support 1.5.x
1 parent ad0789e commit f12781c

33 files changed

+82
-181
lines changed

‎pom.xml

+31-136
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<artifactId>api</artifactId>
66
<packaging>jar</packaging>
77
<name>${project.groupId}:${project.artifactId}</name>
8-
<version>3.2.9-SNAPSHOT</version>
8+
<version>3.3.0-SNAPSHOT</version>
99
<description>Hygieia Rest API Layer</description>
1010
<url>https://github.com/Hygieia/api</url>
1111

@@ -54,24 +54,38 @@
5454
<parent>
5555
<groupId>org.springframework.boot</groupId>
5656
<artifactId>spring-boot-starter-parent</artifactId>
57-
<version>1.3.0.RELEASE</version>
57+
<version>1.5.22.RELEASE</version>
5858
</parent>
5959

6060
<properties>
61-
<com.capitalone.dashboard.core.version>3.9.8</com.capitalone.dashboard.core.version>
61+
<!-- Dependencies -->
62+
<com.capitalone.dashboard.core.version>3.10.0</com.capitalone.dashboard.core.version>
63+
<spring-security.version>4.2.18.RELEASE</spring-security.version>
64+
<tomcat.version>8.5.57</tomcat.version>
65+
<commons-beanutils.version>1.9.4</commons-beanutils.version>
66+
<commons-codec.version>1.14</commons-codec.version>
67+
<commons-collections4.version>4.1</commons-collections4.version>
68+
<commons-io.version>2.4</commons-io.version>
69+
<commons-lang.version>3.10</commons-lang.version>
70+
<fongo.version>2.2.0-RC2</fongo.version>
71+
<guava.version>29.0-jre</guava.version>
72+
<hibernate-validator.version>5.4.2.Final</hibernate-validator.version>
73+
<jackson.version>2.10.3</jackson.version>
74+
<jasypt.version>1.18</jasypt.version>
75+
<logback.version>1.2.3</logback.version>
76+
<mongodb.version>3.6.4</mongodb.version>
77+
<jjwt.version>0.6.0</jjwt.version>
78+
<springfox.version>2.4.0</springfox.version>
79+
<assertj.version>3.9.0</assertj.version>
80+
81+
<!-- Plugins -->
6282
<apache.rat.plugin.version>0.13</apache.rat.plugin.version>
6383
<coveralls.maven.plugin.version>4.3.0</coveralls.maven.plugin.version>
64-
<guava.version>19.0</guava.version>
65-
<hamcrest.version>1.3</hamcrest.version>
6684
<jacoco.maven.plugin.version>0.8.3</jacoco.maven.plugin.version>
6785
<jacoco.coverage.percentage.minimum>0.200</jacoco.coverage.percentage.minimum>
6886
<jacoco.classes.missed.minimum>300</jacoco.classes.missed.minimum>
6987
<java.compilation.source>1.8</java.compilation.source>
7088
<java.compilation.target>1.8</java.compilation.target>
71-
<joda-time.version>2.7</joda-time.version>
72-
<joda-convert.version>1.8.1</joda-convert.version>
73-
<jackson.version>2.10.3</jackson.version>
74-
<junit.version>4.11</junit.version>
7589
<maven.compiler.plugin.version>3.1</maven.compiler.plugin.version>
7690
<maven.changes.plugin.version>2.12.1</maven.changes.plugin.version>
7791
<maven.checkstyle.plugin.version>3.0.0</maven.checkstyle.plugin.version>
@@ -81,19 +95,12 @@
8195
<maven.project-info.version>3.0.0</maven.project-info.version>
8296
<maven.scm.publish.plugin.version>3.0.0</maven.scm.publish.plugin.version>
8397
<maven.site.plugin.version>3.7.1</maven.site.plugin.version>
84-
<mongo>3.6.4</mongo>
85-
<mongodb.version>3.6.4</mongodb.version>
8698
<pmd.version>3.6</pmd.version>
8799
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
88100
<site.publish.url>https://github.com/Hygieia/api</site.publish.url>
89101
<site.publish.checkout.directory>site-content</site.publish.checkout.directory>
90102
<spotbugs.plugin.version>3.1.11</spotbugs.plugin.version>
91-
<spring.version>4.1.7.RELEASE</spring.version>
92-
<spring.data.version>1.8.0.RELEASE</spring.data.version>
93-
<spring-data-releasetrain.version>Gosling-RELEASE</spring-data-releasetrain.version>
94-
<spring.version>4.2.5.RELEASE</spring.version>
95-
<spring.cloud.version>1.3.1.RELEASE</spring.cloud.version>
96-
<application.version.number>${version}</application.version.number>
103+
<application.version.number>${project.version}</application.version.number>
97104
<sonar.projectKey>Hygieia_api</sonar.projectKey>
98105
<sonar.organization>hygieia-oss</sonar.organization>
99106
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
@@ -146,30 +153,17 @@
146153
<artifactId>spring-boot-starter-aop</artifactId>
147154
</dependency>
148155

149-
150-
<dependency>
151-
<groupId>javax.validation</groupId>
152-
<artifactId>validation-api</artifactId>
153-
<version>1.1.0.Final</version>
154-
</dependency>
155-
156-
<dependency>
157-
<groupId>org.hibernate</groupId>
158-
<artifactId>hibernate-validator</artifactId>
159-
</dependency>
160-
161156
<dependency>
162-
<groupId>javax.el</groupId>
163-
<artifactId>javax.el-api</artifactId>
164-
<version>3.0.0</version>
165-
<scope>provided</scope>
157+
<groupId>org.springframework.boot</groupId>
158+
<artifactId>spring-boot-starter-test</artifactId>
159+
<scope>test</scope>
166160
</dependency>
167161

168162
<!-- JWT -->
169163
<dependency>
170164
<groupId>io.jsonwebtoken</groupId>
171165
<artifactId>jjwt</artifactId>
172-
<version>0.6.0</version>
166+
<version>${jjwt.version}</version>
173167
</dependency>
174168

175169
<!-- Jackson -->
@@ -188,123 +182,24 @@
188182
<artifactId>jackson-dataformat-xml</artifactId>
189183
</dependency>
190184

191-
<dependency>
192-
<groupId>org.codehaus.jackson</groupId>
193-
<artifactId>jackson-core-asl</artifactId>
194-
<version>1.9.13</version>
195-
</dependency>
196-
197-
<dependency>
198-
<groupId>org.codehaus.jackson</groupId>
199-
<artifactId>jackson-mapper-asl</artifactId>
200-
<version>1.9.13</version>
201-
</dependency>
202-
203-
<!-- Logging dependencies> -->
204-
<dependency>
205-
<groupId>ch.qos.logback</groupId>
206-
<artifactId>logback-classic</artifactId>
207-
</dependency>
208-
209-
<!-- Misc Deps -->
210-
<dependency>
211-
<groupId>commons-lang</groupId>
212-
<artifactId>commons-lang</artifactId>
213-
<version>2.6</version>
214-
</dependency>
215-
216-
<dependency>
217-
<groupId>com.google.guava</groupId>
218-
<artifactId>guava</artifactId>
219-
<version>${guava.version}</version>
220-
</dependency>
221-
222-
<dependency>
223-
<groupId>joda-time</groupId>
224-
<artifactId>joda-time</artifactId>
225-
</dependency>
226-
227185
<!-- Swagger API -->
228186
<dependency>
229187
<groupId>io.springfox</groupId>
230188
<artifactId>springfox-swagger2</artifactId>
231-
<version>2.4.0</version>
189+
<version>${springfox.version}</version>
232190
</dependency>
233191
<dependency>
234192
<groupId>io.springfox</groupId>
235193
<artifactId>springfox-swagger-ui</artifactId>
236-
<version>2.4.0</version>
237-
</dependency>
238-
<dependency>
239-
<groupId>com.fasterxml</groupId>
240-
<artifactId>classmate</artifactId>
241-
<version>1.3.1</version>
194+
<version>${springfox.version}</version>
242195
</dependency>
243196

244197
<!-- Test Deps -->
245-
<dependency>
246-
<groupId>junit</groupId>
247-
<artifactId>junit</artifactId>
248-
<scope>test</scope>
249-
</dependency>
250-
<dependency>
251-
<groupId>org.mockito</groupId>
252-
<artifactId>mockito-core</artifactId>
253-
<scope>test</scope>
254-
<exclusions>
255-
<exclusion>
256-
<groupId>org.hamcrest</groupId>
257-
<artifactId>hamcrest-core</artifactId>
258-
</exclusion>
259-
</exclusions>
260-
</dependency>
261-
<dependency>
262-
<groupId>org.hamcrest</groupId>
263-
<artifactId>hamcrest-core</artifactId>
264-
<version>1.3</version>
265-
<scope>test</scope>
266-
</dependency>
267-
<dependency>
268-
<groupId>com.jayway.jsonpath</groupId>
269-
<artifactId>json-path</artifactId>
270-
<scope>test</scope>
271-
</dependency>
272-
<dependency>
273-
<groupId>org.joda</groupId>
274-
<artifactId>joda-convert</artifactId>
275-
<version>1.8.1</version>
276-
<scope>provided</scope>
277-
</dependency>
278-
<dependency>
279-
<groupId>commons-io</groupId>
280-
<artifactId>commons-io</artifactId>
281-
<version>2.1</version>
282-
</dependency>
283-
<dependency>
284-
<groupId>commons-beanutils</groupId>
285-
<artifactId>commons-beanutils</artifactId>
286-
</dependency>
287-
<dependency>
288-
<groupId>com.google.code.gson</groupId>
289-
<artifactId>gson</artifactId>
290-
<scope>test</scope>
291-
</dependency>
292198
<dependency>
293199
<groupId>org.springframework.security</groupId>
294200
<artifactId>spring-security-test</artifactId>
295-
<version>4.0.0.RELEASE</version>
296201
<scope>test</scope>
297202
</dependency>
298-
<dependency>
299-
<groupId>org.springframework.boot</groupId>
300-
<artifactId>spring-boot-starter-test</artifactId>
301-
<scope>test</scope>
302-
</dependency>
303-
<dependency>
304-
<groupId>com.google.code.gson</groupId>
305-
<artifactId>gson</artifactId>
306-
<version>2.8.2</version>
307-
</dependency>
308203
</dependencies>
309204

310205
<build>
@@ -684,7 +579,7 @@
684579
<announcementDirectory>.</announcementDirectory>
685580
<announcementFile>RELEASE-NOTES.txt</announcementFile>
686581
<announceParameters>
687-
<releaseVersion>${version}</releaseVersion>
582+
<releaseVersion>${project.version}</releaseVersion>
688583
</announceParameters>
689584
</configuration>
690585
<executions>

‎src/main/java/com/capitalone/dashboard/Application.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
import org.springframework.boot.autoconfigure.SpringBootApplication;
66
import org.springframework.boot.builder.SpringApplicationBuilder;
7-
import org.springframework.boot.context.web.SpringBootServletInitializer;
7+
import org.springframework.boot.web.support.SpringBootServletInitializer;
88
import org.springframework.context.annotation.Bean;
99

1010
import com.capitalone.dashboard.config.MongoConfig;

‎src/main/java/com/capitalone/dashboard/auth/apitoken/ApiTokenRequestFilter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public Authentication attemptAuthentication(HttpServletRequest request, HttpServ
6060

6161
String authHeader = request.getHeader("Authorization");
6262

63-
String encodedAuthStr = CharMatcher.WHITESPACE.matchesAnyOf(authHeader) ? authHeader.substring(authHeader.indexOf(" "), authHeader.length()) : authHeader;
63+
String encodedAuthStr = CharMatcher.whitespace().matchesAnyOf(authHeader) ? authHeader.substring(authHeader.indexOf(" "), authHeader.length()) : authHeader;
6464
byte[] encodedAuthbytes = encodedAuthStr.getBytes();
6565
String decodedAuthStr = new String(Base64.decodeBase64(encodedAuthbytes));
6666
String decodedAuthJson = decodedAuthStr.substring(decodedAuthStr.indexOf(":") + 1, decodedAuthStr.length());

‎src/main/java/com/capitalone/dashboard/auth/ldap/CustomUserDetails.java

+3
Original file line numberDiff line numberDiff line change
@@ -149,4 +149,7 @@ public String getEmailAddress() {
149149
public void setEmailAddress(String emailAddress) {
150150
this.emailAddress = emailAddress;
151151
}
152+
153+
@Override
154+
public void eraseCredentials() { this.password = null; }
152155
}

‎src/main/java/com/capitalone/dashboard/auth/sso/SsoAuthenticationServiceImpl.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package com.capitalone.dashboard.auth.sso;
22

3+
import com.fasterxml.jackson.databind.ObjectMapper;
34
import java.util.Collection;
45
import java.util.HashMap;
56
import java.util.Map;
67

78
import org.apache.log4j.Logger;
8-
import org.codehaus.jackson.map.ObjectMapper;
99
import org.springframework.beans.factory.annotation.Autowired;
1010
import org.springframework.security.core.Authentication;
1111
import org.springframework.security.core.GrantedAuthority;

‎src/main/java/com/capitalone/dashboard/auth/token/JwtAuthenticationFilter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import javax.servlet.http.HttpServletRequest;
77
import javax.servlet.http.HttpServletResponse;
88

9-
import org.apache.commons.lang.StringUtils;
9+
import org.apache.commons.lang3.StringUtils;
1010
import org.apache.log4j.Logger;
1111
import org.springframework.beans.factory.annotation.Autowired;
1212
import org.springframework.core.annotation.Order;

‎src/main/java/com/capitalone/dashboard/auth/token/TokenAuthenticationServiceImpl.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import javax.servlet.http.HttpServletResponse;
1414

1515
import io.jsonwebtoken.SignatureException;
16-
import org.apache.commons.lang.StringUtils;
16+
import org.apache.commons.lang3.StringUtils;
1717
import org.springframework.beans.factory.annotation.Autowired;
1818
import org.springframework.security.core.Authentication;
1919
import org.springframework.security.core.GrantedAuthority;

‎src/main/java/com/capitalone/dashboard/config/monitor/MonitorProxyConfig.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import java.net.Proxy;
77
import java.util.Locale;
88

9-
import org.apache.commons.lang.StringUtils;
9+
import org.apache.commons.lang3.StringUtils;
1010
import org.springframework.beans.factory.annotation.Autowired;
1111
import org.springframework.context.annotation.Bean;
1212
import org.springframework.context.annotation.Configuration;

‎src/main/java/com/capitalone/dashboard/logging/LoggingFilter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import com.capitalone.dashboard.settings.ApiSettings;
77
import com.mongodb.util.JSON;
88
import org.apache.commons.io.output.TeeOutputStream;
9-
import org.apache.commons.lang.StringUtils;
9+
import org.apache.commons.lang3.StringUtils;
1010
import org.apache.log4j.Logger;
1111
import org.springframework.beans.factory.annotation.Autowired;
1212
import org.springframework.core.annotation.Order;

‎src/main/java/com/capitalone/dashboard/service/BinaryArtifactServiceImpl.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import java.util.HashMap;
1515
import java.util.List;
1616
import java.util.Map;
17-
import org.apache.commons.lang.ObjectUtils;
17+
import org.apache.commons.lang3.ObjectUtils;
1818
import org.bson.types.ObjectId;
1919
import org.springframework.beans.factory.annotation.Autowired;
2020
import org.springframework.stereotype.Service;

‎src/main/java/com/capitalone/dashboard/service/BuildServiceImpl.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
import com.capitalone.dashboard.response.BuildDataCreateResponse;
2525
import com.capitalone.dashboard.settings.ApiSettings;
2626
import com.google.common.collect.Sets;
27-
import com.mysema.query.BooleanBuilder;
27+
import com.querydsl.core.BooleanBuilder;
2828
import org.apache.commons.collections4.CollectionUtils;
29-
import org.apache.commons.lang.StringUtils;
29+
import org.apache.commons.lang3.StringUtils;
3030
import org.bson.types.ObjectId;
3131
import org.joda.time.LocalDate;
3232
import org.springframework.beans.factory.annotation.Autowired;

‎src/main/java/com/capitalone/dashboard/service/CodeQualityServiceImpl.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,11 @@
1616
import com.capitalone.dashboard.request.CodeQualityCreateRequest;
1717
import com.capitalone.dashboard.request.CodeQualityRequest;
1818
import com.capitalone.dashboard.request.CollectorRequest;
19+
import com.google.common.base.MoreObjects;
1920
import com.google.common.base.Objects;
2021
import com.google.common.collect.Iterables;
21-
import com.mysema.query.BooleanBuilder;
22-
import org.apache.commons.lang.StringUtils;
22+
import com.querydsl.core.BooleanBuilder;
23+
import org.apache.commons.lang3.StringUtils;
2324
import org.bson.types.ObjectId;
2425
import org.joda.time.LocalDate;
2526
import org.springframework.beans.factory.annotation.Autowired;
@@ -115,7 +116,7 @@ protected CollectorItem getCollectorItem(CodeQualityRequest request) {
115116
return null;
116117
}
117118

118-
CodeQualityType qualityType = Objects.firstNonNull(request.getType(), CodeQualityType.StaticAnalysis);
119+
CodeQualityType qualityType = MoreObjects.firstNonNull(request.getType(), CodeQualityType.StaticAnalysis);
119120

120121
return component.getLastUpdatedCollectorItemForType(qualityType.collectorType());
121122
}

‎src/main/java/com/capitalone/dashboard/service/CollectorServiceImpl.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import org.apache.commons.collections4.CollectionUtils;
2020
import org.apache.commons.collections4.IterableUtils;
2121
import org.apache.commons.collections4.MapUtils;
22-
import org.apache.commons.lang.StringUtils;
22+
import org.apache.commons.lang3.StringUtils;
2323
import org.bson.types.ObjectId;
2424
import org.springframework.beans.factory.annotation.Autowired;
2525
import org.springframework.data.domain.Page;

‎src/main/java/com/capitalone/dashboard/service/CommitServiceImpl.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
import com.capitalone.dashboard.repository.CommitRepository;
1313
import com.capitalone.dashboard.repository.ComponentRepository;
1414
import com.capitalone.dashboard.request.CommitRequest;
15-
import com.mysema.query.BooleanBuilder;
16-
import org.apache.commons.lang.StringUtils;
15+
import com.querydsl.core.BooleanBuilder;
16+
import org.apache.commons.lang3.StringUtils;
1717
import org.joda.time.DateTime;
1818
import org.joda.time.LocalDate;
1919
import org.json.simple.JSONArray;

‎src/main/java/com/capitalone/dashboard/service/DeployServiceImpl.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import com.capitalone.dashboard.request.DeployDataCreateRequest;
2121
import com.google.common.base.Predicate;
2222
import com.google.common.collect.Iterables;
23-
import org.apache.commons.lang.StringUtils;
23+
import org.apache.commons.lang3.StringUtils;
2424
import org.bson.types.ObjectId;
2525
import org.springframework.beans.factory.annotation.Autowired;
2626
import org.springframework.stereotype.Service;

0 commit comments

Comments
 (0)