diff --git a/osgi-core-build.xml b/osgi-core-build.xml
index 52c6473..4f0b3f3 100644
--- a/osgi-core-build.xml
+++ b/osgi-core-build.xml
@@ -110,8 +110,8 @@
         <attribute name="Bundle-SymbolicName" value="${project.artifactId}"/>
         <attribute name="Bundle-Vendor" value="${project.organization.name}"/>
         <attribute name="Bundle-Version" value="${project.version}"/>
-		<attribute name="Export-Package" value="org.osgi.util.tracker;version=&quot;1.5.2&quot;;uses:=&quot;org.osgi.framework&quot;,org.osgi.resource;version=&quot;1.0&quot;,org.osgi.resource.dto;version=&quot;1.0&quot;;uses:=&quot;org.osgi.dto&quot;,org.osgi.dto;version=&quot;1.1&quot;,org.osgi.framework;version=&quot;1.9&quot;,org.osgi.framework.namespace;version=&quot;1.1&quot;;uses:=&quot;org.osgi.resource&quot;,org.osgi.framework.hooks.resolver;version=&quot;1.0&quot;;uses:=&quot;org.osgi.framework.wiring&quot;,org.osgi.framework.hooks.weaving;version=&quot;1.1&quot;;uses:=&quot;org.osgi.framework.wiring&quot;,org.osgi.framework.hooks.service;version=&quot;1.1&quot;;uses:=&quot;org.osgi.framework&quot;,org.osgi.framework.hooks.bundle;version=&quot;1.1&quot;;uses:=&quot;org.osgi.framework&quot;,org.osgi.framework.wiring;version=&quot;1.2&quot;;uses:=&quot;org.osgi.framework,org.osgi.resource&quot;,org.osgi.framework.wiring.dto;version=&quot;1.3&quot;;uses:=&quot;org.osgi.dto,org.osgi.resource.dto&quot;,org.osgi.framework.startlevel;version=&quot;1.0&quot;;uses:=&quot;org.osgi.framework&quot;,org.osgi.framework.startlevel.dto;version=&quot;1.0&quot;;uses:=&quot;org.osgi.dto&quot;,org.osgi.framework.dto;version=&quot;1.8&quot;;uses:=&quot;org.osgi.dto&quot;,org.osgi.framework.launch;version=&quot;1.2&quot;;uses:=&quot;org.osgi.framework&quot;,org.osgi.service.resolver;version=&quot;1.1&quot;;uses:=&quot;org.osgi.resource&quot;,org.osgi.service.url;version=&quot;1.0&quot;,org.osgi.service.packageadmin;version=&quot;1.2&quot;;uses:=&quot;org.osgi.framework&quot;,org.osgi.service.startlevel;version=&quot;1.1&quot;;uses:=&quot;org.osgi.framework&quot;,org.osgi.service.permissionadmin;version=&quot;1.2&quot;,org.osgi.service.condpermadmin;version=&quot;1.1.1&quot;;uses:=&quot;org.osgi.framework,org.osgi.service.permissionadmin&quot;"/>
-		<attribute name="Import-Package" value="javax.security.auth.x500,org.osgi.dto;version=&quot;[1.1,2)&quot;,org.osgi.framework;version=&quot;[1.9,1.10)&quot;,org.osgi.framework.wiring;version=&quot;[1.2,2)&quot;,org.osgi.resource;version=&quot;[1.0,2)&quot;,org.osgi.resource.dto;version=&quot;[1.0,2)&quot;,org.osgi.service.permissionadmin;version=&quot;[1.2,2)&quot;"/>
+		<attribute name="Export-Package" value="org.osgi.dto;version=&quot;1.1.1&quot;,org.osgi.framework.connect;uses:=&quot;org.osgi.framework,org.osgi.framework.launch&quot;;version=&quot;1.0&quot;,org.osgi.framework.dto;uses:=&quot;org.osgi.dto&quot;;version=&quot;1.8&quot;,org.osgi.framework.hooks.bundle;uses:=&quot;org.osgi.framework&quot;;version=&quot;1.1&quot;,org.osgi.framework.hooks.resolver;uses:=&quot;org.osgi.framework.wiring&quot;;version=&quot;1.0&quot;,org.osgi.framework.hooks.service;uses:=&quot;org.osgi.framework&quot;;version=&quot;1.1&quot;,org.osgi.framework.hooks.weaving;uses:=&quot;org.osgi.framework.wiring&quot;;version=&quot;1.1&quot;,org.osgi.framework.launch;uses:=&quot;org.osgi.framework&quot;;version=&quot;1.2&quot;,org.osgi.framework.namespace;uses:=&quot;org.osgi.resource&quot;;version=&quot;1.2&quot;,org.osgi.framework.startlevel.dto;uses:=&quot;org.osgi.dto&quot;;version=&quot;1.0&quot;,org.osgi.framework.startlevel;uses:=&quot;org.osgi.framework&quot;;version=&quot;1.0&quot;,org.osgi.framework.wiring.dto;uses:=&quot;org.osgi.dto,org.osgi.resource.dto&quot;;version=&quot;1.3&quot;,org.osgi.framework.wiring;uses:=&quot;org.osgi.framework,org.osgi.resource&quot;;version=&quot;1.2&quot;,org.osgi.framework;version=&quot;1.10&quot;,org.osgi.resource.dto;uses:=&quot;org.osgi.dto&quot;;version=&quot;1.0.1&quot;,org.osgi.resource;version=&quot;1.0.1&quot;,org.osgi.service.condition;version=&quot;1.0&quot;,org.osgi.service.condpermadmin;uses:=&quot;org.osgi.framework,org.osgi.service.permissionadmin&quot;;version=&quot;1.1.2&quot;,org.osgi.service.log.admin;uses:=&quot;org.osgi.service.log&quot;;version=&quot;1.0&quot;,org.osgi.service.log;uses:=&quot;org.osgi.framework&quot;;version=&quot;1.5&quot;,org.osgi.service.packageadmin;uses:=&quot;org.osgi.framework&quot;;version=&quot;1.2.1&quot;,org.osgi.service.permissionadmin;version=&quot;1.2.1&quot;,org.osgi.service.resolver;uses:=&quot;org.osgi.resource&quot;;version=&quot;1.1.1&quot;,org.osgi.service.startlevel;uses:=&quot;org.osgi.framework&quot;;version=&quot;1.1.1&quot;,org.osgi.service.url;version=&quot;1.0.1&quot;,org.osgi.util.tracker;uses:=&quot;org.osgi.framework&quot;;version=&quot;1.5.3&quot;"/>
+		<attribute name="Import-Package" value="java.io,java.lang,java.lang.invoke,java.lang.reflect,java.net,java.security,java.security.cert,java.util,java.util.function,java.util.stream,javax.security.auth.x500,org.osgi.dto;version=&quot;[1.1,2)&quot;,org.osgi.framework.connect;version=&quot;[1.0,2)&quot;,org.osgi.framework.launch;version=&quot;[1.2,2)&quot;,org.osgi.framework.wiring;version=&quot;[1.2,2)&quot;,org.osgi.framework;version=&quot;[1.10,1.11)&quot;,org.osgi.resource.dto;version=&quot;[1.0,2)&quot;,org.osgi.resource;version=&quot;[1.0,2)&quot;,org.osgi.service.log;version=&quot;[1.5,2)&quot;,org.osgi.service.permissionadmin;version=&quot;[1.2,2)&quot;"/>
         <attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/>
         <attribute name="JavaPackages-GroupId" value="${project.groupId}"/>
         <attribute name="JavaPackages-Version" value="${project.version}"/>