Browse Source

Fix pom.xml

Rob Winch 8 years ago
parent
commit
53ccda1549

+ 9 - 9
acl/pom.xml

@@ -46,19 +46,19 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-aop</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-core</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
       <exclusions>
         <exclusion>
@@ -70,13 +70,13 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-jdbc</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-tx</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -132,19 +132,19 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-beans</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context-support</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-test</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -157,7 +157,7 @@
   <build>
     <plugins>
       <plugin>
-        <maven-compiler-plugin/>
+        <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <source>1.7</source>
           <target>1.7</target>

+ 6 - 6
aspects/pom.xml

@@ -40,19 +40,19 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-beans</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-core</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
       <exclusions>
         <exclusion>
@@ -114,13 +114,13 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-aop</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-test</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -133,7 +133,7 @@
   <build>
     <plugins>
       <plugin>
-        <maven-compiler-plugin/>
+        <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <source>1.7</source>
           <target>1.7</target>

+ 6 - 6
cas/pom.xml

@@ -52,19 +52,19 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-beans</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-core</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
       <exclusions>
         <exclusion>
@@ -76,7 +76,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-web</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -132,7 +132,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-test</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -145,7 +145,7 @@
   <build>
     <plugins>
       <plugin>
-        <maven-compiler-plugin/>
+        <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <source>1.7</source>
           <target>1.7</target>

+ 12 - 12
config/pom.xml

@@ -46,25 +46,25 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-aop</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-beans</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-core</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
       <exclusions>
         <exclusion>
@@ -118,28 +118,28 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-jdbc</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-tx</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-web</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-webmvc</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
       <optional>true</optional>
     </dependency>
@@ -362,19 +362,19 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-expression</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-orm</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-test</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -387,7 +387,7 @@
   <build>
     <plugins>
       <plugin>
-        <maven-compiler-plugin/>
+        <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <source>1.7</source>
           <target>1.7</target>

+ 9 - 9
core/pom.xml

@@ -40,25 +40,25 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-aop</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-beans</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-core</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
       <exclusions>
         <exclusion>
@@ -70,7 +70,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-expression</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -104,14 +104,14 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-jdbc</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-tx</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
       <optional>true</optional>
     </dependency>
@@ -262,7 +262,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-test</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>
@@ -281,7 +281,7 @@
   <build>
     <plugins>
       <plugin>
-        <maven-compiler-plugin/>
+        <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <source>1.7</source>
           <target>1.7</target>

+ 2 - 2
crypto/pom.xml

@@ -71,7 +71,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-test</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -84,7 +84,7 @@
   <build>
     <plugins>
       <plugin>
-        <maven-compiler-plugin/>
+        <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <source>1.7</source>
           <target>1.7</target>

+ 2 - 2
gradle/maven-deployment.gradle

@@ -94,14 +94,14 @@ def customizePom(pom, gradleProject) {
         def plugins = asNode().appendNode('build').appendNode('plugins')
         plugins
             .appendNode('plugin')
-                .appendNode('maven-compiler-plugin').parent()
+                .appendNode('artifactId','maven-compiler-plugin').parent()
                 .appendNode('configuration')
                     .appendNode('source','1.7').parent()
                     .appendNode('target','1.7')
         if(isWar) {
             plugins
                 .appendNode('plugin')
-                    .appendNode('maven-war-plugin').parent()
+                    .appendNode('artifactId','maven-war-plugin').parent()
                     .appendNode('version','2.3').parent()
                     .appendNode('configuration')
                         .appendNode('failOnMissingWebXml','false')

+ 7 - 7
itest/context/pom.xml

@@ -52,25 +52,25 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-aop</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-beans</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-tx</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -137,13 +137,13 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-test</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-web</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -156,7 +156,7 @@
   <build>
     <plugins>
       <plugin>
-        <maven-compiler-plugin/>
+        <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <source>1.7</source>
           <target>1.7</target>

+ 6 - 6
itest/web/pom.xml

@@ -34,13 +34,13 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-web</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -171,19 +171,19 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-beans</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-test</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-webmvc</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -203,7 +203,7 @@
   <build>
     <plugins>
       <plugin>
-        <maven-compiler-plugin/>
+        <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <source>1.7</source>
           <target>1.7</target>

+ 12 - 12
ldap/pom.xml

@@ -38,20 +38,20 @@
       <scope>compile</scope>
       <exclusions>
         <exclusion>
-          <artifactId>spring-beans</artifactId>
+          <artifactId>spring-core</artifactId>
           <groupId>org.springframework</groupId>
         </exclusion>
         <exclusion>
-          <artifactId>spring-core</artifactId>
+          <artifactId>spring-tx</artifactId>
           <groupId>org.springframework</groupId>
         </exclusion>
         <exclusion>
-          <artifactId>commons-logging</artifactId>
-          <groupId>commons-logging</groupId>
+          <artifactId>spring-beans</artifactId>
+          <groupId>org.springframework</groupId>
         </exclusion>
         <exclusion>
-          <artifactId>spring-tx</artifactId>
-          <groupId>org.springframework</groupId>
+          <artifactId>commons-logging</artifactId>
+          <groupId>commons-logging</groupId>
         </exclusion>
       </exclusions>
     </dependency>
@@ -64,19 +64,19 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-beans</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-core</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
       <exclusions>
         <exclusion>
@@ -88,7 +88,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-tx</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -186,7 +186,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-test</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -199,7 +199,7 @@
   <build>
     <plugins>
       <plugin>
-        <maven-compiler-plugin/>
+        <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <source>1.7</source>
           <target>1.7</target>

+ 7 - 7
openid/pom.xml

@@ -64,25 +64,25 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-aop</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-beans</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-core</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
       <exclusions>
         <exclusion>
@@ -94,7 +94,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-web</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -155,7 +155,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-test</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -168,7 +168,7 @@
   <build>
     <plugins>
       <plugin>
-        <maven-compiler-plugin/>
+        <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <source>1.7</source>
           <target>1.7</target>

+ 6 - 6
remoting/pom.xml

@@ -46,19 +46,19 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-beans</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-core</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
       <exclusions>
         <exclusion>
@@ -70,7 +70,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-web</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -113,7 +113,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-test</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -126,7 +126,7 @@
   <build>
     <plugins>
       <plugin>
-        <maven-compiler-plugin/>
+        <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <source>1.7</source>
           <target>1.7</target>

+ 2 - 2
samples/aspectj-jc/pom.xml

@@ -96,7 +96,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-test</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -109,7 +109,7 @@
   <build>
     <plugins>
       <plugin>
-        <maven-compiler-plugin/>
+        <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <source>1.7</source>
           <target>1.7</target>

+ 2 - 2
samples/aspectj-xml/pom.xml

@@ -96,7 +96,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-test</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -109,7 +109,7 @@
   <build>
     <plugins>
       <plugin>
-        <maven-compiler-plugin/>
+        <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <source>1.7</source>
           <target>1.7</target>

+ 3 - 3
samples/cas/sample-xml/pom.xml

@@ -177,7 +177,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-test</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -190,14 +190,14 @@
   <build>
     <plugins>
       <plugin>
-        <maven-compiler-plugin/>
+        <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <source>1.7</source>
           <target>1.7</target>
         </configuration>
       </plugin>
       <plugin>
-        <maven-war-plugin/>
+        <artifactId>maven-war-plugin</artifactId>
         <version>2.3</version>
         <configuration>
           <failOnMissingWebXml>false</failOnMissingWebXml>

+ 3 - 3
samples/cas/server/pom.xml

@@ -75,7 +75,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-test</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -88,14 +88,14 @@
   <build>
     <plugins>
       <plugin>
-        <maven-compiler-plugin/>
+        <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <source>1.7</source>
           <target>1.7</target>
         </configuration>
       </plugin>
       <plugin>
-        <maven-war-plugin/>
+        <artifactId>maven-war-plugin</artifactId>
         <version>2.3</version>
         <configuration>
           <failOnMissingWebXml>false</failOnMissingWebXml>

+ 5 - 5
samples/concurrency-jc/pom.xml

@@ -104,13 +104,13 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-jdbc</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-webmvc</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -171,7 +171,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-test</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -184,14 +184,14 @@
   <build>
     <plugins>
       <plugin>
-        <maven-compiler-plugin/>
+        <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <source>1.7</source>
           <target>1.7</target>
         </configuration>
       </plugin>
       <plugin>
-        <maven-war-plugin/>
+        <artifactId>maven-war-plugin</artifactId>
         <version>2.3</version>
         <configuration>
           <failOnMissingWebXml>false</failOnMissingWebXml>

+ 11 - 11
samples/contacts-xml/pom.xml

@@ -50,43 +50,43 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-aop</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-beans</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-jdbc</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-tx</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-web</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-webmvc</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -159,7 +159,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context-support</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
@@ -183,7 +183,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-test</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -196,14 +196,14 @@
   <build>
     <plugins>
       <plugin>
-        <maven-compiler-plugin/>
+        <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <source>1.7</source>
           <target>1.7</target>
         </configuration>
       </plugin>
       <plugin>
-        <maven-war-plugin/>
+        <artifactId>maven-war-plugin</artifactId>
         <version>2.3</version>
         <configuration>
           <failOnMissingWebXml>false</failOnMissingWebXml>

+ 7 - 7
samples/dms-xml/pom.xml

@@ -46,19 +46,19 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-beans</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-jdbc</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-tx</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -90,7 +90,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context-support</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
@@ -126,13 +126,13 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-test</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -145,7 +145,7 @@
   <build>
     <plugins>
       <plugin>
-        <maven-compiler-plugin/>
+        <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <source>1.7</source>
           <target>1.7</target>

+ 5 - 5
samples/form-jc/pom.xml

@@ -104,13 +104,13 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-jdbc</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-webmvc</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -171,7 +171,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-test</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -184,14 +184,14 @@
   <build>
     <plugins>
       <plugin>
-        <maven-compiler-plugin/>
+        <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <source>1.7</source>
           <target>1.7</target>
         </configuration>
       </plugin>
       <plugin>
-        <maven-war-plugin/>
+        <artifactId>maven-war-plugin</artifactId>
         <version>2.3</version>
         <configuration>
           <failOnMissingWebXml>false</failOnMissingWebXml>

+ 8 - 8
samples/gae-xml/pom.xml

@@ -74,31 +74,31 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-beans</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context-support</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-web</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-webmvc</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -183,7 +183,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-test</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -196,14 +196,14 @@
   <build>
     <plugins>
       <plugin>
-        <maven-compiler-plugin/>
+        <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <source>1.7</source>
           <target>1.7</target>
         </configuration>
       </plugin>
       <plugin>
-        <maven-war-plugin/>
+        <artifactId>maven-war-plugin</artifactId>
         <version>2.3</version>
         <configuration>
           <failOnMissingWebXml>false</failOnMissingWebXml>

+ 5 - 5
samples/hellojs-jc/pom.xml

@@ -110,13 +110,13 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-jdbc</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-webmvc</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -177,7 +177,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-test</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -190,14 +190,14 @@
   <build>
     <plugins>
       <plugin>
-        <maven-compiler-plugin/>
+        <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <source>1.7</source>
           <target>1.7</target>
         </configuration>
       </plugin>
       <plugin>
-        <maven-war-plugin/>
+        <artifactId>maven-war-plugin</artifactId>
         <version>2.3</version>
         <configuration>
           <failOnMissingWebXml>false</failOnMissingWebXml>

+ 5 - 5
samples/hellomvc-jc/pom.xml

@@ -104,13 +104,13 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-jdbc</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-webmvc</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -171,7 +171,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-test</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -184,14 +184,14 @@
   <build>
     <plugins>
       <plugin>
-        <maven-compiler-plugin/>
+        <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <source>1.7</source>
           <target>1.7</target>
         </configuration>
       </plugin>
       <plugin>
-        <maven-war-plugin/>
+        <artifactId>maven-war-plugin</artifactId>
         <version>2.3</version>
         <configuration>
           <failOnMissingWebXml>false</failOnMissingWebXml>

+ 3 - 3
samples/helloworld-jc/pom.xml

@@ -111,7 +111,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-test</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -124,14 +124,14 @@
   <build>
     <plugins>
       <plugin>
-        <maven-compiler-plugin/>
+        <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <source>1.7</source>
           <target>1.7</target>
         </configuration>
       </plugin>
       <plugin>
-        <maven-war-plugin/>
+        <artifactId>maven-war-plugin</artifactId>
         <version>2.3</version>
         <configuration>
           <failOnMissingWebXml>false</failOnMissingWebXml>

+ 5 - 5
samples/inmemory-jc/pom.xml

@@ -104,13 +104,13 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-jdbc</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-webmvc</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -171,7 +171,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-test</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -184,14 +184,14 @@
   <build>
     <plugins>
       <plugin>
-        <maven-compiler-plugin/>
+        <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <source>1.7</source>
           <target>1.7</target>
         </configuration>
       </plugin>
       <plugin>
-        <maven-war-plugin/>
+        <artifactId>maven-war-plugin</artifactId>
         <version>2.3</version>
         <configuration>
           <failOnMissingWebXml>false</failOnMissingWebXml>

+ 3 - 3
samples/insecure/pom.xml

@@ -99,7 +99,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-test</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -112,14 +112,14 @@
   <build>
     <plugins>
       <plugin>
-        <maven-compiler-plugin/>
+        <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <source>1.7</source>
           <target>1.7</target>
         </configuration>
       </plugin>
       <plugin>
-        <maven-war-plugin/>
+        <artifactId>maven-war-plugin</artifactId>
         <version>2.3</version>
         <configuration>
           <failOnMissingWebXml>false</failOnMissingWebXml>

+ 5 - 5
samples/insecuremvc/pom.xml

@@ -86,13 +86,13 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-jdbc</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-webmvc</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -153,7 +153,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-test</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -166,14 +166,14 @@
   <build>
     <plugins>
       <plugin>
-        <maven-compiler-plugin/>
+        <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <source>1.7</source>
           <target>1.7</target>
         </configuration>
       </plugin>
       <plugin>
-        <maven-war-plugin/>
+        <artifactId>maven-war-plugin</artifactId>
         <version>2.3</version>
         <configuration>
           <failOnMissingWebXml>false</failOnMissingWebXml>

+ 7 - 7
samples/jaas-xml/pom.xml

@@ -44,19 +44,19 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-beans</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-web</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -117,7 +117,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context-support</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
@@ -141,7 +141,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-test</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -154,14 +154,14 @@
   <build>
     <plugins>
       <plugin>
-        <maven-compiler-plugin/>
+        <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <source>1.7</source>
           <target>1.7</target>
         </configuration>
       </plugin>
       <plugin>
-        <maven-war-plugin/>
+        <artifactId>maven-war-plugin</artifactId>
         <version>2.3</version>
         <configuration>
           <failOnMissingWebXml>false</failOnMissingWebXml>

+ 5 - 5
samples/jdbc-jc/pom.xml

@@ -104,13 +104,13 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-jdbc</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-webmvc</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -171,7 +171,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-test</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -184,14 +184,14 @@
   <build>
     <plugins>
       <plugin>
-        <maven-compiler-plugin/>
+        <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <source>1.7</source>
           <target>1.7</target>
         </configuration>
       </plugin>
       <plugin>
-        <maven-war-plugin/>
+        <artifactId>maven-war-plugin</artifactId>
         <version>2.3</version>
         <configuration>
           <failOnMissingWebXml>false</failOnMissingWebXml>

+ 5 - 5
samples/ldap-jc/pom.xml

@@ -146,13 +146,13 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-jdbc</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-webmvc</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -213,7 +213,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-test</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -226,14 +226,14 @@
   <build>
     <plugins>
       <plugin>
-        <maven-compiler-plugin/>
+        <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <source>1.7</source>
           <target>1.7</target>
         </configuration>
       </plugin>
       <plugin>
-        <maven-war-plugin/>
+        <artifactId>maven-war-plugin</artifactId>
         <version>2.3</version>
         <configuration>
           <failOnMissingWebXml>false</failOnMissingWebXml>

+ 3 - 3
samples/ldap-xml/pom.xml

@@ -129,7 +129,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-test</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -142,14 +142,14 @@
   <build>
     <plugins>
       <plugin>
-        <maven-compiler-plugin/>
+        <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <source>1.7</source>
           <target>1.7</target>
         </configuration>
       </plugin>
       <plugin>
-        <maven-war-plugin/>
+        <artifactId>maven-war-plugin</artifactId>
         <version>2.3</version>
         <configuration>
           <failOnMissingWebXml>false</failOnMissingWebXml>

+ 11 - 11
samples/messages-jc/pom.xml

@@ -94,55 +94,55 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-aop</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-aspects</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-beans</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-core</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-instrument</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-orm</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-tx</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-webmvc</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -203,7 +203,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-test</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -216,7 +216,7 @@
   <build>
     <plugins>
       <plugin>
-        <maven-compiler-plugin/>
+        <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <source>1.7</source>
           <target>1.7</target>

+ 5 - 5
samples/openid-jc/pom.xml

@@ -110,13 +110,13 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-jdbc</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-webmvc</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -183,7 +183,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-test</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -196,14 +196,14 @@
   <build>
     <plugins>
       <plugin>
-        <maven-compiler-plugin/>
+        <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <source>1.7</source>
           <target>1.7</target>
         </configuration>
       </plugin>
       <plugin>
-        <maven-war-plugin/>
+        <artifactId>maven-war-plugin</artifactId>
         <version>2.3</version>
         <configuration>
           <failOnMissingWebXml>false</failOnMissingWebXml>

+ 3 - 3
samples/openid-xml/pom.xml

@@ -117,7 +117,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-test</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -130,14 +130,14 @@
   <build>
     <plugins>
       <plugin>
-        <maven-compiler-plugin/>
+        <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <source>1.7</source>
           <target>1.7</target>
         </configuration>
       </plugin>
       <plugin>
-        <maven-war-plugin/>
+        <artifactId>maven-war-plugin</artifactId>
         <version>2.3</version>
         <configuration>
           <failOnMissingWebXml>false</failOnMissingWebXml>

+ 5 - 5
samples/preauth-jc/pom.xml

@@ -104,13 +104,13 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-jdbc</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-webmvc</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -171,7 +171,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-test</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -184,14 +184,14 @@
   <build>
     <plugins>
       <plugin>
-        <maven-compiler-plugin/>
+        <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <source>1.7</source>
           <target>1.7</target>
         </configuration>
       </plugin>
       <plugin>
-        <maven-war-plugin/>
+        <artifactId>maven-war-plugin</artifactId>
         <version>2.3</version>
         <configuration>
           <failOnMissingWebXml>false</failOnMissingWebXml>

+ 3 - 3
samples/preauth-xml/pom.xml

@@ -87,7 +87,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-test</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -100,14 +100,14 @@
   <build>
     <plugins>
       <plugin>
-        <maven-compiler-plugin/>
+        <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <source>1.7</source>
           <target>1.7</target>
         </configuration>
       </plugin>
       <plugin>
-        <maven-war-plugin/>
+        <artifactId>maven-war-plugin</artifactId>
         <version>2.3</version>
         <configuration>
           <failOnMissingWebXml>false</failOnMissingWebXml>

+ 5 - 5
samples/rememberme-jc/pom.xml

@@ -104,13 +104,13 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-jdbc</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-webmvc</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -171,7 +171,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-test</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -184,14 +184,14 @@
   <build>
     <plugins>
       <plugin>
-        <maven-compiler-plugin/>
+        <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <source>1.7</source>
           <target>1.7</target>
         </configuration>
       </plugin>
       <plugin>
-        <maven-war-plugin/>
+        <artifactId>maven-war-plugin</artifactId>
         <version>2.3</version>
         <configuration>
           <failOnMissingWebXml>false</failOnMissingWebXml>

+ 8 - 8
samples/servletapi-xml/pom.xml

@@ -56,25 +56,25 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-beans</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-web</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-webmvc</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -123,7 +123,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context-support</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
@@ -147,7 +147,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-test</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -160,14 +160,14 @@
   <build>
     <plugins>
       <plugin>
-        <maven-compiler-plugin/>
+        <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <source>1.7</source>
           <target>1.7</target>
         </configuration>
       </plugin>
       <plugin>
-        <maven-war-plugin/>
+        <artifactId>maven-war-plugin</artifactId>
         <version>2.3</version>
         <configuration>
           <failOnMissingWebXml>false</failOnMissingWebXml>

+ 6 - 6
samples/tutorial-xml/pom.xml

@@ -50,19 +50,19 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-beans</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-web</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-webmvc</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -147,7 +147,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-test</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -160,14 +160,14 @@
   <build>
     <plugins>
       <plugin>
-        <maven-compiler-plugin/>
+        <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <source>1.7</source>
           <target>1.7</target>
         </configuration>
       </plugin>
       <plugin>
-        <maven-war-plugin/>
+        <artifactId>maven-war-plugin</artifactId>
         <version>2.3</version>
         <configuration>
           <failOnMissingWebXml>false</failOnMissingWebXml>

+ 5 - 5
samples/x509-jc/pom.xml

@@ -104,13 +104,13 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-jdbc</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-webmvc</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -171,7 +171,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-test</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -184,14 +184,14 @@
   <build>
     <plugins>
       <plugin>
-        <maven-compiler-plugin/>
+        <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <source>1.7</source>
           <target>1.7</target>
         </configuration>
       </plugin>
       <plugin>
-        <maven-war-plugin/>
+        <artifactId>maven-war-plugin</artifactId>
         <version>2.3</version>
         <configuration>
           <failOnMissingWebXml>false</failOnMissingWebXml>

+ 8 - 8
taglibs/pom.xml

@@ -52,25 +52,25 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-aop</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-beans</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-core</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
       <exclusions>
         <exclusion>
@@ -82,13 +82,13 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-expression</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-web</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -179,7 +179,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-test</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -192,7 +192,7 @@
   <build>
     <plugins>
       <plugin>
-        <maven-compiler-plugin/>
+        <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <source>1.7</source>
           <target>1.7</target>

+ 10 - 10
web/pom.xml

@@ -46,19 +46,19 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-beans</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-core</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
       <exclusions>
         <exclusion>
@@ -70,13 +70,13 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-expression</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-web</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -89,21 +89,21 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-jdbc</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-tx</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-webmvc</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>compile</scope>
       <optional>true</optional>
     </dependency>
@@ -230,7 +230,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-test</artifactId>
-      <version>3.2.17.RELEASE</version>
+      <version>3.2.18.RELEASE</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -243,7 +243,7 @@
   <build>
     <plugins>
       <plugin>
-        <maven-compiler-plugin/>
+        <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <source>1.7</source>
           <target>1.7</target>