Added org.apache.commons.math3 to target platform

This allows org.simantics.db.testing to compile again.
Also fixed ResourceWriteCommand to compile.

refs #6994

Change-Id: Ib44c949c422f0925cca273248383f9deeda7792d

diff --git a/bundles/org.simantics.modeling.tests/src/org/simantics/modeling/tests/commands/ResourceWriteCommand.java b/bundles/org.simantics.modeling.tests/src/org/simantics/modeling/tests/commands/ResourceWriteCommand.java
index bc21a31c28bde97a3eb4c0c3321f77d9301854d8..4892eda69e2993ddf7180f3b4c506a857e415db7 100644 (file)
--- a/bundles/org.simantics.modeling.tests/src/org/simantics/modeling/tests/commands/ResourceWriteCommand.java
+++ b/bundles/org.simantics.modeling.tests/src/org/simantics/modeling/tests/commands/ResourceWriteCommand.java
@@ -22,7 +22,7 @@ abstract public class ResourceWriteCommand<T extends CommandSequenceEnvironment>
        }
        
        public Resource runResource(final T environment) throws Exception {
        }
        
        public Resource runResource(final T environment) throws Exception {

-               return Simantics.getSession().sync(new WriteResultRequest() {
+               return Simantics.getSession().sync(new WriteResultRequest<Resource>() {

 
                        @Override
                        public Resource perform(WriteGraph graph) throws DatabaseException {
 
                        @Override
                        public Resource perform(WriteGraph graph) throws DatabaseException {

diff --git a/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.target b/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.target
index d09693543cf82dbc5f5920be44282e138f8253ce..5e4173d2a291b3a4b550e136dcae2d76c4393908 100644 (file)
--- a/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.target
+++ b/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.target
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<?pde version="3.8"?><target name="Eclipse Mars.2" sequenceNumber="223">
+<?pde version="3.8"?><target name="Eclipse Mars.2" sequenceNumber="224">

 <locations>
 <location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="org.objectweb.asm.xml.source" version="5.0.1.v201404251740"/>
 <locations>
 <location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="org.objectweb.asm.xml.source" version="5.0.1.v201404251740"/>


@@ -163,6 +163,8 @@
 <unit id="org.apache.commons.io.source" version="1.4.0"/>
 <unit id="org.apache.commons.lang" version="2.6.0"/>
 <unit id="org.apache.commons.lang.source" version="2.6.0"/>
 <unit id="org.apache.commons.io.source" version="1.4.0"/>
 <unit id="org.apache.commons.lang" version="2.6.0"/>
 <unit id="org.apache.commons.lang.source" version="2.6.0"/>

+<unit id="org.apache.commons.math3" version="3.6.1"/>
+<unit id="org.apache.commons.math3.source" version="3.6.1"/>

 <unit id="org.apache.lucene4.analyzers-common" version="4.9.0.b0003"/>
 <unit id="org.apache.lucene4.analyzers-common.source" version="4.9.0.b0003"/>
 <unit id="org.apache.lucene4.core" version="4.9.0.b0003"/>
 <unit id="org.apache.lucene4.analyzers-common" version="4.9.0.b0003"/>
 <unit id="org.apache.lucene4.analyzers-common.source" version="4.9.0.b0003"/>
 <unit id="org.apache.lucene4.core" version="4.9.0.b0003"/>

diff --git a/releng/org.simantics.sdk.build.targetdefinition/simantics.target b/releng/org.simantics.sdk.build.targetdefinition/simantics.target
index 139bc9f9f9002b915fe6fba9bcba7ea8071fcc3c..dd3395a297843aa0c549e62c496b43a04c8fc16f 100644 (file)
--- a/releng/org.simantics.sdk.build.targetdefinition/simantics.target
+++ b/releng/org.simantics.sdk.build.targetdefinition/simantics.target
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>

-<target name="Simantics 1.26.0" sequenceNumber="11">
+<target name="Simantics 1.26.0" sequenceNumber="12">

 <locations>
 <location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="org.simantics.sdk.feature.group" version="1.26.0"/>
 <locations>
 <location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="org.simantics.sdk.feature.group" version="1.26.0"/>


@@ -169,6 +169,8 @@
 <unit id="org.apache.commons.io.source" version="1.4.0"/>
 <unit id="org.apache.commons.lang" version="2.6.0"/>
 <unit id="org.apache.commons.lang.source" version="2.6.0"/>
 <unit id="org.apache.commons.io.source" version="1.4.0"/>
 <unit id="org.apache.commons.lang" version="2.6.0"/>
 <unit id="org.apache.commons.lang.source" version="2.6.0"/>

+<unit id="org.apache.commons.math3" version="3.6.1"/>
+<unit id="org.apache.commons.math3.source" version="3.6.1"/>

 <unit id="org.apache.lucene4.analyzers-common" version="4.9.0.b0003"/>
 <unit id="org.apache.lucene4.analyzers-common.source" version="4.9.0.b0003"/>
 <unit id="org.apache.lucene4.core" version="4.9.0.b0003"/>
 <unit id="org.apache.lucene4.analyzers-common" version="4.9.0.b0003"/>
 <unit id="org.apache.lucene4.analyzers-common.source" version="4.9.0.b0003"/>
 <unit id="org.apache.lucene4.core" version="4.9.0.b0003"/>