diff --git a/LICENSE-2.0 b/LICENSE-2.0
new file mode 100644
index 0000000..81fbaf6
--- /dev/null
+++ b/LICENSE-2.0
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/osgi-annotation-build.xml b/osgi-annotation-build.xml
index 7afd7e2..978dc14 100644
--- a/osgi-annotation-build.xml
+++ b/osgi-annotation-build.xml
@@ -13,15 +13,14 @@
   
   <property name="project.artifactId" value="osgi.annotation"/>
   <property name="project.groupId" value="org.osgi"/>
-  <property name="project.version" value="6.0.0"/>
-  <property name="project.description" value="OSGi Annotation Release 6, Annotations for use in compiling bundles."/>
+  <property name="project.version" value="7.0.0"/>
+  <property name="project.description" value="OSGi Annotation Release 7, Annotations for use in compiling bundles."/>
   <property name="project.organization.name" value="OSGi Alliance"/>
 
   <property name="build.finalName" value="${project.artifactId}-${project.version}"/>
   <property name="build.dir" value="target"/>
   <property name="build.outputDir" value="${build.dir}/classes"/>
   <property name="build.srcDir" value="src/main/java"/>
-  <property name="build.resourceDir" value="src/main/resources"/>
 
   <property name="reporting.outputDirectory" value="${build.dir}/site"/>
 
@@ -52,9 +51,6 @@
         <pathelement location="${build.srcDir}"/>
       </src>
     </javac>
-    <copy todir="${build.outputDir}">
-      <fileset dir="${build.resourceDir}"/>
-    </copy>
   </target>
 
   <!-- ====================================================================== -->
@@ -100,7 +96,7 @@
         <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.annotation.versioning;version=&quot;1.0&quot;"/>
+		<attribute name="Export-Package" value="org.osgi.annotation.versioning;version=&quot;1.1&quot;,org.osgi.annotation.bundle;version=&quot;1.0&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-annotation.spec b/osgi-annotation.spec
index 2a37adb..725330f 100644
--- a/osgi-annotation.spec
+++ b/osgi-annotation.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package osgi-annotation
 #
-# 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,7 +17,7 @@
 
 
 Name:           osgi-annotation
-Version:        6.0.0
+Version:        7.0.0
 Release:        0
 Summary:        Annotations for use in compiling OSGi bundles
 License:        Apache-2.0
@@ -25,9 +25,10 @@ Group:          Development/Libraries/Java
 URL:            http://www.osgi.org/
 # Upstream project is behind an account registration system with no anonymous
 # read access, so we download the source from maven central instead
-Source0:        http://repo1.maven.org/maven2/org/osgi/osgi.annotation/%{version}/osgi.annotation-%{version}-sources.jar
-Source1:        http://repo1.maven.org/maven2/org/osgi/osgi.annotation/%{version}/osgi.annotation-%{version}.pom
-Source2:        %{name}-build.xml
+Source0:        https://repo1.maven.org/maven2/org/osgi/osgi.annotation/%{version}/osgi.annotation-%{version}-sources.jar
+Source1:        https://repo1.maven.org/maven2/org/osgi/osgi.annotation/%{version}/osgi.annotation-%{version}.pom
+Source2:        http://www.apache.org/licenses/LICENSE-2.0
+Source3:        %{name}-build.xml
 BuildRequires:  ant
 BuildRequires:  fdupes
 BuildRequires:  javapackages-local
@@ -48,10 +49,10 @@ This package contains the API documentation for %{name}.
 %prep
 %setup -q -c
 
-mkdir -p src/main/resources && mv about.html src/main/resources
 mkdir -p src/main/java && mv org src/main/java
 cp -p %{SOURCE1} pom.xml
-cp -p %{SOURCE2} build.xml
+cp -p %{SOURCE2} LICENSE
+cp -p %{SOURCE3} build.xml
 
 # Ensure OSGi metadata is generated
 %pom_xpath_inject pom:project "
diff --git a/osgi.annotation-6.0.0-sources.jar b/osgi.annotation-6.0.0-sources.jar
deleted file mode 100644
index 7022cfe..0000000
--- a/osgi.annotation-6.0.0-sources.jar
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f0490148ecfb840bec25df0b8b01392bd7022fbc67a176b6c1ce8fdb28468804
-size 9887
diff --git a/osgi.annotation-7.0.0-sources.jar b/osgi.annotation-7.0.0-sources.jar
new file mode 100644
index 0000000..a1740bd
--- /dev/null
+++ b/osgi.annotation-7.0.0-sources.jar
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:57e6da6079004fb2e5d249be66ada95a9b8c1bf8be2155c6714b66d307eb0a95
+size 17293
diff --git a/osgi.annotation-6.0.0.pom b/osgi.annotation-7.0.0.pom
similarity index 54%
rename from osgi.annotation-6.0.0.pom
rename to osgi.annotation-7.0.0.pom
index 0c4f3e4..b22feb3 100644
--- a/osgi.annotation-6.0.0.pom
+++ b/osgi.annotation-7.0.0.pom
@@ -3,25 +3,27 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.osgi</groupId>
   <artifactId>osgi.annotation</artifactId>
-  <version>6.0.0</version>
-  <description>OSGi Annotation Release 6, Annotations for use in compiling bundles.</description>
+  <version>7.0.0</version>
+  <description>OSGi Annotation Release 7, Annotations for use in compiling bundles</description>
   <name>org.osgi:osgi.annotation</name>
-  <url>http://www.osgi.org/</url>
+  <url>https://www.osgi.org/</url>
   <organization>
     <name>OSGi Alliance</name>
-    <url>http://www.osgi.org/</url>
+    <url>https://www.osgi.org/</url>
   </organization>
   <licenses>
     <license>
-      <name>Apache License, Version 2.0</name>
-      <url>http://opensource.org/licenses/apache2.0.php</url>
+      <name>Apache-2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0</url>
       <distribution>repo</distribution>
+      <comments>Apache License, Version 2.0</comments>
     </license>
   </licenses>
   <scm>
-    <url>https://www.osgi.org/members/git/build.git</url>
-    <connection>scm:git:https://www.osgi.org/members/git/build.git</connection>
-    <developerConnection>scm:git:https://www.osgi.org/members/git/build.git</developerConnection>
+    <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>
   </scm>
   <developers>
     <developer>
@@ -29,6 +31,7 @@
       <email>info@osgi.org</email>
       <name>OSGi Alliance</name>
       <organization>OSGi Alliance</organization>
+      <organizationUrl>https://www.osgi.org/</organizationUrl>
     </developer>
   </developers>
 </project>