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

diff --git a/org.simantics.district.feature/feature.xml b/org.simantics.district.feature/feature.xml
index c27c5d6d40193fe52a9620e09d2d4e4d488f21c1..4f50ad33b8706eae7967236cb95afd27fc059b6a 100644 (file)
--- a/org.simantics.district.feature/feature.xml
+++ b/org.simantics.district.feature/feature.xml
@@ -91,4 +91,11 @@
          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 ac0cdbaf41e6d13d17977fb0ac1a51029fdb266a..ac00167432b5a15892d60958a94d4edd2e4e91cd 100644 (file)
--- a/org.simantics.district.imports/.classpath
+++ b/org.simantics.district.imports/.classpath
@@ -6,7 +6,6 @@
                </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="target/classes"/>\r
 </classpath>\r

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

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