diff --git a/datarouter-node/pom.xml b/datarouter-node/pom.xml
index 8879f1c..f9bdce6 100755
--- a/datarouter-node/pom.xml
+++ b/datarouter-node/pom.xml
@@ -41,6 +41,11 @@
     </properties>
     <dependencies>
         <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>${google.guava.version}</version>
+        </dependency>
+        <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
             <version>${commons-codec.version}</version>
@@ -59,7 +64,7 @@
         <dependency>
             <groupId>javax.mail</groupId>
             <artifactId>javax.mail-api</artifactId>
-            <version>1.5.1</version>
+            <version>${javax.mail-api.version}</version>
         </dependency>
         <dependency>
             <groupId>com.att.eelf</groupId>
@@ -155,11 +160,6 @@
             <version>4.4</version>
         </dependency>
         <dependency>
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
-            <version>1.6</version>
-        </dependency>
-        <dependency>
             <groupId>org.mozilla</groupId>
             <artifactId>rhino</artifactId>
             <version>1.7R3</version>
diff --git a/datarouter-prov/pom.xml b/datarouter-prov/pom.xml
index 4685499..c9c0c2f 100755
--- a/datarouter-prov/pom.xml
+++ b/datarouter-prov/pom.xml
@@ -82,7 +82,7 @@
         <dependency>
             <groupId>javax.mail</groupId>
             <artifactId>javax.mail-api</artifactId>
-            <version>1.5.5</version>
+            <version>${javax.mail-api.version}</version>
         </dependency>
         <dependency>
             <groupId>com.att.eelf</groupId>
diff --git a/datarouter-subscriber/pom.xml b/datarouter-subscriber/pom.xml
index de393ba..cc1d486 100755
--- a/datarouter-subscriber/pom.xml
+++ b/datarouter-subscriber/pom.xml
@@ -42,6 +42,11 @@
     </properties>
     <dependencies>
         <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>${google.guava.version}</version>
+        </dependency>
+        <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
             <version>${commons-codec.version}</version>
diff --git a/pom.xml b/pom.xml
index f1b90f4..afbbf92 100755
--- a/pom.xml
+++ b/pom.xml
@@ -47,6 +47,7 @@
         <sonar.projectVersion>${project.version}</sonar.projectVersion>
         <jetty.version>9.3.8.RC0</jetty.version>
         <jetty.websocket.version>8.2.0.v20160908</jetty.websocket.version>
+        <javax.mail-api.version>1.5.5</javax.mail-api.version>
         <dom4j.version>1.6</dom4j.version>
         <thoughtworks.version>1.4.10</thoughtworks.version>
         <google.guava.version>26.0-jre</google.guava.version>