From 5d738948a22f0587f417fff81b49070ea1efb153 Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Oct 05 2019 12:45:05 +0000
Subject: migrate away from the retired felix OSGi implementation


---

diff --git a/.gitignore b/.gitignore
index e1624f7..923e8f1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,4 @@
+/results_*
+/*.src.rpm
+
 /grizzly-npn-1.2.tar.xz
diff --git a/grizzly-npn.spec b/grizzly-npn.spec
index 68eb11b..94fb2bf 100644
--- a/grizzly-npn.spec
+++ b/grizzly-npn.spec
@@ -1,6 +1,6 @@
 Name:          grizzly-npn
 Version:       1.2
-Release:       10%{?dist}
+Release:       11%{?dist}
 Summary:       Grizzly Next Protocol Negotiation API
 License:       CDDL or GPLv2 with exceptions
 URL:           https://grizzly.java.net/spdy.html
@@ -16,8 +16,8 @@ BuildRequires: maven-local
 BuildRequires: mvn(net.java:jvnet-parent:pom:)
 BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
 BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin)
-BuildRequires: mvn(org.osgi:org.osgi.compendium)
-BuildRequires: mvn(org.osgi:org.osgi.core)
+BuildRequires: mvn(org.osgi:osgi.cmpn)
+BuildRequires: mvn(org.osgi:osgi.core)
 
 BuildArch:     noarch
 
@@ -80,6 +80,10 @@ rm -r bootstrap/src/main/java/sun/security/ssl/Alerts.java \
  bootstrap/src/main/java/sun/security/ssl/ServerHandshaker.java \
  bootstrap/src/main/java/sun/security/ssl/SSLEngineImpl.java
 
+# use latest OSGi implementation
+%pom_change_dep -r :org.osgi.core org.osgi:osgi.core
+%pom_change_dep -r :org.osgi.compendium org.osgi:osgi.cmpn
+
 %pom_xpath_remove "pom:plugin[pom:artifactId = 'maven-bundle-plugin']/pom:configuration/pom:instructions/pom:Export-Package" bootstrap
 %pom_xpath_inject "pom:plugin[pom:artifactId = 'maven-bundle-plugin']/pom:configuration/pom:instructions" "
 <Export-Package>
@@ -112,6 +116,9 @@ rm -r bootstrap/src/main/java/sun/security/ssl/Alerts.java \
 %license LICENSE.txt
 
 %changelog
+* Sat Oct 05 2019 Fabio Valentini <decathorpe@gmail.com> - 1.2-11
+- Migrate away from the retired felix OSGi implementation.
+
 * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild