diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 415d8be780..584edc6a20 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -9,6 +9,8 @@ + + @@ -56,7 +58,6 @@ - diff --git a/.idea/encodings.xml b/.idea/encodings.xml index 98fdcc816b..789cc552fc 100644 --- a/.idea/encodings.xml +++ b/.idea/encodings.xml @@ -7,6 +7,10 @@ + + + + diff --git a/core-java-modules/core-java-8/src/test/java/com/ossez/internationalization/DateFormatUnitTest.java b/core-java-modules/core-java-8/src/test/java/com/ossez/internationalization/DateFormatUnitTest.java index 3b3e327c54..0b9ecb3685 100644 --- a/core-java-modules/core-java-8/src/test/java/com/ossez/internationalization/DateFormatUnitTest.java +++ b/core-java-modules/core-java-8/src/test/java/com/ossez/internationalization/DateFormatUnitTest.java @@ -1,7 +1,7 @@ package com.ossez.internationalization; import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.text.DateFormat; import java.text.DateFormatSymbols; @@ -14,7 +14,7 @@ import java.util.TimeZone; public class DateFormatUnitTest { - @Tes t + @Test public void givenGregorianCalendar_whenLocaleSpecificDateInstance_givenLanguageSpecificMonths() { GregorianCalendar gregorianCalendar = new GregorianCalendar(2018, 1, 1, 10, 15, 20); Date date = gregorianCalendar.getTime(); diff --git a/core-java-modules/core-java-8/src/test/java/com/ossez/util/CurrentDateTimeUnitTest.java b/core-java-modules/core-java-8/src/test/java/com/ossez/util/CurrentDateTimeUnitTest.java index 2a2b03b3ef..9671262e32 100644 --- a/core-java-modules/core-java-8/src/test/java/com/ossez/util/CurrentDateTimeUnitTest.java +++ b/core-java-modules/core-java-8/src/test/java/com/ossez/util/CurrentDateTimeUnitTest.java @@ -1,6 +1,6 @@ package com.ossez.util; -//import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertEquals; import java.time.Clock; import java.time.Instant; diff --git a/core-java-modules/core-java-datetime-conversion/pom.xml b/core-java-modules/core-java-datetime-conversion/pom.xml index 4c4e9f1eb7..fc16899a9b 100644 --- a/core-java-modules/core-java-datetime-conversion/pom.xml +++ b/core-java-modules/core-java-datetime-conversion/pom.xml @@ -1,7 +1,7 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 core-java-datetime-conversion ${project.parent.version} @@ -12,7 +12,7 @@ com.ossez.core-java-modules core-java-modules 0.0.2-SNAPSHOT - + ../pom.xml diff --git a/core-java-modules/core-java-io/pom.xml b/core-java-modules/core-java-io/pom.xml index 19aa11fa15..31937ff946 100644 --- a/core-java-modules/core-java-io/pom.xml +++ b/core-java-modules/core-java-io/pom.xml @@ -209,8 +209,7 @@ maven-javadoc-plugin ${maven-javadoc-plugin.version} - ${maven.compiler.source} - ${maven.compiler.target} + 11 @@ -287,7 +286,7 @@ 1.7.0 - 3.3.1 + 3.3.2 2.4.0 2.3.0.0 1.19 diff --git a/core-java-modules/core-java-io/src/test/java/com/ossez/java8/JavaFolderSizeUnitTest.java b/core-java-modules/core-java-io/src/test/java/com/ossez/java8/JavaFolderSizeUnitTest.java index 67c175401e..c3b429a37f 100644 --- a/core-java-modules/core-java-io/src/test/java/com/ossez/java8/JavaFolderSizeUnitTest.java +++ b/core-java-modules/core-java-io/src/test/java/com/ossez/java8/JavaFolderSizeUnitTest.java @@ -72,7 +72,7 @@ public class JavaFolderSizeUnitTest { public void whenGetFolderSizeUsingGuava_thenCorrect() { final File folder = new File(path); - final Iterable files = com.google.common.io.Files.fileTreeTraverser().breadthFirstTraversal(folder); + final Iterable files = com.google.common.io.Files.fileTraverser().breadthFirst(folder); final long size = StreamSupport.stream(files.spliterator(), false).filter(File::isFile).mapToLong(File::length).sum(); assertEquals(EXPECTED_SIZE, size); diff --git a/core-java-modules/pom.xml b/core-java-modules/pom.xml index 09d7bee994..42616c6f5a 100644 --- a/core-java-modules/pom.xml +++ b/core-java-modules/pom.xml @@ -18,8 +18,8 @@ core-java-8 core-java-annotations core-java-collections-list - - + core-java-datetime-conversion + core-java-io diff --git a/pom.xml b/pom.xml index 8bbf30d669..2b0201bcc3 100644 --- a/pom.xml +++ b/pom.xml @@ -140,8 +140,8 @@ org.apache.velocity - velocity - 1.7 + velocity-engine-core + 2.3 antlr @@ -161,9 +161,9 @@ 1.4 - org.apache.velocity - velocity-tools - 2.0 + org.apache.velocity.tools + velocity-tools-generic + 3.1 jaxen @@ -253,7 +253,7 @@ net.lingala.zip4j zip4j - 2.9.1 + 2.10.0