diff --git a/SPECS-EXTENDED/osgi-annotation/osgi-annotation-build.xml b/SPECS-EXTENDED/osgi-annotation/osgi-annotation-build.xml index df51dd9c1fc..bec718c1979 100644 --- a/SPECS-EXTENDED/osgi-annotation/osgi-annotation-build.xml +++ b/SPECS-EXTENDED/osgi-annotation/osgi-annotation-build.xml @@ -8,13 +8,13 @@ - + - - + + @@ -96,7 +96,7 @@ - + diff --git a/SPECS-EXTENDED/osgi-annotation/osgi-annotation.signatures.json b/SPECS-EXTENDED/osgi-annotation/osgi-annotation.signatures.json index b8e7b0e3f75..8fd11af8ae0 100644 --- a/SPECS-EXTENDED/osgi-annotation/osgi-annotation.signatures.json +++ b/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" } } diff --git a/SPECS-EXTENDED/osgi-annotation/osgi-annotation.spec b/SPECS-EXTENDED/osgi-annotation/osgi-annotation.spec index 25178ffa660..6425d612a3e 100644 --- a/SPECS-EXTENDED/osgi-annotation/osgi-annotation.spec +++ b/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 @@ -99,14 +100,19 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/ %{_javadocdir}/%{name} %changelog -* Thu Oct 14 2021 Pawel Winogrodzki - 7.0.0-2 -- Converting the 'Release' tag to the '[number].[distribution]' format. - -* Mon Nov 16 2020 Ruying Chen - 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 - 8.1.0-1 +- Initial Azure Linux import from openSUSE Tumbleweed (license: same as "License" tag). +- License verified + +* Wed Oct 2 2024 Fridrich Strba +- Spec file cleanup +* Sat Sep 2 2023 Fridrich Strba +- Upgrade to the upstream version 8.1.0 + * no upstream changes +* Sun Mar 20 2022 Fridrich Strba +- Build with source and target levels 8 * Wed Apr 1 2020 Fridrich Strba - Upgrade to the upstream version 7.0.0 + * no upstream changes * Mon Feb 11 2019 Fridrich Strba - Initial packaging of osgi-annotations 6.0.0 diff --git a/SPECS-EXTENDED/osgi-annotation/osgi.annotation-7.0.0.pom b/SPECS-EXTENDED/osgi-annotation/osgi.annotation-8.1.0.pom similarity index 51% rename from SPECS-EXTENDED/osgi-annotation/osgi.annotation-7.0.0.pom rename to SPECS-EXTENDED/osgi-annotation/osgi.annotation-8.1.0.pom index 9b410586b15..a219f742521 100644 --- a/SPECS-EXTENDED/osgi-annotation/osgi.annotation-7.0.0.pom +++ b/SPECS-EXTENDED/osgi-annotation/osgi.annotation-8.1.0.pom @@ -3,34 +3,33 @@ 4.0.0 org.osgi osgi.annotation - 7.0.0 - OSGi Annotation Release 7, Annotations for use in compiling bundles + 8.1.0 + OSGi Annotation Release 8, Annotations for use in compiling bundles org.osgi:osgi.annotation - https://www.osgi.org/ + https://docs.osgi.org/ - OSGi Alliance - https://www.osgi.org/ + Eclipse Foundation Apache-2.0 - http://www.apache.org/licenses/LICENSE-2.0 + https://opensource.org/licenses/Apache-2.0 repo - Apache License, Version 2.0 + This program and the accompanying materials are made available under the terms of the Apache License, Version 2.0. - https://osgi.org/gitweb/build.git - scm:git:https://osgi.org/git/build.git - scm:git:https://osgi.org/git/build.git - hudson-build.core-1432 + https://github.com/osgi/osgi + scm:git:https://github.com/osgi/osgi.git + scm:git:git@github.com:osgi/osgi.git + 8.0.0.1 osgi - info@osgi.org - OSGi Alliance - OSGi Alliance + osgi-wg@eclipse.org + OSGi Working Group + Eclipse Foundation https://www.osgi.org/ diff --git a/cgmanifest.json b/cgmanifest.json index ca4c107a5d5..a1d692a9a32 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -15653,8 +15653,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" } } },