Repository: johnzon Updated Branches: refs/heads/master 18c215ce7 -> 5f47f2973
JOHNZON-108 patch based on Stefan Seifert to support SPI in osgi Project: http://git-wip-us.apache.org/repos/asf/johnzon/repo Commit: http://git-wip-us.apache.org/repos/asf/johnzon/commit/5f47f297 Tree: http://git-wip-us.apache.org/repos/asf/johnzon/tree/5f47f297 Diff: http://git-wip-us.apache.org/repos/asf/johnzon/diff/5f47f297 Branch: refs/heads/master Commit: 5f47f29734f7a8b23623792324b8eb997855d03d Parents: 18c215c Author: rmannibucau <[email protected]> Authored: Tue May 30 10:39:26 2017 +0200 Committer: rmannibucau <[email protected]> Committed: Tue May 30 10:39:26 2017 +0200 ---------------------------------------------------------------------- johnzon-core/pom.xml | 20 ++++++++++++++++++-- johnzon-jsonb/pom.xml | 17 ++++++++++++++++- 2 files changed, 34 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/johnzon/blob/5f47f297/johnzon-core/pom.xml ---------------------------------------------------------------------- diff --git a/johnzon-core/pom.xml b/johnzon-core/pom.xml index 11363e9..f11b695 100644 --- a/johnzon-core/pom.xml +++ b/johnzon-core/pom.xml @@ -17,7 +17,8 @@ specific language governing permissions and limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <parent> <artifactId>johnzon</artifactId> <groupId>org.apache.johnzon</groupId> @@ -27,9 +28,24 @@ <artifactId>johnzon-core</artifactId> <name>Johnzon :: Core</name> + <packaging>bundle</packaging> <properties> <staging.directory>${project.parent.reporting.outputDirectory}</staging.directory> </properties> - <packaging>bundle</packaging> + + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <configuration> + <instructions> + <Require-Capability>osgi.extender;filter:="(osgi.extender=osgi.serviceloader.registrar)"</Require-Capability> + <Provide-Capability>osgi.serviceloader;osgi.serviceloader=javax.json.spi.JsonProvider</Provide-Capability> + </instructions> + </configuration> + </plugin> + </plugins> + </build> </project> http://git-wip-us.apache.org/repos/asf/johnzon/blob/5f47f297/johnzon-jsonb/pom.xml ---------------------------------------------------------------------- diff --git a/johnzon-jsonb/pom.xml b/johnzon-jsonb/pom.xml index a3d8338..78d8a1a 100644 --- a/johnzon-jsonb/pom.xml +++ b/johnzon-jsonb/pom.xml @@ -27,6 +27,7 @@ <artifactId>johnzon-jsonb</artifactId> <name>Johnzon :: JSON-B Implementation</name> + <packaging>bundle</packaging> <properties> <java-compile.version>1.8</java-compile.version> @@ -96,5 +97,19 @@ <scope>test</scope> </dependency> </dependencies> - <packaging>bundle</packaging> + + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <configuration> + <instructions> + <Require-Capability>osgi.extender;filter:="(osgi.extender=osgi.serviceloader.registrar)"</Require-Capability> + <Provide-Capability>osgi.serviceloader;osgi.serviceloader=javax.json.bind.spi.JsonbProvider</Provide-Capability> + </instructions> + </configuration> + </plugin> + </plugins> + </build> </project>
