From 857dbc869796d772864327ce02f19dc252b159fc Mon Sep 17 00:00:00 2001 From: Tuukka Lehtonen Date: Thu, 11 Aug 2016 14:46:32 +0300 Subject: [PATCH] Fixes to allow tycho builds to work. --- bundles/org.simantics.db.indexing/META-INF/MANIFEST.MF | 4 +++- .../simantics/graph/compiler/internal/parsing/Graph.g | 4 ++-- .../graph/compiler/internal/parsing/GraphLexer.java | 4 ++-- bundles/org.simantics.modeling.ui/META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 3 ++- features/org.simantics.charts.feature/feature.xml | 2 +- features/org.simantics.event.feature/feature.xml | 2 +- features/org.simantics.issues.feature/feature.xml | 2 +- features/org.simantics.issues.ui.feature/feature.xml | 4 ++-- features/org.simantics.platform.ui.feature/feature.xml | 4 ++-- features/org.simantics.sdk.feature/feature.xml | 10 +++++----- features/org.simantics.utils.ui.feature/feature.xml | 2 +- features/org.simantics.wiki.ui.feature/feature.xml | 2 +- features/pom.xml | 2 +- 14 files changed, 25 insertions(+), 22 deletions(-) diff --git a/bundles/org.simantics.db.indexing/META-INF/MANIFEST.MF b/bundles/org.simantics.db.indexing/META-INF/MANIFEST.MF index d74cdea36..f86c1499d 100644 --- 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 Require-Bundle: org.eclipse.core.runtime, org.simantics.db.layer0;bundle-version="0.8.0", - org.apache.lucene4;bundle-version="4.9.0", + org.apache.lucene4.core;bundle-version="4.9.0", + org.apache.lucene4.queryparser;bundle-version="4.9.0", + org.apache.lucene4.analyzers-common;bundle-version="4.9.0", org.simantics.db.services;bundle-version="0.8.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.simantics.db.indexing 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 67b11fbaa..995960f94 100644 --- 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. */ if(iStack.size() <= 1) - return Token.EOF_TOKEN; + return getEOFToken(); else { while(iStack.size() > 1) { iStack.removeAt(iStack.size()-1); @@ -450,4 +450,4 @@ mapAssignment : value '=' value -> ^(ASSIGNMENT value*) ; - \ No newline at end of file + 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 98a10ec97..d75d8cc93 100644 --- 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. */ if(iStack.size() <= 1) - return Token.EOF_TOKEN; + return getEOFToken(); else { while(iStack.size() > 1) { iStack.removeAt(iStack.size()-1); @@ -2471,4 +2471,4 @@ public class GraphLexer extends Lexer { } -} \ No newline at end of file +} diff --git a/bundles/org.simantics.modeling.ui/META-INF/MANIFEST.MF b/bundles/org.simantics.modeling.ui/META-INF/MANIFEST.MF index 1b915e3a7..561e41e10 100644 --- 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 967272c07..a5eef2fb2 100644 --- 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 65acfa390..a00ee500a 100644 --- a/features/org.simantics.charts.feature/feature.xml +++ b/features/org.simantics.charts.feature/feature.xml @@ -26,7 +26,7 @@ version="0.0.0"/> diff --git a/features/org.simantics.issues.feature/feature.xml b/features/org.simantics.issues.feature/feature.xml index 78aa3eed4..fc37ff353 100644 --- 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 --> diff --git a/features/org.simantics.issues.ui.feature/feature.xml b/features/org.simantics.issues.ui.feature/feature.xml index 035aa296c..71b86dfd0 100644 --- a/features/org.simantics.issues.ui.feature/feature.xml +++ b/features/org.simantics.issues.ui.feature/feature.xml @@ -1,6 +1,6 @@ @@ -18,7 +18,7 @@ diff --git a/features/org.simantics.wiki.ui.feature/feature.xml b/features/org.simantics.wiki.ui.feature/feature.xml index 8284fb3c0..5569344e7 100644 --- a/features/org.simantics.wiki.ui.feature/feature.xml +++ b/features/org.simantics.wiki.ui.feature/feature.xml @@ -1,6 +1,6 @@ diff --git a/features/pom.xml b/features/pom.xml index daafeeca0..db0e8e6b1 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -52,4 +52,4 @@ org.simantics.wiki.ui.feature org.simantics.workbench.feature - \ No newline at end of file + -- 2.47.1