Code Review / yangide.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: 183bcea)
Bug 5866 Remove Guava v15 (as we already have a v18 on same classpath) 96/38596/2
authorMichael Vorburger <vorburger@redhat.com>
Mon, 9 May 2016 16:10:59 +0000 (18:10 +0200)
committerDavid M. Karr <davidmichaelkarr@gmail.com>
Mon, 9 May 2016 18:42:37 +0000 (11:42 -0700)
Also removed similar plugin dependency from ext.model.editor and added
exported package reference for com.google.common.io to yangparser.

Change-Id: I84f10adca4c3edd59259bfd0f84596e71779183c
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Signed-off-by: David M. Karr <davidmichaelkarr@gmail.com>
plugins/org.opendaylight.yangide.ext.model.editor/META-INF/MANIFEST.MF patch | blob | history
plugins/org.opendaylight.yangide.yangparser/META-INF/MANIFEST.MF patch | blob | history

diff --git a/plugins/org.opendaylight.yangide.ext.model.editor/META-INF/MANIFEST.MF b/plugins/org.opendaylight.yangide.ext.model.editor/META-INF/MANIFEST.MF
index ef65b2f92f41b225ed5904a183298516b3aa047c..fa8cf3ed02968f620c35c281ac8f630d47e0d7e9 100644 (file)
--- a/plugins/org.opendaylight.yangide.ext.model.editor/META-INF/MANIFEST.MF
+++ b/plugins/org.opendaylight.yangide.ext.model.editor/META-INF/MANIFEST.MF
@@ -34,7 +34,6 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.emf.databinding,
  org.eclipse.wst.sse.ui;bundle-version="1.3.400",
  org.opendaylight.yangide.yangparser;bundle-version="1.1.1",
- com.google.guava;bundle-version="15.0.0",
  org.junit
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.opendaylight.yangide.yangparser/META-INF/MANIFEST.MF b/plugins/org.opendaylight.yangide.yangparser/META-INF/MANIFEST.MF
index ac286585af86ff98450bc9991402e2e8ea5e6c3d..d6713a0bbaac11f1bdfe5fba5905cbe03c035e52 100644 (file)
--- a/plugins/org.opendaylight.yangide.yangparser/META-INF/MANIFEST.MF
+++ b/plugins/org.opendaylight.yangide.yangparser/META-INF/MANIFEST.MF
@@ -10,7 +10,6 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.text,
  org.eclipse.core.resources,
  org.eclipse.core.filesystem,
- com.google.guava;bundle-version="15.0.0",
  org.slf4j.api;bundle-version="1.7.2"
 Bundle-ClassPath: .,
  libs/antlr4-runtime-4.5.1.jar,
@@ -31,6 +30,7 @@ Bundle-ClassPath: .,
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Export-Package: com.google.common.base,
+ com.google.common.io,
  org.antlr.v4.runtime,
  org.antlr.v4.runtime.atn,
  org.antlr.v4.runtime.dfa,