commit 0fe0d096029412d10cf3e63e19664cb02f21cc85
author Sean Owen <srowen@gmail.com> Fri Jan 06 13:30:11 2017 +0000
committer Sean Owen <srowen@gmail.com> Fri Jan 06 13:30:11 2017 +0000
tree 4fa610074eaedc8ac5e66f932a96c4e764ba3449
parent b81c9ea01268da0dab04aad2190c64f51bd52abe

Minor dep update

pom.xml

diff --git a/pom.xml b/pom.xml
index f366f35..a6e358a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -97,7 +97,7 @@
     <maven.version.min>3.2.1</maven.version.min>
     <proguard.version>5.3.2</proguard.version>
     <proguard.plugin.version>2.0.13</proguard.plugin.version>
-    <slf4j.version>1.7.21</slf4j.version>
+    <slf4j.version>1.7.22</slf4j.version>
     <!-- This can't reference project.version as some subprojects version differently -->
     <zxing.version>3.3.1-SNAPSHOT</zxing.version>
   </properties>
@@ -362,7 +362,7 @@
           </executions>
           <configuration>
             <sdk>
-              <platform>24</platform>
+              <platform>25</platform>
             </sdk>
             <proguard>
               <skip>true</skip>

zxingorg/src/main/webapp/.ebextensions/server.xml

diff --git a/zxingorg/src/main/webapp/.ebextensions/server.xml b/zxingorg/src/main/webapp/.ebextensions/server.xml
index adaa9e3..a5d9ebc 100644
--- a/zxingorg/src/main/webapp/.ebextensions/server.xml
+++ b/zxingorg/src/main/webapp/.ebextensions/server.xml
@@ -18,7 +18,7 @@
 
 <!-- Additional config:
  JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
- JAVA_OPTS="-Djava.awt.headless=true -Xmx800m -XX:+UseG1GC -XX:+UseStringDeduplication XX:+UseCompressedOops -XX:-OmitStackTraceInFastThrow"
+ JAVA_OPTS="-Djava.awt.headless=true -Xmx640m -XX:+UseG1GC -XX:-OmitStackTraceInFastThrow"
 -->
 
 <Server port="-1" shutdown="">