diff --git a/osgi-compendium-build.xml b/osgi-compendium-build.xml
index c585c7a..4b7b783 100644
--- a/osgi-compendium-build.xml
+++ b/osgi-compendium-build.xml
@@ -9,13 +9,14 @@
   <property file="build.properties"/>
 
 
-  <property name="compiler.source" value="1.8"/>
+  <property name="compiler.release" value="8"/>
+  <property name="compiler.source" value="1.${compiler.release}"/>
   <property name="compiler.target" value="${compiler.source}"/>
 
   <property name="project.artifactId" value="osgi.cmpn"/>
   <property name="project.groupId" value="org.osgi"/>
-  <property name="project.version" value="7.0.0"/>
-  <property name="project.description" value="OSGi Compendium Release 7, Interfaces and Classes for use in compiling bundles."/>
+  <property name="project.version" value="8.0.0"/>
+  <property name="project.description" value="OSGi Compendium Release 8, Interfaces and Classes for use in compiling bundles."/>
   <property name="project.organization.name" value="OSGi Alliance"/>
 
   <property name="build.finalName" value="${project.artifactId}-${project.version}"/>
@@ -56,6 +57,7 @@
            encoding="UTF-8"
            optimize="false"
            deprecation="true"
+           release="${compiler.release}"
            target="${compiler.target}"
            verbose="false"
            fork="false"
@@ -116,8 +118,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.application;uses:=&quot;org.osgi.framework&quot;;version=&quot;1.0&quot;,org.osgi.namespace.contract;uses:=&quot;org.osgi.resource&quot;;version=&quot;1.0&quot;,org.osgi.namespace.extender;uses:=&quot;org.osgi.resource&quot;;version=&quot;1.0.1&quot;,org.osgi.namespace.service;uses:=&quot;org.osgi.resource&quot;;version=&quot;1.0&quot;,org.osgi.namespace.unresolvable;uses:=&quot;org.osgi.resource&quot;;version=&quot;1.0&quot;,org.osgi.service.application;uses:=&quot;org.osgi.framework&quot;;version=&quot;1.1&quot;,org.osgi.service.async.delegate;uses:=&quot;org.osgi.util.promise&quot;;version=&quot;1.0&quot;,org.osgi.service.async;uses:=&quot;org.osgi.framework,org.osgi.util.promise&quot;;version=&quot;1.0&quot;,org.osgi.service.blueprint.container;uses:=&quot;org.osgi.framework,org.osgi.service.blueprint.reflect&quot;;version=&quot;1.0.2&quot;,org.osgi.service.blueprint.reflect;version=&quot;1.0.1&quot;,org.osgi.service.cm.annotations;version=&quot;1.6.0&quot;,org.osgi.service.cm;uses:=&quot;org.osgi.framework&quot;;version=&quot;1.6.0&quot;,org.osgi.service.component.annotations;version=&quot;1.4.0&quot;,org.osgi.service.component.propertytypes;version=&quot;1.4.0&quot;,org.osgi.service.component.runtime.dto;uses:=&quot;org.osgi.dto,org.osgi.framework.dto&quot;;version=&quot;1.4.0&quot;,org.osgi.service.component.runtime;uses:=&quot;org.osgi.framework,org.osgi.service.component.runtime.dto,org.osgi.util.promise&quot;;version=&quot;1.4.0&quot;,org.osgi.service.component;uses:=&quot;org.osgi.framework&quot;;version=&quot;1.4.0&quot;,org.osgi.service.configurator.annotations;version=&quot;1.0&quot;,org.osgi.service.configurator.namespace;uses:=&quot;org.osgi.resource&quot;;version=&quot;1.0&quot;,org.osgi.service.configurator;version=&quot;1.0&quot;,org.osgi.service.coordinator;uses:=&quot;org.osgi.framework&quot;;version=&quot;1.0.2&quot;,org.osgi.service.deploymentadmin.spi;uses:=&quot;org.osgi.framework,org.osgi.service.deploymentadmin&quot;;version=&quot;1.0.1&quot;,org.osgi.service.deploymentadmin;uses:=&quot;org.osgi.framework,org.osgi.service.deploymentadmin.spi&quot;;version=&quot;1.1&quot;,org.osgi.service.device;uses:=&quot;org.osgi.framework&quot;;version=&quot;1.1&quot;,org.osgi.service.dmt.notification.spi;uses:=&quot;org.osgi.service.dmt.notification&quot;;version=&quot;2.0&quot;,org.osgi.service.dmt.notification;uses:=&quot;org.osgi.service.dmt&quot;;version=&quot;2.0&quot;,org.osgi.service.dmt.security;version=&quot;2.0&quot;,org.osgi.service.dmt.spi;uses:=&quot;org.osgi.service.dmt&quot;;version=&quot;2.0&quot;,org.osgi.service.dmt;version=&quot;2.0.2&quot;,org.osgi.service.event.annotations;version=&quot;1.4.0&quot;,org.osgi.service.event.propertytypes;version=&quot;1.4.0&quot;,org.osgi.service.event;uses:=&quot;org.osgi.framework&quot;;version=&quot;1.4.0&quot;,org.osgi.service.jdbc;uses:=&quot;javax.sql&quot;;version=&quot;1.0&quot;,org.osgi.service.jndi;uses:=&quot;javax.naming,javax.naming.directory&quot;;version=&quot;1.0&quot;,org.osgi.service.log.admin;uses:=&quot;org.osgi.service.log&quot;;version=&quot;1.0&quot;,org.osgi.service.log.stream;uses:=&quot;org.osgi.service.log,org.osgi.util.pushstream&quot;;version=&quot;1.0&quot;,org.osgi.service.log;uses:=&quot;org.osgi.framework&quot;;version=&quot;1.4&quot;,org.osgi.service.metatype.annotations;version=&quot;1.4.0&quot;,org.osgi.service.metatype;uses:=&quot;org.osgi.framework&quot;;version=&quot;1.4.0&quot;,org.osgi.service.monitor;version=&quot;1.0&quot;,org.osgi.service.prefs;version=&quot;1.1.1&quot;,org.osgi.service.provisioning;version=&quot;1.2&quot;,org.osgi.service.remoteserviceadmin.namespace;uses:=&quot;org.osgi.resource&quot;;version=&quot;1.0.0&quot;,org.osgi.service.remoteserviceadmin;uses:=&quot;org.osgi.framework&quot;;version=&quot;1.1.0&quot;,org.osgi.service.repository;uses:=&quot;org.osgi.resource,org.osgi.util.promise&quot;;version=&quot;1.1&quot;,org.osgi.service.rest.client;uses:=&quot;org.osgi.framework.dto,org.osgi.framework.startlevel.dto&quot;;version=&quot;1.0.0&quot;,org.osgi.service.rest;version=&quot;1.0.0&quot;,org.osgi.service.serviceloader;uses:=&quot;org.osgi.resource&quot;;version=&quot;1.0&quot;,org.osgi.service.subsystem;uses:=&quot;org.osgi.framework,org.osgi.resource&quot;;version=&quot;1.1&quot;,org.osgi.service.transaction.control.jdbc;uses:=&quot;javax.sql,org.osgi.service.jdbc,org.osgi.service.transaction.control&quot;;version=&quot;1.0.0&quot;,org.osgi.service.transaction.control.recovery;uses:=&quot;javax.transaction.xa&quot;;version=&quot;1.0.0&quot;,org.osgi.service.transaction.control;uses:=&quot;javax.transaction.xa&quot;;version=&quot;1.0.0&quot;,org.osgi.service.upnp;version=&quot;1.2&quot;,org.osgi.service.useradmin;uses:=&quot;org.osgi.framework&quot;;version=&quot;1.1&quot;,org.osgi.service.wireadmin;uses:=&quot;org.osgi.framework&quot;;version=&quot;1.0.1&quot;,org.osgi.util.converter;uses:=&quot;org.osgi.util.function&quot;;version=&quot;1.0&quot;,org.osgi.util.function;version=&quot;1.1&quot;,org.osgi.util.measurement;version=&quot;1.0.2&quot;,org.osgi.util.position;uses:=&quot;org.osgi.util.measurement&quot;;version=&quot;1.0.1&quot;,org.osgi.util.promise;uses:=&quot;org.osgi.util.function&quot;;version=&quot;1.1&quot;,org.osgi.util.pushstream;uses:=&quot;org.osgi.util.function,org.osgi.util.promise&quot;;version=&quot;1.0&quot;,org.osgi.util.xml;uses:=&quot;javax.xml.parsers,org.osgi.framework&quot;;version=&quot;1.0.1&quot;"/>
-		<attribute name="Import-Package" value="java.io,java.lang,java.lang.annotation,java.lang.invoke,java.lang.reflect,java.net,java.security,java.security.cert,java.sql,java.text,java.time,java.util,java.util.concurrent,java.util.concurrent.atomic,java.util.concurrent.locks,java.util.function,java.util.regex,java.util.stream,java.util.zip,javax.naming,javax.naming.directory,javax.sql,javax.transaction.xa,javax.xml.parsers,org.osgi.dto;version=&quot;[1.1,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.framework;version=&quot;[1.10,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.spi;version=&quot;[1.0,2)&quot;,org.osgi.service.deploymentadmin;version=&quot;[1.1,2)&quot;,org.osgi.service.dmt.notification;version=&quot;[2.0,3)&quot;,org.osgi.service.dmt;version=&quot;[2.0,3)&quot;,org.osgi.service.jdbc;version=&quot;[1.0,2)&quot;,org.osgi.service.log;version=&quot;[1.4,2)&quot;,org.osgi.service.transaction.control;version=&quot;[1.0,2)&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,2)&quot;,org.osgi.util.pushstream;version=&quot;[1.0,2)&quot;"/>
+		<attribute name="Export-Package" value="org.osgi.namespace.contract;version=&quot;1.0&quot;;uses:=&quot;org.osgi.resource&quot;,org.osgi.namespace.extender;version=&quot;1.0.1&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.unresolvable;version=&quot;1.0&quot;;uses:=&quot;org.osgi.resource&quot;,org.osgi.service.async.delegate;version=&quot;1.0&quot;;uses:=&quot;org.osgi.util.promise&quot;,org.osgi.service.async;version=&quot;1.0&quot;;uses:=&quot;org.osgi.framework,org.osgi.util.promise&quot;,org.osgi.service.cdi.annotations;version=&quot;1.0.1&quot;;uses:=&quot;javax.enterprise.inject,javax.enterprise.util,javax.inject,org.osgi.service.cdi&quot;,org.osgi.service.cdi.propertytypes;version=&quot;1.0.0&quot;;uses:=&quot;org.osgi.service.cdi.annotations&quot;,org.osgi.service.cdi.reference;version=&quot;1.0.0&quot;;uses:=&quot;org.osgi.framework&quot;,org.osgi.service.cdi.runtime.dto.template;version=&quot;1.0.0&quot;;uses:=&quot;org.osgi.dto,org.osgi.service.cdi&quot;,org.osgi.service.cdi.runtime.dto;version=&quot;1.0.0&quot;;uses:=&quot;org.osgi.dto,org.osgi.framework.dto,org.osgi.service.cdi.runtime.dto.template&quot;,org.osgi.service.cdi.runtime;version=&quot;1.0.0&quot;;uses:=&quot;org.osgi.framework,org.osgi.service.cdi.runtime.dto,org.osgi.service.cdi.runtime.dto.template&quot;,org.osgi.service.cdi;version=&quot;1.0.1&quot;,org.osgi.service.clusterinfo.dto;version=&quot;1.0&quot;;uses:=&quot;org.osgi.dto&quot;,org.osgi.service.clusterinfo;version=&quot;1.0&quot;;uses:=&quot;org.osgi.framework.dto,org.osgi.framework.startlevel.dto&quot;,org.osgi.service.cm.annotations;version=&quot;1.6.1&quot;,org.osgi.service.cm;version=&quot;1.6.1&quot;;uses:=&quot;org.osgi.framework&quot;,org.osgi.service.component.annotations;version=&quot;1.5&quot;,org.osgi.service.component.propertytypes;version=&quot;1.5&quot;,org.osgi.service.component.runtime.dto;version=&quot;1.5&quot;;uses:=&quot;org.osgi.dto,org.osgi.framework.dto&quot;,org.osgi.service.component.runtime;version=&quot;1.5&quot;;uses:=&quot;org.osgi.framework,org.osgi.service.component.runtime.dto,org.osgi.util.promise&quot;,org.osgi.service.component;version=&quot;1.5&quot;;uses:=&quot;org.osgi.framework&quot;,org.osgi.service.configurator.annotations;version=&quot;1.0&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.1&quot;,org.osgi.service.coordinator;version=&quot;1.0.2&quot;;uses:=&quot;org.osgi.framework&quot;,org.osgi.service.dal.functions.data;version=&quot;1.0.1&quot;;uses:=&quot;org.osgi.service.dal&quot;,org.osgi.service.dal.functions;version=&quot;1.0.1&quot;;uses:=&quot;org.osgi.service.dal,org.osgi.service.dal.functions.data&quot;,org.osgi.service.dal;version=&quot;1.0.2&quot;;uses:=&quot;org.osgi.service.event&quot;,org.osgi.service.device;version=&quot;1.1.1&quot;;uses:=&quot;org.osgi.framework&quot;,org.osgi.service.dmt.notification.spi;version=&quot;2.0&quot;;uses:=&quot;org.osgi.service.dmt.notification&quot;,org.osgi.service.dmt.notification;version=&quot;2.0&quot;;uses:=&quot;org.osgi.service.dmt&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;version=&quot;2.0.2&quot;,org.osgi.service.enocean.descriptions;version=&quot;1.0.1&quot;;uses:=&quot;org.osgi.service.enocean&quot;,org.osgi.service.enocean;version=&quot;1.0.1&quot;,org.osgi.service.event.annotations;version=&quot;1.4.1&quot;,org.osgi.service.event.propertytypes;version=&quot;1.4.0&quot;,org.osgi.service.event;version=&quot;1.4.1&quot;;uses:=&quot;org.osgi.framework&quot;,org.osgi.service.feature.annotation;version=&quot;1.0&quot;,org.osgi.service.feature;version=&quot;1.0&quot;,org.osgi.service.http.context;version=&quot;1.1.0&quot;;uses:=&quot;javax.servlet.http,org.osgi.framework&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.runtime;version=&quot;1.1.0&quot;;uses:=&quot;org.osgi.service.http.runtime.dto&quot;,org.osgi.service.http.whiteboard.annotations;version=&quot;1.1.1&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.1&quot;;uses:=&quot;javax.servlet&quot;,org.osgi.service.http;version=&quot;1.2.2&quot;;uses:=&quot;javax.servlet,javax.servlet.http&quot;,org.osgi.service.jdbc;version=&quot;1.0.1&quot;;uses:=&quot;javax.sql&quot;,org.osgi.service.jndi;version=&quot;1.0.1&quot;;uses:=&quot;javax.naming,javax.naming.directory&quot;,org.osgi.service.jpa.annotations;version=&quot;1.1&quot;,org.osgi.service.jpa;version=&quot;1.1.1&quot;;uses:=&quot;javax.persistence,org.osgi.framework&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.metatype.annotations;version=&quot;1.4.1&quot;,org.osgi.service.metatype;version=&quot;1.4.1&quot;;uses:=&quot;org.osgi.framework&quot;,org.osgi.service.networkadapter;version=&quot;1.0.1&quot;,org.osgi.service.onem2m.dto;version=&quot;1.0&quot;;uses:=&quot;org.osgi.dto&quot;,org.osgi.service.onem2m;version=&quot;1.0&quot;;uses:=&quot;org.osgi.service.onem2m.dto,org.osgi.util.promise&quot;,org.osgi.service.prefs;version=&quot;1.1.2&quot;,org.osgi.service.remoteserviceadmin.namespace;version=&quot;1.0.0&quot;;uses:=&quot;org.osgi.resource&quot;,org.osgi.service.remoteserviceadmin;version=&quot;1.1.0&quot;;uses:=&quot;org.osgi.framework&quot;,org.osgi.service.repository;version=&quot;1.1&quot;;uses:=&quot;org.osgi.resource,org.osgi.util.promise&quot;,org.osgi.service.resourcemonitoring.monitor;version=&quot;1.0.1&quot;;uses:=&quot;org.osgi.service.resourcemonitoring&quot;,org.osgi.service.resourcemonitoring;version=&quot;1.0.1&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.rest;version=&quot;1.0.0&quot;,org.osgi.service.serial;version=&quot;1.0.1&quot;,org.osgi.service.serviceloader;version=&quot;1.0&quot;;uses:=&quot;org.osgi.resource&quot;,org.osgi.service.tr069todmt;version=&quot;1.0.2&quot;;uses:=&quot;org.osgi.service.dmt&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.jpa;version=&quot;1.0.0&quot;;uses:=&quot;javax.persistence,org.osgi.service.jpa,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;version=&quot;1.0.0&quot;;uses:=&quot;javax.transaction.xa&quot;,org.osgi.service.typedevent.annotations;version=&quot;1.0&quot;,org.osgi.service.typedevent.monitor;version=&quot;1.0&quot;;uses:=&quot;org.osgi.util.pushstream&quot;,org.osgi.service.typedevent.propertytypes;version=&quot;1.0&quot;,org.osgi.service.typedevent;version=&quot;1.0&quot;,org.osgi.service.upnp;version=&quot;1.2.1&quot;,org.osgi.service.usbinfo;version=&quot;1.0.1&quot;,org.osgi.service.useradmin;version=&quot;1.1.1&quot;;uses:=&quot;org.osgi.framework&quot;,org.osgi.service.wireadmin;version=&quot;1.0.2&quot;;uses:=&quot;org.osgi.framework&quot;,org.osgi.service.zigbee.descriptions;version=&quot;1.0.1&quot;;uses:=&quot;org.osgi.service.zigbee&quot;,org.osgi.service.zigbee.descriptors;version=&quot;1.0.1&quot;,org.osgi.service.zigbee.types;version=&quot;1.0.1&quot;;uses:=&quot;org.osgi.service.zigbee,org.osgi.service.zigbee.descriptions&quot;,org.osgi.service.zigbee;version=&quot;1.0.1&quot;;uses:=&quot;org.osgi.service.zigbee.descriptions,org.osgi.service.zigbee.descriptors,org.osgi.util.function,org.osgi.util.promise&quot;,org.osgi.util.converter;version=&quot;1.0.8&quot;;uses:=&quot;org.osgi.util.function&quot;,org.osgi.util.function;version=&quot;1.2&quot;,org.osgi.util.promise;version=&quot;1.2.0&quot;;uses:=&quot;org.osgi.util.function&quot;,org.osgi.util.pushstream;version=&quot;1.0.2&quot;;uses:=&quot;org.osgi.util.function,org.osgi.util.promise&quot;,org.osgi.util.xml;version=&quot;1.0.2&quot;;uses:=&quot;javax.xml.parsers,org.osgi.framework&quot;"/>
+		<attribute name="Import-Package" value="java.io,java.lang,java.lang.annotation,java.lang.invoke,java.lang.reflect,java.math,java.net,java.security,java.security.cert,java.sql,java.text,java.time,java.util,java.util.concurrent,java.util.concurrent.atomic,java.util.concurrent.locks,java.util.function,java.util.regex,java.util.stream,javax.enterprise.inject;version=&quot;[2.0,3)&quot;,javax.enterprise.util;version=&quot;[2.0,3)&quot;,javax.inject;version=&quot;[1.0,2)&quot;,javax.naming,javax.naming.directory,javax.persistence,javax.servlet.http;version=&quot;[3.1,4)&quot;,javax.servlet;version=&quot;[3.1,4)&quot;,javax.sql,javax.transaction.xa,javax.xml.parsers,org.osgi.dto;version=&quot;[1.1,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.framework;version=&quot;[1.10,2)&quot;,org.osgi.resource;version=&quot;[1.0,2)&quot;,org.osgi.service.cdi.annotations;version=&quot;[1.0,2)&quot;,org.osgi.service.cdi.runtime.dto.template;version=&quot;[1.0,2)&quot;,org.osgi.service.cdi.runtime.dto;version=&quot;[1.0,2)&quot;,org.osgi.service.cdi;version=&quot;[1.0,2)&quot;,org.osgi.service.component.runtime.dto;version=&quot;[1.5,2)&quot;,org.osgi.service.dal.functions.data;version=&quot;[1.0,2)&quot;,org.osgi.service.dal;version=&quot;[1.0,2)&quot;,org.osgi.service.dmt.notification;version=&quot;[2.0,3)&quot;,org.osgi.service.dmt;version=&quot;[2.0,3)&quot;,org.osgi.service.enocean;version=&quot;[1.0,2)&quot;,org.osgi.service.event;version=&quot;[1.4,2)&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.5,2)&quot;,org.osgi.service.onem2m.dto;version=&quot;[1.0,2)&quot;,org.osgi.service.resourcemonitoring;version=&quot;[1.0,2)&quot;,org.osgi.service.transaction.control;version=&quot;[1.0,2)&quot;,org.osgi.service.zigbee.descriptions;version=&quot;[1.0,2)&quot;,org.osgi.service.zigbee.descriptors;version=&quot;[1.0,2)&quot;,org.osgi.service.zigbee;version=&quot;[1.0,2)&quot;,org.osgi.util.function;version=&quot;[1.2,2)&quot;,org.osgi.util.promise;version=&quot;[1.2,2)&quot;,org.osgi.util.pushstream;version=&quot;[1.0,2)&quot;"/>
 		<attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/>
 		<attribute name="JavaPackages-GroupId" value="${project.groupId}"/>
 		<attribute name="JavaPackages-Version" value="${project.version}"/>
diff --git a/osgi-compendium.changes b/osgi-compendium.changes
index 80925b6..4bd9b80 100644
--- a/osgi-compendium.changes
+++ b/osgi-compendium.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon Oct  7 22:53:25 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Upgrade to upstream version 8.0.0
+  * no upstream changelog
+
+-------------------------------------------------------------------
+Wed Oct  2 15:57:05 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Spec file cleanup
+
 -------------------------------------------------------------------
 Sat Sep  2 21:52:09 UTC 2023 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/osgi-compendium.spec b/osgi-compendium.spec
index ca13fbf..84a3dd6 100644
--- a/osgi-compendium.spec
+++ b/osgi-compendium.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package osgi-compendium
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,19 +17,21 @@
 
 
 Name:           osgi-compendium
-Version:        7.0.0
+Version:        8.0.0
 Release:        0
 Summary:        Interfaces and Classes for use in compiling OSGi bundles
 License:        Apache-2.0
 Group:          Development/Libraries/Java
-URL:            http://www.osgi.org
-Source0:        https://osgi.org/download/r7/osgi.cmpn-%{version}.jar
+URL:            https://www.osgi.org
+Source0:        https://osgi.org/download/r8/osgi.cmpn-%{version}.jar
 Source1:        %{name}-build.xml
 BuildRequires:  ant
+BuildRequires:  atinject
+BuildRequires:  cdi-api
 BuildRequires:  fdupes
 BuildRequires:  geronimo-jpa-3_0-api
 BuildRequires:  glassfish-servlet-api
-BuildRequires:  javapackages-local
+BuildRequires:  javapackages-local >= 6
 BuildRequires:  osgi-annotation
 BuildRequires:  osgi-core
 BuildRequires:  unzip
@@ -56,10 +58,9 @@ mkdir -p src/main/{java,resources}
 mv OSGI-OPT/src/org src/main/java/
 mv xmlns src/main/resources
 
-# J2ME stuff
-rm -r src/main/java/org/osgi/service/io
-
 mv META-INF/maven/org.osgi/osgi.cmpn/pom.xml .
+mv META-INF/LICENSE .
+mv META-INF/NOTICE .
 
 %pom_xpath_inject pom:project '
 <packaging>bundle</packaging>
@@ -82,15 +83,18 @@ mv META-INF/maven/org.osgi/osgi.cmpn/pom.xml .
   </plugins>
 </build>'
 
+%pom_remove_dep :
 %pom_add_dep org.osgi:osgi.annotation::provided
 %pom_add_dep org.osgi:osgi.core::provided
 %pom_add_dep javax.servlet:javax.servlet-api::provided
 %pom_add_dep javax.persistence:persistence-api::provided
+%pom_add_dep javax.enterprise:cdi-api::provided
+%pom_add_dep javax.inject:javax.inject::provided
 
 rm -r src/main/java/org/osgi/service/jaxrs
 
 mkdir -p lib
-build-jar-repository -s lib geronimo-jpa-3.0-api glassfish-servlet-api osgi-annotation osgi-core
+build-jar-repository -s lib geronimo-jpa-3.0-api glassfish-servlet-api osgi-annotation osgi-core javax.enterprise.inject atinject
 
 %build
 ant jar javadoc
@@ -101,7 +105,7 @@ install -dm 0755 %{buildroot}%{_javadir}/%{name}
 install -pm 0644 target/osgi.cmpn-%{version}.jar %{buildroot}%{_javadir}/%{name}/osgi.cmpn.jar
 # pom
 install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name}
-install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}/osgi.cmpn.pom
+%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/%{name}/osgi.cmpn.pom
 %add_maven_depmap %{name}/osgi.cmpn.pom %{name}/osgi.cmpn.jar
 # javadoc
 install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
@@ -109,11 +113,10 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
 %fdupes -s %{buildroot}%{_javadocdir}
 
 %files -f .mfiles
-%license LICENSE
-%doc about.html
+%license LICENSE NOTICE
 
 %files javadoc
-%license LICENSE
+%license LICENSE NOTICE
 %{_javadocdir}/%{name}
 
 %changelog
diff --git a/osgi.cmpn-7.0.0.jar b/osgi.cmpn-7.0.0.jar
deleted file mode 100644
index f1c3958..0000000
--- a/osgi.cmpn-7.0.0.jar
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8e6445afe1abb3dcd43c60c8cd6c0f15b052a8f4228812559ba521c5ce91db34
-size 1478661
diff --git a/osgi.cmpn-8.0.0.jar b/osgi.cmpn-8.0.0.jar
new file mode 100644
index 0000000..343f53d
--- /dev/null
+++ b/osgi.cmpn-8.0.0.jar
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4f2dd5348f0c97e78588252d7730c05c065cc7b712e1892cc963ab9bf58a0c47
+size 1897102