.fmf/version

@@ -1 +0,0 @@
-1

.gitignore

@@ -1,2 +1 @@
-/osgi.cmpn-6.0.0.jar
-/osgi.cmpn-7.0.0.jar
+SOURCES/osgi.cmpn-7.0.0.jar

.osgi-compendium.metadata

@@ -0,0 +1 @@
+4fa9f239a60aeca4a27648df329d112d562a350c SOURCES/osgi.cmpn-7.0.0.jar

SPECS/osgi-compendium.spec

@@ -1,24 +1,18 @@
-%bcond_with bootstrap
-
 Name:           osgi-compendium
 Version:        7.0.0
-Release:        34%{?dist}
+Release:        4%{?dist}
 Summary:        Interfaces and Classes for use in compiling OSGi bundles
-License:        Apache-2.0
+License:        ASL 2.0
 URL:            http://www.osgi.org
 BuildArch:      noarch
-ExclusiveArch:  %{java_arches} noarch
 
 Source0:        https://osgi.org/download/r7/osgi.cmpn-%{version}.jar
 
-%if %{with bootstrap}
-BuildRequires:  javapackages-bootstrap
-%else
 BuildRequires:  maven-local
+BuildRequires:  mvn(javax.servlet:javax.servlet-api)
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
 BuildRequires:  mvn(org.osgi:osgi.annotation)
 BuildRequires:  mvn(org.osgi:osgi.core)
-%endif
 
 %description
 OSGi Compendium, Interfaces and Classes for use in compiling bundles.
@@ -27,10 +21,10 @@ OSGi Compendium, Interfaces and Classes for use in compiling bundles.
 Summary:        API documentation for %{name}
 
 %description javadoc
-API documentation for %{name}.
+This package provides %{summary}.
 
 %prep
-%autosetup -p1 -c
+%setup -q -c
 
 # Delete pre-built binaries
 rm -r org
@@ -68,8 +62,8 @@ mv META-INF/maven/org.osgi/osgi.cmpn/pom.xml .
 
 %pom_add_dep org.osgi:osgi.annotation::provided
 %pom_add_dep org.osgi:osgi.core::provided
-# Don't compile in Servlet, Jax RS and JPA support
-rm -r src/main/java/org/osgi/service/http
+%pom_add_dep javax.servlet:javax.servlet-api::provided
+# Don't compile in Jax RS and JPA support when jp_minimal is activated
 rm -r src/main/java/org/osgi/service/jaxrs
 rm -r src/main/java/org/osgi/service/jpa
 rm -r src/main/java/org/osgi/service/transaction/control/jpa
@@ -80,6 +74,7 @@ rm -r src/main/java/org/osgi/service/transaction/control/jpa
 %install
 %mvn_install
 
+
 %files -f .mfiles
 %license LICENSE
 %doc about.html
@@ -87,74 +82,11 @@ rm -r src/main/java/org/osgi/service/transaction/control/jpa
 %files javadoc -f .mfiles-javadoc
 %license LICENSE
 
+
 %changelog
-* Mon Dec 30 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 7.0.0-32
-- Use %%autosetup -C
-
-* Fri Nov 29 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 7.0.0-31
-- Update javapackages test plan to f42
-
-* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 7.0.0-21
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Tue Feb 27 2024 Jiri Vanek <jvanek@redhat.com> - 7.0.0-20
-- Rebuilt for java-21-openjdk as system jdk
-
-* Fri Feb 23 2024 Jiri Vanek <jvanek@redhat.com> - 7.0.0-19
-- bump of release for for java-21-openjdk as system jdk
-
-* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 7.0.0-18
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 7.0.0-17
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Sep 01 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 7.0.0-16
-- Convert License tag to SPDX format
-
-* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 7.0.0-15
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 7.0.0-14
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 7.0.0-13
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 7.0.0-12
-- Rebuilt for java-17-openjdk as system jdk
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 7.0.0-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 7.0.0-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 7.0.0-9
-- Bootstrap build
-- Non-bootstrap build
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 7.0.0-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Wed Nov 25 2020 Mat Booth <mat.booth@redhat.com> - 7.0.0-7
-- Rebuild to regenerate OSGi metadata
-
-* 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-4
 - 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-3
 - Mass rebuild for javapackages-tools 201901
 

ci.fmf

@@ -1 +0,0 @@
-resultsdb-testcase: separate

gating.yaml

@@ -1,7 +0,0 @@
---- !Policy
-product_versions:
-  - rhel-9
-decision_contexts:
-  - osci_compose_gate
-rules:
-  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/javapackages.functional}

plans/javapackages.fmf

@@ -1,7 +0,0 @@
-summary: Run javapackages-specific tests
-discover:
-  how: fmf
-  url: https://src.fedoraproject.org/tests/javapackages
-  ref: c9s
-execute:
-  how: tmt

sources

@@ -1 +0,0 @@
-SHA512 (osgi.cmpn-7.0.0.jar) = 7fb3ab1f27b097290d67369bde993c9fbbe2db81b541f90ac332d0181c2823b21b7f4444070b627216d601582997f16cb9886d8e177c3a24e7fa118a875316ae