From: Tuukka Lehtonen 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=refs%2Fchanges%2F46%2F4446%2F1;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 --- diff --git a/org.simantics.district.feature/feature.xml b/org.simantics.district.feature/feature.xml index c27c5d6d..4f50ad33 100644 --- a/org.simantics.district.feature/feature.xml +++ b/org.simantics.district.feature/feature.xml @@ -91,4 +91,11 @@ version="0.0.0" unpack="false"/> + + diff --git a/org.simantics.district.imports/.classpath b/org.simantics.district.imports/.classpath index ac0cdbaf..ac001674 100644 --- a/org.simantics.district.imports/.classpath +++ b/org.simantics.district.imports/.classpath @@ -6,7 +6,6 @@ - diff --git a/org.simantics.district.imports/META-INF/MANIFEST.MF b/org.simantics.district.imports/META-INF/MANIFEST.MF index 747c33cb..1fc6b8e6 100644 --- 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 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