SAK-40025 - Update to opencsv 4.1

axxter99 · May 25, 2018 · 873d623 · 873d623
1 parent 6ccedf8
commit 873d623
Show file tree

Hide file tree

Showing 23 changed files with 27 additions and 28 deletions.
diff --git a/admin-tools/pom.xml b/admin-tools/pom.xml
@@ -63,7 +63,7 @@
             <version>0.0.7</version>
         </dependency>
         <dependency>
-            <groupId>net.sf.opencsv</groupId>
+            <groupId>com.opencsv</groupId>
             <artifactId>opencsv</artifactId>
         </dependency>
         <dependency>

diff --git a/admin-tools/src/java/org/sakaiproject/user/tool/UsersAction.java b/admin-tools/src/java/org/sakaiproject/user/tool/UsersAction.java
@@ -92,7 +92,7 @@
 import org.sakaiproject.util.ResourceLoader;
 import org.sakaiproject.util.StringUtil;
 
-import au.com.bytecode.opencsv.CSVReader;
+import com.opencsv.CSVReader;
 import lombok.extern.slf4j.Slf4j;
 import net.tanesha.recaptcha.ReCaptcha;
 import net.tanesha.recaptcha.ReCaptchaFactory;

diff --git a/assignment/impl/pom.xml b/assignment/impl/pom.xml
@@ -17,7 +17,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>net.sf.opencsv</groupId>
+            <groupId>com.opencsv</groupId>
             <artifactId>opencsv</artifactId>
         </dependency>
         <dependency>

diff --git a/assignment/impl/src/java/org/sakaiproject/assignment/impl/SpreadsheetExporter.java b/assignment/impl/src/java/org/sakaiproject/assignment/impl/SpreadsheetExporter.java
@@ -33,7 +33,7 @@
 import org.apache.poi.ss.usermodel.Workbook;
 import org.sakaiproject.util.Validator;
 
-import au.com.bytecode.opencsv.CSVWriter;
+import com.opencsv.CSVWriter;
 
 /**
  * Abstracts away writing to a CSV or Excel file.

diff --git a/assignment/tool/pom.xml b/assignment/tool/pom.xml
@@ -22,7 +22,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>net.sf.opencsv</groupId>
+            <groupId>com.opencsv</groupId>
             <artifactId>opencsv</artifactId>
         </dependency>
         <dependency>

diff --git a/assignment/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java b/assignment/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java
@@ -41,7 +41,7 @@
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
-import au.com.bytecode.opencsv.CSVReader;
+import com.opencsv.CSVReader;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;

diff --git a/deploy/pom.xml b/deploy/pom.xml
@@ -144,7 +144,7 @@
 
         <!-- csv library -->
         <dependency>
-            <groupId>net.sf.opencsv</groupId>
+            <groupId>com.opencsv</groupId>
             <artifactId>opencsv</artifactId>
             <scope>compile</scope>
         </dependency>

diff --git a/gradebookng/tool/pom.xml b/gradebookng/tool/pom.xml
@@ -80,7 +80,7 @@
 			<artifactId>commons-validator</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.opencsv</groupId>
+			<groupId>com.opencsv</groupId>
 			<artifactId>opencsv</artifactId>
 		</dependency>
 		<dependency>

diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/business/util/ImportGradesHelper.java b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/business/util/ImportGradesHelper.java
@@ -15,8 +15,8 @@
  */
 package org.sakaiproject.gradebookng.business.util;
 
-import au.com.bytecode.opencsv.CSVParser;
-import au.com.bytecode.opencsv.CSVReader;
+import com.opencsv.CSVParser;
+import com.opencsv.CSVReader;
 
 import java.io.IOException;
 import java.io.InputStream; 

diff --git a/...okng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/importExport/ExportPanel.java b/...okng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/importExport/ExportPanel.java
@@ -15,7 +15,7 @@
  */
 package org.sakaiproject.gradebookng.tool.panels.importExport;
 
-import au.com.bytecode.opencsv.CSVWriter;
+import com.opencsv.CSVWriter;
 
 import java.io.File;
 import java.io.FileWriter;

diff --git a/jobscheduler/scheduler-component-shared/pom.xml b/jobscheduler/scheduler-component-shared/pom.xml
@@ -82,9 +82,8 @@
             <artifactId>hibernate-core</artifactId>
         </dependency>
         <dependency>
-            <groupId>net.sf.opencsv</groupId>
+            <groupId>com.opencsv</groupId>
             <artifactId>opencsv</artifactId>
-            <version>2.3</version>
         </dependency>
         <dependency>
             <groupId>commons-lang</groupId>

diff --git a/...java/org/sakaiproject/component/app/scheduler/jobs/cm/processor/BaseCsvFileProcessor.java b/...java/org/sakaiproject/component/app/scheduler/jobs/cm/processor/BaseCsvFileProcessor.java
@@ -15,7 +15,7 @@
  */
 package org.sakaiproject.component.app.scheduler.jobs.cm.processor;
 
-import au.com.bytecode.opencsv.CSVReader;
+import com.opencsv.CSVReader;
 import lombok.extern.slf4j.Slf4j;
 
 import java.io.BufferedReader;

diff --git a/kernel/kernel-impl/pom.xml b/kernel/kernel-impl/pom.xml
@@ -142,7 +142,7 @@
     </dependency>
     <dependency>
         <!-- for parsing CSV data from config service files -->
-        <groupId>net.sf.opencsv</groupId>
+        <groupId>com.opencsv</groupId>
         <artifactId>opencsv</artifactId>
     </dependency>
     <dependency>

diff --git a/.../kernel-impl/src/main/java/org/sakaiproject/component/impl/BasicConfigurationService.java b/.../kernel-impl/src/main/java/org/sakaiproject/component/impl/BasicConfigurationService.java
@@ -21,7 +21,7 @@
 
 package org.sakaiproject.component.impl;
 
-import au.com.bytecode.opencsv.CSVParser;
+import com.opencsv.CSVParser;
 
 import java.io.IOException;
 import java.lang.ref.WeakReference;

diff --git a/lessonbuilder/tool/pom.xml b/lessonbuilder/tool/pom.xml
@@ -159,7 +159,7 @@
             <artifactId>commons-fileupload</artifactId>
         </dependency>
         <dependency>
-             <groupId>net.sf.opencsv</groupId>
+             <groupId>com.opencsv</groupId>
              <artifactId>opencsv</artifactId>
         </dependency>
         <dependency>

diff --git a/...onbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/beans/SimplePageBean.java b/...onbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/beans/SimplePageBean.java
@@ -24,7 +24,7 @@
 
 package org.sakaiproject.lessonbuildertool.tool.beans;
 
-import au.com.bytecode.opencsv.CSVParser;
+import com.opencsv.CSVParser;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;

diff --git a/master/pom.xml b/master/pom.xml
@@ -53,7 +53,7 @@
     <sakai.org.json.version>20171018</sakai.org.json.version>
     <sakai.pluto.version>1.1.7</sakai.pluto.version>
     <sakai.quartz.version>2.2.3</sakai.quartz.version>
-    <sakai.opencsv.version>2.3</sakai.opencsv.version>
+    <sakai.opencsv.version>4.1</sakai.opencsv.version>
     <sakai.servletapi.version>2.4</sakai.servletapi.version>
     <sakai.groovy.version>2.4.13</sakai.groovy.version>
     <sakai.simple-xml.version>2.6.4</sakai.simple-xml.version>
@@ -949,7 +949,7 @@
         <scope>provided</scope>
       </dependency>
       <dependency>
-        <groupId>net.sf.opencsv</groupId>
+        <groupId>com.opencsv</groupId>
         <artifactId>opencsv</artifactId>
         <version>${sakai.opencsv.version}</version>
         <scope>provided</scope>

diff --git a/profile2/impl/pom.xml b/profile2/impl/pom.xml
@@ -63,7 +63,7 @@
             <artifactId>servlet-api</artifactId>
         </dependency>
 		<dependency>
-			<groupId>net.sf.opencsv</groupId>
+			<groupId>com.opencsv</groupId>
 			<artifactId>opencsv</artifactId>
 		</dependency>
   		<dependency>

diff --git a/profile2/impl/src/java/org/sakaiproject/profile2/conversion/ProfileConverter.java b/profile2/impl/src/java/org/sakaiproject/profile2/conversion/ProfileConverter.java
@@ -28,9 +28,9 @@
 import java.util.List;
 import java.util.Map;
 
-import au.com.bytecode.opencsv.CSVReader;
-import au.com.bytecode.opencsv.bean.CsvToBean;
-import au.com.bytecode.opencsv.bean.HeaderColumnNameTranslateMappingStrategy;
+import com.opencsv.CSVReader;
+import com.opencsv.bean.CsvToBean;
+import com.opencsv.bean.HeaderColumnNameTranslateMappingStrategy;
 import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;

diff --git a/signup/tool/pom.xml b/signup/tool/pom.xml
@@ -146,7 +146,7 @@
             <artifactId>commons-lang</artifactId>
         </dependency>
         <dependency>
-            <groupId>net.sf.opencsv</groupId>
+            <groupId>com.opencsv</groupId>
             <artifactId>opencsv</artifactId>
         </dependency>
         <dependency>

diff --git a/signup/tool/src/java/org/sakaiproject/signup/tool/downloadEvents/DownloadEventBean.java b/signup/tool/src/java/org/sakaiproject/signup/tool/downloadEvents/DownloadEventBean.java
@@ -45,7 +45,7 @@
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 
-import au.com.bytecode.opencsv.CSVWriter;
+import com.opencsv.CSVWriter;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.ss.usermodel.Workbook;
 

diff --git a/site-manage/site-manage-group-section-role-helper/tool/pom.xml b/site-manage/site-manage-group-section-role-helper/tool/pom.xml
@@ -75,7 +75,7 @@
 			<artifactId>commons-fileupload</artifactId>
 		</dependency>
         <dependency>
-			<groupId>net.sf.opencsv</groupId>
+			<groupId>com.opencsv</groupId>
 			<artifactId>opencsv</artifactId>
 		</dependency>
          <dependency>

diff --git a/...oject/site/tool/helper/managegroupsectionrole/impl/SiteManageGroupSectionRoleHandler.java b/...oject/site/tool/helper/managegroupsectionrole/impl/SiteManageGroupSectionRoleHandler.java
@@ -32,7 +32,7 @@
 
 import javax.servlet.http.HttpServletRequest;
 
-import au.com.bytecode.opencsv.CSVReader;
+import com.opencsv.CSVReader;
 import lombok.extern.slf4j.Slf4j;
 import lombok.Getter;
 import lombok.Setter;