.gitignore

@@ -1 +1 @@
-/osgi.cmpn-6.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,35 +1,32 @@
 Name:           osgi-compendium
-Version:        6.0.0
+Version:        7.0.0
-Release:        5%{?dist}
+Release:        4%{?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)
 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)
 
-
 %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
 
@@ -66,10 +63,13 @@ 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
-%pom_add_dep javax.persistence:persistence-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
 
 %build
-%mvn_build
+%mvn_build -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8
 
 %install
 %mvn_install
@@ -84,6 +84,24 @@ mv META-INF/maven/org.osgi/osgi.cmpn/pom.xml .
 
 
 %changelog
+* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 7.0.0-4
+- Mass rebuild for javapackages-tools 201902
+
+* 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
 

sources

@@ -1 +0,0 @@
-SHA512 (osgi.cmpn-6.0.0.jar) = 9fd431eea4abab1b8c9ca04820a62c7584eaa1cf3e669bf43eb6547aaee6fa1f740071f8dfbbb060f88139dd539b0ac91d671dd3d15ffcb3ecf5627cba2fcd19