upgrade dependencies

Author: oldratlee

.travis.yml

@@ -21,6 +21,7 @@ env:
   #   Log4j 2.4 and greater requires Java 7
   #   versions 2.0-alpha1 to 2.3 required Java 6.
   - dummy=dummy
+  - LOG4J2_VERSION=2.12.0
   - LOG4J2_VERSION=2.11.0
   - LOG4J2_VERSION=2.10.0
   - LOG4J2_VERSION=2.9.0

pom.xml

@@ -50,8 +50,8 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-		<log4j2.version>2.12.1</log4j2.version>
-		<slf4j.version>1.7.29</slf4j.version>
+		<log4j2.version>2.13.3</log4j2.version>
+		<slf4j.version>1.7.30</slf4j.version>
 	</properties>
 
 	<dependencies>
@@ -76,7 +76,7 @@
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.12</version>
+			<version>4.13</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -189,7 +189,7 @@
 				</plugin>
 				<plugin>
 					<artifactId>maven-source-plugin</artifactId>
-					<version>3.2.0</version>
+					<version>3.2.1</version>
 				</plugin>
 				<plugin>
 					<artifactId>maven-compiler-plugin</artifactId>
@@ -201,15 +201,15 @@
 				</plugin>
 				<plugin>
 					<artifactId>maven-javadoc-plugin</artifactId>
-					<version>3.1.1</version>
+					<version>3.2.0</version>
 				</plugin>
 				<plugin>
 					<artifactId>maven-surefire-plugin</artifactId>
 					<version>2.22.2</version>
 				</plugin>
 				<plugin>
 					<artifactId>maven-site-plugin</artifactId>
-					<version>3.8.2</version>
+					<version>3.9.0</version>
 				</plugin>
 				<plugin>
 					<artifactId>maven-gpg-plugin</artifactId>

scripts/common.sh

@@ -91,18 +91,26 @@ readonly -a JAVA_CMD=(
         -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005
     }
 )
+readonly JAVA_VERSION=$("${JAVA_CMD[@]}" -version 2>&1 | awk '-F"' 'NR==1{print $2}')
 
 readonly -a MVN_CMD=( ./mvnw ${LOG4J2_VERSION:+-Dlog4j2.version=$LOG4J2_VERSION} )
 
 isLog4j2NotSupportedByJdk() {
-    local java_version=$("${JAVA_CMD[@]}" -version 2>&1 | awk '-F"' 'NR==1{print $2}')
     local log4j2_minor_version="$(echo "${LOG4J2_VERSION:-"$log4j2_version_in_pom"}" | awk -F'[.]' '{print $2}')"
 
     # log4j2 Changelog
     # https://logging.apache.org/log4j/2.x/changelog.html
+    #   Log4j 2.13 and greater requires Java 8
     #   Log4j 2.4 and greater requires Java 7
     #   versions 2.0-alpha1 to 2.3 required Java 6.
-    [[ "$java_version" == 1.6.* ]] && (( log4j2_minor_version >= 4 ))
+
+    if (( log4j2_minor_version >= 13 )) && [[ "$JAVA_VERSION" == 1.6.* || "$JAVA_VERSION" == 1.7.* ]]; then
+        return 0 # true
+    elif (( log4j2_minor_version >= 4 )) && [[ "$JAVA_VERSION" == 1.6.* ]] ; then
+        return 0 # true
+    else
+      return 1 # false
+    fi
 }
 
 #################################################################################

scripts/run-junit.sh

@@ -15,7 +15,7 @@ junit_test_cases() {
 }
 
 if isLog4j2NotSupportedByJdk; then
-    yellowEcho "skip run junit: log4j2 $LOG4J2_VERSION not support java 6"
+    yellowEcho "skip run junit: log4j2 $LOG4J2_VERSION not support java $JAVA_VERSION"
     exit
 fi