Removed antlr packages from core's "Import-Package" directive.

This may fix the "Linkage Error" problem.

Still a bit uncertain what the POINT is of the "Import-Package"
directive.

Change-Id: Ia2a5d3acc7696d6fe8897da2579e2d33d28ba20c
Signed-off-by: David M. Karr <davidmichaelkarr@gmail.com>

diff --git a/plugins/com.cisco.yangide.core/META-INF/MANIFEST.MF b/plugins/com.cisco.yangide.core/META-INF/MANIFEST.MF
index 29c765a4dca1b6372de778ff7f4675e05c934679..71ef95cb7199af1b87b79e7fff5d4fd30de8b8e9 100644 (file)
--- a/plugins/com.cisco.yangide.core/META-INF/MANIFEST.MF
+++ b/plugins/com.cisco.yangide.core/META-INF/MANIFEST.MF
@@ -21,14 +21,7 @@ Export-Package: com.cisco.yangide.core,
  com.cisco.yangide.core.indexing,
  com.cisco.yangide.core.model,
  com.cisco.yangide.core.parser
-Import-Package: org.antlr.v4.runtime,
- org.antlr.v4.runtime.atn,
- org.antlr.v4.runtime.dfa,
- org.antlr.v4.runtime.misc,
- org.antlr.v4.runtime.tree,
- org.antlr.v4.runtime.tree.pattern,
- org.antlr.v4.runtime.tree.xpath,
- org.opendaylight.yangtools.yang.parser.spi.meta,
+Import-Package: org.opendaylight.yangtools.yang.parser.spi.meta,
  org.opendaylight.yangtools.yang.parser.spi.source,
  org.opendaylight.yangtools.yang.parser.stmt.reactor,
  org.opendaylight.yangtools.yang.parser.stmt.rfc6020

diff --git a/plugins/com.cisco.yangide.ext.model.editor/META-INF/MANIFEST.MF b/plugins/com.cisco.yangide.ext.model.editor/META-INF/MANIFEST.MF
index 8bc19d35d15e97ca90a41eed1e24e39d07f7c6b9..a6fc6e7b1638f2ba7a0bcebf4787b28ed687f445 100644 (file)
--- a/plugins/com.cisco.yangide.ext.model.editor/META-INF/MANIFEST.MF
+++ b/plugins/com.cisco.yangide.ext.model.editor/META-INF/MANIFEST.MF
@@ -36,5 +36,5 @@ Require-Bundle: org.eclipse.ui,
  com.cisco.yangide.yangparser;bundle-version="1.1.1",
  com.google.guava;bundle-version="15.0.0",
  org.junit
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy

diff --git a/plugins/com.cisco.yangide.yangparser/.classpath b/plugins/com.cisco.yangide.yangparser/.classpath
index 589198f32bdf4c2dd70eb1145739c6a0185902db..b71b54f778221c3cbff81df4b6447e061f532ff3 100644 (file)
--- a/plugins/com.cisco.yangide.yangparser/.classpath
+++ b/plugins/com.cisco.yangide.yangparser/.classpath
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-       <classpathentry exported="true" kind="lib" path="libs/guava-18.0.jar"/>
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
        <classpathentry kind="src" path="src/"/>
@@ -18,5 +17,6 @@
        <classpathentry exported="true" kind="lib" path="libs/yang-model-util-1.0.0-SNAPSHOT.jar"/>
        <classpathentry exported="true" kind="lib" path="libs/yang-parser-api-1.0.0-SNAPSHOT.jar"/>
        <classpathentry exported="true" kind="lib" path="libs/yang-parser-impl-1.0.0-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="libs/guava-18.0.jar"/>
        <classpathentry kind="output" path="target/classes"/>
 </classpath>