remove out of date ant jar from eclim lib and eclipse shipped version…

… instead
ervandew · Apr 7, 2012 · bd82749 · bd82749
1 parent 9f419b9
commit bd82749
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 10 deletions.
diff --git a/ant/build.gant b/ant/build.gant
@@ -87,6 +87,7 @@ target(name: 'init'){
       include(name: 'startup.jar')
       include(name: 'dropins/**/plugins/org.eclipse.*.jar')
       include(name: 'plugins/org.eclipse.*.jar')
+      include(name: 'plugins/org.apache.ant_*/lib/ant.jar')
       include(name: 'plugins/com.ibm.*.jar')
     }
     dirset(dir: '${eclipse}'){

diff --git a/org.eclim.cdt/META-INF/MANIFEST.MF b/org.eclim.cdt/META-INF/MANIFEST.MF
@@ -9,7 +9,8 @@ Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.eclim.plugin.cdt.CdtPlugin
 Bundle-ClassPath: .,
   eclim.cdt.jar
-Require-Bundle: org.eclim,
+Require-Bundle: org.apache.ant,
+  org.eclim,
   org.eclim.core,
   org.eclipse.cdt.core,
   org.eclipse.cdt.managedbuilder.core,

diff --git a/org.eclim.vimplugin/META-INF/MANIFEST.MF b/org.eclim.vimplugin/META-INF/MANIFEST.MF
@@ -8,7 +8,8 @@ Bundle-Localization: plugin
 Bundle-Activator: org.vimplugin.VimPlugin
 Bundle-ClassPath: .,
   eclim.vimplugin.jar
-Require-Bundle: org.eclim,
+Require-Bundle: org.apache.ant,
+ org.eclim,
  org.eclipse.core.resources,
  org.eclipse.core.runtime,
  org.eclipse.jface.text,

diff --git a/org.eclim.wst/META-INF/MANIFEST.MF b/org.eclim.wst/META-INF/MANIFEST.MF
@@ -12,7 +12,8 @@ Bundle-ClassPath: .,
   ${eclim.lib.jars}
 Export-Package: org.eclim.plugin.wst.command.complete,
   org.eclim.plugin.wst.command.validate
-Require-Bundle: org.eclim,
+Require-Bundle: org.apache.ant,
+  org.eclim,
   org.eclim.core,
   org.eclipse.core.resources,
   org.eclipse.core.runtime,

diff --git a/org.eclim/META-INF/MANIFEST.MF b/org.eclim/META-INF/MANIFEST.MF
@@ -14,13 +14,6 @@ Export-Package: org.apache.commons.collections,
   org.apache.commons.lang.builder,
   org.apache.commons.logging,
   org.apache.commons.vfs,
-  org.apache.tools.ant,
-  org.apache.tools.ant.taskdefs,
-  org.apache.tools.ant.taskdefs.condition,
-  org.apache.tools.ant.types,
-  org.apache.tools.bzip2,
-  org.apache.tools.tar,
-  org.apache.tools.zip,
   org.eclim,
   org.eclim.annotation,
   org.eclim.command,

diff --git a/org.eclim/lib/ant-1.7.1.jar b/org.eclim/lib/ant-1.7.1.jar