diff --git a/osgi-core-build.xml b/osgi-core-build.xml
index 4915f0b..52c6473 100644
--- a/osgi-core-build.xml
+++ b/osgi-core-build.xml
@@ -6,13 +6,13 @@
   <!-- Build environment 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.core"/>
   <property name="project.groupId" value="org.osgi"/>
-  <property name="project.version" value="7.0.0"/>
-  <property name="project.description" value="OSGi Core Release 7, Interfaces and Classes for use in compiling bundles."/>
+  <property name="project.version" value="8.0.0"/>
+  <property name="project.description" value="OSGi Core 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}"/>
diff --git a/osgi-core.spec b/osgi-core.spec
index 8f22c47..2b26977 100644
--- a/osgi-core.spec
+++ b/osgi-core.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package osgi-core
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:           osgi-core
-Version:        7.0.0
+Version:        8.0.0
 Release:        0
 Summary:        OSGi Core API
 License:        Apache-2.0
diff --git a/osgi.core-7.0.0-sources.jar b/osgi.core-7.0.0-sources.jar
deleted file mode 100644
index acf028d..0000000
--- a/osgi.core-7.0.0-sources.jar
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e25ca4d936521cd1cd67f655ec01f57ce5e0316be9edc99f8a2f985580b10f9c
-size 300171
diff --git a/osgi.core-8.0.0-sources.jar b/osgi.core-8.0.0-sources.jar
new file mode 100644
index 0000000..660e7a5
--- /dev/null
+++ b/osgi.core-8.0.0-sources.jar
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:df92374f65300db3b22927ef5d0cb654db2ba0cfba459c45917bf8735920b280
+size 333124
diff --git a/osgi.core-7.0.0.pom b/osgi.core-8.0.0.pom
similarity index 75%
rename from osgi.core-7.0.0.pom
rename to osgi.core-8.0.0.pom
index 545edf5..450a713 100644
--- a/osgi.core-7.0.0.pom
+++ b/osgi.core-8.0.0.pom
@@ -3,8 +3,8 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.osgi</groupId>
   <artifactId>osgi.core</artifactId>
-  <version>7.0.0</version>
-  <description>OSGi Core Release 7, Interfaces and Classes for use in compiling bundles</description>
+  <version>8.0.0</version>
+  <description>OSGi Core Release 8, Interfaces and Classes for use in compiling bundles</description>
   <name>org.osgi:osgi.core</name>
   <url>https://www.osgi.org/</url>
   <organization>
@@ -14,7 +14,7 @@
   <licenses>
     <license>
       <name>Apache-2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+      <url>https://www.apache.org/licenses/LICENSE-2.0</url>
       <distribution>repo</distribution>
       <comments>Apache License, Version 2.0</comments>
     </license>
@@ -23,7 +23,7 @@
     <url>https://osgi.org/gitweb/build.git</url>
     <connection>scm:git:https://osgi.org/git/build.git</connection>
     <developerConnection>scm:git:https://osgi.org/git/build.git</developerConnection>
-    <tag>hudson-build.core-1432</tag>
+    <tag>r8-core-final</tag>
   </scm>
   <developers>
     <developer>
@@ -34,4 +34,12 @@
       <organizationUrl>https://www.osgi.org/</organizationUrl>
     </developer>
   </developers>
+  <dependencies>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>osgi.annotation</artifactId>
+      <version>7.0.0</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
 </project>