From 497544421781982f048a5a0995754239f2fc0696 Mon Sep 17 00:00:00 2001
From: YuCheng Hu <huyuchengus@gmail.com>
Date: Mon, 2 May 2022 08:51:50 -0400
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BC=96=E8=AF=91?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E5=B9=B6=E4=B8=94=E6=A0=B9=E6=8D=AE=20POM=20?=
 =?UTF-8?q?=20=E4=BE=9D=E8=B5=96=E7=9A=84=E6=8F=90=E7=A4=BA=E6=8F=90?=
 =?UTF-8?q?=E5=8D=87=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../internationalization/DateFormatUnitTest.java     |  4 ++--
 .../java/com/ossez/util/CurrentDateTimeUnitTest.java |  2 +-
 pom.xml                                              | 12 ++++++------
 3 files changed, 9 insertions(+), 9 deletions(-)

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/pom.xml b/pom.xml
index 8bbf30d669..2b0201bcc3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -140,8 +140,8 @@
         </dependency>
         <dependency>
             <groupId>org.apache.velocity</groupId>
-            <artifactId>velocity</artifactId>
-            <version>1.7</version>
+            <artifactId>velocity-engine-core</artifactId>
+            <version>2.3</version>
         </dependency>
         <dependency>
             <groupId>antlr</groupId>
@@ -161,9 +161,9 @@
             <version>1.4</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.velocity</groupId>
-            <artifactId>velocity-tools</artifactId>
-            <version>2.0</version>
+            <groupId>org.apache.velocity.tools</groupId>
+            <artifactId>velocity-tools-generic</artifactId>
+            <version>3.1</version>
         </dependency>
         <dependency>
             <groupId>jaxen</groupId>
@@ -253,7 +253,7 @@
         <dependency>
             <groupId>net.lingala.zip4j</groupId>
             <artifactId>zip4j</artifactId>
-            <version>2.9.1</version>
+            <version>2.10.0</version>
         </dependency>
         <!-- RETS -->
 

From 0bb9073a6700361b915cba47c93e894f8ad17932 Mon Sep 17 00:00:00 2001
From: YuCheng Hu <huyuchengus@gmail.com>
Date: Mon, 2 May 2022 08:54:18 -0400
Subject: [PATCH 2/3] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=96=B0=E7=9A=84?=
 =?UTF-8?q?=E5=AD=90=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/compiler.xml                                      | 1 +
 .idea/encodings.xml                                     | 2 ++
 core-java-modules/core-java-datetime-conversion/pom.xml | 6 +++---
 core-java-modules/pom.xml                               | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 415d8be780..6c24c01bfa 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -9,6 +9,7 @@
         <outputRelativeToContentRoot value="true" />
         <module name="codebank" />
         <module name="core-java-collections-list" />
+        <module name="core-java-datetime-conversion" />
         <module name="core-java-annotations" />
         <module name="core-java-8" />
         <module name="junit-5-basics" />
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 98fdcc816b..7028930c57 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -7,6 +7,8 @@
     <file url="file://$PROJECT_DIR$/core-java-modules/core-java-annotations/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/core-java-modules/core-java-collections-list/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/core-java-modules/core-java-collections-list/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/core-java-modules/core-java-datetime-conversion/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/core-java-modules/core-java-datetime-conversion/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/core-java-modules/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/core-java-modules/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/jackson-modules/jackson-annotations/src/main/java" charset="UTF-8" />
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 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-    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">
+         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">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>core-java-datetime-conversion</artifactId>
     <version>${project.parent.version}</version>
@@ -12,7 +12,7 @@
         <groupId>com.ossez.core-java-modules</groupId>
         <artifactId>core-java-modules</artifactId>
         <version>0.0.2-SNAPSHOT</version>
-        <relativePath></relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <dependencies>
diff --git a/core-java-modules/pom.xml b/core-java-modules/pom.xml
index 09d7bee994..dcd87b8c37 100644
--- a/core-java-modules/pom.xml
+++ b/core-java-modules/pom.xml
@@ -18,7 +18,7 @@
         <module>core-java-8</module>
         <module>core-java-annotations</module>
         <module>core-java-collections-list</module>
-        <!--        <module>core-java-datetime-conversion</module>-->
+        <module>core-java-datetime-conversion</module>
         <!--        <module>core-java-io</module>-->
     </modules>
 

From 77d3a177ea471edb57bc1cd1cb982c0e641670b3 Mon Sep 17 00:00:00 2001
From: YuCheng Hu <huyuchengus@gmail.com>
Date: Mon, 2 May 2022 10:06:38 -0400
Subject: [PATCH 3/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=B0=E7=9A=84?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=EF=BC=8C=E5=B9=B6=E4=B8=94=E6=9B=BF=E6=8D=A2?=
 =?UTF-8?q?=E8=A2=AB=E4=B8=A2=E5=BC=83=E7=9A=84=20fileTreeTraverser=20?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/compiler.xml                                           | 2 +-
 .idea/encodings.xml                                          | 2 ++
 core-java-modules/core-java-io/pom.xml                       | 5 ++---
 .../test/java/com/ossez/java8/JavaFolderSizeUnitTest.java    | 2 +-
 core-java-modules/pom.xml                                    | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 6c24c01bfa..584edc6a20 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -9,6 +9,7 @@
         <outputRelativeToContentRoot value="true" />
         <module name="codebank" />
         <module name="core-java-collections-list" />
+        <module name="core-java-io" />
         <module name="core-java-datetime-conversion" />
         <module name="core-java-annotations" />
         <module name="core-java-8" />
@@ -57,7 +58,6 @@
       <module name="core-java-exceptions-4" target="1.8" />
       <module name="core-java-function" target="1.8" />
       <module name="core-java-functional" target="1.8" />
-      <module name="core-java-io" target="1.8" />
       <module name="core-java-io-2" target="1.8" />
       <module name="core-java-io-3" target="1.8" />
       <module name="core-java-io-4" target="1.8" />
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 7028930c57..789cc552fc 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -9,6 +9,8 @@
     <file url="file://$PROJECT_DIR$/core-java-modules/core-java-collections-list/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/core-java-modules/core-java-datetime-conversion/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/core-java-modules/core-java-datetime-conversion/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/core-java-modules/core-java-io/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/core-java-modules/core-java-io/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/core-java-modules/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/core-java-modules/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/jackson-modules/jackson-annotations/src/main/java" charset="UTF-8" />
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 @@
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <version>${maven-javadoc-plugin.version}</version>
                 <configuration>
-                    <source>${maven.compiler.source}</source>
-                    <target>${maven.compiler.target}</target>
+                    <source>11</source>
                 </configuration>
             </plugin>
 
@@ -287,7 +286,7 @@
         <avaitility.version>1.7.0</avaitility.version>
 
         <!-- maven plugins -->
-        <maven-javadoc-plugin.version>3.3.1</maven-javadoc-plugin.version>
+        <maven-javadoc-plugin.version>3.3.2</maven-javadoc-plugin.version>
         <hsqldb.version>2.4.0</hsqldb.version>
         <esapi.version>2.3.0.0</esapi.version>
         <jmh-generator-annprocess.version>1.19</jmh-generator-annprocess.version>
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<File> files = com.google.common.io.Files.fileTreeTraverser().breadthFirstTraversal(folder);
+        final Iterable<File> 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 dcd87b8c37..42616c6f5a 100644
--- a/core-java-modules/pom.xml
+++ b/core-java-modules/pom.xml
@@ -19,7 +19,7 @@
         <module>core-java-annotations</module>
         <module>core-java-collections-list</module>
         <module>core-java-datetime-conversion</module>
-        <!--        <module>core-java-io</module>-->
+        <module>core-java-io</module>
     </modules>
 
     <dependencyManagement>