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 2b095890ee91f878640e4a80cd0787a8e744367b..b862a296d38fe04269faeee6c9d77d11ff77380d 100644 (file)
--- 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"/>\r
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
        <classpathentry kind="src" path="src"/>\r
-       <classpathentry kind="lib" path="lib/commons-math3-3.6.1.jar"/>\r
        <classpathentry kind="output" path="bin"/>\r
 </classpath>\r

diff --git a/bundles/org.simantics.spreadsheet/META-INF/MANIFEST.MF b/bundles/org.simantics.spreadsheet/META-INF/MANIFEST.MF
index 6c49df22c90a7e604af19eb19abfbef2208151bc..d20fbf27e0d850546eb43784800794cd93201376 100644 (file)
--- 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 a1c21d247965fc14d7d9b35e138d12c3e4a766a7..dfa46571bba26df766d0c2656b9133051b8a9ca5 100644 (file)
--- 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 (file)
index 0ff582c..0000000
Binary files a/bundles/org.simantics.spreadsheet/lib/commons-math3-3.6.1.jar and /dev/null differ