.gitignore

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

.osgi-compendium.metadata

@@ -1 +1 @@
-a3a5269424e5ea6488d30dedce8fabca11efbc3d SOURCES/osgi.cmpn-6.0.0.jar
+4fa9f239a60aeca4a27648df329d112d562a350c SOURCES/osgi.cmpn-7.0.0.jar

SPECS/osgi-compendium.spec

@@ -1,35 +1,37 @@
+%bcond_with bootstrap
+
 Name:           osgi-compendium
-Version:        6.0.0
+Version:        7.0.0
-Release:        5%{?dist}
+Release:        12%{?dist}
 Summary:        Interfaces and Classes for use in compiling OSGi bundles
 License:        ASL 2.0
 URL:            http://www.osgi.org
 BuildArch:      noarch
 
-Source0:        https://osgi.org/download/r6/osgi.cmpn-%{version}.jar
+Source0:        https://osgi.org/download/r7/osgi.cmpn-%{version}.jar
 
 BuildRequires:  maven-local
-BuildRequires:  mvn(javax.persistence:persistence-api)
+%if %{with bootstrap}
-BuildRequires:  mvn(javax.servlet:javax.servlet-api)
+BuildRequires:  javapackages-bootstrap
+%else
 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.
 
-
 %package javadoc
 Summary:        API documentation for %{name}
 
 %description javadoc
 This package provides %{summary}.
 
-
 %prep
 %setup -q -c
 
+# Delete pre-built binaries
 rm -r org
 find -name '*.class' -delete
 
@@ -65,11 +67,14 @@ 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
-%pom_add_dep javax.servlet:javax.servlet-api::provided
+# Don't compile in Servlet, Jax RS and JPA support
-%pom_add_dep javax.persistence:persistence-api::provided
+rm -r src/main/java/org/osgi/service/http
+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
 
 %build
-%mvn_build
+%mvn_build -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8
 
 %install
 %mvn_install
@@ -84,6 +89,56 @@ mv META-INF/maven/org.osgi/osgi.cmpn/pom.xml .
 
 
 %changelog
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 7.0.0-12
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
+
+* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 7.0.0-11
+- Rebuild to workaround DistroBaker issue
+
+* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 7.0.0-10
+- Bootstrap Maven for CentOS Stream 9
+
+* 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
+
+* Tue Mar 19 2019 Mat Booth <mat.booth@redhat.com> - 7.0.0-2
+- Allow conditionally compiling in support for Jax RS and JPA
+
+* Wed Mar 06 2019 Mat Booth <mat.booth@redhat.com> - 7.0.0-1
+- Update to OSGi R7
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 6.0.0-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 6.0.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
 * Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 6.0.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild