diff --git a/pom.xml b/pom.xml index 5cd2d73..1295b6a 100755 --- a/pom.xml +++ b/pom.xml @@ -17,6 +17,8 @@ UTF-8 + 4.7 + 2.8 src/main/java @@ -53,6 +55,7 @@ org.apache.maven.plugins maven-source-plugin + 3.0.1 attach-sources @@ -61,38 +64,37 @@ - 2.3 org.apache.maven.plugins maven-compiler-plugin + 3.6.1 1.8 1.8 - 3.1 org.apache.maven.plugins maven-resources-plugin - 2.6 + 3.0.2 org.apache.maven.plugins maven-surefire-plugin - 2.12.4 + 2.19.1 -Xmx2048m -XX:MaxPermSize=256m -Djava.awt.headless=true maven-eclipse-plugin - 2.9 + 2.10 org.antlr antlr4-maven-plugin - 4.3 + 4.7 run antlr @@ -164,43 +166,43 @@ org.antlr antlr4 - 4.3 + ${antlr.version} org.antlr antlr4-runtime - 4.3 + ${antlr.version} org.antlr antlr4-maven-plugin - 4.3 + ${antlr.version} - org.apache.commons + commons-io commons-io - 1.3.2 + 2.5 org.apache.commons commons-lang3 - 3.4 + 3.5 org.apache.logging.log4j log4j-core - 2.1 + ${log4j.version} org.apache.logging.log4j log4j-api - 2.1 + ${log4j.version} junit junit - 4.11 + 4.12 test diff --git a/src/test/java/io/proleap/vb6/ThrowingErrorListener.java b/src/test/java/io/proleap/vb6/ThrowingErrorListener.java index 4c8b34c..e7e1bee 100644 --- a/src/test/java/io/proleap/vb6/ThrowingErrorListener.java +++ b/src/test/java/io/proleap/vb6/ThrowingErrorListener.java @@ -12,7 +12,7 @@ import org.antlr.v4.runtime.BaseErrorListener; import org.antlr.v4.runtime.RecognitionException; import org.antlr.v4.runtime.Recognizer; import org.antlr.v4.runtime.misc.NotNull; -import org.antlr.v4.runtime.misc.Nullable; +import org.sonatype.inject.Nullable; public class ThrowingErrorListener extends BaseErrorListener { diff --git a/src/test/java/io/proleap/vb6/util/TreeUtils.java b/src/test/java/io/proleap/vb6/util/TreeUtils.java index 2827246..e8d26e8 100644 --- a/src/test/java/io/proleap/vb6/util/TreeUtils.java +++ b/src/test/java/io/proleap/vb6/util/TreeUtils.java @@ -5,10 +5,10 @@ import java.util.List; import org.antlr.v4.runtime.Parser; import org.antlr.v4.runtime.misc.NotNull; -import org.antlr.v4.runtime.misc.Nullable; import org.antlr.v4.runtime.misc.Utils; import org.antlr.v4.runtime.tree.Tree; import org.antlr.v4.runtime.tree.Trees; +import org.sonatype.inject.Nullable; public class TreeUtils {