From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Wed, 12 Dec 2018 12:25:39 +0000 (+0200)
Subject: Take commons math3 from target platform instead of embedded jar
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=9446ee7d361a4a05c784050c605e6d3dcd5fdf05;p=simantics%2Fplatform.git

Take commons math3 from target platform instead of embedded jar

Change-Id: I41456bbcfbfa1378384cb64c9b7fe7e43f7a6c13
---

diff --git a/bundles/org.simantics.spreadsheet/.classpath b/bundles/org.simantics.spreadsheet/.classpath
index 2b095890e..b862a296d 100644
--- a/bundles/org.simantics.spreadsheet/.classpath
+++ b/bundles/org.simantics.spreadsheet/.classpath
@@ -3,6 +3,5 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="lib" path="lib/commons-math3-3.6.1.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/bundles/org.simantics.spreadsheet/META-INF/MANIFEST.MF b/bundles/org.simantics.spreadsheet/META-INF/MANIFEST.MF
index 6c49df22c..d20fbf27e 100644
--- a/bundles/org.simantics.spreadsheet/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.spreadsheet/META-INF/MANIFEST.MF
@@ -15,6 +15,7 @@ Export-Package: org.simantics.spreadsheet,
 Require-Bundle: org.simantics.utils.datastructures;bundle-version="1.0.0",
  org.simantics.databoard;bundle-version="0.6.1",
  it.unimi.dsi.fastutil;bundle-version="7.2.1",
+ org.apache.commons.math3,
  gnu.trove3,
  org.simantics.scl.runtime,
  org.simantics.datatypes;bundle-version="1.0.0",
diff --git a/bundles/org.simantics.spreadsheet/build.properties b/bundles/org.simantics.spreadsheet/build.properties
index a1c21d247..dfa46571b 100644
--- a/bundles/org.simantics.spreadsheet/build.properties
+++ b/bundles/org.simantics.spreadsheet/build.properties
@@ -12,5 +12,4 @@
 source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
-               .,\
-               lib/
+               .
diff --git a/bundles/org.simantics.spreadsheet/lib/commons-math3-3.6.1.jar b/bundles/org.simantics.spreadsheet/lib/commons-math3-3.6.1.jar
deleted file mode 100644
index 0ff582cfc..000000000
Binary files a/bundles/org.simantics.spreadsheet/lib/commons-math3-3.6.1.jar and /dev/null differ