.gitignore

@@ -1 +1 @@
-SOURCES/osgi.annotation-8.0.0.jar
+SOURCES/osgi.annotation-8.1.0.jar

.osgi-annotation.metadata

@@ -1 +1 @@
-5bef633a1ec605ee7af1db5ed999202559ce093d SOURCES/osgi.annotation-8.0.0.jar
+59d42736bcc0af2144ba5c1a12ff7c08ea4b7e12 SOURCES/osgi.annotation-8.1.0.jar

SOURCES/osgi.annotation-8.1.0.pom

@@ -3,34 +3,33 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.osgi</groupId>
   <artifactId>osgi.annotation</artifactId>
-  <version>8.0.0</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://www.osgi.org/</url>
+  <url>https://docs.osgi.org/</url>
   <organization>
-    <name>OSGi Alliance</name>
+    <name>Eclipse Foundation</name>
-    <url>https://www.osgi.org/</url>
   </organization>
   <licenses>
     <license>
       <name>Apache-2.0</name>
-      <url>https://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>
+    <url>https://github.com/osgi/osgi</url>
-    <connection>scm:git:https://osgi.org/git/build.git</connection>
+    <connection>scm:git:https://github.com/osgi/osgi.git</connection>
-    <developerConnection>scm:git:https://osgi.org/git/build.git</developerConnection>
+    <developerConnection>scm:git:git@github.com:osgi/osgi.git</developerConnection>
-    <tag>r8-core-final</tag>
+    <tag>8.0.0.1</tag>
   </scm>
   <developers>
     <developer>
       <id>osgi</id>
-      <email>info@osgi.org</email>
+      <email>osgi-wg@eclipse.org</email>
-      <name>OSGi Alliance</name>
+      <name>OSGi Working Group</name>
-      <organization>OSGi Alliance</organization>
+      <organization>Eclipse Foundation</organization>
       <organizationUrl>https://www.osgi.org/</organizationUrl>
     </developer>
   </developers>

SPECS/osgi-annotation.spec

@@ -1,22 +1,23 @@
 %bcond_with bootstrap
 
 Name:           osgi-annotation
-Version:        8.0.0
+Version:        8.1.0
-Release:        5%{?dist}
+Release:        7%{?dist}
 Summary:        Annotations for use in compiling OSGi bundles
-License:        ASL 2.0
+License:        Apache-2.0
 URL:            https://www.osgi.org
 BuildArch:      noarch
+ExclusiveArch:  %{java_arches} noarch
 
 # Upstream project is behind an account registration system with no anonymous
 # read access, so we download the source from maven central instead
 Source0:        https://repo1.maven.org/maven2/org/osgi/osgi.annotation/%{version}/osgi.annotation-%{version}.jar
 Source1:        https://repo1.maven.org/maven2/org/osgi/osgi.annotation/%{version}/osgi.annotation-%{version}.pom
 
-BuildRequires:  maven-local
 %if %{with bootstrap}
 BuildRequires:  javapackages-bootstrap
 %else
+BuildRequires:  maven-local
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
 %endif
 
@@ -62,28 +63,70 @@ cp -p %{SOURCE1} pom.xml
 %mvn_alias org.osgi:osgi.annotation org.osgi:org.osgi.annotation
 
 %build
-%mvn_build
+%mvn_build -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8
 
 %install
 %mvn_install
 
 %files -f .mfiles
-%license LICENSE
+%license META-INF/LICENSE META-INF/NOTICE
-%doc about.html
 
 %files javadoc -f .mfiles-javadoc
-%doc LICENSE
+%license META-INF/LICENSE META-INF/NOTICE
 
 %changelog
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 8.0.0-5
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 8.1.0-7
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- Bump release for October 2024 mass rebuild:
-  Related: rhbz#1991688
+  Resolves: RHEL-64018
+
+* Fri Oct 25 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 8.1.0-6
+- Rebuilt for MSVSphere 10
+
+* Mon Aug 05 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 8.1.0-6
+- Switch Java compiler source/target to 1.8
+- Resolves: RHEL-52702
+
+* Thu Aug 01 2024 Troy Dawson <tdawson@redhat.com> - 8.1.0-6
+- Bump release for Aug 2024 java mass rebuild
+
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 8.1.0-5
+- Bump release for June 2024 mass rebuild
+
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 8.1.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 8.1.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Sep 01 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 8.1.0-2
+- Convert License tag to SPDX format
+
+* Thu Aug 17 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 8.1.0-1
+- Update to upstream version 8.1.0
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 8.0.1-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 8.0.1-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 8.0.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 8.0.1-4
+- Rebuilt for java-17-openjdk as system jdk
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 8.0.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Tue Nov 02 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 8.0.1-2
+- Set explicit Java compiler source/target levels to 1.7
 
-* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 8.0.0-4
+* Wed Oct 13 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 8.0.1-1
-- Rebuild to workaround DistroBaker issue
+- Update to upstream version 8.0.1
 
-* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 8.0.0-3
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 8.0.0-3
-- Bootstrap Maven for CentOS Stream 9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
 * Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 8.0.0-2
 - Bootstrap build