From: Hannu Niemistö <hannu.niemisto@semantum.fi>
Date: Mon, 18 Jun 2018 09:12:01 +0000 (+0300)
Subject: Fix ANTLR package versions
X-Git-Tag: v1.43.0~136^2~462
X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=commitdiff_plain;h=13715f28f0d0ab75c52da408222afb21f8b16007

Fix ANTLR package versions

gitlab #24

Change-Id: I9c9cdbe4fe3f27364f7248822942bca75a268525
---

diff --git a/bundles/org.simantics.graph.compiler/META-INF/MANIFEST.MF b/bundles/org.simantics.graph.compiler/META-INF/MANIFEST.MF
index f1e93de0d..a578997a7 100644
--- a/bundles/org.simantics.graph.compiler/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.graph.compiler/META-INF/MANIFEST.MF
@@ -7,10 +7,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.simantics.graph;bundle-version="1.1.15";visibility:=reexport,
  org.simantics.databoard;bundle-version="0.6.6",
  freemarker;bundle-version="2.3.23",
- org.junit;bundle-version="4.12.0";resolution:=optional
+ org.junit;bundle-version="4.12.0";resolution:=optional,
+ org.antlr.runtime;bundle-version="3.5.2"
 Export-Package: org.simantics.graph.compiler,
  org.simantics.graph.compiler.internal.ltk
-Import-Package: org.antlr.runtime;version="[0.0.0,0.0.0]";bundle-version="3.5.2",
- org.antlr.runtime.debug;version="[0.0.0,0.0.0]";bundle-version="3.5.2",
- org.antlr.runtime.misc;version="[0.0.0,0.0.0]";bundle-version="3.5.2",
- org.antlr.runtime.tree;version="[0.0.0,0.0.0]";bundle-version="3.5.2"
diff --git a/releng/org.simantics.sdk.build.p2.site/pom.xml b/releng/org.simantics.sdk.build.p2.site/pom.xml
index 4eceda52c..190c95de5 100644
--- a/releng/org.simantics.sdk.build.p2.site/pom.xml
+++ b/releng/org.simantics.sdk.build.p2.site/pom.xml
@@ -10,6 +10,7 @@
 
     <properties>
         <itext.version.actual>2.1.7.b1</itext.version.actual>
+        <antlr.version>3.5.2</antlr.version>
         <lucene.version>4.9.0</lucene.version>
         <lucene.version.actual>4.9.0.b0003</lucene.version.actual>
         <lucene.prefix>org.apache.lucene4</lucene.prefix>
@@ -101,8 +102,13 @@
                         <configuration>
                             <artifacts>
                                 <artifact>
-                                    <id>org.antlr:antlr-runtime:3.5.2</id>
+                                    <id>org.antlr:antlr-runtime:${antlr.version}</id>
                                     <source>true</source>
+                                    <instructions>
+                                        <Bundle-SymbolicName>org.antlr.runtime</Bundle-SymbolicName>
+                                        <Bundle-Version>${antlr.version}</Bundle-Version>
+                                        <Export-Package>*;version="${antlr.version}"</Export-Package>
+                                    </instructions>                                    
                                 </artifact>
                                 <artifact>
                                     <id>org.apache.lucene:lucene-core:${lucene.version}</id>