From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Thu, 10 Sep 2020 18:47:25 +0000 (+0300)
Subject: Use org.apache.commons.csv from platform's external dependencies
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=353d1b0cd909dd104cbcf97b7ba9db4c0486ca7a;hp=8af3aedc6b9fc6ff41bb60884cfe667d5ebca164;p=simantics%2Fdistrict.git

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 df28e2cf..90ffeb7b 100644
--- 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}.&quot;
          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 55224807..5b0fccef 100644
--- a/org.simantics.district.imports/.classpath
+++ b/org.simantics.district.imports/.classpath
@@ -1,13 +1,12 @@
-<?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 exported="true" kind="lib" path="lib/commons-csv-1.4.jar" sourcepath="lib/commons-csv-1.4-sources.jar"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?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 b00215a2..203b2fa3 100644
--- 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 4e38199d..e4774e93 100644
--- 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
index baf9b88f..00000000
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
index e9eb0bd3..00000000
Binary files a/org.simantics.district.imports/lib/commons-csv-1.4.jar and /dev/null differ