Permalink
Browse files

Minor dep update

1 parent b81c9ea commit 0fe0d096029412d10cf3e63e19664cb02f21cc85 @srowen srowen committed Jan 6, 2017
Showing with 3 additions and 3 deletions.
  1. +2 −2 pom.xml
  2. +1 −1 zxingorg/src/main/webapp/.ebextensions/server.xml
View
@@ -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>
@@ -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="">

0 comments on commit 0fe0d09

Please sign in to comment.