Repository: marmotta Updated Branches: refs/heads/ldp 673ddc35d -> b8d367a96
MARMOTTA-428: added OSGI metadata to some pom.xml files Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/a110dcd3 Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/a110dcd3 Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/a110dcd3 Branch: refs/heads/ldp Commit: a110dcd37ba0746b11644be58d29801a49193a8f Parents: e26b3ce Author: Rupert Westenthaler <[email protected]> Authored: Mon Feb 3 13:36:32 2014 +0100 Committer: Rupert Westenthaler <[email protected]> Committed: Mon Feb 3 13:36:32 2014 +0100 ---------------------------------------------------------------------- libraries/kiwi/pom.xml | 12 ++++++++++-- libraries/ldcache/ldcache-api/pom.xml | 15 +++++++++++++++ libraries/ldcache/pom.xml | 10 ++++++++++ libraries/ldclient/ldclient-api/pom.xml | 25 +++++++++++++++++++++++++ libraries/ldclient/pom.xml | 10 ++++++++++ libraries/ldpath/ldpath-api/pom.xml | 16 ++++------------ libraries/ldpath/pom.xml | 11 +++++++++++ parent/pom.xml | 17 ++++++++++++++--- 8 files changed, 99 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/a110dcd3/libraries/kiwi/pom.xml ---------------------------------------------------------------------- diff --git a/libraries/kiwi/pom.xml b/libraries/kiwi/pom.xml index d4c382a..9e7aa42 100644 --- a/libraries/kiwi/pom.xml +++ b/libraries/kiwi/pom.xml @@ -77,7 +77,16 @@ <rootPath>$${rebel.root}</rootPath> </configuration> </plugin> - + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <inherited>true</inherited> + <configuration> + <instructions> + <Bundle-Category>Apache Marmotta KiWi Triplestore</Bundle-Category> + </instructions> + </configuration> + </plugin> </plugins> </pluginManagement> <plugins> @@ -85,7 +94,6 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> </plugin> - </plugins> </build> http://git-wip-us.apache.org/repos/asf/marmotta/blob/a110dcd3/libraries/ldcache/ldcache-api/pom.xml ---------------------------------------------------------------------- diff --git a/libraries/ldcache/ldcache-api/pom.xml b/libraries/ldcache/ldcache-api/pom.xml index 9a16779..b3acd34 100644 --- a/libraries/ldcache/ldcache-api/pom.xml +++ b/libraries/ldcache/ldcache-api/pom.xml @@ -27,6 +27,7 @@ <artifactId>ldcache-api</artifactId> <name>LDCache: API</name> + <packaging>bundle</packaging> <description> Interfaces and Data Model for the Linked Data Caching component. @@ -52,6 +53,20 @@ <rootPath>$${rebel.root}</rootPath> </configuration> </plugin> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <inherited>true</inherited> + <configuration> + <instructions> + <Export-Package> + org.apache.marmotta.ldcache.api;version=${project.version}, + org.apache.marmotta.ldcache.model;version=${project.version} + </Export-Package> + </instructions> + </configuration> + </plugin> + </plugins> </pluginManagement> </build> http://git-wip-us.apache.org/repos/asf/marmotta/blob/a110dcd3/libraries/ldcache/pom.xml ---------------------------------------------------------------------- diff --git a/libraries/ldcache/pom.xml b/libraries/ldcache/pom.xml index b6435a1..d2a4d8e 100644 --- a/libraries/ldcache/pom.xml +++ b/libraries/ldcache/pom.xml @@ -49,6 +49,16 @@ <skip>true</skip> </configuration> </plugin> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <inherited>true</inherited> + <configuration> + <instructions> + <Bundle-Category>Apache Marmotta Linked Data Caching</Bundle-Category> + </instructions> + </configuration> + </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/marmotta/blob/a110dcd3/libraries/ldclient/ldclient-api/pom.xml ---------------------------------------------------------------------- diff --git a/libraries/ldclient/ldclient-api/pom.xml b/libraries/ldclient/ldclient-api/pom.xml index e54ea3d..bec955f 100644 --- a/libraries/ldclient/ldclient-api/pom.xml +++ b/libraries/ldclient/ldclient-api/pom.xml @@ -27,6 +27,31 @@ <artifactId>ldclient-api</artifactId> <name>LDClient: API</name> + <description> + Interfaces and Data Model for the Linked Data Client component. + </description> + <packaging>bundle</packaging> + + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <inherited>true</inherited> + <configuration> + <instructions> + <Export-Package> + org.apache.marmotta.ldlient.api.*;version=${project.version}, + org.apache.marmotta.ldcache.exception;version=${project.version}, + org.apache.marmotta.ldcache.model;version=${project.version} + </Export-Package> + </instructions> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> <dependencies> <dependency> http://git-wip-us.apache.org/repos/asf/marmotta/blob/a110dcd3/libraries/ldclient/pom.xml ---------------------------------------------------------------------- diff --git a/libraries/ldclient/pom.xml b/libraries/ldclient/pom.xml index da449b2..14bad12 100644 --- a/libraries/ldclient/pom.xml +++ b/libraries/ldclient/pom.xml @@ -70,6 +70,16 @@ <skip>true</skip> </configuration> </plugin> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <inherited>true</inherited> + <configuration> + <instructions> + <Bundle-Category>Apache Marmotta Linked Data Client</Bundle-Category> + </instructions> + </configuration> + </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/marmotta/blob/a110dcd3/libraries/ldpath/ldpath-api/pom.xml ---------------------------------------------------------------------- diff --git a/libraries/ldpath/ldpath-api/pom.xml b/libraries/ldpath/ldpath-api/pom.xml index e5cd5fa..4aa36fb 100644 --- a/libraries/ldpath/ldpath-api/pom.xml +++ b/libraries/ldpath/ldpath-api/pom.xml @@ -27,6 +27,9 @@ <name>LDPath API</name> <artifactId>ldpath-api</artifactId> + <description> + Interfaces and Data Model for the Linked Data Path component. + </description> <packaging>bundle</packaging> @@ -59,20 +62,9 @@ <extensions>true</extensions> <configuration> <instructions> - <Bundle-Name>LDPath API</Bundle-Name> - <Bundle-DocURL>http://wiki.apache.org/marmotta/LDPath</Bundle-DocURL> <Bundle-Vendor>Apache Software Foundation</Bundle-Vendor> - <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> - <_versionpolicy>$${version;===;${@}}</_versionpolicy> - <!-- Enable this for including your enhancement chain configuration --> - <!-- <Install-Path>config</Install-Path> --> <Export-Package> - org.apache.marmotta.ldpath.api;version=${project.version}, - org.apache.marmotta.ldpath.api.backend;version=${project.version}, - org.apache.marmotta.ldpath.api.functions;version=${project.version}, - org.apache.marmotta.ldpath.api.selectors;version=${project.version}, - org.apache.marmotta.ldpath.api.tests;version=${project.version}, - org.apache.marmotta.ldpath.api.transformers;version=${project.version} + org.apache.marmotta.ldpath.api.*;version=${project.version} </Export-Package> </instructions> </configuration> http://git-wip-us.apache.org/repos/asf/marmotta/blob/a110dcd3/libraries/ldpath/pom.xml ---------------------------------------------------------------------- diff --git a/libraries/ldpath/pom.xml b/libraries/ldpath/pom.xml index 18b9c48..3676590 100644 --- a/libraries/ldpath/pom.xml +++ b/libraries/ldpath/pom.xml @@ -59,6 +59,17 @@ <skip>true</skip> </configuration> </plugin> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <inherited>true</inherited> + <configuration> + <instructions> + <Bundle-Category>Apache Marmotta LDPath</Bundle-Category> + <Bundle-DocURL>http://wiki.apache.org/marmotta/LDPath</Bundle-DocURL> + </instructions> + </configuration> + </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/marmotta/blob/a110dcd3/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 33d783d..6e4a15a 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -511,9 +511,20 @@ --> </plugin> <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <version>2.3.7</version> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>2.3.7</version> + <inherited>true</inherited> + <configuration> + <instructions> + <Bundle-DocURL>http://marmotta.apache.org</Bundle-DocURL> + <Bundle-Vendor>Apache Marmotta</Bundle-Vendor> + <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> + <_versionpolicy>$${version;===;${@}}</_versionpolicy> + <_provider-policy>[$(version;===;$(@)),$(version;=+;$(@)))</_provider-policy> + <_consumer-policy>[$(version;===;$(@)),$(version;+;$(@)))</_consumer-policy> + </instructions> + </configuration> </plugin> <plugin> <groupId>org.apache.felix</groupId>
