You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2015/03/30 22:02:34 UTC
[6/8] jena git commit: jena-shadowed-ext not a bundle,
Private-Package in OSGi
jena-shadowed-ext not a bundle, Private-Package in OSGi
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/2551df7d
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/2551df7d
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/2551df7d
Branch: refs/heads/master
Commit: 2551df7d1b625d97ff36c06f6d41ffce32bdd291
Parents: 8957d1a
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Mon Mar 30 17:06:47 2015 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Mon Mar 30 17:06:47 2015 +0100
----------------------------------------------------------------------
apache-jena-osgi/jena-osgi/pom.xml | 9 ++++++++-
jena-shadowed-ext/pom.xml | 16 ----------------
2 files changed, 8 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/2551df7d/apache-jena-osgi/jena-osgi/pom.xml
----------------------------------------------------------------------
diff --git a/apache-jena-osgi/jena-osgi/pom.xml b/apache-jena-osgi/jena-osgi/pom.xml
index ab953e8..a872f6c 100644
--- a/apache-jena-osgi/jena-osgi/pom.xml
+++ b/apache-jena-osgi/jena-osgi/pom.xml
@@ -110,6 +110,12 @@
<version>2.13.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-shadowed-ext</artifactId>
+ <version>2.13.1-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.jena</groupId>
@@ -218,7 +224,8 @@
<Export-Package>com.hp.hpl.jena.*,org.apache.jena.*</Export-Package>
<Embed-Dependency>artifactId=jena*;inline=true,artifactId=xercesImpl;inline=true,artifactId=xml-apis;inline=true</Embed-Dependency>
<Embed-Transitive>true</Embed-Transitive>
- <Import-Package>!sun.io,!org.apache.avalon.framework.logger,!com.ibm.uvm.tools,!com.sun.jdmk.comm,!org.apache.log,!org.apache.xml.*,!org.apache.xerces.*,*</Import-Package>
+ <Import-Package>!sun.io,!org.apache.avalon.framework.logger,!com.ibm.uvm.tools,!com.sun.jdmk.comm,!org.apache.log,!org.apache.xml.*,!org.apache.xerces.*,!org.apache.jena.ext.*,*</Import-Package>
+ <Private-Package>org.apache.jena.ext.*</Private-Package>
</instructions>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/jena/blob/2551df7d/jena-shadowed-ext/pom.xml
----------------------------------------------------------------------
diff --git a/jena-shadowed-ext/pom.xml b/jena-shadowed-ext/pom.xml
index dfbc7b4..f13d833 100644
--- a/jena-shadowed-ext/pom.xml
+++ b/jena-shadowed-ext/pom.xml
@@ -27,7 +27,6 @@
</parent>
<artifactId>jena-shadowed-ext</artifactId>
<version>2.13.1-SNAPSHOT</version>
- <packaging>bundle</packaging>
<name>Apache Jena - Shadowed external libraries</name>
<description>
This module shadows some external libraries like Guava,
@@ -112,22 +111,7 @@
</relocations>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
-<!-- From META-INF/MANIFEST.MF of
-http://central.maven.org/maven2/com/google/guava/guava/18.0/guava-18.0.jar
-Update below if a newer guava is used
--->
- <Export-Package>org.apache.jena.ext.com.google.common.net;uses:="javax.annotation,org.apache.jena.ext.com.google.common.base,org.apache.jena.ext.com.google.common.hash,org.apache.jena.ext.com.google.common.io,org.apache.jena.ext.com.google.common.primitives,org.apache.jena.ext.com.google.common.collect,org.apache.jena.ext.com.google.common.escape";version="18.0.0",org.apache.jena.ext.com.google.common.html;uses:="org.apache.jena.ext.com.google.common.escape,javax.annotation";version="18.0.0",org.apache.jena.ext.com.google.common.collect;uses:="org.apache.jena.ext.com.google.common.base,javax.annotation,org.apache.jena.ext.com.google.common.primitives,org.apache.jena.ext.com.google.common.math";version="18.0.0",org.apache.jena.ext.com.google.common.primitives;uses:="org.apache.jena.ext.com.google.common.base,javax.annotation,sun.misc";version="18.0.0",org.apache.jena.ext.com.google.common.base;uses:="javax.annotation";version="18.0.0",org.apache.jena.ext.com.google.common
.escape;uses:="org.apache.jena.ext.com.google.common.base,javax.annotation";version="18.0.0",org.apache.jena.ext.com.google.common.cache;uses:="org.apache.jena.ext.com.google.common.collect,org.apache.jena.ext.com.google.common.util.concurrent,javax.annotation,org.apache.jena.ext.com.google.common.base,org.apache.jena.ext.com.google.common.primitives,sun.misc";version="18.0.0",org.apache.jena.ext.com.google.common.eventbus;uses:="org.apache.jena.ext.com.google.common.collect,org.apache.jena.ext.com.google.common.cache,javax.annotation,org.apache.jena.ext.com.google.common.base,org.apache.jena.ext.com.google.common.util.concurrent,org.apache.jena.ext.com.google.common.reflect";version="18.0.0",org.apache.jena.ext.com.google.common.util.concurrent;uses:="org.apache.jena.ext.com.google.common.base,javax.annotation,org.apache.jena.ext.com.google.common.collect,org.apache.jena.ext.com.google.common.primitives,org.apache.jena.ext.com.google.common.math";version="18.0.0",org.apache.jena.ex
t.com.google.common.hash;uses:="org.apache.jena.ext.com.google.common.primitives,org.apache.jena.ext.com.google.common.base,javax.annotation,org.apache.jena.ext.com.google.common.math";version="18.0.0",org.apache.jena.ext.com.google.common.io;uses:="javax.annotation,org.apache.jena.ext.com.google.common.base,org.apache.jena.ext.com.google.common.math,org.apache.jena.ext.com.google.common.hash,org.apache.jena.ext.com.google.common.collect,org.apache.jena.ext.com.google.common.primitives";version="18.0.0",org.apache.jena.ext.com.google.common.xml;uses:="org.apache.jena.ext.com.google.common.escape,javax.annotation";version="18.0.0",org.apache.jena.ext.com.google.common.reflect;uses:="javax.annotation,org.apache.jena.ext.com.google.common.base,org.apache.jena.ext.com.google.common.collect,org.apache.jena.ext.com.google.common.primitives";version="18.0.0",org.apache.jena.ext.com.google.common.math;uses:="org.apache.jena.ext.com.google.common.base,org.apache.jena.ext.com.google.common.pr
imitives,javax.annotation";version="18.0.0",org.apache.jena.ext.com.google.common.annotations;version="18.0.0"</Export-Package>
- <Import-Package>javax.annotation;resolution:=optional,sun.misc;resolution:=optional</Import-Package>
-
- </instructions>
- </configuration>
- </plugin>
</plugins>
</build>