Merge remote-tracking branch 'upstream/master'

This commit is contained in:
DOHA 2015-02-22 18:09:36 +02:00
commit c86b410abc
3 changed files with 3 additions and 2 deletions

View File

@ -172,7 +172,7 @@
<!-- Spring -->
<org.springframework.version>4.1.5.RELEASE</org.springframework.version>
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
<javassist.version>3.18.1-GA</javassist.version>
<javassist.version>3.19.0-GA</javassist.version>
<!-- persistence -->
<hibernate.version>4.3.8.Final</hibernate.version>

View File

@ -0,0 +1 @@
email.properties

View File

@ -3,5 +3,5 @@ smtp.host=email-smtp.us-east-1.amazonaws.com
smtp.port=465
smtp.protocol=smtps
smtp.username=AKIAJIKXZAQFFJDXI4VQ
smtp.password=AjYQNjXVTalbpfRL37RYqyXEkyQAvmKFcUFQllfAsBLh
smtp.password=
support.email=eugen@baeldung.com