diff --git a/SPECS-EXTENDED/osgi-compendium/osgi-compendium.spec b/SPECS-EXTENDED/osgi-compendium/osgi-compendium.spec index 1307a415f7c..62df804437f 100644 --- a/SPECS-EXTENDED/osgi-compendium/osgi-compendium.spec +++ b/SPECS-EXTENDED/osgi-compendium/osgi-compendium.spec @@ -20,7 +20,7 @@ Distribution: Azure Linux Name: osgi-compendium Version: 7.0.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Interfaces and Classes for use in compiling OSGi bundles License: Apache-2.0 Group: Development/Libraries/Java @@ -108,10 +108,14 @@ install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}/osgi.cmpn.pom # javadoc install -dm 0755 %{buildroot}%{_javadocdir}/%{name} cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/ +mv %{buildroot}%{_javadocdir}/%{name}/legal/ADDITIONAL_LICENSE_INFO . +mv %{buildroot}%{_javadocdir}/%{name}/legal/LICENSE . + %fdupes -s %{buildroot}%{_javadocdir} %files -f .mfiles %license LICENSE +%license ADDITIONAL_LICENSE_INFO %doc about.html %files javadoc @@ -119,6 +123,10 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/ %{_javadocdir}/%{name} %changelog +* Wed Dec 24 2025 Durga Jagadeesh Palli - 7.0.0-3 +- address license warning. +- License verified + * Thu Oct 14 2021 Pawel Winogrodzki - 7.0.0-2 - Converting the 'Release' tag to the '[number].[distribution]' format. diff --git a/SPECS-EXTENDED/osgi-core/osgi-core-build.xml b/SPECS-EXTENDED/osgi-core/osgi-core-build.xml index eb4671f5416..cce1cd290e0 100644 --- a/SPECS-EXTENDED/osgi-core/osgi-core-build.xml +++ b/SPECS-EXTENDED/osgi-core/osgi-core-build.xml @@ -6,13 +6,13 @@ - + - - + + @@ -110,12 +110,12 @@ - - + + - + diff --git a/SPECS-EXTENDED/osgi-core/osgi-core.signatures.json b/SPECS-EXTENDED/osgi-core/osgi-core.signatures.json index 604efa9f425..3a42ec49814 100644 --- a/SPECS-EXTENDED/osgi-core/osgi-core.signatures.json +++ b/SPECS-EXTENDED/osgi-core/osgi-core.signatures.json @@ -1,8 +1,8 @@ { "Signatures": { "LICENSE-2.0": "cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30", - "osgi-core-build.xml": "d9499d11320d38261befe31bbdbfbd4552762fcb6ea8d9ee24af3f39db938d41", - "osgi.core-7.0.0-sources.jar": "e25ca4d936521cd1cd67f655ec01f57ce5e0316be9edc99f8a2f985580b10f9c", - "osgi.core-7.0.0.pom": "d51d5fd23e1e6e0d3babdbd82a2b922e3a7ddbe19dadc0e00504affb9090098e" + "osgi-core-build.xml": "476eb29bb6b1fb401bc4da55d5725c07678a377e843c8d4820287a91da84bdac", + "osgi.core-8.0.0-sources.jar": "df92374f65300db3b22927ef5d0cb654db2ba0cfba459c45917bf8735920b280", + "osgi.core-8.0.0.pom": "651f76ba29bb4392d36aea56f7d0b0c82fc4917024d9e6a843774bba5015eb53" } -} +} \ No newline at end of file diff --git a/SPECS-EXTENDED/osgi-core/osgi-core.spec b/SPECS-EXTENDED/osgi-core/osgi-core.spec index 59faea118cd..f1d9df81702 100644 --- a/SPECS-EXTENDED/osgi-core/osgi-core.spec +++ b/SPECS-EXTENDED/osgi-core/osgi-core.spec @@ -3,7 +3,7 @@ Distribution: Azure Linux # # spec file for package osgi-core # -# 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,8 +19,8 @@ Distribution: Azure Linux Name: osgi-core -Version: 7.0.0 -Release: 2%{?dist} +Version: 8.0.0 +Release: 1%{?dist} Summary: OSGi Core API License: Apache-2.0 Group: Development/Libraries/Java @@ -31,13 +31,13 @@ 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: osgi-annotation BuildRequires: unzip BuildArch: noarch %description -OSGi Core Release 7, Interfaces and Classes for use in compiling bundles. +OSGi Core Release 8, Interfaces and Classes for use in compiling bundles. %package javadoc Summary: API documentation for %{name} @@ -94,16 +94,24 @@ install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}/osgi.core.pom # javadoc install -dm 0755 %{buildroot}%{_javadocdir}/%{name} cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/ +mv %{buildroot}%{_javadocdir}/%{name}/legal/ADDITIONAL_LICENSE_INFO . +mv %{buildroot}%{_javadocdir}/%{name}/legal/LICENSE . + %fdupes -s %{buildroot}%{_javadocdir} %files -f .mfiles %license LICENSE +%license ADDITIONAL_LICENSE_INFO %files javadoc %license LICENSE %{_javadocdir}/%{name} %changelog +* Wed Dec 17 2025 Durga Jagadeesh Palli - 8.0.0-1 +- Upgrade to 8.0.0 (Reference: openSUSE Tumbleweed) +- License verified + * Thu Oct 14 2021 Pawel Winogrodzki - 7.0.0-2 - Converting the 'Release' tag to the '[number].[distribution]' format. diff --git a/SPECS-EXTENDED/osgi-core/osgi.core-7.0.0.pom b/SPECS-EXTENDED/osgi-core/osgi.core-8.0.0.pom similarity index 75% rename from SPECS-EXTENDED/osgi-core/osgi.core-7.0.0.pom rename to SPECS-EXTENDED/osgi-core/osgi.core-8.0.0.pom index ee61e137004..c15b493c331 100644 --- a/SPECS-EXTENDED/osgi-core/osgi.core-7.0.0.pom +++ b/SPECS-EXTENDED/osgi-core/osgi.core-8.0.0.pom @@ -3,8 +3,8 @@ 4.0.0 org.osgi osgi.core - 7.0.0 - OSGi Core Release 7, Interfaces and Classes for use in compiling bundles + 8.0.0 + OSGi Core Release 8, Interfaces and Classes for use in compiling bundles org.osgi:osgi.core https://www.osgi.org/ @@ -14,7 +14,7 @@ Apache-2.0 - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 repo Apache License, Version 2.0 @@ -23,7 +23,7 @@ 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 + r8-core-final @@ -34,4 +34,12 @@ https://www.osgi.org/ + + + org.osgi + osgi.annotation + 7.0.0 + provided + + diff --git a/cgmanifest.json b/cgmanifest.json index 3d426f14bb3..39f3801afd1 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -15713,8 +15713,8 @@ "type": "other", "other": { "name": "osgi-core", - "version": "7.0.0", - "downloadUrl": "https://repo1.maven.org/maven2/org/osgi/osgi.core/7.0.0/osgi.core-7.0.0-sources.jar" + "version": "8.0.0", + "downloadUrl": "https://repo1.maven.org/maven2/org/osgi/osgi.core/8.0.0/osgi.core-8.0.0-sources.jar" } } },