Merge pull request #136 from dougmorato/master

Update dependency version, build number and unregister DB driver

.travis.yml

@@ -8,7 +8,7 @@ script:
   - git clone https://github.com/WebGoat/WebGoat-Lessons.git
   - mvn -file ./WebGoat-Lessons/pom.xml package
   - cp -fa ./WebGoat-Lessons/target/plugins/*.jar ./webgoat-container/src/main/webapp/plugin_lessons/
-  - if [[ $TRAVIS_PULL_REQUEST == "false" ]]; then mvn -Prun-integration-tests clean install; else mvn clean install; fi
+  - if [[ $TRAVIS_PULL_REQUEST == "false" ]]; then mvn "-Dbuild.number=$TRAVIS_BUILD_NUMBER" -Prun-integration-tests clean install; else mvn clean install; fi
 before_deploy:
   - export WEBGOAT_CONTAINTER_TARGET_DIR=$HOME/build/$TRAVIS_REPO_SLUG/webgoat-container/target
   - export WEBGOAT_ARTIFACTS_FOLDER=$HOME/build/$TRAVIS_REPO_SLUG/Deployable_Artifacts/

pom.xml

@@ -27,7 +27,7 @@
 
     <developers>
         <developer>
-            <id>mayher64</id>
+            <id>mayhew64</id>
             <name>Bruce Mayhew</name>
             <email>webgoat@owasp.org</email>
             <organization>OWASP</organization>
@@ -108,58 +108,58 @@
         <build.number>build</build.number>
 
         <!-- Shared properties with plugins and version numbers across submodules-->
-        <activation.version>1.1</activation.version>
+        <activation.version>1.1.1</activation.version>
-        <axis-ant.version>1.2</axis-ant.version>
+        <axis-ant.version>1.4</axis-ant.version>
-        <axis-jaxrpc.version>1.2</axis-jaxrpc.version>
+        <axis-jaxrpc.version>1.4</axis-jaxrpc.version>
-        <axis-saaj.version>1.2</axis-saaj.version>
+        <axis-saaj.version>1.4</axis-saaj.version>
-        <axis.version>1.2</axis.version>
+        <axis.version>1.4</axis.version>
-        <build-helper-maven-plugin.version>1.7</build-helper-maven-plugin.version>
+        <build-helper-maven-plugin.version>1.9.1</build-helper-maven-plugin.version>
         <cobertura-maven-plugin.version>2.7</cobertura-maven-plugin.version>
-        <commons-collections.version>3.1</commons-collections.version>
+        <commons-collections.version>3.2.1</commons-collections.version>
-        <commons-digester.version>1.8.1</commons-digester.version>
+        <commons-digester.version>2.1</commons-digester.version>
         <commons-discovery.version>0.2</commons-discovery.version>
-        <commons-fileupload.version>1.2.2</commons-fileupload.version>
+        <commons-fileupload.version>1.3.1</commons-fileupload.version>
-        <commons-io.version>1.4</commons-io.version>
+        <commons-io.version>2.4</commons-io.version>
-        <commons-lang3.version>3.3.2</commons-lang3.version>
+        <commons-lang3.version>3.4</commons-lang3.version>
-        <commons-logging.version>1.1.3</commons-logging.version>
+        <commons-logging.version>1.2</commons-logging.version>
         <coveralls-maven-plugin.version>4.0.0</coveralls-maven-plugin.version>
         <ecs.version>1.4.2</ecs.version>
         <guava.version>18.0</guava.version>
-        <h2.version>1.4.187</h2.version>
+        <h2.version>1.4.190</h2.version>
         <hsqldb.version>1.8.0.10</hsqldb.version>
         <j2h.version>1.3.1</j2h.version>
-        <jackson-core.version>2.0.4</jackson-core.version>
+        <jackson-core.version>2.6.3</jackson-core.version>
-        <jackson-databind.version>2.0.4</jackson-databind.version>
+        <jackson-databind.version>2.6.3</jackson-databind.version>
         <javaee-api.version>6.0</javaee-api.version>
         <javax.transaction-api.version>1.2</javax.transaction-api.version>
         <jcl-over-slf4j.version>1.7.7</jcl-over-slf4j.version>
         <jstl.version>1.2</jstl.version>
-        <jtds.version>1.2.2</jtds.version>
+        <jtds.version>1.3.1</jtds.version>
         <junit.version>4.12</junit.version>
         <log4j.version>1.2.17</log4j.version>
-        <mail.version>1.4.2</mail.version>
+        <mail.version>1.4.3</mail.version>
-        <maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
+        <maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
         <maven-failsafe-plugin.version>2.19</maven-failsafe-plugin.version>
         <maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
         <maven-jar-plugin.version>2.6</maven-jar-plugin.version>
         <maven-javadoc-plugin.version>2.10.3</maven-javadoc-plugin.version>
         <maven-release-plugin.version>2.5.2</maven-release-plugin.version>
         <maven-source-plugin.version>2.4</maven-source-plugin.version>
-        <maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
+        <maven-surefire-plugin.version>2.19</maven-surefire-plugin.version>
-        <maven-war-plugin.version>2.4</maven-war-plugin.version>
+        <maven-war-plugin.version>2.6</maven-war-plugin.version>
         <nexus-staging-maven-plugin.version>1.6.6</nexus-staging-maven-plugin.version>
         <org.springframework.version>3.2.4.RELEASE</org.springframework.version>
-        <sauce_junit.version>2.1.18</sauce_junit.version>
+        <sauce_junit.version>2.1.20</sauce_junit.version>
-        <selenium-java.version>2.47.1</selenium-java.version>
+        <selenium-java.version>2.48.2</selenium-java.version>
-        <slf4j-api.version>1.7.7</slf4j-api.version>
+        <slf4j-api.version>1.7.12</slf4j-api.version>
-        <slf4j-log4j12.version>1.7.7</slf4j-log4j12.version>
+        <slf4j-log4j12.version>1.7.12</slf4j-log4j12.version>
         <spring.security.version>3.2.4.RELEASE</spring.security.version>
         <standard.version>1.1.2</standard.version>
-        <tiles.version>2.2.2</tiles.version>
+        <tiles.version>3.0.5</tiles.version>
+        <tomcat-catalina.version>7.0.65</tomcat-catalina.version>
         <tomcat7-maven-plugin.version>2.3-SNAPSHOT</tomcat7-maven-plugin.version>
-        <wsdl4j.version>1.5.1</wsdl4j.version>
-        <tomcat-catalina.version>7.0.63</tomcat-catalina.version>
         <versioneye-maven-plugin.version>3.5.1</versioneye-maven-plugin.version>
+        <wsdl4j.version>1.6.3</wsdl4j.version>
     </properties>
 
     <modules>

webgoat-container/src/main/java/org/owasp/webgoat/application/WebGoatServletListener.java

@@ -10,6 +10,10 @@ import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
 import java.io.IOException;
 import java.io.InputStream;
+import java.sql.Driver;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.util.Enumeration;
 import java.util.jar.Attributes;
 import java.util.jar.Manifest;
 
@@ -34,6 +38,27 @@ public class WebGoatServletListener implements ServletContextListener {
     public void contextDestroyed(ServletContextEvent sce) {
         ServletContext context = sce.getServletContext();
         context.log("WebGoat is stopping");
+
+        // Unregister JDBC drivers in this context's ClassLoader:
+        // Get the webapp's ClassLoader
+        ClassLoader cl = Thread.currentThread().getContextClassLoader();
+        // Loop through all drivers
+        Enumeration<Driver> drivers = DriverManager.getDrivers();
+        while (drivers.hasMoreElements()) {
+            java.sql.Driver driver = drivers.nextElement();
+            if (driver.getClass().getClassLoader() == cl) {
+                // This driver was registered by the webapp's ClassLoader, so deregister it:
+                try {
+                    context.log("Unregister JDBC driver {}");
+                    DriverManager.deregisterDriver(driver);
+                } catch (SQLException ex) {
+                    context.log("Error unregistering JDBC driver {}");
+                }
+            } else {
+                // driver was not registered by the webapp's ClassLoader and may be in use elsewhere
+                context.log("Not unregistering JDBC driver {} as it does not belong to this webapp's ClassLoader");
+            }
+        }
     }
 
     private void setApplicationVariables(ServletContext context) {