Upgrade: osgi-annotation to the version 8.1.0 (microsoft#13896)

Co-authored-by: Sandeep Karambelkar <[email protected]>

Author: durgajagadeesh

SPECS-EXTENDED/osgi-annotation/osgi-annotation-build.xml

@@ -8,13 +8,13 @@
 
   <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"/>
   <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.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"/>
 
   <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;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}"/>

SPECS-EXTENDED/osgi-annotation/osgi-annotation.signatures.json

@@ -1,8 +1,8 @@
 {
  "Signatures": {
   "LICENSE-2.0": "cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30",
-  "osgi-annotation-build.xml": "455668ebead4b9060352ac683fcd4b4508963e4598d4c346d8b0902ec86f66c3",
-  "osgi.annotation-7.0.0-sources.jar": "57e6da6079004fb2e5d249be66ada95a9b8c1bf8be2155c6714b66d307eb0a95",
-  "osgi.annotation-7.0.0.pom": "f47e44669cc613b5c13d38768171d0d2344af83fe3cc7f33ea5fae146afdfcb5"
+  "osgi-annotation-build.xml": "440bd47d2d47ddbc85d26ce59eaa4def9cb4d707d6c4a78d6dbb1daf1b2ca163",
+  "osgi.annotation-8.1.0-sources.jar": "b1f418597a5029764973731d9e68835f13eb3bf4e7a69898e690ec50445a7a76",
+  "osgi.annotation-8.1.0.pom": "229a7e0c6023e693e50b93bcd30e49d1cd10e519d9615e18696dd0ecfa1b9dd7"
  }
 }

SPECS-EXTENDED/osgi-annotation/osgi-annotation.spec

@@ -1,9 +1,10 @@
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
+
 #
 # spec file for package osgi-annotation
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -19,12 +20,12 @@ Distribution:   Azure Linux
 
 
 Name:           osgi-annotation
-Version:        7.0.0
-Release:        2%{?dist}
+Version:        8.1.0
+Release:        1%{?dist}
 Summary:        Annotations for use in compiling OSGi bundles
 License:        Apache-2.0
 Group:          Development/Libraries/Java
-URL:            http://www.osgi.org/
+URL:            https://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:        https://repo1.maven.org/maven2/org/osgi/osgi.annotation/%{version}/osgi.annotation-%{version}-sources.jar
@@ -33,7 +34,7 @@ Source2:        http://www.apache.org/licenses/LICENSE-2.0
 Source3:        %{name}-build.xml
 BuildRequires:  ant
 BuildRequires:  fdupes
-BuildRequires:  javapackages-local-bootstrap
+BuildRequires:  javapackages-local-bootstrap >= 6
 BuildRequires:  unzip
 BuildArch:      noarch
 
@@ -88,25 +89,37 @@ install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}/osgi.annotation.pom
 %add_maven_depmap %{name}/osgi.annotation.pom %{name}/osgi.annotation.jar -a org.osgi:org.osgi.annotation
 # javadoc
 install -dm 0744 %{buildroot}%{_javadocdir}/%{name}
+install -dm 0755 %{buildroot}%{_docdir}/%{name}
 cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
+mv %{buildroot}%{_javadocdir}/%{name}/legal/ADDITIONAL_LICENSE_INFO .
 %fdupes -s %{buildroot}%{_javadocdir}
 
+# Remove LICENSE from javadoc directory to avoid duplicate license warning
+rm -f %{buildroot}%{_javadocdir}/%{name}/legal/LICENSE
+
 %files -f .mfiles
 %license LICENSE
+%license ADDITIONAL_LICENSE_INFO
 
 %files javadoc
-%license LICENSE
 %{_javadocdir}/%{name}
 
 %changelog
-* Thu Oct 14 2021 Pawel Winogrodzki <[email protected]> - 7.0.0-2
-- Converting the 'Release' tag to the '[number].[distribution]' format.
-
-* Mon Nov 16 2020 Ruying Chen <[email protected]> - 7.0.0-1.4
-- Initial CBL-Mariner import from openSUSE Tumbleweed (license: same as "License" tag).
-- Use javapackages-local-bootstrap to avoid build cycle.
-
+* Tue May 27 2025 Durga Jagadeesh Palli <[email protected]> - 8.1.0-1
+- Initial Azure Linux import from openSUSE Tumbleweed (license: same as "License" tag).
+- Fixed duplicate LICENSE warning
+- Marked extra legal files as documentation.
+- License verified
+
+* Wed Oct  2 2024 Fridrich Strba <[email protected]>
+- Spec file cleanup
+* Sat Sep  2 2023 Fridrich Strba <[email protected]>
+- Upgrade to the upstream version 8.1.0
+  * no upstream changes
+* Sun Mar 20 2022 Fridrich Strba <[email protected]>
+- Build with source and target levels 8
 * Wed Apr  1 2020 Fridrich Strba <[email protected]>
 - Upgrade to the upstream version 7.0.0
+  * no upstream changes
 * Mon Feb 11 2019 Fridrich Strba <[email protected]>
 - Initial packaging of osgi-annotations 6.0.0

SPECS-EXTENDED/osgi-annotation/osgi.annotation-7.0.0.pom renamed to SPECS-EXTENDED/osgi-annotation/osgi.annotation-8.1.0.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.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>
-    <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:[email protected]:osgi/osgi.git</developerConnection>
+    <tag>8.0.0.1</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>

cgmanifest.json

@@ -15713,8 +15713,8 @@
         "type": "other",
         "other": {
           "name": "osgi-annotation",
-          "version": "7.0.0",
-          "downloadUrl": "https://repo1.maven.org/maven2/org/osgi/osgi.annotation/7.0.0/osgi.annotation-7.0.0-sources.jar"
+          "version": "8.1.0",
+          "downloadUrl": "https://repo1.maven.org/maven2/org/osgi/osgi.annotation/8.1.0/osgi.annotation-8.1.0-sources.jar"
         }
       }
     },