Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
atlas
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
dataplatform
atlas
Commits
f3faad54
Commit
f3faad54
authored
Oct 22, 2020
by
chaitali borole
Committed by
nixonrodrigues
Oct 23, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ATLAS-4002 : Upgrade commons-beanutils to 1.9.4 due to CVE-2019-10086
parent
7dec8f53
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
2 deletions
+5
-2
pom.xml
pom.xml
+1
-1
FileUtils.java
...sitory/src/main/java/org/apache/atlas/util/FileUtils.java
+4
-1
No files found.
pom.xml
View file @
f3faad54
...
@@ -718,7 +718,7 @@
...
@@ -718,7 +718,7 @@
<!-- Apache commons -->
<!-- Apache commons -->
<!--Apache poi and Open csv-->
<!--Apache poi and Open csv-->
<opencsv.version>
4.6
</opencsv.version>
<opencsv.version>
5.0
</opencsv.version>
<poi.version>
3.17
</poi.version>
<poi.version>
3.17
</poi.version>
<poi-ooxml.version>
3.17
</poi-ooxml.version>
<poi-ooxml.version>
3.17
</poi-ooxml.version>
...
...
repository/src/main/java/org/apache/atlas/util/FileUtils.java
View file @
f3faad54
...
@@ -18,6 +18,7 @@
...
@@ -18,6 +18,7 @@
package
org
.
apache
.
atlas
.
util
;
package
org
.
apache
.
atlas
.
util
;
import
com.opencsv.CSVReader
;
import
com.opencsv.CSVReader
;
import
com.opencsv.exceptions.CsvValidationException
;
import
org.apache.atlas.AtlasErrorCode
;
import
org.apache.atlas.AtlasErrorCode
;
import
org.apache.atlas.exception.AtlasBaseException
;
import
org.apache.atlas.exception.AtlasBaseException
;
import
org.apache.commons.collections.CollectionUtils
;
import
org.apache.commons.collections.CollectionUtils
;
...
@@ -70,7 +71,7 @@ public class FileUtils {
...
@@ -70,7 +71,7 @@ public class FileUtils {
return
ret
;
return
ret
;
}
}
public
static
List
<
String
[]>
readCSV
(
InputStream
inputStream
)
throws
IOException
{
public
static
List
<
String
[]>
readCSV
(
InputStream
inputStream
)
throws
IOException
,
AtlasBaseException
{
List
<
String
[]>
ret
=
new
ArrayList
<>();
List
<
String
[]>
ret
=
new
ArrayList
<>();
try
(
CSVReader
csvReader
=
new
CSVReader
(
new
InputStreamReader
(
inputStream
)))
{
try
(
CSVReader
csvReader
=
new
CSVReader
(
new
InputStreamReader
(
inputStream
)))
{
...
@@ -87,6 +88,8 @@ public class FileUtils {
...
@@ -87,6 +88,8 @@ public class FileUtils {
ret
.
add
(
data
);
ret
.
add
(
data
);
}
}
}
}
}
catch
(
CsvValidationException
e
)
{
throw
new
AtlasBaseException
(
AtlasErrorCode
.
NO_DATA_FOUND
,
e
);
}
}
return
ret
;
return
ret
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment