.gitignore

@@ -1 +1 @@
-SOURCES/osgi.annotation-6.0.0-sources.jar
+SOURCES/osgi.annotation-8.0.0.jar

.osgi-annotation.metadata

@@ -1 +1 @@
-09b256fd1357d5f8cb85e35f6c9ef460ce42cb16 SOURCES/osgi.annotation-6.0.0-sources.jar
+5bef633a1ec605ee7af1db5ed999202559ce093d SOURCES/osgi.annotation-8.0.0.jar

SOURCES/osgi.annotation-8.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>
+  <version>8.0.0</version>
-  <description>OSGi Annotation Release 6, Annotations for use in compiling bundles.</description>
+  <description>OSGi Annotation Release 8, 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>
+      <name>Apache-2.0</name>
-      <url>http://opensource.org/licenses/apache2.0.php</url>
+      <url>https://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>
+    <url>https://osgi.org/gitweb/build.git</url>
-    <connection>scm:git:https://www.osgi.org/members/git/build.git</connection>
+    <connection>scm:git:https://osgi.org/git/build.git</connection>
-    <developerConnection>scm:git:https://www.osgi.org/members/git/build.git</developerConnection>
+    <developerConnection>scm:git:https://osgi.org/git/build.git</developerConnection>
+    <tag>r8-core-final</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>

SPECS/osgi-annotation.spec

@@ -1,19 +1,24 @@
-Name:    osgi-annotation
+%bcond_with bootstrap
-Version: 6.0.0
+
-Release: 7%{?dist}
+Name:           osgi-annotation
-Summary: Annotations for use in compiling OSGi bundles
+Version:        8.0.0
+Release:        5%{?dist}
+Summary:        Annotations for use in compiling OSGi bundles
+License:        ASL 2.0
+URL:            https://www.osgi.org
+BuildArch:      noarch
 
-License: ASL 2.0
-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
+Source0:        https://repo1.maven.org/maven2/org/osgi/osgi.annotation/%{version}/osgi.annotation-%{version}.jar
-Source1: http://repo1.maven.org/maven2/org/osgi/osgi.annotation/%{version}/osgi.annotation-%{version}.pom
+Source1:        https://repo1.maven.org/maven2/org/osgi/osgi.annotation/%{version}/osgi.annotation-%{version}.pom
-
-BuildArch:     noarch
 
-BuildRequires: maven-local
+BuildRequires:  maven-local
-BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
+%if %{with bootstrap}
+BuildRequires:  javapackages-bootstrap
+%else
+BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
+%endif
 
 %description
 Annotations for use in compiling OSGi bundles. This package is not normally
@@ -28,8 +33,10 @@ This package contains the API documentation for %{name}.
 %prep
 %setup -c -q
 
-mkdir -p src/main/resources && mv about.html src/main/resources
+mkdir -p src/main/java && mv OSGI-OPT/src/org src/main/java
-mkdir -p src/main/java && mv org src/main/java
+
+rm -r org OSGI-OPT
+
 cp -p %{SOURCE1} pom.xml
 
 # Ensure OSGi metadata is generated
@@ -61,16 +68,59 @@ cp -p %{SOURCE1} pom.xml
 %mvn_install
 
 %files -f .mfiles
-%doc LICENSE
+%license LICENSE
-%dir %{_javadir}/osgi-annotation
+%doc about.html
-%dir %{_mavenpomdir}/osgi-annotation
 
 %files javadoc -f .mfiles-javadoc
 %doc LICENSE
 
 %changelog
-* Tue Dec 12 2023 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 6.0.0-7
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 8.0.0-5
-- Rebuilt for MSVSphere 8.8
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
+
+* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 8.0.0-4
+- Rebuild to workaround DistroBaker issue
+
+* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 8.0.0-3
+- Bootstrap Maven for CentOS Stream 9
+
+* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 8.0.0-2
+- Bootstrap build
+- Non-bootstrap build
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 7.0.0-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Fri Jan 15 2021 Marian Koncek <mkoncek@redhat.com> - 8.0.0-1
+- Update to upstream version 8.0.0
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 7.0.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Sat Jul 11 2020 Jiri Vanek <jvanek@redhat.com> - 7.0.0-5
+- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 7.0.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 7.0.0-3
+- Mass rebuild for javapackages-tools 201902
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 7.0.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 7.0.0-2
+- Mass rebuild for javapackages-tools 201901
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 7.0.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Tue Nov 20 2018 Marian Koncek <mkoncek@redhat.com> - 7.0.0-1
+- Update to upstream version 7.0.0
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 6.0.0-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
 * Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 6.0.0-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild