diff --git a/build.xml b/build.xml
index 6550936..d095378 100644
--- a/build.xml
+++ b/build.xml
@@ -493,10 +493,31 @@ Not found: ${groovyJar14path}
         <mkdir dir="${mainClassesDirectory}/META-INF"/>
         <copy todir="${mainClassesDirectory}/META-INF" file="LICENSE.txt"/>
     	<makemanifest dependencies="antlr,
+antlr.collections;resolution:=optional,
+antlr.collections.impl;resolution:=optional,
+antlr.debug.misc;resolution:=optional,
 org.objectweb.asm,
 org.apache.ant;resolution:=optional,
 org.apache.commons.cli;resolution:=optional,
-org.junit;resolution:=optional" file="${mainClassesDirectory}/META-INF/MANIFEST.MF"/>
+org.junit;resolution:=optional,
+javax.management;resolution:=optional,
+javax.sql;resolution:=optional,
+javax.swing;resolution:=optional,
+javax.swing.border;resolution:=optional,
+javax.swing.event;resolution:=optional,
+javax.swing.plaf;resolution:=optional,
+javax.swing.plaf.metal;resolution:=optional,
+javax.swing.table;resolution:=optional,
+javax.swing.text;resolution:=optional,
+javax.swing.undo;resolution:=optional,
+javax.xml.parsers;resolution:=optional,
+javax.xml.transform;resolution:=optional,
+javax.xml.transform.dom;resolution:=optional,
+javax.xml.transform.stream;resolution:=optional,
+org.w3c.dom;resolution:=optional,
+org.xml.sax;resolution:=optional,
+org.xml.sax.ext;resolution:=optional,
+org.xml.sax.helpers;resolution:=optional" file="${mainClassesDirectory}/META-INF/MANIFEST.MF"/>
 	</target>
 
     <!-- TODO: investigate whether we can generate package list not hard-code it -->
@@ -521,63 +542,63 @@ org.junit;resolution:=optional" file="${mainClassesDirectory}/META-INF/MANIFEST.
                 <attribute name="Bundle-ClassPath" value="." />
                 <attribute name="Bundle-RequiredExecutionEnvironment" value="J2SE-1.4" />
                 <attribute name="Import-Package" value="@{dependencies}" />
-                <attribute name="Export-Package" value="groovy.inspect,
-groovy.inspect.swingui,
-groovy.io,
-groovy.lang,
-groovy.mock,
-groovy.mock.interceptor,
-groovy.model,
-groovy.security,
-groovy.servlet,
-groovy.sql,
-groovy.swing,
-groovy.swing.binding,
-groovy.swing.factory,
-groovy.swing.impl,
-groovy.text,
-groovy.time,
-groovy.ui,
-groovy.ui.icons,
-groovy.ui.text,
-groovy.ui.view,
-groovy.util,
-groovy.util.slurpersupport,
-groovy.xml,
-groovy.xml.dom,
-groovy.xml.streamingmarkupsupport,
-org.codehaus.groovy,
-org.codehaus.groovy.ant,
-org.codehaus.groovy.antlr,
-org.codehaus.groovy.antlr.java,
-org.codehaus.groovy.antlr.parser,
-org.codehaus.groovy.antlr.treewalker,
-org.codehaus.groovy.ast,
-org.codehaus.groovy.ast.expr,
-org.codehaus.groovy.ast.stmt,
-org.codehaus.groovy.binding,
-org.codehaus.groovy.bsf,
-org.codehaus.groovy.classgen,
-org.codehaus.groovy.control,
-org.codehaus.groovy.control.io,
-org.codehaus.groovy.control.messages,
-org.codehaus.groovy.groovydoc,
-org.codehaus.groovy.reflection,
-org.codehaus.groovy.runtime,
-org.codehaus.groovy.runtime.metaclass,
-org.codehaus.groovy.runtime.typehandling,
-org.codehaus.groovy.runtime.wrappers,
-org.codehaus.groovy.syntax,
-org.codehaus.groovy.tools,
-org.codehaus.groovy.tools.groovydoc,
-org.codehaus.groovy.tools.javac,
-org.codehaus.groovy.tools.shell,
-org.codehaus.groovy.tools.shell.commands,
-org.codehaus.groovy.tools.shell.util,
-org.codehaus.groovy.tools.xml,
-org.codehaus.groovy.vmplugin,
-org.codehaus.groovy.vmplugin.v4,
-org.codehaus.groovy.vmplugin.v5" />
+                <attribute name="Export-Package" value="groovy.inspect;version=&quot;${groovyBundleVersion}&quot;,
+groovy.inspect.swingui;version=&quot;${groovyBundleVersion}&quot;,
+groovy.io;version=&quot;${groovyBundleVersion}&quot;,
+groovy.lang;version=&quot;${groovyBundleVersion}&quot;,
+groovy.mock;version=&quot;${groovyBundleVersion}&quot;,
+groovy.mock.interceptor;version=&quot;${groovyBundleVersion}&quot;,
+groovy.model;version=&quot;${groovyBundleVersion}&quot;,
+groovy.security;version=&quot;${groovyBundleVersion}&quot;,
+groovy.servlet;version=&quot;${groovyBundleVersion}&quot;,
+groovy.sql;version=&quot;${groovyBundleVersion}&quot;,
+groovy.swing;version=&quot;${groovyBundleVersion}&quot;,
+groovy.swing.binding;version=&quot;${groovyBundleVersion}&quot;,
+groovy.swing.factory;version=&quot;${groovyBundleVersion}&quot;,
+groovy.swing.impl;version=&quot;${groovyBundleVersion}&quot;,
+groovy.text;version=&quot;${groovyBundleVersion}&quot;,
+groovy.time;version=&quot;${groovyBundleVersion}&quot;,
+groovy.ui;version=&quot;${groovyBundleVersion}&quot;,
+groovy.ui.icons;version=&quot;${groovyBundleVersion}&quot;,
+groovy.ui.text;version=&quot;${groovyBundleVersion}&quot;,
+groovy.ui.view;version=&quot;${groovyBundleVersion}&quot;,
+groovy.util;version=&quot;${groovyBundleVersion}&quot;,
+groovy.util.slurpersupport;version=&quot;${groovyBundleVersion}&quot;,
+groovy.xml;version=&quot;${groovyBundleVersion}&quot;,
+groovy.xml.dom;version=&quot;${groovyBundleVersion}&quot;,
+groovy.xml.streamingmarkupsupport;version=&quot;${groovyBundleVersion}&quot;,
+org.codehaus.groovy;version=&quot;${groovyBundleVersion}&quot;,
+org.codehaus.groovy.ant;version=&quot;${groovyBundleVersion}&quot;,
+org.codehaus.groovy.antlr;version=&quot;${groovyBundleVersion}&quot;,
+org.codehaus.groovy.antlr.java;version=&quot;${groovyBundleVersion}&quot;,
+org.codehaus.groovy.antlr.parser;version=&quot;${groovyBundleVersion}&quot;,
+org.codehaus.groovy.antlr.treewalker;version=&quot;${groovyBundleVersion}&quot;,
+org.codehaus.groovy.ast;version=&quot;${groovyBundleVersion}&quot;,
+org.codehaus.groovy.ast.expr;version=&quot;${groovyBundleVersion}&quot;,
+org.codehaus.groovy.ast.stmt;version=&quot;${groovyBundleVersion}&quot;,
+org.codehaus.groovy.binding;version=&quot;${groovyBundleVersion}&quot;,
+org.codehaus.groovy.bsf;version=&quot;${groovyBundleVersion}&quot;,
+org.codehaus.groovy.classgen;version=&quot;${groovyBundleVersion}&quot;,
+org.codehaus.groovy.control;version=&quot;${groovyBundleVersion}&quot;,
+org.codehaus.groovy.control.io;version=&quot;${groovyBundleVersion}&quot;,
+org.codehaus.groovy.control.messages;version=&quot;${groovyBundleVersion}&quot;,
+org.codehaus.groovy.groovydoc;version=&quot;${groovyBundleVersion}&quot;,
+org.codehaus.groovy.reflection;version=&quot;${groovyBundleVersion}&quot;,
+org.codehaus.groovy.runtime;version=&quot;${groovyBundleVersion}&quot;,
+org.codehaus.groovy.runtime.metaclass;version=&quot;${groovyBundleVersion}&quot;,
+org.codehaus.groovy.runtime.typehandling;version=&quot;${groovyBundleVersion}&quot;,
+org.codehaus.groovy.runtime.wrappers;version=&quot;${groovyBundleVersion}&quot;,
+org.codehaus.groovy.syntax;version=&quot;${groovyBundleVersion}&quot;,
+org.codehaus.groovy.tools;version=&quot;${groovyBundleVersion}&quot;,
+org.codehaus.groovy.tools.groovydoc;version=&quot;${groovyBundleVersion}&quot;,
+org.codehaus.groovy.tools.javac;version=&quot;${groovyBundleVersion}&quot;,
+org.codehaus.groovy.tools.shell;version=&quot;${groovyBundleVersion}&quot;,
+org.codehaus.groovy.tools.shell.commands;version=&quot;${groovyBundleVersion}&quot;,
+org.codehaus.groovy.tools.shell.util;version=&quot;${groovyBundleVersion}&quot;,
+org.codehaus.groovy.tools.xml;version=&quot;${groovyBundleVersion}&quot;,
+org.codehaus.groovy.vmplugin;version=&quot;${groovyBundleVersion}&quot;,
+org.codehaus.groovy.vmplugin.v4;version=&quot;${groovyBundleVersion}&quot;,
+org.codehaus.groovy.vmplugin.v5;version=&quot;${groovyBundleVersion}&quot;" />
                 <attribute name="Eclipse-BuddyPolicy" value="dependent"/>
                 <attribute name="Eclipse-LazyStart" value="true"/>
             </manifest>