merge from upstream and fixing conflicts
This commit is contained in:
parent
3894a0bb6c
commit
af6973884f
4
pom.xml
4
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>
|
||||
|
Loading…
x
Reference in New Issue
Block a user