From a6ec660a1de8cf194088cc85e68d6d35250e4f4dee3d3a6c15c301bb3dbf9bce Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Fri, 11 Mar 2022 14:15:42 +0000
Subject: [PATCH 1/6] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/osgi-annotation?expand=0&rev=10

---
 osgi-annotation-build.xml                     |  6 ++---
 osgi-annotation.spec                          |  4 +--
 osgi.annotation-7.0.0-sources.jar             |  3 ---
 osgi.annotation-8.0.1-sources.jar             |  3 +++
 ...ion-7.0.0.pom => osgi.annotation-8.0.1.pom | 27 +++++++++----------
 5 files changed, 21 insertions(+), 22 deletions(-)
 delete mode 100644 osgi.annotation-7.0.0-sources.jar
 create mode 100644 osgi.annotation-8.0.1-sources.jar
 rename osgi.annotation-7.0.0.pom => osgi.annotation-8.0.1.pom (51%)

diff --git a/osgi-annotation-build.xml b/osgi-annotation-build.xml
index ece4e0e..ff1ad29 100644
--- a/osgi-annotation-build.xml
+++ b/osgi-annotation-build.xml
@@ -13,8 +13,8 @@
   
   <property name="project.artifactId" value="osgi.annotation"/>
   <property name="project.groupId" value="org.osgi"/>
-  <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.version" value="8.0.1"/>
+  <property name="project.description" value="OSGi Annotation Release 8, Annotations for use in compiling bundles."/>
   <property name="project.organization.name" value="OSGi Alliance"/>
 
   <property name="build.finalName" value="${project.artifactId}-${project.version}"/>
@@ -96,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.1&quot;,org.osgi.annotation.bundle;version=&quot;1.0&quot;"/>
+        <attribute name="Export-Package" value="org.osgi.annotation.bundle;version=&quot;1.1.1&quot;,org.osgi.annotation.versioning;version=&quot;1.1.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-annotation.spec b/osgi-annotation.spec
index 725330f..47b6f2c 100644
--- a/osgi-annotation.spec
+++ b/osgi-annotation.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package osgi-annotation
 #
-# 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-annotation
-Version:        7.0.0
+Version:        8.0.1
 Release:        0
 Summary:        Annotations for use in compiling OSGi bundles
 License:        Apache-2.0
diff --git a/osgi.annotation-7.0.0-sources.jar b/osgi.annotation-7.0.0-sources.jar
deleted file mode 100644
index a1740bd..0000000
--- a/osgi.annotation-7.0.0-sources.jar
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:57e6da6079004fb2e5d249be66ada95a9b8c1bf8be2155c6714b66d307eb0a95
-size 17293
diff --git a/osgi.annotation-8.0.1-sources.jar b/osgi.annotation-8.0.1-sources.jar
new file mode 100644
index 0000000..10fb95c
--- /dev/null
+++ b/osgi.annotation-8.0.1-sources.jar
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1239d8e863a6f9fa1f8a9d430843395f39956a25cabeb462f1f8dd41476e88bb
+size 18635
diff --git a/osgi.annotation-7.0.0.pom b/osgi.annotation-8.0.1.pom
similarity index 51%
rename from osgi.annotation-7.0.0.pom
rename to osgi.annotation-8.0.1.pom
index b22feb3..3e2985c 100644
--- a/osgi.annotation-7.0.0.pom
+++ b/osgi.annotation-8.0.1.pom
@@ -3,34 +3,33 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.osgi</groupId>
   <artifactId>osgi.annotation</artifactId>
-  <version>7.0.0</version>
-  <description>OSGi Annotation Release 7, Annotations for use in compiling bundles</description>
+  <version>8.0.1</version>
+  <description>OSGi Annotation Release 8, Annotations for use in compiling bundles</description>
   <name>org.osgi:osgi.annotation</name>
-  <url>https://www.osgi.org/</url>
+  <url>https://docs.osgi.org/</url>
   <organization>
-    <name>OSGi Alliance</name>
-    <url>https://www.osgi.org/</url>
+    <name>Eclipse Foundation</name>
   </organization>
   <licenses>
     <license>
       <name>Apache-2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+      <url>https://opensource.org/licenses/Apache-2.0</url>
       <distribution>repo</distribution>
-      <comments>Apache License, Version 2.0</comments>
+      <comments>This program and the accompanying materials are made available under the terms of the Apache License, Version 2.0.</comments>
     </license>
   </licenses>
   <scm>
-    <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>
+    <url>https://github.com/osgi/osgi</url>
+    <connection>scm:git:https://github.com/osgi/osgi.git</connection>
+    <developerConnection>scm:git:git@github.com:osgi/osgi.git</developerConnection>
+    <tag>r8-cmpn-final</tag>
   </scm>
   <developers>
     <developer>
       <id>osgi</id>
-      <email>info@osgi.org</email>
-      <name>OSGi Alliance</name>
-      <organization>OSGi Alliance</organization>
+      <email>osgi-wg@eclipse.org</email>
+      <name>OSGi Working Group</name>
+      <organization>Eclipse Foundation</organization>
       <organizationUrl>https://www.osgi.org/</organizationUrl>
     </developer>
   </developers>

From fcb531d208e9538c4ca773e92318bcdaf890826f3f10cf64e835d11f4f727b4e Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Fri, 11 Mar 2022 14:22:10 +0000
Subject: [PATCH 2/6] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/osgi-annotation?expand=0&rev=11

---
 osgi-annotation-build.xml                              | 4 ++--
 osgi-annotation.spec                                   | 2 +-
 osgi.annotation-8.0.1-sources.jar                      | 3 ---
 osgi.annotation-8.1.0-sources.jar                      | 3 +++
 osgi.annotation-8.0.1.pom => osgi.annotation-8.1.0.pom | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)
 delete mode 100644 osgi.annotation-8.0.1-sources.jar
 create mode 100644 osgi.annotation-8.1.0-sources.jar
 rename osgi.annotation-8.0.1.pom => osgi.annotation-8.1.0.pom (96%)

diff --git a/osgi-annotation-build.xml b/osgi-annotation-build.xml
index ff1ad29..77f3034 100644
--- a/osgi-annotation-build.xml
+++ b/osgi-annotation-build.xml
@@ -13,7 +13,7 @@
   
   <property name="project.artifactId" value="osgi.annotation"/>
   <property name="project.groupId" value="org.osgi"/>
-  <property name="project.version" value="8.0.1"/>
+  <property name="project.version" value="8.1.0"/>
   <property name="project.description" value="OSGi Annotation Release 8, Annotations for use in compiling bundles."/>
   <property name="project.organization.name" value="OSGi Alliance"/>
 
@@ -96,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.bundle;version=&quot;1.1.1&quot;,org.osgi.annotation.versioning;version=&quot;1.1.2&quot;"/>
+        <attribute name="Export-Package" value="org.osgi.annotation.bundle;version=&quot;2.0&quot;,org.osgi.annotation.versioning;version=&quot;1.1.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-annotation.spec b/osgi-annotation.spec
index 47b6f2c..a0a3059 100644
--- a/osgi-annotation.spec
+++ b/osgi-annotation.spec
@@ -17,7 +17,7 @@
 
 
 Name:           osgi-annotation
-Version:        8.0.1
+Version:        8.1.0
 Release:        0
 Summary:        Annotations for use in compiling OSGi bundles
 License:        Apache-2.0
diff --git a/osgi.annotation-8.0.1-sources.jar b/osgi.annotation-8.0.1-sources.jar
deleted file mode 100644
index 10fb95c..0000000
--- a/osgi.annotation-8.0.1-sources.jar
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1239d8e863a6f9fa1f8a9d430843395f39956a25cabeb462f1f8dd41476e88bb
-size 18635
diff --git a/osgi.annotation-8.1.0-sources.jar b/osgi.annotation-8.1.0-sources.jar
new file mode 100644
index 0000000..351cf2a
--- /dev/null
+++ b/osgi.annotation-8.1.0-sources.jar
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b1f418597a5029764973731d9e68835f13eb3bf4e7a69898e690ec50445a7a76
+size 18633
diff --git a/osgi.annotation-8.0.1.pom b/osgi.annotation-8.1.0.pom
similarity index 96%
rename from osgi.annotation-8.0.1.pom
rename to osgi.annotation-8.1.0.pom
index 3e2985c..dc327cf 100644
--- a/osgi.annotation-8.0.1.pom
+++ b/osgi.annotation-8.1.0.pom
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.osgi</groupId>
   <artifactId>osgi.annotation</artifactId>
-  <version>8.0.1</version>
+  <version>8.1.0</version>
   <description>OSGi Annotation Release 8, Annotations for use in compiling bundles</description>
   <name>org.osgi:osgi.annotation</name>
   <url>https://docs.osgi.org/</url>
@@ -22,7 +22,7 @@
     <url>https://github.com/osgi/osgi</url>
     <connection>scm:git:https://github.com/osgi/osgi.git</connection>
     <developerConnection>scm:git:git@github.com:osgi/osgi.git</developerConnection>
-    <tag>r8-cmpn-final</tag>
+    <tag>8.0.0.1</tag>
   </scm>
   <developers>
     <developer>

From f20423de74b673e753a73c06ed98ca1b9f6c27daa02847a08b6f0f67dbe62c47 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Tue, 15 Mar 2022 16:55:55 +0000
Subject: [PATCH 3/6] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/osgi-annotation?expand=0&rev=12

---
 osgi-annotation-build.xml                     |  6 ++---
 osgi-annotation.spec                          |  2 +-
 osgi.annotation-7.0.0-sources.jar             |  3 +++
 ...ion-8.1.0.pom => osgi.annotation-7.0.0.pom | 27 ++++++++++---------
 osgi.annotation-8.1.0-sources.jar             |  3 ---
 5 files changed, 21 insertions(+), 20 deletions(-)
 create mode 100644 osgi.annotation-7.0.0-sources.jar
 rename osgi.annotation-8.1.0.pom => osgi.annotation-7.0.0.pom (51%)
 delete mode 100644 osgi.annotation-8.1.0-sources.jar

diff --git a/osgi-annotation-build.xml b/osgi-annotation-build.xml
index 77f3034..ece4e0e 100644
--- a/osgi-annotation-build.xml
+++ b/osgi-annotation-build.xml
@@ -13,8 +13,8 @@
   
   <property name="project.artifactId" value="osgi.annotation"/>
   <property name="project.groupId" value="org.osgi"/>
-  <property name="project.version" value="8.1.0"/>
-  <property name="project.description" value="OSGi Annotation Release 8, 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}"/>
@@ -96,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.bundle;version=&quot;2.0&quot;,org.osgi.annotation.versioning;version=&quot;1.1.2&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 a0a3059..13158d2 100644
--- a/osgi-annotation.spec
+++ b/osgi-annotation.spec
@@ -17,7 +17,7 @@
 
 
 Name:           osgi-annotation
-Version:        8.1.0
+Version:        7.0.0
 Release:        0
 Summary:        Annotations for use in compiling OSGi bundles
 License:        Apache-2.0
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-8.1.0.pom b/osgi.annotation-7.0.0.pom
similarity index 51%
rename from osgi.annotation-8.1.0.pom
rename to osgi.annotation-7.0.0.pom
index dc327cf..b22feb3 100644
--- a/osgi.annotation-8.1.0.pom
+++ b/osgi.annotation-7.0.0.pom
@@ -3,33 +3,34 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.osgi</groupId>
   <artifactId>osgi.annotation</artifactId>
-  <version>8.1.0</version>
-  <description>OSGi Annotation Release 8, 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>https://docs.osgi.org/</url>
+  <url>https://www.osgi.org/</url>
   <organization>
-    <name>Eclipse Foundation</name>
+    <name>OSGi Alliance</name>
+    <url>https://www.osgi.org/</url>
   </organization>
   <licenses>
     <license>
       <name>Apache-2.0</name>
-      <url>https://opensource.org/licenses/Apache-2.0</url>
+      <url>http://www.apache.org/licenses/LICENSE-2.0</url>
       <distribution>repo</distribution>
-      <comments>This program and the accompanying materials are made available under the terms of the Apache License, Version 2.0.</comments>
+      <comments>Apache License, Version 2.0</comments>
     </license>
   </licenses>
   <scm>
-    <url>https://github.com/osgi/osgi</url>
-    <connection>scm:git:https://github.com/osgi/osgi.git</connection>
-    <developerConnection>scm:git:git@github.com:osgi/osgi.git</developerConnection>
-    <tag>8.0.0.1</tag>
+    <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>
       <id>osgi</id>
-      <email>osgi-wg@eclipse.org</email>
-      <name>OSGi Working Group</name>
-      <organization>Eclipse Foundation</organization>
+      <email>info@osgi.org</email>
+      <name>OSGi Alliance</name>
+      <organization>OSGi Alliance</organization>
       <organizationUrl>https://www.osgi.org/</organizationUrl>
     </developer>
   </developers>
diff --git a/osgi.annotation-8.1.0-sources.jar b/osgi.annotation-8.1.0-sources.jar
deleted file mode 100644
index 351cf2a..0000000
--- a/osgi.annotation-8.1.0-sources.jar
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b1f418597a5029764973731d9e68835f13eb3bf4e7a69898e690ec50445a7a76
-size 18633

From 4050e4eabc802b019c55016029ae8cca5fbe7a9bcc3067c1ed3c9c84b3d3b6f0 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Tue, 15 Mar 2022 16:56:38 +0000
Subject: [PATCH 4/6] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/osgi-annotation?expand=0&rev=13

---
 osgi-annotation.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osgi-annotation.spec b/osgi-annotation.spec
index 13158d2..725330f 100644
--- a/osgi-annotation.spec
+++ b/osgi-annotation.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package osgi-annotation
 #
-# Copyright (c) 2022 SUSE LLC
+# 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

From ccfa3136567a0c984ad8cd4f46eadf775bd5eb53df0da72cadbc831c7c21a3b1 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Sun, 20 Mar 2022 13:13:31 +0000
Subject: [PATCH 5/6] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/osgi-annotation?expand=0&rev=14

---
 osgi-annotation-build.xml | 2 +-
 osgi-annotation.spec      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osgi-annotation-build.xml b/osgi-annotation-build.xml
index ece4e0e..7d42877 100644
--- a/osgi-annotation-build.xml
+++ b/osgi-annotation-build.xml
@@ -8,7 +8,7 @@
 
   <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.annotation"/>
diff --git a/osgi-annotation.spec b/osgi-annotation.spec
index 725330f..13158d2 100644
--- a/osgi-annotation.spec
+++ b/osgi-annotation.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package osgi-annotation
 #
-# 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

From d51550fa8e78fc1ef3519c16b29cf209fbe2f86838f1cc9e53b98611e01ff34f Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Sun, 20 Mar 2022 13:13:52 +0000
Subject: [PATCH 6/6] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/osgi-annotation?expand=0&rev=15

---
 osgi-annotation.changes | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osgi-annotation.changes b/osgi-annotation.changes
index cc77ff0..a1b1148 100644
--- a/osgi-annotation.changes
+++ b/osgi-annotation.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Mar 20 13:13:35 UTC 2022 - Fridrich Strba <fstrba@suse.com>
+
+- Build with source and target levels 8
+
 -------------------------------------------------------------------
 Wed Apr  1 08:49:38 UTC 2020 - Fridrich Strba <fstrba@suse.com>