Make sure we don't import exported packages for specs
git-svn-id: https://svn.apache.org/repos/asf/servicemix/smx4/specs/trunk@1227694 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/activation-api-1.1/pom.xml b/activation-api-1.1/pom.xml
index 8ef454d..1a55ce2 100644
--- a/activation-api-1.1/pom.xml
+++ b/activation-api-1.1/pom.xml
@@ -69,7 +69,7 @@
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Description>${project.description}</Bundle-Description>
- <Export-Package>javax.activation*;version=1.1;-split-package:=merge-first</Export-Package>
+ <Export-Package>javax.activation*;version=1.1;-split-package:=merge-first;-noimport:=true</Export-Package>
<Import-Package>
*,
!org.apache.servicemix.specs.activation
diff --git a/jain-sip-api-1.2/pom.xml b/jain-sip-api-1.2/pom.xml
index c8150bb..2a11fe4 100644
--- a/jain-sip-api-1.2/pom.xml
+++ b/jain-sip-api-1.2/pom.xml
@@ -60,7 +60,7 @@
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Description>${project.description}</Bundle-Description>
- <Export-Package>javax.sip*;version=1.2;-split-package:=merge-first</Export-Package>
+ <Export-Package>javax.sip*;version=1.2;-split-package:=merge-first;-noimport:=true</Export-Package>
<Import-Package>*</Import-Package>
<Implementation-Title>Apache ServiceMix</Implementation-Title>
<Implementation-Version>${project.version}</Implementation-Version>
diff --git a/java-persistence-api-1.1.1/pom.xml b/java-persistence-api-1.1.1/pom.xml
index ad081d4..537c429 100644
--- a/java-persistence-api-1.1.1/pom.xml
+++ b/java-persistence-api-1.1.1/pom.xml
@@ -55,8 +55,8 @@
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Description>${project.description}</Bundle-Description>
- <Export-Package>javax.persistence*;version=1.1.1;-split-package:=merge-first</Export-Package>
- <Import-Package>!javax.persistence*,*</Import-Package>
+ <Export-Package>javax.persistence*;version=1.1.1;-split-package:=merge-first;-noimport:=true</Export-Package>
+ <Import-Package>*</Import-Package>
<Private-Package>org.apache.servicemix.specs.locator;-split-package:=merge-first</Private-Package>
<Bundle-Activator>org.apache.servicemix.specs.locator.Activator</Bundle-Activator>
<Implementation-Title>Apache ServiceMix</Implementation-Title>
diff --git a/java-persistence-api-2.0/pom.xml b/java-persistence-api-2.0/pom.xml
index 80f0cb2..1df6ac3 100644
--- a/java-persistence-api-2.0/pom.xml
+++ b/java-persistence-api-2.0/pom.xml
@@ -55,8 +55,8 @@
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Description>${project.description}</Bundle-Description>
- <Export-Package>javax.persistence*;version=2.0;-split-package:=merge-first</Export-Package>
- <Import-Package>!javax.persistence*,*</Import-Package>
+ <Export-Package>javax.persistence*;version=2.0;-split-package:=merge-first;-noimport:=true</Export-Package>
+ <Import-Package>*</Import-Package>
<Private-Package>org.apache.servicemix.specs.locator;-split-package:=merge-first</Private-Package>
<Bundle-Activator>org.apache.servicemix.specs.locator.Activator</Bundle-Activator>
<Implementation-Title>Apache ServiceMix</Implementation-Title>
diff --git a/jaxb-api-2.0/pom.xml b/jaxb-api-2.0/pom.xml
index a96e181..f8e4ffc 100644
--- a/jaxb-api-2.0/pom.xml
+++ b/jaxb-api-2.0/pom.xml
@@ -81,7 +81,7 @@
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Description>${project.description}</Bundle-Description>
- <Export-Package>javax.xml.bind*;version=2.0;-split-package:=merge-first</Export-Package>
+ <Export-Package>javax.xml.bind*;version=2.0;-split-package:=merge-first;-noimport:=true</Export-Package>
<Import-Package>*</Import-Package>
<Private-Package>org.apache.servicemix.specs.locator;-split-package:=merge-first</Private-Package>
<Bundle-Activator>org.apache.servicemix.specs.locator.Activator</Bundle-Activator>
diff --git a/jaxb-api-2.1/pom.xml b/jaxb-api-2.1/pom.xml
index da27258..1752a61 100644
--- a/jaxb-api-2.1/pom.xml
+++ b/jaxb-api-2.1/pom.xml
@@ -81,7 +81,7 @@
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Description>${project.description}</Bundle-Description>
- <Export-Package>javax.xml.bind*;version=2.1;-split-package:=merge-first</Export-Package>
+ <Export-Package>javax.xml.bind*;version=2.1;-split-package:=merge-first;-noimport:=true</Export-Package>
<Import-Package>*</Import-Package>
<Private-Package>org.apache.servicemix.specs.locator;-split-package:=merge-first</Private-Package>
<Bundle-Activator>org.apache.servicemix.specs.locator.Activator</Bundle-Activator>
diff --git a/jaxb-api-2.2/pom.xml b/jaxb-api-2.2/pom.xml
index eecf3ea..ac3940a 100644
--- a/jaxb-api-2.2/pom.xml
+++ b/jaxb-api-2.2/pom.xml
@@ -65,8 +65,8 @@
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Description>${project.description}</Bundle-Description>
- <Export-Package>javax.xml.bind*;version=2.2.1;-split-package:=merge-first</Export-Package>
- <Import-Package>!javax.xml.bind*,*</Import-Package>
+ <Export-Package>javax.xml.bind*;version=2.2.1;-split-package:=merge-first;-noimport:=true</Export-Package>
+ <Import-Package>*</Import-Package>
<Private-Package>org.apache.servicemix.specs.locator;-split-package:=merge-first</Private-Package>
<Bundle-Activator>org.apache.servicemix.specs.locator.Activator</Bundle-Activator>
<Implementation-Title>Apache ServiceMix</Implementation-Title>
diff --git a/jaxp-api-1.4/pom.xml b/jaxp-api-1.4/pom.xml
index 3c42ea7..e361995 100644
--- a/jaxp-api-1.4/pom.xml
+++ b/jaxp-api-1.4/pom.xml
@@ -69,10 +69,10 @@
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Description>${project.description}</Bundle-Description>
<Export-Package>
- javax.xml.stream*;version=1.2;-split-package:=merge-first,
- javax.xml*;version=1.4;-split-package:=merge-first,
- org.w3c.dom*;version=1.0;-split-package:=merge-first,
- org.xml.sax*;version=2.0.2;-split-package:=merge-first,
+ javax.xml.stream*;version=1.2;-split-package:=merge-first;-noimport:=true,
+ javax.xml*;version=1.4;-split-package:=merge-first;-noimport:=true,
+ org.w3c.dom*;version=1.0;-split-package:=merge-first;-noimport:=true,
+ org.xml.sax*;version=2.0.2;-split-package:=merge-first;-noimport:=true,
</Export-Package>
<Import-Package>
*
diff --git a/jaxws-api-2.0/pom.xml b/jaxws-api-2.0/pom.xml
index 92184a0..c591118 100644
--- a/jaxws-api-2.0/pom.xml
+++ b/jaxws-api-2.0/pom.xml
@@ -129,7 +129,7 @@
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Description>${project.description}</Bundle-Description>
- <Export-Package>javax.xml.ws*;version=2.0;-split-package:=merge-first</Export-Package>
+ <Export-Package>javax.xml.ws*;version=2.0;-split-package:=merge-first;-noimport:=true</Export-Package>
<Import-Package>*</Import-Package>
<Private-Package>org.apache.servicemix.specs.locator;-split-package:=merge-first</Private-Package>
<Bundle-Activator>org.apache.servicemix.specs.locator.Activator</Bundle-Activator>
diff --git a/jaxws-api-2.1/pom.xml b/jaxws-api-2.1/pom.xml
index 4398da4..a87bfe6 100644
--- a/jaxws-api-2.1/pom.xml
+++ b/jaxws-api-2.1/pom.xml
@@ -87,7 +87,7 @@
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Description>${project.description}</Bundle-Description>
- <Export-Package>javax.xml.ws*;version=2.1;-split-package:=merge-first</Export-Package>
+ <Export-Package>javax.xml.ws*;version=2.1;-split-package:=merge-first;-noimport:=true</Export-Package>
<Import-Package>*</Import-Package>
<Private-Package>org.apache.servicemix.specs.locator;-split-package:=merge-first</Private-Package>
<Bundle-Activator>org.apache.servicemix.specs.locator.Activator</Bundle-Activator>
diff --git a/jaxws-api-2.2/pom.xml b/jaxws-api-2.2/pom.xml
index 002c424..8ecae1c 100644
--- a/jaxws-api-2.2/pom.xml
+++ b/jaxws-api-2.2/pom.xml
@@ -87,8 +87,8 @@
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Description>${project.description}</Bundle-Description>
- <Export-Package>javax.xml.ws*;version=2.2;-split-package:=merge-first</Export-Package>
- <Import-Package>!javax.xml.ws*,!org.apache.geronimo.osgi*,*</Import-Package>
+ <Export-Package>javax.xml.ws*;version=2.2;-split-package:=merge-first;-noimport:=true</Export-Package>
+ <Import-Package>*</Import-Package>
<Private-Package>org.apache.servicemix.specs.locator;-split-package:=merge-first</Private-Package>
<Bundle-Activator>org.apache.servicemix.specs.locator.Activator</Bundle-Activator>
<Implementation-Title>Apache ServiceMix</Implementation-Title>
diff --git a/jbi-api-1.0/pom.xml b/jbi-api-1.0/pom.xml
index 1a83f1c..d0e4320 100644
--- a/jbi-api-1.0/pom.xml
+++ b/jbi-api-1.0/pom.xml
@@ -50,7 +50,7 @@
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Description>${project.description}</Bundle-Description>
- <Export-Package>javax.jbi*;version=1.0;-split-package:=merge-first</Export-Package>
+ <Export-Package>javax.jbi*;version=1.0;-split-package:=merge-first;-noimport:=true</Export-Package>
<Import-Package>*</Import-Package>
<Implementation-Title>Apache ServiceMix</Implementation-Title>
<Implementation-Version>${project.version}</Implementation-Version>
diff --git a/jcr-api-2.0/pom.xml b/jcr-api-2.0/pom.xml
index 95de69a..af7cbe5 100644
--- a/jcr-api-2.0/pom.xml
+++ b/jcr-api-2.0/pom.xml
@@ -49,8 +49,8 @@
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Description>${project.description}</Bundle-Description>
- <Export-Package>javax.jcr*;version=2.0;-split-package:=merge-first</Export-Package>
- <Import-Package>!javax.jcr*,*</Import-Package>
+ <Export-Package>javax.jcr*;version=2.0;-split-package:=merge-first;-noimport:=true</Export-Package>
+ <Import-Package>*</Import-Package>
<Implementation-Title>Apache ServiceMix</Implementation-Title>
<Implementation-Version>${project.version}</Implementation-Version>
</instructions>
diff --git a/jsr250-1.0/pom.xml b/jsr250-1.0/pom.xml
index 1b83de6..54d9d9b 100644
--- a/jsr250-1.0/pom.xml
+++ b/jsr250-1.0/pom.xml
@@ -55,7 +55,7 @@
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Description>${project.description}</Bundle-Description>
- <Export-Package>javax.annotation*;version=1.0;-split-package:=merge-first</Export-Package>
+ <Export-Package>javax.annotation*;version=1.0;-split-package:=merge-first;-noimport:=true</Export-Package>
<Import-Package>*</Import-Package>
<Private-Package>org.apache.servicemix.specs.locator;-split-package:=merge-first</Private-Package>
<Bundle-Activator>org.apache.servicemix.specs.locator.Activator</Bundle-Activator>
diff --git a/jsr303-api-1.0.0/pom.xml b/jsr303-api-1.0.0/pom.xml
index 649e5e7..348d68e 100644
--- a/jsr303-api-1.0.0/pom.xml
+++ b/jsr303-api-1.0.0/pom.xml
@@ -55,11 +55,8 @@
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Description>${project.description}</Bundle-Description>
- <Export-Package>javax.validation*;version=1.0.0;-split-package:=merge-first</Export-Package>
- <Import-Package>
- !javax.validation*,
- *
- </Import-Package>
+ <Export-Package>javax.validation*;version=1.0.0;-split-package:=merge-first;-noimport:=true</Export-Package>
+ <Import-Package>*</Import-Package>
<Private-Package>org.apache.servicemix.specs.locator;-split-package:=merge-first</Private-Package>
<Bundle-Activator>org.apache.servicemix.specs.locator.Activator</Bundle-Activator>
<Implementation-Title>Apache ServiceMix</Implementation-Title>
diff --git a/jsr311-api-0.8/pom.xml b/jsr311-api-0.8/pom.xml
index cba216c..0d1f318 100644
--- a/jsr311-api-0.8/pom.xml
+++ b/jsr311-api-0.8/pom.xml
@@ -57,7 +57,7 @@
<Bundle-Description>${project.description}</Bundle-Description>
<Export-Package>javax.ws.rs*;version=0.8;-split-package:=merge-first</Export-Package>
<Import-Package>*</Import-Package>
- <Private-Package>org.apache.servicemix.specs.locator;-split-package:=merge-first</Private-Package>
+ <Private-Package>org.apache.servicemix.specs.locator;-split-package:=merge-first;-noimport:=true</Private-Package>
<Bundle-Activator>org.apache.servicemix.specs.locator.Activator</Bundle-Activator>
<Implementation-Title>Apache ServiceMix</Implementation-Title>
<Implementation-Version>${project.version}</Implementation-Version>
diff --git a/jsr311-api-1.0/pom.xml b/jsr311-api-1.0/pom.xml
index 55e6619..93762ef 100644
--- a/jsr311-api-1.0/pom.xml
+++ b/jsr311-api-1.0/pom.xml
@@ -55,7 +55,7 @@
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Description>${project.description}</Bundle-Description>
- <Export-Package>javax.ws.rs*;version=1.0;-split-package:=merge-first</Export-Package>
+ <Export-Package>javax.ws.rs*;version=1.0;-split-package:=merge-first;-noimport:=true</Export-Package>
<Import-Package>*</Import-Package>
<Private-Package>org.apache.servicemix.specs.locator;-split-package:=merge-first</Private-Package>
<Bundle-Activator>org.apache.servicemix.specs.locator.Activator</Bundle-Activator>
diff --git a/jsr311-api-1.1.1/pom.xml b/jsr311-api-1.1.1/pom.xml
index 3ca3698..bf16056 100644
--- a/jsr311-api-1.1.1/pom.xml
+++ b/jsr311-api-1.1.1/pom.xml
@@ -70,7 +70,7 @@
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Description>${project.description}</Bundle-Description>
- <Export-Package>javax.ws.rs*;version=1.1.1;-split-package:=merge-first</Export-Package>
+ <Export-Package>javax.ws.rs*;version=1.1.1;-split-package:=merge-first;-noimport:=true</Export-Package>
<Import-Package>*</Import-Package>
<Private-Package>org.apache.servicemix.specs.locator;-split-package:=merge-first</Private-Package>
<Bundle-Activator>org.apache.servicemix.specs.locator.Activator</Bundle-Activator>
diff --git a/jsr311-api-1.1/pom.xml b/jsr311-api-1.1/pom.xml
index 7304346..65e0e4f 100644
--- a/jsr311-api-1.1/pom.xml
+++ b/jsr311-api-1.1/pom.xml
@@ -72,7 +72,7 @@
<Bundle-Description>${project.description}</Bundle-Description>
<Export-Package>javax.ws.rs*;version=1.1;-split-package:=merge-first</Export-Package>
<Import-Package>*</Import-Package>
- <Private-Package>org.apache.servicemix.specs.locator;-split-package:=merge-first</Private-Package>
+ <Private-Package>org.apache.servicemix.specs.locator;-split-package:=merge-first;-noimport:=true</Private-Package>
<Bundle-Activator>org.apache.servicemix.specs.locator.Activator</Bundle-Activator>
<Implementation-Title>Apache ServiceMix</Implementation-Title>
<Implementation-Version>${project.version}</Implementation-Version>
diff --git a/saaj-api-1.3/pom.xml b/saaj-api-1.3/pom.xml
index ff37468..73fb012 100644
--- a/saaj-api-1.3/pom.xml
+++ b/saaj-api-1.3/pom.xml
@@ -55,7 +55,7 @@
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Description>${project.description}</Bundle-Description>
- <Export-Package>javax.xml.soap*;version=1.3;-split-package:=merge-first</Export-Package>
+ <Export-Package>javax.xml.soap*;version=1.3;-split-package:=merge-first;-noimport:=true</Export-Package>
<Import-Package>*</Import-Package>
<Private-Package>org.apache.servicemix.specs.locator;-split-package:=merge-first</Private-Package>
<Bundle-Activator>org.apache.servicemix.specs.locator.Activator</Bundle-Activator>
diff --git a/scripting-api-1.0/pom.xml b/scripting-api-1.0/pom.xml
index 7539a77..ae56274 100644
--- a/scripting-api-1.0/pom.xml
+++ b/scripting-api-1.0/pom.xml
@@ -55,7 +55,7 @@
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Description>${project.description}</Bundle-Description>
- <Export-Package>javax.script*;version=1.0;-split-package:=merge-first</Export-Package>
+ <Export-Package>javax.script*;version=1.0;-split-package:=merge-first;-noimport:=true</Export-Package>
<Import-Package>*</Import-Package>
<Private-Package>org.apache.servicemix.specs.locator;-split-package:=merge-first</Private-Package>
<Bundle-Activator>org.apache.servicemix.specs.locator.Activator</Bundle-Activator>
