diff options
| author |   Ittay Stern <ittay.stern@att.com> | 2020-02-28 03:51:09 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-02-28 03:51:09 +0000 |
| commit | f4a7b8b3469b291a21229f26636f2082ba933652 (patch) | |
| tree | 730ba401c7c9e2b02008b16b893fae1ce611c871 | |
| parent | ddb75d4b617a641bc056ca38e1c515bf7c345eb5 (diff) | |
| parent | 904eaac80a52cb25117254501b9f8cc483b60fca (diff) | |
Merge "Bump opencsv, c3p0, snakeyaml, h2 database to latests"
| -rwxr-xr-x | epsdk-app-onap/pom.xml | 2 | ||||
| -rwxr-xr-x | vid-app-common/pom.xml | 8 | ||||
| -rw-r--r-- | vid-app-common/src/main/java/org/onap/vid/services/CsvServiceImpl.java | 22 | ||||
| -rw-r--r-- | vid-automation/pom.xml | 2 |
4 files changed, 17 insertions, 17 deletions
diff --git a/epsdk-app-onap/pom.xml b/epsdk-app-onap/pom.xml index c8da0ea09..94bd5152a 100755 --- a/epsdk-app-onap/pom.xml +++ b/epsdk-app-onap/pom.xml @@ -368,7 +368,7 @@ <dependency> <groupId>com.mchange</groupId> <artifactId>c3p0</artifactId> - <version>0.9.5.4</version> + <version>0.9.5.5</version> </dependency> <dependency> <groupId>io.searchbox</groupId> diff --git a/vid-app-common/pom.xml b/vid-app-common/pom.xml index b894dc5bf..3b255d8c9 100755 --- a/vid-app-common/pom.xml +++ b/vid-app-common/pom.xml @@ -515,7 +515,7 @@ <dependency> <groupId>com.opencsv</groupId> <artifactId>opencsv</artifactId> - <version>4.6</version> + <version>5.0</version> </dependency> <!-- HTTP client --> @@ -652,7 +652,7 @@ <dependency> <groupId>com.mchange</groupId> <artifactId>c3p0</artifactId> - <version>0.9.5.4</version> + <version>0.9.5.5</version> </dependency> <dependency> <groupId>io.searchbox</groupId> @@ -828,7 +828,7 @@ <dependency> <groupId>org.yaml</groupId> <artifactId>snakeyaml</artifactId> - <version>1.24</version> + <version>1.25</version> </dependency> <dependency> <groupId>org.skyscreamer</groupId> @@ -893,7 +893,7 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.4.199</version> + <version>1.4.200</version> <scope>test</scope> </dependency> <dependency> diff --git a/vid-app-common/src/main/java/org/onap/vid/services/CsvServiceImpl.java b/vid-app-common/src/main/java/org/onap/vid/services/CsvServiceImpl.java index 4aabdae21..45ac78ab0 100644 --- a/vid-app-common/src/main/java/org/onap/vid/services/CsvServiceImpl.java +++ b/vid-app-common/src/main/java/org/onap/vid/services/CsvServiceImpl.java @@ -20,22 +20,22 @@ package org.onap.vid.services; -import com.opencsv.CSVReader; -import org.json.JSONArray; -import org.json.JSONObject; -import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate; -import org.springframework.stereotype.Service; -import org.springframework.web.multipart.MultipartFile; +import static org.apache.commons.lang3.exception.ExceptionUtils.rethrow; +import static org.onap.vid.utils.Logging.getMethodName; -import javax.ws.rs.BadRequestException; +import com.opencsv.CSVReader; import java.io.FileReader; import java.io.IOException; import java.io.InputStreamReader; import java.util.ArrayList; import java.util.Arrays; import java.util.List; - -import static org.onap.vid.utils.Logging.getMethodName; +import javax.ws.rs.BadRequestException; +import org.json.JSONArray; +import org.json.JSONObject; +import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate; +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; @Service public class CsvServiceImpl implements CsvService{ @@ -84,7 +84,7 @@ public class CsvServiceImpl implements CsvService{ } - private List<String[]> readCsv(CSVReader reader) throws IOException { + private List<String[]> readCsv(CSVReader reader) { try { List<String[]> myEntries = new ArrayList<>() ; String [] line; @@ -100,7 +100,7 @@ public class CsvServiceImpl implements CsvService{ } catch (Exception e){ logger.error("error during reading CSV file. exception:" + e.getMessage()); - throw e; + return rethrow(e); } } diff --git a/vid-automation/pom.xml b/vid-automation/pom.xml index 5c77a8111..d633054dc 100644 --- a/vid-automation/pom.xml +++ b/vid-automation/pom.xml @@ -83,7 +83,7 @@ <dependency> <groupId>org.yaml</groupId> <artifactId>snakeyaml</artifactId> - <version>1.14</version> + <version>1.25</version> </dependency> <dependency> <groupId>joda-time</groupId> |