upgrade for convergence

Author: wiiitek

pom.xml

@@ -364,7 +364,7 @@
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-reflect</artifactId>
-            <version>2.0.0</version>
+            <version>2.0.2</version>
             <scope>test</scope>
             <exclusions>
                 <exclusion>
@@ -526,36 +526,25 @@
                 </dependencies>
                 <executions>
                     <execution>
-                      <id>enforce-bytecode-version</id>
                       <goals>
                         <goal>enforce</goal>
                       </goals>
                       <configuration>
                         <rules>
+                          <dependencyConvergence />
+                          <requireJavaVersion>
+                            <version>1.7</version>
+                              <message>
+                                ESAPI 2.x now uses the JDK1.7 for it's baseline. Please make sure that your
+                                JAVA_HOME environment variable is pointed to a JDK1.7 distribution.
+                              </message>
+                          </requireJavaVersion>
                           <enforceBytecodeVersion>
                             <maxJdkVersion>1.7</maxJdkVersion>
                           </enforceBytecodeVersion>
                         </rules>
-                        <fail>true</fail>
                       </configuration>
                     </execution>
-                    <execution>
-                        <id>enforce-jdk-version</id>
-                        <goals>
-                            <goal>enforce</goal>
-                        </goals>
-                        <configuration>
-                            <rules>
-                                <requireJavaVersion>
-                                    <version>1.7</version>
-                                    <message>
-                                        ESAPI 2.x now uses the JDK1.7 for it's baseline. Please make sure that your
-                                        JAVA_HOME environment variable is pointed to a JDK1.7 distribution.
-                                    </message>
-                                </requireJavaVersion>
-                            </rules>
-                        </configuration>
-                    </execution>
                 </executions>
             </plugin>