From 44b20bfc89078097c1e5b745597ba98672ec9096 Mon Sep 17 00:00:00 2001
From: Doug Morato <dm@corp.io>
Date: Tue, 27 Oct 2015 21:19:12 -0400
Subject: [PATCH 1/2] Caching .m2 repository to speed the Travis build

Signed-off-by: Doug Morato <dm@corp.io>
---
 .travis.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 656a6d651..e1b934356 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,9 +6,12 @@ install: "/bin/true"
 script:
   - mvn clean install
   - git clone https://github.com/WebGoat/WebGoat-Lessons.git
-  - mvn -file ./WebGoat-Lessons/pom.xml package
+  - mvn -file ./WebGoat-Lessons/pom.xml clean package
   - cp -fa ./WebGoat-Lessons/target/plugins/*.jar ./webgoat-container/src/main/webapp/plugin_lessons/
   - if [[ $TRAVIS_PULL_REQUEST == "false" ]]; then mvn "-Dbuild.number=$TRAVIS_BUILD_NUMBER" -Prun-integration-tests clean install; else mvn clean install; fi
+cache:
+  directories:
+  - $HOME/.m2
 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/

From ba20f8d14ba58d9948f1ea2740728c24b855a89b Mon Sep 17 00:00:00 2001
From: Doug Morato <dm@corp.io>
Date: Tue, 27 Oct 2015 22:15:14 -0400
Subject: [PATCH 2/2] Fix javax.mail dependecy and update versions

Signed-off-by: Doug Morato <dm@corp.io>
---
 pom.xml                   | 6 +++---
 webgoat-container/pom.xml | 9 ++-------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index 226d490fa..9d706ec4f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -117,7 +117,7 @@
         <cobertura-maven-plugin.version>2.7</cobertura-maven-plugin.version>
         <commons-collections.version>3.2.1</commons-collections.version>
         <commons-digester.version>2.1</commons-digester.version>
-        <commons-discovery.version>0.2</commons-discovery.version>
+        <commons-discovery.version>0.5</commons-discovery.version>
         <commons-fileupload.version>1.3.1</commons-fileupload.version>
         <commons-io.version>2.4</commons-io.version>
         <commons-lang3.version>3.4</commons-lang3.version>
@@ -132,12 +132,12 @@
         <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>
+        <jcl-over-slf4j.version>1.7.12</jcl-over-slf4j.version>
         <jstl.version>1.2</jstl.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.3</mail.version>
+        <mail-api.version>1.5.4</mail-api.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>
diff --git a/webgoat-container/pom.xml b/webgoat-container/pom.xml
index c2908d96b..36dc8d831 100644
--- a/webgoat-container/pom.xml
+++ b/webgoat-container/pom.xml
@@ -284,13 +284,8 @@
         </dependency>
         <dependency>
             <groupId>javax.mail</groupId>
-            <artifactId>mail</artifactId>
-            <version>${mail.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>javax.mail</groupId>
-            <artifactId>mailapi</artifactId>
-            <version>${mail.version}</version>
+            <artifactId>javax.mail-api</artifactId>
+            <version>${mail-api.version}</version>
         </dependency>
         <dependency>
             <groupId>hsqldb</groupId>