diff --git a/osgi-compendium-build.xml b/osgi-compendium-build.xml
index 3af3073..092a857 100644
--- a/osgi-compendium-build.xml
+++ b/osgi-compendium-build.xml
@@ -9,13 +9,13 @@
   <property file="build.properties"/>
 
 
-  <property name="compiler.source" value="1.6"/>
+  <property name="compiler.source" value="1.8"/>
   <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="6.0.0"/>
-  <property name="project.description" value="OSGi Compendium Release 6, Interfaces and Classes for use in compiling bundles."/>
+  <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.organization.name" value="OSGi Alliance"/>
 
   <property name="build.finalName" value="${project.artifactId}-${project.version}"/>
@@ -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.xml;version=&quot;1.0.1&quot;;uses:=&quot;javax.xml.parsers,org.osgi.framework&quot;,org.osgi.util.function;version=&quot;1.0&quot;,org.osgi.util.promise;version=&quot;1.0&quot;;uses:=&quot;org.osgi.util.function&quot;,org.osgi.util.position;version=&quot;1.0.1&quot;;uses:=&quot;org.osgi.util.measurement&quot;,org.osgi.util.measurement;version=&quot;1.0.1&quot;,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.application;version=&quot;1.0&quot;;uses:=&quot;org.osgi.framework&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.provisioning;version=&quot;1.2&quot;,org.osgi.service.useradmin;version=&quot;1.1&quot;;uses:=&quot;org.osgi.framework&quot;,org.osgi.service.subsystem;version=&quot;1.1&quot;;uses:=&quot;org.osgi.framework,org.osgi.resource&quot;,org.osgi.service.wireadmin;version=&quot;1.0.1&quot;;uses:=&quot;org.osgi.framework&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.log;version=&quot;1.3&quot;;uses:=&quot;org.osgi.framework&quot;,org.osgi.service.device;version=&quot;1.1&quot;;uses:=&quot;org.osgi.framework&quot;,org.osgi.service.dmt;version=&quot;2.0.1&quot;,org.osgi.service.dmt.spi;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.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.component.annotations;version=&quot;1.3&quot;,org.osgi.service.component;version=&quot;1.3&quot;;uses:=&quot;org.osgi.framework&quot;,org.osgi.service.component.runtime;version=&quot;1.3&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.3&quot;;uses:=&quot;org.osgi.dto,org.osgi.framework.dto&quot;,org.osgi.service.repository;version=&quot;1.1&quot;;uses:=&quot;org.osgi.resource,org.osgi.util.promise&quot;,org.osgi.service.coordinator;version=&quot;1.0.2&quot;;uses:=&quot;org.osgi.framework&quot;,org.osgi.service.jpa;version=&quot;1.0&quot;;uses:=&quot;javax.persistence&quot;,org.osgi.service.http.context;version=&quot;1.0&quot;;uses:=&quot;javax.servlet.http,org.osgi.framework&quot;,org.osgi.service.http.whiteboard;version=&quot;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.0&quot;;uses:=&quot;org.osgi.service.http.runtime.dto&quot;,org.osgi.service.http.runtime.dto;version=&quot;1.0&quot;;uses:=&quot;org.osgi.dto,org.osgi.framework.dto&quot;,org.osgi.service.monitor;version=&quot;1.0&quot;,org.osgi.service.deploymentadmin;version=&quot;1.1&quot;;uses:=&quot;org.osgi.framework&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.event;version=&quot;1.3.1&quot;;uses:=&quot;org.osgi.framework&quot;,org.osgi.service.prefs;version=&quot;1.1.1&quot;,org.osgi.service.jdbc;version=&quot;1.0&quot;;uses:=&quot;javax.sql&quot;,org.osgi.service.metatype.annotations;version=&quot;1.3&quot;,org.osgi.service.metatype;version=&quot;1.3&quot;;uses:=&quot;org.osgi.framework&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.serviceloader;version=&quot;1.0&quot;;uses:=&quot;org.osgi.resource&quot;,org.osgi.service.resolver;version=&quot;1.0.1&quot;;uses:=&quot;org.osgi.resource&quot;,org.osgi.service.application;version=&quot;1.1&quot;;uses:=&quot;org.osgi.framework&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.blueprint.reflect;version=&quot;1.0.1&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.cm;version=&quot;1.5&quot;;uses:=&quot;org.osgi.framework&quot;"/>
-		<attribute name="Import-Package" value="javax.naming,javax.naming.directory,javax.persistence;version=&quot;[3.0,4)&quot;,javax.servlet;version=&quot;[3.1,4)&quot;,javax.servlet.http;version=&quot;[3.1,4)&quot;,javax.sql,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.3,2)&quot;,org.osgi.service.deploymentadmin;version=&quot;[1.1,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.0,2)&quot;,org.osgi.util.function;version=&quot;[1.0,2)&quot;,org.osgi.util.measurement;version=&quot;[1.0,2)&quot;,org.osgi.util.promise;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}"/>
diff --git a/osgi-compendium.changes b/osgi-compendium.changes
index 4513ea2..82d9c70 100644
--- a/osgi-compendium.changes
+++ b/osgi-compendium.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Apr  1 08:52:15 UTC 2020 - Fridrich Strba <fstrba@suse.com>
+
+- Update to upstream version 7.0.0
+
 -------------------------------------------------------------------
 Mon Apr 15 13:48:07 UTC 2019 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/osgi-compendium.spec b/osgi-compendium.spec
index daca43a..a179d86 100644
--- a/osgi-compendium.spec
+++ b/osgi-compendium.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package osgi-compendium
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,13 +17,13 @@
 
 
 Name:           osgi-compendium
-Version:        6.0.0
+Version:        7.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/r6/osgi.cmpn-%{version}.jar
+Source0:        https://osgi.org/download/r7/osgi.cmpn-%{version}.jar
 Source1:        %{name}-build.xml
 BuildRequires:  ant
 BuildRequires:  fdupes
@@ -87,6 +87,8 @@ mv META-INF/maven/org.osgi/osgi.cmpn/pom.xml .
 %pom_add_dep javax.servlet:javax.servlet-api::provided
 %pom_add_dep javax.persistence:persistence-api::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
 
diff --git a/osgi.cmpn-6.0.0.jar b/osgi.cmpn-6.0.0.jar
deleted file mode 100644
index 77cea15..0000000
--- a/osgi.cmpn-6.0.0.jar
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:dbe06105a0e3e46bc88425b3d7c682a2d8b6bd055341913b6c37e998c00c9176
-size 958829
diff --git a/osgi.cmpn-7.0.0.jar b/osgi.cmpn-7.0.0.jar
new file mode 100644
index 0000000..f1c3958
--- /dev/null
+++ b/osgi.cmpn-7.0.0.jar
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8e6445afe1abb3dcd43c60c8cd6c0f15b052a8f4228812559ba521c5ce91db34
+size 1478661