Use org.apache.commons.csv from platform's external dependencies

Remove commons-csv-1.4 JAR from org.simantics.district.imports in favor
of commons-csv 1.6 from platform externals.

gitlab #93

Change-Id: I4016fcf2f39d45b1ce599682aa7d7112621a5a12
(cherry picked from commit f4c1e22c72ee5eb5332bfb4dd9ab54d2854dd6d2)

diff --git a/org.simantics.district.feature/feature.xml b/org.simantics.district.feature/feature.xml
index df28e2cf3aae45a07565d3a35491940778b919af..90ffeb7bbdb35de5bd0df3c6c09e634c0e66c10d 100644 (file)
--- a/org.simantics.district.feature/feature.xml
+++ b/org.simantics.district.feature/feature.xml
@@ -354,4 +354,11 @@ version(s), and exceptions or additional permissions here}."
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.apache.commons.csv"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>

diff --git a/org.simantics.district.imports/.classpath b/org.simantics.district.imports/.classpath
index 552248074e56959eb5176f31feebace276d4699b..5b0fcceff8d436f1abe7ad877a1fae26e6eb3fb8 100644 (file)
--- a/org.simantics.district.imports/.classpath
+++ b/org.simantics.district.imports/.classpath
@@ -1,13 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<classpath>\r
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">\r
-               <attributes>\r
-                       <attribute name="module" value="true"/>\r
-                       <attribute name="maven.pomderived" value="true"/>\r
-               </attributes>\r
-       </classpathentry>\r
-       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
-       <classpathentry exported="true" kind="lib" path="lib/commons-csv-1.4.jar" sourcepath="lib/commons-csv-1.4-sources.jar"/>\r
-       <classpathentry kind="src" path="src"/>\r
-       <classpathentry kind="output" path="bin"/>\r
-</classpath>\r
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+               <attributes>
+                       <attribute name="module" value="true"/>
+                       <attribute name="maven.pomderived" value="true"/>
+               </attributes>
+       </classpathentry>
+       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+       <classpathentry kind="src" path="src"/>
+       <classpathentry kind="output" path="bin"/>
+</classpath>

diff --git a/org.simantics.district.imports/META-INF/MANIFEST.MF b/org.simantics.district.imports/META-INF/MANIFEST.MF
index b00215a2ac28163eb5a855ce68a01924ea4b26e6..203b2fa324995dc3ebdd277375f6ccb94d0f1697 100644 (file)
--- a/org.simantics.district.imports/META-INF/MANIFEST.MF
+++ b/org.simantics.district.imports/META-INF/MANIFEST.MF
@@ -10,7 +10,8 @@ Require-Bundle: org.simantics.db,
  org.simantics.district.network.ontology,
  org.simantics.district.network,
  org.simantics.diagram.ontology,
- org.slf4j.api
+ org.slf4j.api,
+ org.apache.commons.csv;visibility:=reexport
 Export-Package: org.apache.commons.csv,
  org.simantics.district.imports
 Bundle-ClassPath: lib/commons-csv-1.4.jar,

diff --git a/org.simantics.district.imports/build.properties b/org.simantics.district.imports/build.properties
index 4e38199d7eaf39d4213d359d20909eb756433e44..e4774e933c3cfd79adfa0ea45d1c5e87a4369d3b 100644 (file)
--- a/org.simantics.district.imports/build.properties
+++ b/org.simantics.district.imports/build.properties
@@ -1,6 +1,4 @@
 source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
-               .,\
-               lib/commons-csv-1.4.jar,\
                scl/

diff --git a/org.simantics.district.imports/lib/commons-csv-1.4-sources.jar b/org.simantics.district.imports/lib/commons-csv-1.4-sources.jar
deleted file mode 100644 (file)
index baf9b88..0000000
Binary files a/org.simantics.district.imports/lib/commons-csv-1.4-sources.jar and /dev/null differ

diff --git a/org.simantics.district.imports/lib/commons-csv-1.4.jar b/org.simantics.district.imports/lib/commons-csv-1.4.jar
deleted file mode 100644 (file)
index e9eb0bd..0000000
Binary files a/org.simantics.district.imports/lib/commons-csv-1.4.jar and /dev/null differ