Fixing code to compile with latest master.

gitlab simantics/platform#405

diff --git a/bundles/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/Sheet.java b/bundles/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/Sheet.java
index 7a27fd24b3404db12ec433ae0e87f26c19052324..aca73a16f8e3089f9dac5e557df252413e3586c2 100644 (file)
--- a/bundles/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/Sheet.java
+++ b/bundles/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/Sheet.java
@@ -36,7 +36,7 @@ import org.simantics.objmap.annotations.RelatedElement;
 import org.simantics.objmap.annotations.UpdateMethod;\r
 import org.simantics.spreadsheet.Range;\r
 import org.simantics.spreadsheet.SheetVariables;\r
-import org.simantics.spreadsheet.common.exception.CellParseException;\r
+import org.simantics.spreadsheet.CellParseException;\r
 import org.simantics.spreadsheet.resource.SpreadsheetResource;\r
 import org.simantics.spreadsheet.util.SpreadsheetUtils;\r
 import org.simantics.sysdyn.representation.visitors.IElementVisitorVoid;\r

diff --git a/releng/org.simantics.sysdyn.tycho.configuration/pom.xml b/releng/org.simantics.sysdyn.tycho.configuration/pom.xml
index e68d200117bb7884ce92558a49b946d010259fd8..843afbabc08a9f98356b279c315f1022f8721139 100644 (file)
--- a/releng/org.simantics.sysdyn.tycho.configuration/pom.xml
+++ b/releng/org.simantics.sysdyn.tycho.configuration/pom.xml
@@ -8,8 +8,8 @@
        <packaging>pom</packaging>
 
        <properties>
-               <tycho.version>1.0.0</tycho.version>
-               <tycho.extras.version>1.0.0</tycho.extras.version>
+               <tycho.version>1.4.0</tycho.version>
+               <tycho.extras.version>1.4.0</tycho.extras.version>
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
                <branch-spec>master</branch-spec>
                <simantics-download-site>http://www.simantics.org/download</simantics-download-site>
@@ -76,11 +76,6 @@
                                        <resolver>p2</resolver>
                                        <environments>
 <!--
-                                               <environment>
-                                                       <os>linux</os>
-                                                       <ws>gtk</ws>
-                                                       <arch>x86</arch>
-                                               </environment>
                                                <environment>
                                                        <os>linux</os>
                                                        <ws>gtk</ws>