FELIX-1115: use version ranges + clean up a bit gshell-core
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@771352 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/karaf/jaas/jaas-boot/pom.xml b/karaf/jaas/jaas-boot/pom.xml
index 022e6e3..e064b26 100644
--- a/karaf/jaas/jaas-boot/pom.xml
+++ b/karaf/jaas/jaas-boot/pom.xml
@@ -53,10 +53,10 @@
<configuration>
<instructions>
<Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
- <Export-Package>${artifactId}*;version=${project.version};-split-package:=merge-first
- </Export-Package>
+ <Export-Package>${pom.artifactId}*;version=${project.version}</Export-Package>
<Import-Package>*</Import-Package>
<Private-Package>!*</Private-Package>
+ <_versionpolicy>${bnd.version.policy}</_versionpolicy>
</instructions>
</configuration>
</plugin>
diff --git a/karaf/jaas/jaas-config/pom.xml b/karaf/jaas/jaas-config/pom.xml
index 3c9c0b3..9055ecf 100644
--- a/karaf/jaas/jaas-config/pom.xml
+++ b/karaf/jaas/jaas-config/pom.xml
@@ -81,12 +81,11 @@
<configuration>
<instructions>
<Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
- <Export-Package>
- ${artifactId};version=${project.version};-split-package:=merge-first
- </Export-Package>
+ <Export-Package>${pom.artifactId}*;version=${project.version}</Export-Package>
<Import-Package>*</Import-Package>
<Private-Package>${artifactId}.impl</Private-Package>
- <Spring-Context>*;publish-context:=false;create-asynchronously:=false</Spring-Context>
+ <Spring-Context>*;publish-context:=false;create-asynchronously:=true</Spring-Context>
+ <_versionpolicy>${bnd.version.policy}</_versionpolicy>
</instructions>
</configuration>
</plugin>
diff --git a/karaf/jaas/jaas-modules/pom.xml b/karaf/jaas/jaas-modules/pom.xml
index 07af5aa..9c873c8 100644
--- a/karaf/jaas/jaas-modules/pom.xml
+++ b/karaf/jaas/jaas-modules/pom.xml
@@ -74,15 +74,14 @@
<configuration>
<instructions>
<Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
- <Export-Package>
- org.apache.felix.karaf.jaas.modules*;version=${project.version};-split-package:=merge-first
- </Export-Package>
+ <Export-Package>${pom.artifactId}*;version=${project.version}</Export-Package>
<Import-Package>
org.apache.felix.karaf.jaas.config,
org.springframework.beans.factory.config,
*
</Import-Package>
- <Spring-Context>*;publish-context:=false;create-asynchronously:=false</Spring-Context>
+ <Spring-Context>*;publish-context:=false;create-asynchronously:=true</Spring-Context>
+ <_versionpolicy>${bnd.version.policy}</_versionpolicy>
</instructions>
</configuration>
</plugin>