MARMOTTA-428: two minor fixes in the maven-bundle-plugin definitions for two pom files
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/9acbddfa Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/9acbddfa Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/9acbddfa Branch: refs/heads/develop Commit: 9acbddfa8546168ba61ef4ca074a96f9e3d9fb39 Parents: 9512243 Author: Rupert Westenthaler <[email protected]> Authored: Mon Feb 3 13:55:53 2014 +0100 Committer: Rupert Westenthaler <[email protected]> Committed: Mon Feb 3 13:55:53 2014 +0100 ---------------------------------------------------------------------- libraries/ldcache/ldcache-api/pom.xml | 29 ++++++++++++------------ libraries/ldclient/ldclient-api/pom.xml | 34 +++++++++++++--------------- 2 files changed, 31 insertions(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/9acbddfa/libraries/ldcache/ldcache-api/pom.xml ---------------------------------------------------------------------- diff --git a/libraries/ldcache/ldcache-api/pom.xml b/libraries/ldcache/ldcache-api/pom.xml index b3acd34..59454ef 100644 --- a/libraries/ldcache/ldcache-api/pom.xml +++ b/libraries/ldcache/ldcache-api/pom.xml @@ -53,22 +53,23 @@ <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> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + <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> </build> <dependencies> http://git-wip-us.apache.org/repos/asf/marmotta/blob/9acbddfa/libraries/ldclient/ldclient-api/pom.xml ---------------------------------------------------------------------- diff --git a/libraries/ldclient/ldclient-api/pom.xml b/libraries/ldclient/ldclient-api/pom.xml index bec955f..9dfd901 100644 --- a/libraries/ldclient/ldclient-api/pom.xml +++ b/libraries/ldclient/ldclient-api/pom.xml @@ -33,24 +33,22 @@ <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> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + <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> </build> <dependencies>
