From 9a36c64d6f80637b40f7b8d069ab336460f80812 Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <apoutsma@vmware.com>
Date: Wed, 6 Jan 2010 12:08:20 +0000
Subject: [PATCH] SWS-578 - Fix manifest to disallow usage of
 org.springframework.oxm version 3.0.0

---
 core-tiger/pom.xml | 10 +++----
 core/pom.xml       | 10 +++----
 oxm-tiger/pom.xml  |  8 +++---
 oxm/pom.xml        | 12 ++++-----
 parent/pom.xml     | 65 ++++++++++++++++++++++++++++++----------------
 security/pom.xml   |  4 +--
 support/pom.xml    | 12 +++++----
 xml/pom.xml        |  6 ++---
 8 files changed, 69 insertions(+), 58 deletions(-)

diff --git a/core-tiger/pom.xml b/core-tiger/pom.xml
index 6384b08b..bde22989 100644
--- a/core-tiger/pom.xml
+++ b/core-tiger/pom.xml
@@ -44,8 +44,6 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.4.3</version>
-                <extensions>true</extensions>
                 <configuration>
                     <excludeDependencies>true</excludeDependencies>
                     <instructions>
@@ -56,10 +54,10 @@
                             javax.xml.namespace*,
                             javax.xml.transform*,
                             org.w3c.dom*,
-                            org.springframework.xml*;version="${pom.version}",
-                            org.springframework.oxm*;version="${pom.version}",
-                            org.springframework.ws*;version="${pom.version}",
-                            org.springframework*;version="[2.0,3.1.0)",
+                            org.springframework.xml*;version="[${pom.version},${pom.version}]",
+                            org.springframework.oxm*;version="[${pom.version},${pom.version}]",
+                            org.springframework.ws*;version="[${pom.version},${pom.version}]",
+                            org.springframework*;version="[2.0,4.0)",
                             *;resolution:=optional
                         </Import-Package>
                         <Fragment-Host>org.springframework.bundle.ws.core</Fragment-Host>
diff --git a/core/pom.xml b/core/pom.xml
index 76f5623b..57c94191 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -41,8 +41,6 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.4.3</version>
-                <extensions>true</extensions>
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>org.springframework.bundle.ws.core</Bundle-SymbolicName>
@@ -57,10 +55,10 @@
                             javax.xml.transform*,
                             org.xml.sax*,
                             org.w3c.dom*,
-                            org.springframework.xml*;version="${pom.version}",
-                            org.springframework.oxm*;version="${pom.version}",
-                            org.springframework.ws*;version="${pom.version}",
-                            org.springframework*;version="[2.0,3.1.0)",
+                            org.springframework.xml*;version="[${pom.version},${pom.version}]",
+                            org.springframework.oxm*;version="[${pom.version},${pom.version}]",
+                            org.springframework.ws*;version="[${pom.version},${pom.version}]",
+                            org.springframework*;version="[2.0,4.0)",
                             *;resolution:=optional
                         </Import-Package>
                         <Implementation-Title>${pom.name}</Implementation-Title>
diff --git a/oxm-tiger/pom.xml b/oxm-tiger/pom.xml
index 9c2adbbe..14af5395 100644
--- a/oxm-tiger/pom.xml
+++ b/oxm-tiger/pom.xml
@@ -78,8 +78,6 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.4.3</version>
-                <extensions>true</extensions>
                 <configuration>
                     <excludeDependencies>true</excludeDependencies>
                     <instructions>
@@ -90,9 +88,9 @@
                             javax.xml.namespace*,
                             javax.xml.stream*,
                             javax.xml.transform*,
-                            org.springframework.xml*;version="${pom.version}",
-                            org.springframework.oxm*;version="${pom.version}",
-                            org.springframework*;version="[2.0,3.1.0)",
+                            org.springframework.xml*;version="[${pom.version},${pom.version}]",
+                            org.springframework.oxm*;version="[${pom.version},${pom.version}]",
+                            org.springframework*;version="[2.0,4.0)",
                             *;resolution:=optional
                         </Import-Package>
                         <Fragment-Host>org.springframework.bundle.ws.oxm</Fragment-Host>
diff --git a/oxm/pom.xml b/oxm/pom.xml
index 78e12a18..8ca7a9ce 100644
--- a/oxm/pom.xml
+++ b/oxm/pom.xml
@@ -74,8 +74,6 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.4.3</version>
-                <extensions>true</extensions>
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>org.springframework.bundle.ws.oxm</Bundle-SymbolicName>
@@ -87,11 +85,11 @@
                             javax.xml.transform*,
                             org.xml.sax*,
                             org.w3c.dom*,
-                            org.springframework.xml*;version="${pom.version}",
-                            org.springframework.oxm*;version="${pom.version}",
-                            org.springframework.jms*;version="[2.0,3.1.0)";resolution:=optional,
-                            org.springframework.web*;version="[2.0,3.1.0)";resolution:=optional,
-                            org.springframework*;version="[2.0,3.1.0)",
+                            org.springframework.xml*;version="[${pom.version},${pom.version}]",
+                            org.springframework.oxm*;version="[${pom.version},${pom.version}]",
+                            org.springframework.jms*;version="[2.0,4.0)";resolution:=optional,
+                            org.springframework.web*;version="[2.0,4.0)";resolution:=optional,
+                            org.springframework*;version="[2.0,4.0)",
                             *;resolution:=optional
                         </Import-Package>
                         <Implementation-Title>${pom.name}</Implementation-Title>
diff --git a/parent/pom.xml b/parent/pom.xml
index 7877bc2b..3b9e64fa 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -57,35 +57,56 @@
                 <version>1.2.2</version>
             </extension>
         </extensions>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>2.1</version>
+                    <configuration>
+                        <source>1.3</source>
+                        <target>1.4</target>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <version>2.3</version>
+                    <configuration>
+                        <forkMode>once</forkMode>
+                        <childDelegation>false</childDelegation>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-jar-plugin</artifactId>
+                    <version>2.3</version>
+                    <configuration>
+                        <archive>
+                            <manifest>
+                                <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                            </manifest>
+                            <manifestEntries>
+                                <Spring-WS-Version>${pom.version}</Spring-WS-Version>
+                            </manifestEntries>
+                        </archive>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.felix</groupId>
+                    <artifactId>maven-bundle-plugin</artifactId>
+                    <version>2.0.1</version>
+                    <extensions>true</extensions>
+                </plugin>
+            </plugins>
+        </pluginManagement>
         <plugins>
             <!-- Building -->
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.3</source>
-                    <target>1.4</target>
-                </configuration>
             </plugin>
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.3</version>
-                <configuration>
-                    <forkMode>once</forkMode>
-                    <childDelegation>false</childDelegation>
-                </configuration>
             </plugin>
             <plugin>
                 <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-                        </manifest>
-                        <manifestEntries>
-                            <Spring-WS-Version>${pom.version}</Spring-WS-Version>
-                        </manifestEntries>
-                    </archive>
-                </configuration>
             </plugin>
         </plugins>
     </build>
@@ -93,21 +114,21 @@
         <plugins>
             <plugin>
                 <artifactId>maven-jxr-plugin</artifactId>
+                <version>2.1</version>
                 <configuration>
                     <aggregate>true</aggregate>
                 </configuration>
             </plugin>
             <plugin>
                 <artifactId>maven-surefire-report-plugin</artifactId>
+                <version>2.4.2</version>
                 <configuration>
                     <aggregate>true</aggregate>
                 </configuration>
             </plugin>
-            <plugin>
-                <artifactId>maven-project-info-reports-plugin</artifactId>
-            </plugin>
             <plugin>
                 <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.6.1</version>
                 <configuration>
                     <quiet>true</quiet>
                 </configuration>
diff --git a/security/pom.xml b/security/pom.xml
index 306938f4..c66e40df 100644
--- a/security/pom.xml
+++ b/security/pom.xml
@@ -49,8 +49,6 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.4.3</version>
-                <extensions>true</extensions>
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>org.springframework.bundle.ws.security</Bundle-SymbolicName>
@@ -62,7 +60,7 @@
                             javax.xml.namespace*,
                             javax.xml.soap*,
                             com.sun.xml.wss*,
-                            org.springframework.ws*;version="${pom.version}",
+                            org.springframework.ws*;version="[${pom.version},${pom.version}]",
                             org.springframework*;version="2.0",
                             *;resolution:=optional
                         </Import-Package>
diff --git a/support/pom.xml b/support/pom.xml
index da8efe45..ae6e2c0c 100644
--- a/support/pom.xml
+++ b/support/pom.xml
@@ -50,8 +50,6 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.4.3</version>
-                <extensions>true</extensions>
                 <configuration>
                     <excludeDependencies>true</excludeDependencies>
                     <instructions>
@@ -62,9 +60,9 @@
                             javax.activation*,
                             javax.jms*,
                             javax.mail*,
-                            org.springframework.xml*;version="${pom.version}",
-                            org.springframework.ws*;version="${pom.version}",
-                            org.springframework*;version="[2.0,3.1.0)",
+                            org.springframework.xml*;version="[${pom.version},${pom.version}]",
+                            org.springframework.ws*;version="[${pom.version},${pom.version}]",
+                            org.springframework*;version="[2.0,4.0)",
                             *;resolution:=optional
                         </Import-Package>
                         <Fragment-Host>org.springframework.bundle.ws.core</Fragment-Host>
@@ -91,6 +89,10 @@
             <groupId>org.springframework</groupId>
             <artifactId>spring-jms</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-tx</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
diff --git a/xml/pom.xml b/xml/pom.xml
index 37ff50c2..98378db8 100644
--- a/xml/pom.xml
+++ b/xml/pom.xml
@@ -28,8 +28,6 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.4.3</version>
-                <extensions>true</extensions>
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>org.springframework.bundle.ws.xml</Bundle-SymbolicName>
@@ -42,8 +40,8 @@
                             javax.xml.transform*,
                             org.xml.sax*,
                             org.w3c.dom*,
-                            org.springframework.xml*;version="${pom.version}",
-                            org.springframework*;version="[2.0,3.1.0)",
+                            org.springframework.xml*;version="[${pom.version},${pom.version}]",
+                            org.springframework*;version="[2.0,4.0)",
                             *;resolution:=optional
                         </Import-Package>
                         <Implementation-Title>${pom.name}</Implementation-Title>