diff --git a/osgi-compendium-build.xml b/osgi-compendium-build.xml
index 579fa8b..092a857 100644
--- a/osgi-compendium-build.xml
+++ b/osgi-compendium-build.xml
@@ -116,8 +116,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.converter;version=&quot;1.0&quot;;uses:=&quot;org.osgi.util.function&quot;,org.osgi.util.function;version=&quot;1.1&quot;,org.osgi.util.position;version=&quot;1.0.1&quot;;uses:=&quot;org.osgi.util.measurement&quot;,org.osgi.util.pushstream;version=&quot;1.0&quot;;uses:=&quot;org.osgi.util.function,org.osgi.util.promise&quot;,org.osgi.util.promise;version=&quot;1.1&quot;;uses:=&quot;org.osgi.util.function&quot;,org.osgi.util.xml;version=&quot;1.0.1&quot;;uses:=&quot;javax.xml.parsers,org.osgi.framework&quot;,org.osgi.util.measurement;version=&quot;1.0.2&quot;,org.osgi.namespace.extender;version=&quot;1.0.1&quot;;uses:=&quot;org.osgi.resource&quot;,org.osgi.namespace.unresolvable;version=&quot;1.0&quot;;uses:=&quot;org.osgi.resource&quot;,org.osgi.namespace.service;version=&quot;1.0&quot;;uses:=&quot;org.osgi.resource&quot;,org.osgi.namespace.contract;version=&quot;1.0&quot;;uses:=&quot;org.osgi.resource&quot;,org.osgi.application;version=&quot;1.0&quot;;uses:=&quot;org.osgi.framework&quot;,org.osgi.service.dmt;version=&quot;2.0.2&quot;,org.osgi.service.dmt.security;version=&quot;2.0&quot;,org.osgi.service.dmt.spi;version=&quot;2.0&quot;;uses:=&quot;org.osgi.service.dmt&quot;,org.osgi.service.dmt.notification;version=&quot;2.0&quot;;uses:=&quot;org.osgi.service.dmt&quot;,org.osgi.service.dmt.notification.spi;version=&quot;2.0&quot;;uses:=&quot;org.osgi.service.dmt.notification&quot;,org.osgi.service.rest;version=&quot;1.0.0&quot;,org.osgi.service.rest.client;version=&quot;1.0.0&quot;;uses:=&quot;org.osgi.framework.dto,org.osgi.framework.startlevel.dto&quot;,org.osgi.service.jdbc;version=&quot;1.0&quot;;uses:=&quot;javax.sql&quot;,org.osgi.service.event;version=&quot;1.4.0&quot;;uses:=&quot;org.osgi.framework&quot;,org.osgi.service.event.propertytypes;version=&quot;1.4.0&quot;,org.osgi.service.event.annotations;version=&quot;1.4.0&quot;,org.osgi.service.repository;version=&quot;1.1&quot;;uses:=&quot;org.osgi.resource,org.osgi.util.promise&quot;,org.osgi.service.blueprint.container;version=&quot;1.0.2&quot;;uses:=&quot;org.osgi.framework,org.osgi.service.blueprint.reflect&quot;,org.osgi.service.blueprint.reflect;version=&quot;1.0.1&quot;,org.osgi.service.upnp;version=&quot;1.2&quot;,org.osgi.service.jndi;version=&quot;1.0&quot;;uses:=&quot;javax.naming,javax.naming.directory&quot;,org.osgi.service.jpa;version=&quot;1.1&quot;;uses:=&quot;javax.persistence,org.osgi.framework&quot;,org.osgi.service.jpa.annotations;version=&quot;1.1&quot;,org.osgi.service.prefs;version=&quot;1.1.1&quot;,org.osgi.service.cm;version=&quot;1.6.0&quot;;uses:=&quot;org.osgi.framework&quot;,org.osgi.service.cm.annotations;version=&quot;1.6.0&quot;,org.osgi.service.serviceloader;version=&quot;1.0&quot;;uses:=&quot;org.osgi.resource&quot;,org.osgi.service.device;version=&quot;1.1&quot;;uses:=&quot;org.osgi.framework&quot;,org.osgi.service.deploymentadmin;version=&quot;1.1&quot;;uses:=&quot;org.osgi.framework,org.osgi.service.deploymentadmin.spi&quot;,org.osgi.service.deploymentadmin.spi;version=&quot;1.0.1&quot;;uses:=&quot;org.osgi.framework,org.osgi.service.deploymentadmin&quot;,org.osgi.service.coordinator;version=&quot;1.0.2&quot;;uses:=&quot;org.osgi.framework&quot;,org.osgi.service.wireadmin;version=&quot;1.0.1&quot;;uses:=&quot;org.osgi.framework&quot;,org.osgi.service.useradmin;version=&quot;1.1&quot;;uses:=&quot;org.osgi.framework&quot;,org.osgi.service.application;version=&quot;1.1&quot;;uses:=&quot;org.osgi.framework&quot;,org.osgi.service.configurator.namespace;version=&quot;1.0&quot;;uses:=&quot;org.osgi.resource&quot;,org.osgi.service.configurator;version=&quot;1.0&quot;,org.osgi.service.configurator.annotations;version=&quot;1.0&quot;,org.osgi.service.http.whiteboard.propertytypes;version=&quot;1.1.0&quot;;uses:=&quot;javax.servlet&quot;,org.osgi.service.http.whiteboard;version=&quot;1.1.0&quot;;uses:=&quot;javax.servlet&quot;,org.osgi.service.http.whiteboard.annotations;version=&quot;1.1.0&quot;,org.osgi.service.http;version=&quot;1.2.1&quot;;uses:=&quot;javax.servlet,javax.servlet.http&quot;,org.osgi.service.http.runtime;version=&quot;1.1.0&quot;;uses:=&quot;org.osgi.service.http.runtime.dto&quot;,org.osgi.service.http.runtime.dto;version=&quot;1.1.0&quot;;uses:=&quot;org.osgi.dto,org.osgi.framework.dto&quot;,org.osgi.service.http.context;version=&quot;1.1.0&quot;;uses:=&quot;javax.servlet.http,org.osgi.framework&quot;,org.osgi.service.component;version=&quot;1.4.0&quot;;uses:=&quot;org.osgi.framework&quot;,org.osgi.service.component.propertytypes;version=&quot;1.4.0&quot;,org.osgi.service.component.annotations;version=&quot;1.4.0&quot;,org.osgi.service.component.runtime;version=&quot;1.4.0&quot;;uses:=&quot;org.osgi.framework,org.osgi.service.component.runtime.dto,org.osgi.util.promise&quot;,org.osgi.service.component.runtime.dto;version=&quot;1.4.0&quot;;uses:=&quot;org.osgi.dto,org.osgi.framework.dto&quot;,org.osgi.service.provisioning;version=&quot;1.2&quot;,org.osgi.service.metatype;version=&quot;1.4.0&quot;;uses:=&quot;org.osgi.framework&quot;,org.osgi.service.metatype.annotations;version=&quot;1.4.0&quot;,org.osgi.service.monitor;version=&quot;1.0&quot;,org.osgi.service.transaction.control;version=&quot;1.0.0&quot;;uses:=&quot;javax.transaction.xa&quot;,org.osgi.service.transaction.control.jdbc;version=&quot;1.0.0&quot;;uses:=&quot;javax.sql,org.osgi.service.jdbc,org.osgi.service.transaction.control&quot;,org.osgi.service.transaction.control.recovery;version=&quot;1.0.0&quot;;uses:=&quot;javax.transaction.xa&quot;,org.osgi.service.transaction.control.jpa;version=&quot;1.0.0&quot;;uses:=&quot;javax.persistence,org.osgi.service.jpa,org.osgi.service.transaction.control&quot;,org.osgi.service.remoteserviceadmin;version=&quot;1.1.0&quot;;uses:=&quot;org.osgi.framework&quot;,org.osgi.service.remoteserviceadmin.namespace;version=&quot;1.0.0&quot;;uses:=&quot;org.osgi.resource&quot;,org.osgi.service.async;version=&quot;1.0&quot;;uses:=&quot;org.osgi.framework,org.osgi.util.promise&quot;,org.osgi.service.async.delegate;version=&quot;1.0&quot;;uses:=&quot;org.osgi.util.promise&quot;,org.osgi.service.log;version=&quot;1.4&quot;;uses:=&quot;org.osgi.framework&quot;,org.osgi.service.log.admin;version=&quot;1.0&quot;;uses:=&quot;org.osgi.service.log&quot;,org.osgi.service.log.stream;version=&quot;1.0&quot;;uses:=&quot;org.osgi.service.log,org.osgi.util.pushstream&quot;,org.osgi.service.subsystem;version=&quot;1.1&quot;;uses:=&quot;org.osgi.framework,org.osgi.resource&quot;"/>
-		<attribute name="Import-Package" value="javax.naming,javax.naming.directory,javax.persistence,javax.servlet;version=&quot;[3.1,4)&quot;,javax.servlet.http;version=&quot;[3.1,4)&quot;,javax.sql,javax.transaction.xa,javax.xml.parsers,org.osgi.dto;version=&quot;[1.0,2)&quot;,org.osgi.framework;version=&quot;[1.8,2)&quot;,org.osgi.framework.dto;version=&quot;[1.8,2)&quot;,org.osgi.framework.startlevel.dto;version=&quot;[1.0,2)&quot;,org.osgi.resource;version=&quot;[1.0,2)&quot;,org.osgi.service.blueprint.reflect;version=&quot;[1.0,2)&quot;,org.osgi.service.component.runtime.dto;version=&quot;[1.4,2)&quot;,org.osgi.service.deploymentadmin;version=&quot;[1.1,2)&quot;,org.osgi.service.deploymentadmin.spi;version=&quot;[1.0,2)&quot;,org.osgi.service.dmt;version=&quot;[2.0,3)&quot;,org.osgi.service.dmt.notification;version=&quot;[2.0,3)&quot;,org.osgi.service.http.runtime.dto;version=&quot;[1.1,2)&quot;,org.osgi.service.jdbc;version=&quot;[1.0,2)&quot;,org.osgi.service.jpa;version=&quot;[1.1,2)&quot;,org.osgi.service.log;version=&quot;[1.4,1.5)&quot;,org.osgi.service.transaction.control;version=&quot;[1.0,1.1)&quot;,org.osgi.util.function;version=&quot;[1.1,2)&quot;,org.osgi.util.measurement;version=&quot;[1.0,2)&quot;,org.osgi.util.promise;version=&quot;[1.1,1.2)&quot;,org.osgi.util.pushstream;version=&quot;[1.0,1.1)&quot;"/>
+		<attribute name="Export-Package" value="org.osgi.util.converter;version=&quot;1.0&quot;;uses:=&quot;org.osgi.util.function&quot;,org.osgi.util.function;version=&quot;1.1&quot;,org.osgi.util.position;version=&quot;1.0.1&quot;;uses:=&quot;org.osgi.util.measurement&quot;,org.osgi.util.pushstream;version=&quot;1.0&quot;;uses:=&quot;org.osgi.util.function,org.osgi.util.promise&quot;,org.osgi.util.promise;version=&quot;1.1&quot;;uses:=&quot;org.osgi.util.function&quot;,org.osgi.util.xml;version=&quot;1.0.1&quot;;uses:=&quot;javax.xml.parsers,org.osgi.framework&quot;,org.osgi.util.measurement;version=&quot;1.0.2&quot;,org.osgi.namespace.extender;version=&quot;1.0.1&quot;;uses:=&quot;org.osgi.resource&quot;,org.osgi.namespace.unresolvable;version=&quot;1.0&quot;;uses:=&quot;org.osgi.resource&quot;,org.osgi.namespace.service;version=&quot;1.0&quot;;uses:=&quot;org.osgi.resource&quot;,org.osgi.namespace.contract;version=&quot;1.0&quot;;uses:=&quot;org.osgi.resource&quot;,org.osgi.application;version=&quot;1.0&quot;;uses:=&quot;org.osgi.framework&quot;,org.osgi.service.dmt;version=&quot;2.0.2&quot;,org.osgi.service.dmt.security;version=&quot;2.0&quot;,org.osgi.service.dmt.spi;version=&quot;2.0&quot;;uses:=&quot;org.osgi.service.dmt&quot;,org.osgi.service.dmt.notification;version=&quot;2.0&quot;;uses:=&quot;org.osgi.service.dmt&quot;,org.osgi.service.dmt.notification.spi;version=&quot;2.0&quot;;uses:=&quot;org.osgi.service.dmt.notification&quot;,org.osgi.service.rest;version=&quot;1.0.0&quot;,org.osgi.service.rest.client;version=&quot;1.0.0&quot;;uses:=&quot;org.osgi.framework.dto,org.osgi.framework.startlevel.dto&quot;,org.osgi.service.jdbc;version=&quot;1.0&quot;;uses:=&quot;javax.sql&quot;,org.osgi.service.event;version=&quot;1.4.0&quot;;uses:=&quot;org.osgi.framework&quot;,org.osgi.service.event.propertytypes;version=&quot;1.4.0&quot;,org.osgi.service.event.annotations;version=&quot;1.4.0&quot;,org.osgi.service.repository;version=&quot;1.1&quot;;uses:=&quot;org.osgi.resource,org.osgi.util.promise&quot;,org.osgi.service.blueprint.container;version=&quot;1.0.2&quot;;uses:=&quot;org.osgi.framework,org.osgi.service.blueprint.reflect&quot;,org.osgi.service.blueprint.reflect;version=&quot;1.0.1&quot;,org.osgi.service.upnp;version=&quot;1.2&quot;,org.osgi.service.jndi;version=&quot;1.0&quot;;uses:=&quot;javax.naming,javax.naming.directory&quot;,org.osgi.service.prefs;version=&quot;1.1.1&quot;,org.osgi.service.cm;version=&quot;1.6.0&quot;;uses:=&quot;org.osgi.framework&quot;,org.osgi.service.cm.annotations;version=&quot;1.6.0&quot;,org.osgi.service.serviceloader;version=&quot;1.0&quot;;uses:=&quot;org.osgi.resource&quot;,org.osgi.service.device;version=&quot;1.1&quot;;uses:=&quot;org.osgi.framework&quot;,org.osgi.service.deploymentadmin;version=&quot;1.1&quot;;uses:=&quot;org.osgi.framework,org.osgi.service.deploymentadmin.spi&quot;,org.osgi.service.deploymentadmin.spi;version=&quot;1.0.1&quot;;uses:=&quot;org.osgi.framework,org.osgi.service.deploymentadmin&quot;,org.osgi.service.coordinator;version=&quot;1.0.2&quot;;uses:=&quot;org.osgi.framework&quot;,org.osgi.service.wireadmin;version=&quot;1.0.1&quot;;uses:=&quot;org.osgi.framework&quot;,org.osgi.service.useradmin;version=&quot;1.1&quot;;uses:=&quot;org.osgi.framework&quot;,org.osgi.service.application;version=&quot;1.1&quot;;uses:=&quot;org.osgi.framework&quot;,org.osgi.service.configurator.namespace;version=&quot;1.0&quot;;uses:=&quot;org.osgi.resource&quot;,org.osgi.service.configurator;version=&quot;1.0&quot;,org.osgi.service.configurator.annotations;version=&quot;1.0&quot;,org.osgi.service.http.whiteboard.propertytypes;version=&quot;1.1.0&quot;;uses:=&quot;javax.servlet&quot;,org.osgi.service.http.whiteboard;version=&quot;1.1.0&quot;;uses:=&quot;javax.servlet&quot;,org.osgi.service.http.whiteboard.annotations;version=&quot;1.1.0&quot;,org.osgi.service.http;version=&quot;1.2.1&quot;;uses:=&quot;javax.servlet,javax.servlet.http&quot;,org.osgi.service.http.runtime;version=&quot;1.1.0&quot;;uses:=&quot;org.osgi.service.http.runtime.dto&quot;,org.osgi.service.http.runtime.dto;version=&quot;1.1.0&quot;;uses:=&quot;org.osgi.dto,org.osgi.framework.dto&quot;,org.osgi.service.http.context;version=&quot;1.1.0&quot;;uses:=&quot;javax.servlet.http,org.osgi.framework&quot;,org.osgi.service.component;version=&quot;1.4.0&quot;;uses:=&quot;org.osgi.framework&quot;,org.osgi.service.component.propertytypes;version=&quot;1.4.0&quot;,org.osgi.service.component.annotations;version=&quot;1.4.0&quot;,org.osgi.service.component.runtime;version=&quot;1.4.0&quot;;uses:=&quot;org.osgi.framework,org.osgi.service.component.runtime.dto,org.osgi.util.promise&quot;,org.osgi.service.component.runtime.dto;version=&quot;1.4.0&quot;;uses:=&quot;org.osgi.dto,org.osgi.framework.dto&quot;,org.osgi.service.provisioning;version=&quot;1.2&quot;,org.osgi.service.metatype;version=&quot;1.4.0&quot;;uses:=&quot;org.osgi.framework&quot;,org.osgi.service.metatype.annotations;version=&quot;1.4.0&quot;,org.osgi.service.monitor;version=&quot;1.0&quot;,org.osgi.service.transaction.control;version=&quot;1.0.0&quot;;uses:=&quot;javax.transaction.xa&quot;,org.osgi.service.transaction.control.jdbc;version=&quot;1.0.0&quot;;uses:=&quot;javax.sql,org.osgi.service.jdbc,org.osgi.service.transaction.control&quot;,org.osgi.service.transaction.control.recovery;version=&quot;1.0.0&quot;;uses:=&quot;javax.transaction.xa&quot;,org.osgi.service.remoteserviceadmin;version=&quot;1.1.0&quot;;uses:=&quot;org.osgi.framework&quot;,org.osgi.service.remoteserviceadmin.namespace;version=&quot;1.0.0&quot;;uses:=&quot;org.osgi.resource&quot;,org.osgi.service.async;version=&quot;1.0&quot;;uses:=&quot;org.osgi.framework,org.osgi.util.promise&quot;,org.osgi.service.async.delegate;version=&quot;1.0&quot;;uses:=&quot;org.osgi.util.promise&quot;,org.osgi.service.log;version=&quot;1.4&quot;;uses:=&quot;org.osgi.framework&quot;,org.osgi.service.log.admin;version=&quot;1.0&quot;;uses:=&quot;org.osgi.service.log&quot;,org.osgi.service.log.stream;version=&quot;1.0&quot;;uses:=&quot;org.osgi.service.log,org.osgi.util.pushstream&quot;,org.osgi.service.subsystem;version=&quot;1.1&quot;;uses:=&quot;org.osgi.framework,org.osgi.resource&quot;"/>
+		<attribute name="Import-Package" value="javax.naming,javax.naming.directory,javax.servlet;version=&quot;[3.1,4)&quot;,javax.servlet.http;version=&quot;[3.1,4)&quot;,javax.sql,javax.transaction.xa,javax.xml.parsers,org.osgi.dto;version=&quot;[1.0,2)&quot;,org.osgi.framework;version=&quot;[1.8,2)&quot;,org.osgi.framework.dto;version=&quot;[1.8,2)&quot;,org.osgi.framework.startlevel.dto;version=&quot;[1.0,2)&quot;,org.osgi.resource;version=&quot;[1.0,2)&quot;,org.osgi.service.blueprint.reflect;version=&quot;[1.0,2)&quot;,org.osgi.service.component.runtime.dto;version=&quot;[1.4,2)&quot;,org.osgi.service.deploymentadmin;version=&quot;[1.1,2)&quot;,org.osgi.service.deploymentadmin.spi;version=&quot;[1.0,2)&quot;,org.osgi.service.dmt;version=&quot;[2.0,3)&quot;,org.osgi.service.dmt.notification;version=&quot;[2.0,3)&quot;,org.osgi.service.http.runtime.dto;version=&quot;[1.1,2)&quot;,org.osgi.service.jdbc;version=&quot;[1.0,2)&quot;,org.osgi.service.log;version=&quot;[1.4,1.5)&quot;,org.osgi.service.transaction.control;version=&quot;[1.0,1.1)&quot;,org.osgi.util.function;version=&quot;[1.1,2)&quot;,org.osgi.util.measurement;version=&quot;[1.0,2)&quot;,org.osgi.util.promise;version=&quot;[1.1,1.2)&quot;,org.osgi.util.pushstream;version=&quot;[1.0,1.1)&quot;"/>
 		<attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/>
 		<attribute name="JavaPackages-GroupId" value="${project.groupId}"/>
 		<attribute name="JavaPackages-Version" value="${project.version}"/>