Upgrade log4j to 2.13.2 change Google Guava and java version

awslabs · Aug 14, 2020 · 534e92d · 534e92d
1 parent 1ee2587
commit 534e92d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 12 deletions.
diff --git a/build.xml b/build.xml
@@ -21,13 +21,12 @@
     <target name="get-java-version">
       <condition property="current.java.version">
         <or>
-          <equals arg1="${ant.java.version}" arg2="1.7"/>
           <equals arg1="${ant.java.version}" arg2="1.8"/>
         </or>
       </condition>
     </target>
     <target name="check-java-version" depends="get-java-version" unless="current.java.version">
-        <fail message="Unsupported Java version: ${ant.java.version}. Make sure that the Java version is 1.7 or greater."/>
+        <fail message="Unsupported Java version: ${ant.java.version}. Make sure that the Java version is 1.8 or greater."/>
     </target>
 
     <target name="init">
@@ -37,7 +36,7 @@
     <target name="compile" depends="check-java-version, init">
         <mkdir dir="${build.private}" />
     	<property name="build.compiler" value="javac1.7" />
-        <javac source="1.7" target="1.7" includeantruntime="false" classpathref="classpath" srcdir="${src.dir}" destdir="${build.private}" debug="true" />
+        <javac source="1.8" target="1.8" includeantruntime="false" classpathref="classpath" srcdir="${src.dir}" destdir="${build.private}" debug="true" />
         <property name="src.agent.path" value="com/amazon/kinesis/streaming/agent" />
         <copy todir="${build.private}/${src.agent.path}" failonerror="true">
             <fileset dir="${src.dir}/${src.agent.path}" excludes="**/*.java" />

diff --git a/pom.xml b/pom.xml
@@ -95,7 +95,7 @@
         <dependency>
           <groupId>com.google.guava</groupId>
           <artifactId>guava</artifactId>
-          <version>28.2-android</version>
+          <version>28.2-jre</version>
         </dependency>
         <dependency>
           <groupId>org.apache.httpcomponents</groupId>
@@ -155,12 +155,12 @@
         <dependency>
           <groupId>org.apache.logging.log4j</groupId>
           <artifactId>log4j-1.2-api</artifactId>
-          <version>2.12.1</version>
+          <version>2.13.2</version>
         </dependency>
         <dependency>
           <groupId>org.apache.logging.log4j</groupId>
           <artifactId>log4j-core</artifactId>
-          <version>2.12.1</version>
+          <version>2.13.2</version>
           <scope>runtime</scope>
         </dependency>
         <dependency>
@@ -171,7 +171,7 @@
         <dependency>
           <groupId>org.apache.logging.log4j</groupId>
           <artifactId>log4j-slf4j-impl</artifactId>
-          <version>2.12.1</version>
+          <version>2.13.2</version>
           <exclusions>
             <exclusion>
               <groupId>log4j</groupId> 

diff --git a/setup b/setup
@@ -111,7 +111,7 @@ download_dependencies() {
                   com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.10.3 \
                   com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.10.3 \
                   com.google.code.findbugs:jsr305:3.0.1 \
-                  com.google.guava:guava:28.2-android \
+                  com.google.guava:guava:28.2-jre \
                   org.apache.httpcomponents:httpclient:4.5.1 \
                   org.apache.httpcomponents:httpclient-cache:4.5.1 \
                   org.apache.httpcomponents:httpmime:4.5.1 \
@@ -123,10 +123,10 @@ download_dependencies() {
                   commons-logging:commons-logging-adapters:1.1 \
                   commons-logging:commons-logging-api:1.1 \
                   org.apache.commons:commons-lang3:3.4 \
-                  org.apache.logging.log4j:log4j-1.2-api:2.12.1 \
-                  org.apache.logging.log4j:log4j-api:2.12.1 \
-                  org.apache.logging.log4j:log4j-core:2.12.1 \
-                  org.apache.logging.log4j:log4j-slf4j-impl:2.12.1 \
+                  org.apache.logging.log4j:log4j-1.2-api:2.13.2 \
+                  org.apache.logging.log4j:log4j-api:2.13.2 \
+                  org.apache.logging.log4j:log4j-core:2.13.2 \
+                  org.apache.logging.log4j:log4j-slf4j-impl:2.13.2 \
                   org.slf4j:slf4j-api:1.7.12 \
                   com.beust:jcommander:1.48 \
                   org.xerial:sqlite-jdbc:3.20.1 \