Fixes to allow tycho builds to work.

diff --git a/bundles/org.simantics.db.indexing/META-INF/MANIFEST.MF b/bundles/org.simantics.db.indexing/META-INF/MANIFEST.MF
index d74cdea3664d0d48d24f5f739c10d1c00315c80e..f86c1499ddee0458013e7207a7109ca56ae6c86d 100644 (file)
--- a/bundles/org.simantics.db.indexing/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.db.indexing/META-INF/MANIFEST.MF
@@ -6,7 +6,9 @@ Bundle-Version: 1.1.0.qualifier
 Bundle-Vendor: VTT Technical Research Centre of Finland\r
 Require-Bundle: org.eclipse.core.runtime,\r
  org.simantics.db.layer0;bundle-version="0.8.0",\r
- org.apache.lucene4;bundle-version="4.9.0",\r
+ org.apache.lucene4.core;bundle-version="4.9.0",\r
+ org.apache.lucene4.queryparser;bundle-version="4.9.0",\r
+ org.apache.lucene4.analyzers-common;bundle-version="4.9.0",\r
  org.simantics.db.services;bundle-version="0.8.0"\r
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8\r
 Export-Package: org.simantics.db.indexing\r

diff --git a/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/parsing/Graph.g b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/parsing/Graph.g
index 67b11fbaa7a1abc257a4c7117387036f4ae89758..995960f94b5019322e562cf8accc10a68cd229b5 100644 (file)
--- a/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/parsing/Graph.g
+++ b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/parsing/Graph.g
@@ -85,7 +85,7 @@ public Token nextToken() {
                emit balancing number of DEDENT tokens.\r
             */\r
             if(iStack.size() <= 1)\r
-                return Token.EOF_TOKEN;\r
+                return getEOFToken();\r
             else {                \r
                 while(iStack.size() > 1) {\r
                     iStack.removeAt(iStack.size()-1);\r
@@ -450,4 +450,4 @@ mapAssignment
     : value '=' value\r
     -> ^(ASSIGNMENT value*) \r
     ;\r
-        
\ No newline at end of file
+        \r

diff --git a/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/parsing/GraphLexer.java b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/parsing/GraphLexer.java
index 98a10ec9769a48ca85a68659ca75acbb247aff50..d75d8cc93f96eb30710baf90a8b0bc1fd258746b 100644 (file)
--- a/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/parsing/GraphLexer.java
+++ b/bundles/org.simantics.graph.compiler/src/org/simantics/graph/compiler/internal/parsing/GraphLexer.java
@@ -108,7 +108,7 @@ public class GraphLexer extends Lexer {
                    emit balancing number of DEDENT tokens.\r
                 */\r
                 if(iStack.size() <= 1)\r
-                    return Token.EOF_TOKEN;\r
+                    return getEOFToken();\r
                 else {                \r
                     while(iStack.size() > 1) {\r
                         iStack.removeAt(iStack.size()-1);\r
@@ -2471,4 +2471,4 @@ public class GraphLexer extends Lexer {
     }\r
  \r
 \r
-}
\ No newline at end of file
+}\r

diff --git a/bundles/org.simantics.modeling.ui/META-INF/MANIFEST.MF b/bundles/org.simantics.modeling.ui/META-INF/MANIFEST.MF
index 1b915e3a7a9e0daa82aaad885ec679e9d3aee27e..561e41e10919faa1239e398ebcc98838159a35c8 100644 (file)
--- a/bundles/org.simantics.modeling.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.modeling.ui/META-INF/MANIFEST.MF
@@ -32,7 +32,7 @@ Require-Bundle: org.simantics.project;bundle-version="1.0.0",
  org.simantics.issues;bundle-version="1.1.0",
  org.simantics.document;bundle-version="1.0.0",
  org.simantics.graph.db;bundle-version="1.1.9",
- org.bouncycastle;bundle-version="1.47.0",
+ org.bouncycastle.bcprov-jdk14;bundle-version="1.38.0",
  org.simantics.image2.ontology;bundle-version="1.1.0",
  org.simantics.scl.compiler;bundle-version="0.4.0",
  org.simantics.scl.compiler.dummy;bundle-version="1.0.0",

diff --git a/bundles/org.simantics.spreadsheet.graph/META-INF/MANIFEST.MF b/bundles/org.simantics.spreadsheet.graph/META-INF/MANIFEST.MF
index 967272c074c03e5dd6f6624d5ed6a3fc60373b2f..a5eef2fb2265eaec3cb1921bface8a1e4a103578 100644 (file)
--- a/bundles/org.simantics.spreadsheet.graph/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.spreadsheet.graph/META-INF/MANIFEST.MF
@@ -21,7 +21,8 @@ Require-Bundle: org.simantics.layer0.utils,
  org.simantics.datatypes.ontology;bundle-version="1.1.0",
  org.simantics.document.server.io;bundle-version="0.0.1",
  org.simantics.simulator.variable,
- org.apache.poi;bundle-version="3.10.0",
+ org.apache.poi;bundle-version="3.14.0",
+ org.apache.poi.ooxml;bundle-version="3.14.0",
  it.unimi.dsi.fastutil,
  org.simantics.structural.synchronization.client,
  org.simantics.db.indexing,

diff --git a/features/org.simantics.charts.feature/feature.xml b/features/org.simantics.charts.feature/feature.xml
index 65acfa3903b2059fb9554576fc578421bffa8a98..a00ee500ab0fb8e423831b38c195e9dffb4b3b4a 100644 (file)
--- a/features/org.simantics.charts.feature/feature.xml
+++ b/features/org.simantics.charts.feature/feature.xml
@@ -26,7 +26,7 @@
          version="0.0.0"/>\r
 \r
    <includes\r
-         id="org.simantics.event"\r
+         id="org.simantics.event.feature"\r
          version="0.0.0"/>\r
 \r
    <plugin\r

diff --git a/features/org.simantics.event.feature/feature.xml b/features/org.simantics.event.feature/feature.xml
index 5d129d61925875875f7fdbd8750a6a0dfc22c20e..54796e239f926ab2dbb96b225c3e1842f3a64083 100644 (file)
--- a/features/org.simantics.event.feature/feature.xml
+++ b/features/org.simantics.event.feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <feature\r
-      id="org.simantics.event"\r
+      id="org.simantics.event.feature"\r
       label="Event Log Feature"\r
       version="0.0.1.qualifier"\r
       provider-name="Semantum Oy">\r

diff --git a/features/org.simantics.issues.feature/feature.xml b/features/org.simantics.issues.feature/feature.xml
index 78aa3eed4f5306a5e554ba1175516854387e5f29..fc37ff353ad12076a1630f8e78065a8d441644b0 100644 (file)
--- a/features/org.simantics.issues.feature/feature.xml
+++ b/features/org.simantics.issues.feature/feature.xml
@@ -11,7 +11,7 @@
         VTT Technical Research Centre of Finland - initial API and implementation
  -->\r
 <feature\r
-      id="org.simantics.issues"\r
+      id="org.simantics.issues.feature"\r
       label="Issue Subsystem"\r
       version="1.1.0.qualifier"\r
       provider-name="VTT Technical Research Centre of Finland">\r

diff --git a/features/org.simantics.issues.ui.feature/feature.xml b/features/org.simantics.issues.ui.feature/feature.xml
index 035aa296cc78a0aae720a0080ffd9dc6f5ae8a4b..71b86dfd0f6d8dab17ce351532fffb8aa068865c 100644 (file)
--- a/features/org.simantics.issues.ui.feature/feature.xml
+++ b/features/org.simantics.issues.ui.feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <feature\r
-      id="org.simantics.issues.ui"\r
+      id="org.simantics.issues.ui.feature"\r
       label="Issue UI Feature"\r
       version="1.1.1.qualifier"\r
       provider-name="Semantum Oy">\r
@@ -18,7 +18,7 @@
    </license>\r
 \r
    <includes\r
-         id="org.simantics.issues"\r
+         id="org.simantics.issues.feature"\r
          version="0.0.0"/>\r
 \r
    <plugin\r

diff --git a/features/org.simantics.platform.ui.feature/feature.xml b/features/org.simantics.platform.ui.feature/feature.xml
index c3efa01b5827ad8f45913d35bddd747ca5dac4a0..000aad2c7fb878784bcc02da0ac6cd91addb8b37 100644 (file)
--- a/features/org.simantics.platform.ui.feature/feature.xml
+++ b/features/org.simantics.platform.ui.feature/feature.xml
@@ -32,7 +32,7 @@ reusable components implemented on top of the platform.
          version="0.0.0"/>\r
 \r
    <includes\r
-         id="org.simantics.utils.ui"\r
+         id="org.simantics.utils.ui.feature"\r
          version="0.0.0"/>\r
 \r
    <includes\r
@@ -56,7 +56,7 @@ reusable components implemented on top of the platform.
          version="0.0.0"/>\r
 \r
    <includes\r
-         id="org.simantics.wiki.ui"\r
+         id="org.simantics.wiki.ui.feature"\r
          version="0.0.0"/>\r
 \r
    <includes\r

diff --git a/features/org.simantics.sdk.feature/feature.xml b/features/org.simantics.sdk.feature/feature.xml
index ed5ed345cf7c7b964612a7716c1eaad263b07cb7..87764edb9bf951f59b542730e660e0e5033607af 100644 (file)
--- a/features/org.simantics.sdk.feature/feature.xml
+++ b/features/org.simantics.sdk.feature/feature.xml
@@ -49,7 +49,7 @@
          version="0.0.0"/>\r
 \r
    <includes\r
-         id="org.simantics.utils.ui"\r
+         id="org.simantics.utils.ui.feature"\r
          version="0.0.0"/>\r
 \r
    <includes\r
@@ -97,11 +97,11 @@
          version="0.0.0"/>\r
 \r
    <includes\r
-         id="org.simantics.issues"\r
+         id="org.simantics.issues.feature"\r
          version="0.0.0"/>\r
 \r
    <includes\r
-         id="org.simantics.issues.ui"\r
+         id="org.simantics.issues.ui.feature"\r
          version="0.0.0"/>\r
 \r
    <includes\r
@@ -113,7 +113,7 @@
          version="0.0.0"/>\r
 \r
    <includes\r
-         id="org.simantics.event"\r
+         id="org.simantics.event.feature"\r
          version="0.0.0"/>\r
 \r
    <includes\r
@@ -121,7 +121,7 @@
          version="0.0.0"/>\r
 \r
    <includes\r
-         id="org.simantics.wiki.ui"\r
+         id="org.simantics.wiki.ui.feature"\r
          version="0.0.0"/>\r
 \r
    <includes\r

diff --git a/features/org.simantics.utils.ui.feature/feature.xml b/features/org.simantics.utils.ui.feature/feature.xml
index e5cc91c1ea8df99726e171252d931dbb51b75b9f..6924e60acaa672050fa2ac1b029200b448579671 100644 (file)
--- a/features/org.simantics.utils.ui.feature/feature.xml
+++ b/features/org.simantics.utils.ui.feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <feature\r
-      id="org.simantics.utils.ui"\r
+      id="org.simantics.utils.ui.feature"\r
       label="UI Utils Feature"\r
       version="1.25.0.qualifier"\r
       provider-name="VTT Technical Research Centre of Finland">\r

diff --git a/features/org.simantics.wiki.ui.feature/feature.xml b/features/org.simantics.wiki.ui.feature/feature.xml
index 8284fb3c0d7bbb62504577228952f662780c1c48..5569344e7ce964d83a336ed13a3cc10fbfdd9a3d 100644 (file)
--- a/features/org.simantics.wiki.ui.feature/feature.xml
+++ b/features/org.simantics.wiki.ui.feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <feature\r
-      id="org.simantics.wiki.ui"\r
+      id="org.simantics.wiki.ui.feature"\r
       label="Wiki Documentation Feature"\r
       version="1.25.0.qualifier"\r
       provider-name="Semantum Oy">\r

diff --git a/features/pom.xml b/features/pom.xml
index daafeeca0e5fd754d890b4764b8185b2b34582ed..db0e8e6b1a528adb3f57c5c66b5649ca1c9e562e 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -52,4 +52,4 @@
         <module>org.simantics.wiki.ui.feature</module>\r
         <module>org.simantics.workbench.feature</module>\r
     </modules>\r
-</project>
\ No newline at end of file
+</project>\r