Update opencsv version to 5.5.2 #159

cuba-platform · Oct 25, 2021 · c410e7d · c410e7d
1 parent e7680b3
commit c410e7d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/core/build.gradle b/core/build.gradle
@@ -264,7 +264,7 @@ configure(core) {
         }
         compile(group: "org.jsoup", name: "jsoup", version: "1.12.1")
         compile(group: "com.jayway.jsonpath", name: "json-path", version: "2.4.0")
-        compile(group: "com.opencsv", name: "opencsv", version: "4.6")
+        compile(group: "com.opencsv", name: "opencsv", version: "5.5.2")
         compile group: 'org.olap4j', name: 'olap4j', version: '1.2.0'
         compile(group: "net.sf.jasperreports", name: "jasperreports", version: "6.9.0") {
             exclude(group: 'org.apache.lucene')

diff --git a/core/modules/core/src/com/haulmont/yarg/formatters/impl/CsvFormatter.java b/core/modules/core/src/com/haulmont/yarg/formatters/impl/CsvFormatter.java
@@ -54,7 +54,8 @@ public void renderDocument() {
     protected void writeCsvDocument(BandData rootBand, OutputStream outputStream) {
         try {
             List<BandData> actualData = getActualData(rootBand);
-            CSVWriter writer = new CSVWriter(new OutputStreamWriter(outputStream), separator, CSVWriter.DEFAULT_QUOTE_CHARACTER);
+            CSVWriter writer = new CSVWriter(new OutputStreamWriter(outputStream), separator,
+                    CSVWriter.DEFAULT_QUOTE_CHARACTER, CSVWriter.DEFAULT_ESCAPE_CHARACTER, CSVWriter.DEFAULT_LINE_END);
 
             writer.writeNext(header);
 

diff --git a/core/modules/core/src/com/haulmont/yarg/formatters/impl/XlsxFormatter.java b/core/modules/core/src/com/haulmont/yarg/formatters/impl/XlsxFormatter.java
@@ -1026,7 +1026,8 @@ protected <T> T getLast(List<T> list) {
     }
 
     protected void saveXlsxAsCsv(Document document, OutputStream outputStream) throws IOException, Docx4JException {
-        CSVWriter writer = new CSVWriter(new OutputStreamWriter(outputStream), ';', CSVWriter.DEFAULT_QUOTE_CHARACTER);
+        CSVWriter writer = new CSVWriter(new OutputStreamWriter(outputStream), ';', CSVWriter.DEFAULT_QUOTE_CHARACTER,
+                CSVWriter.DEFAULT_ESCAPE_CHARACTER, CSVWriter.DEFAULT_LINE_END);
 
         for (Document.SheetWrapper sheetWrapper : document.getWorksheets()) {
             Worksheet worksheet = sheetWrapper.getWorksheet().getContents();