From af6973884f643712a445bcafd0aaee5c8bf2bb2f Mon Sep 17 00:00:00 2001
From: Dheeraj Mummareddy <dheeraj.mummareddy@gmail.com>
Date: Sun, 4 Mar 2018 17:46:29 -0500
Subject: [PATCH] merge from upstream and fixing conflicts

---
 pom.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pom.xml b/pom.xml
index 7e669d396..f65bd1e6b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,6 +48,9 @@
         <mongo-java-driver.version>3.3.0</mongo-java-driver.version>
         <slf4j.version>1.7.21</slf4j.version>
         <logback.version>1.1.7</logback.version>
+        <aws-lambda-core.version>1.1.0</aws-lambda-core.version>
+        <aws-lambda-log4j.version>1.0.0</aws-lambda-log4j.version>
+        <jackson.version>2.8.5</jackson.version>
     </properties>
     <modules>
         <module>abstract-factory</module>
@@ -154,6 +157,7 @@
         <module>eip-aggregator</module>
         <module>retry</module>
 		<module>trampoline</module>
+        <module>serverless</module>
     </modules>
 
     <repositories>