[felix-bundlerepository] 01/04: Compatibility with OSGI Compendium 6: Throwing exception from the new methods

[Kai-Chung Yan]

This is an automated email from the git hooks/post-receive script.

seamlik-guest pushed a commit to branch master
in repository felix-bundlerepository.

commit 563fd1d2a776a4ddba8776693312cd61bebf2937
Author: 殷啟聰 | Kai-Chung Yan <seamlikok at gmail.com>
Date:   Sun Mar 4 21:18:24 2018 +0800

    Compatibility with OSGI Compendium 6: Throwing exception from the new methods
---
 debian/control                         |  2 +-
 debian/maven.rules                     |  1 +
 debian/patches/osgi-compendium-6.patch | 26 ++++++++++++++++++++++++++
 debian/patches/series                  |  1 +
 4 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 81d834d..9d05965 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Build-Depends:
  libmaven-bundle-plugin-java,
  libmaven-javadoc-plugin-java,
  libmaven-source-plugin-java,
- libosgi-compendium-java (>= 5.0.0~),
+ libosgi-compendium-java (>= 6),
  libosgi-core-java (>= 5.0.0~),
  maven-debian-helper (>= 1.4)
 Standards-Version: 4.0.0
diff --git a/debian/maven.rules b/debian/maven.rules
index e1494a0..22d065f 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -20,3 +20,4 @@ org.apache.felix org.apache.felix.shell jar s/.*/debian/ * *
 org.apache.felix org.apache.felix.utils jar s/.*/debian/ * *
 s/net.sf.kxml/kxml2/ kxml2 jar s/.*/debian/ * *
 s/org.apache.felix/org.osgi/ org.osgi.core * s/.*/debian/
+org.osgi s/org.osgi.compendium/osgi.cmpn/ * s/.*/debian/ * *
diff --git a/debian/patches/osgi-compendium-6.patch b/debian/patches/osgi-compendium-6.patch
new file mode 100644
index 0000000..a0c87a6
--- /dev/null
+++ b/debian/patches/osgi-compendium-6.patch
@@ -0,0 +1,26 @@
+Description: Compatibility with OSGI Compendium 6
+Author: Kai-Chung Yan (殷啟聰) <seamlikok at gmail.com>
+Bug: https://issues.apache.org/jira/browse/FELIX-5048
+Forwarded: no
+--- a/src/main/java/org/apache/felix/bundlerepository/impl/OSGiRepositoryImpl.java
++++ b/src/main/java/org/apache/felix/bundlerepository/impl/OSGiRepositoryImpl.java
+@@ -179,4 +179,19 @@
+         }
+         return sb.toString();
+     }
++
++    @Override
++    public org.osgi.service.repository.RequirementBuilder newRequirementBuilder(String namespace) {
++        throw new UnsupportedOperationException("felix-bundlerepository does not fully work with OSGI Compendium 6.");
++    }
++
++    @Override
++    public org.osgi.service.repository.ExpressionCombiner getExpressionCombiner() {
++        throw new UnsupportedOperationException("felix-bundlerepository does not fully work with OSGI Compendium 6.");
++    }
++
++    @Override
++    public org.osgi.util.promise.Promise<Collection<org.osgi.resource.Resource>> findProviders(org.osgi.service.repository.RequirementExpression expression) {
++        throw new UnsupportedOperationException("felix-bundlerepository does not fully work with OSGI Compendium 6.");
++    }
+ }
diff --git a/debian/patches/series b/debian/patches/series
index b68497d..f328ac2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 relax-Import-Package-requirements.patch
+osgi-compendium-6.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/felix-bundlerepository.git