From d4f24871096513a9a0548a4ab20a28944ebf1c01 Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <apoutsma@vmware.com>
Date: Wed, 20 May 2009 12:54:15 +0000
Subject: [PATCH] SWS-484: Missing version qualifiers on Export-Package entries

---
 core-tiger/pom.xml | 16 ++++++++--------
 core/pom.xml       | 14 +++++++-------
 oxm-tiger/pom.xml  | 16 +++++++---------
 oxm/pom.xml        | 16 ++++++++--------
 security/pom.xml   |  8 ++++----
 support/pom.xml    | 17 +++++++++--------
 xml/pom.xml        | 10 +++++-----
 7 files changed, 48 insertions(+), 49 deletions(-)

diff --git a/core-tiger/pom.xml b/core-tiger/pom.xml
index 1acd213c..59c98341 100644
--- a/core-tiger/pom.xml
+++ b/core-tiger/pom.xml
@@ -45,28 +45,28 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.2.0</version>
+                <version>1.4.3</version>
                 <extensions>true</extensions>
                 <configuration>
                     <excludeDependencies>true</excludeDependencies>
                     <instructions>
                         <Bundle-SymbolicName>org.springframework.bundle.ws.core-tiger</Bundle-SymbolicName>
-                        <Export-Package>org.springframework.ws*</Export-Package>
+                        <Export-Package>org.springframework.ws*;version="${pom.version}"</Export-Package>
                         <Import-Package>
                             org.apache.commons.logging*,
                             javax.xml.namespace*,
                             javax.xml.transform*,
                             org.w3c.dom*,
-                            org.springframework.xml*,
-                            org.springframework.oxm*,
-                            org.springframework.ws*,
-                            org.springframework*;version="2.0",
+                            org.springframework.xml*;version="${pom.version}",
+                            org.springframework.oxm*;version="${pom.version}",
+                            org.springframework.ws*;version="${pom.version}",
+                            org.springframework*;version="[2.0,3.0)",
                             *;resolution:=optional
                         </Import-Package>
-                        <Fragment-Host>org.springframework.bundle.ws.core;version="[${pom.version}, ${pom.version}]"</Fragment-Host>
+                        <Fragment-Host>org.springframework.bundle.ws.core</Fragment-Host>
                         <Implementation-Title>${pom.name}</Implementation-Title>
-                        <Implementation-Version>${pom.version}</Implementation-Version>
                         <Spring-WS-Version>${pom.version}</Spring-WS-Version>
+                        <Bundle-Vendor>SpringSource</Bundle-Vendor>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/core/pom.xml b/core/pom.xml
index 4d44c87a..4ad97d23 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -42,12 +42,12 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.2.0</version>
+                <version>1.4.3</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>org.springframework.bundle.ws.core</Bundle-SymbolicName>
-                        <Export-Package>org.springframework.ws*</Export-Package>
+                        <Export-Package>org.springframework.ws*;version="${pom.version}"</Export-Package>
                         <Import-Package>
                             org.apache.commons.logging*,
                             javax.activation*,
@@ -58,15 +58,15 @@
                             javax.xml.transform*,
                             org.xml.sax*,
                             org.w3c.dom*,
-                            org.springframework.xml*,
-                            org.springframework.oxm*,
-                            org.springframework.ws*,
-                            org.springframework*;version="2.0",
+                            org.springframework.xml*;version="${pom.version}",
+                            org.springframework.oxm*;version="${pom.version}",
+                            org.springframework.ws*;version="${pom.version}",
+                            org.springframework*;version="[2.0,3.0)",
                             *;resolution:=optional
                         </Import-Package>
                         <Implementation-Title>${pom.name}</Implementation-Title>
-                        <Implementation-Version>${pom.version}</Implementation-Version>
                         <Spring-WS-Version>${pom.version}</Spring-WS-Version>
+                        <Bundle-Vendor>SpringSource</Bundle-Vendor>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/oxm-tiger/pom.xml b/oxm-tiger/pom.xml
index 7a1a052e..380ff4f1 100644
--- a/oxm-tiger/pom.xml
+++ b/oxm-tiger/pom.xml
@@ -80,29 +80,27 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.2.0</version>
+                <version>1.4.3</version>
                 <extensions>true</extensions>
                 <configuration>
                     <excludeDependencies>true</excludeDependencies>
                     <instructions>
                         <Bundle-SymbolicName>org.springframework.bundle.ws.oxm-tiger</Bundle-SymbolicName>
-                        <Export-Package>
-                            org.springframework.oxm*
-                        </Export-Package>
+                        <Export-Package>org.springframework.oxm*;version="${pom.version}"</Export-Package>
                         <Import-Package>
                             org.apache.commons.logging*,
                             javax.xml.namespace*,
                             javax.xml.stream*,
                             javax.xml.transform*,
-                            org.springframework.xml*,
-                            org.springframework.oxm*,
-                            org.springframework*;version="2.0",
+                            org.springframework.xml*;version="${pom.version}",
+                            org.springframework.oxm*;version="${pom.version}",
+                            org.springframework*;version="[2.0,3.0)",
                             *;resolution:=optional
                         </Import-Package>
-                        <Fragment-Host>org.springframework.bundle.ws.oxm;version="[${pom.version}, ${pom.version}]"</Fragment-Host>
+                        <Fragment-Host>org.springframework.bundle.ws.oxm</Fragment-Host>
                         <Implementation-Title>${pom.name}</Implementation-Title>
-                        <Implementation-Version>${pom.version}</Implementation-Version>
                         <Spring-WS-Version>${pom.version}</Spring-WS-Version>
+                        <Bundle-Vendor>SpringSource</Bundle-Vendor>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/oxm/pom.xml b/oxm/pom.xml
index 5e8fddef..c57b702b 100644
--- a/oxm/pom.xml
+++ b/oxm/pom.xml
@@ -76,12 +76,12 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.2.0</version>
+                <version>1.4.3</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>org.springframework.bundle.ws.oxm</Bundle-SymbolicName>
-                        <Export-Package>org.springframework.oxm*</Export-Package>
+                        <Export-Package>org.springframework.oxm*;version="${pom.version}"</Export-Package>
                         <Import-Package>
                             org.apache.commons.logging*,
                             javax.xml.parsers*,
@@ -89,16 +89,16 @@
                             javax.xml.transform*,
                             org.xml.sax*,
                             org.w3c.dom*,
-                            org.springframework.xml*,
-                            org.springframework.oxm*,
-                            org.springframework.jms*;version="2.0";resolution:=optional,
-                            org.springframework.web*;version="2.0";resolution:=optional,
-                            org.springframework*;version="2.0",
+                            org.springframework.xml*;version="${pom.version}",
+                            org.springframework.oxm*;version="${pom.version}",
+                            org.springframework.jms*;version="[2.0,3.0)";resolution:=optional,
+                            org.springframework.web*;version="[2.0,3.0)";resolution:=optional,
+                            org.springframework*;version="[2.0,3.0)",
                             *;resolution:=optional
                         </Import-Package>
                         <Implementation-Title>${pom.name}</Implementation-Title>
-                        <Implementation-Version>${pom.version}</Implementation-Version>
                         <Spring-WS-Version>${pom.version}</Spring-WS-Version>
+                        <Bundle-Vendor>SpringSource</Bundle-Vendor>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/security/pom.xml b/security/pom.xml
index 79e6c55d..0a343d70 100644
--- a/security/pom.xml
+++ b/security/pom.xml
@@ -50,12 +50,12 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.2.0</version>
+                <version>1.4.3</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>org.springframework.bundle.ws.security</Bundle-SymbolicName>
-                        <Export-Package>org.springframework.ws.soap.security*</Export-Package>
+                        <Export-Package>org.springframework.ws.soap.security*;version="${pom.version}"</Export-Package>
                         <Import-Package>
                             org.apache.commons.logging*,
                             javax.crypto*,
@@ -63,13 +63,13 @@
                             javax.xml.namespace*,
                             javax.xml.soap*,
                             com.sun.xml.wss*,
-                            org.springframework.ws*,
+                            org.springframework.ws*;version="${pom.version}",
                             org.springframework*;version="2.0",
                             *;resolution:=optional
                         </Import-Package>
                         <Implementation-Title>${pom.name}</Implementation-Title>
-                        <Implementation-Version>${pom.version}</Implementation-Version>
                         <Spring-WS-Version>${pom.version}</Spring-WS-Version>
+                        <Bundle-Vendor>SpringSource</Bundle-Vendor>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/support/pom.xml b/support/pom.xml
index 5f749d68..6f81423f 100644
--- a/support/pom.xml
+++ b/support/pom.xml
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <parent>
         <artifactId>spring-ws-parent</artifactId>
         <groupId>org.springframework.ws</groupId>
@@ -50,27 +51,27 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.2.0</version>
+                <version>1.4.3</version>
                 <extensions>true</extensions>
                 <configuration>
                     <excludeDependencies>true</excludeDependencies>
                     <instructions>
                         <Bundle-SymbolicName>org.springframework.bundle.ws.support</Bundle-SymbolicName>
-                        <Export-Package>org.springframework.ws*</Export-Package>
+                        <Export-Package>org.springframework.ws*;version="${pom.version}"</Export-Package>
                         <Import-Package>
                             org.apache.commons.logging*,
                             javax.activation*,
                             javax.jms*,
                             javax.mail*,
-                            org.springframework.xml*,
-                            org.springframework.ws*,
-                            org.springframework*;version="2.0",
+                            org.springframework.xml*;version="${pom.version}",
+                            org.springframework.ws*;version="${pom.version}",
+                            org.springframework*;version="[2.0,3.0)",
                             *;resolution:=optional
                         </Import-Package>
-                        <Fragment-Host>org.springframework.bundle.ws.core;version="[${pom.version}, ${pom.version}]"</Fragment-Host>
+                        <Fragment-Host>org.springframework.bundle.ws.core</Fragment-Host>
                         <Implementation-Title>${pom.name}</Implementation-Title>
-                        <Implementation-Version>${pom.version}</Implementation-Version>
                         <Spring-WS-Version>${pom.version}</Spring-WS-Version>
+                        <Bundle-Vendor>SpringSource</Bundle-Vendor>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/xml/pom.xml b/xml/pom.xml
index eafa40dd..aac0b858 100644
--- a/xml/pom.xml
+++ b/xml/pom.xml
@@ -29,12 +29,12 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.2.0</version>
+                <version>1.4.3</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>org.springframework.bundle.ws.xml</Bundle-SymbolicName>
-                        <Export-Package>org.springframework.xml*</Export-Package>
+                        <Export-Package>org.springframework.xml*;version="${pom.version}"</Export-Package>
                         <Import-Package>
                             org.apache.commons.logging*,
                             javax.xml.namespace*,
@@ -43,13 +43,13 @@
                             javax.xml.transform*,
                             org.xml.sax*,
                             org.w3c.dom*,
-                            org.springframework.xml*,
-                            org.springframework*;version="2.0",
+                            org.springframework.xml*;version="${pom.version}",
+                            org.springframework*;version="[2.0,3.0)",
                             *;resolution:=optional
                         </Import-Package>
                         <Implementation-Title>${pom.name}</Implementation-Title>
-                        <Implementation-Version>${pom.version}</Implementation-Version>
                         <Spring-WS-Version>${pom.version}</Spring-WS-Version>
+                        <Bundle-Vendor>SpringSource</Bundle-Vendor>
                     </instructions>
                 </configuration>
             </plugin>