Update to OSGi R7

.gitignore

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

osgi-compendium.spec

@@ -1,35 +1,34 @@
 Name:           osgi-compendium
-Version:        6.0.0
-Release:        7%{?dist}
+Version:        7.0.0
+Release:        1%{?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(javax.ws.rs:javax.ws.rs-api) >= 2.1.5-2
 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
 
@@ -67,9 +66,10 @@ mv META-INF/maven/org.osgi/osgi.cmpn/pom.xml .
 %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
+%pom_add_dep javax.ws.rs:javax.ws.rs-api::provided
 
 %build
-%mvn_build
+%mvn_build -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8
 
 %install
 %mvn_install
@@ -84,6 +84,9 @@ mv META-INF/maven/org.osgi/osgi.cmpn/pom.xml .
 
 
 %changelog
+* 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
 

sources

@@ -1 +1 @@
-40a24e915b654df4aed69c7f0f663eec  osgi.cmpn-6.0.0.jar
+SHA512 (osgi.cmpn-7.0.0.jar) = 7fb3ab1f27b097290d67369bde993c9fbbe2db81b541f90ac332d0181c2823b21b7f4444070b627216d601582997f16cb9886d8e177c3a24e7fa118a875316ae