diff --git a/core-java-modules/core-java-8-2/.gitignore b/core-java-modules/core-java-8-2/.gitignore
deleted file mode 100644
index 374c8bf907..0000000000
--- a/core-java-modules/core-java-8-2/.gitignore
+++ /dev/null
@@ -1,25 +0,0 @@
-*.class
-
-0.*
-
-#folders#
-/target
-/neoDb*
-/data
-/src/main/webapp/WEB-INF/classes
-*/META-INF/*
-.resourceCache
-
-# Packaged files #
-*.jar
-*.war
-*.ear
-
-# Files generated by integration tests
-backup-pom.xml
-/bin/
-/temp
-
-#IntelliJ specific
-.idea/
-*.iml
\ No newline at end of file
diff --git a/core-java-modules/core-java-8-2/README.md b/core-java-modules/core-java-8-2/README.md
deleted file mode 100644
index cb4d816400..0000000000
--- a/core-java-modules/core-java-8-2/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-## Java 8 核心（第 2 部分）
-
-本模块中包含有关 Java 8 核心新增功能特性的一些文章。
-
-### 相关文章
-
-- [[<-- Java 8 核心（第 1 部分）]](/core-java-modules/core-java-8)
diff --git a/core-java-modules/core-java-8-2/pom.xml b/core-java-modules/core-java-8-2/pom.xml
deleted file mode 100644
index 7c8a59c157..0000000000
--- a/core-java-modules/core-java-8-2/pom.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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">
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>core-java-8-2</artifactId>
-    <name>core-java-8-2</name>
-    <packaging>jar</packaging>
-
-    <parent>
-        <groupId>com.ossez.core-java-modules</groupId>
-        <artifactId>core-java-modules</artifactId>
-        <version>0.0.2-SNAPSHOT</version>
-    </parent>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.ibm.icu</groupId>
-            <artifactId>icu4j</artifactId>
-            <version>${icu.version}</version>
-        </dependency>
-    </dependencies>
-
-    <properties>
-        <icu.version>64.2</icu.version>
-    </properties>
-
-</project>
\ No newline at end of file
diff --git a/core-java-modules/core-java-8/src/main/resources/formats_fr.properties b/core-java-modules/core-java-8/src/main/resources/formats_fr.properties
index c2d5159b32..218385c54c 100644
--- a/core-java-modules/core-java-8/src/main/resources/formats_fr.properties
+++ b/core-java-modules/core-java-8/src/main/resources/formats_fr.properties
@@ -1,2 +1,2 @@
-label={0, date, short}, {1}{2, choice, 0# ne|0<} vous a envoy� {2, choice, 0#aucun message|1#un message|2#deux messages|2<{2,number,integer} messages}.
-label-icu={0} {2, plural, =0 {ne } other {}}vous a envoy� {2, plural, =0 {aucun message} =1 {un message} other {{2, number, integer} messages}}.
\ No newline at end of file
+label={0, date, short}, {1}{2, choice, 0# ne|0<} vous a envoyé {2, choice, 0#aucun message|1#un message|2#deux messages|2<{2,number,integer} messages}.
+label-icu={0} {2, plural, =0 {ne } other {}}vous a envoyé {2, plural, =0 {aucun message} =1 {un message} other {{2, number, integer} messages}}.
\ No newline at end of file
diff --git a/core-java-modules/core-java-8/src/main/resources/formats_pl.properties b/core-java-modules/core-java-8/src/main/resources/formats_pl.properties
index 9333ec3396..dc63d3720b 100644
--- a/core-java-modules/core-java-8/src/main/resources/formats_pl.properties
+++ b/core-java-modules/core-java-8/src/main/resources/formats_pl.properties
@@ -1,2 +1,2 @@
 label=W {0, date, short} {1}{2, choice, 0# nie|0<} wys\u0142a\u0142a ci {2, choice, 0#\u017Cadnych wiadomo\u015Bci|1#wiadomo\u015B\u0107|2#dwie wiadomo\u015Bci|2<{2, number, integer} wiadomo\u015Bci}.
-label-icu={0} {2, plural, =0 {nie } other {}}{1, select, male {wys\u0142a\u0142} female {wys\u0142a\u0142a} other {wys\u0142a\u0142o}} ci {2, plural, =0 {\u017Cadnej wiadomo\u015Bci} =1 {wiadomo\u015B\u0107} other {{2, number, integer} wiadomo\u015Bci}}.
+label-icu={0} {2, plural, =0 {nie } other {}}{1, select, male {wys\u0142a\u0142} female {wys\u0142a\u0142a} other {wys\u0142a\u0142o}} ci {2, plural, =0 {\u017Cadnej wiadomo\u015Bci} =1 {wiadomo\u015B\u0107} other {{2, number, integer} wiadomo\u015Bci}}.
\ No newline at end of file
diff --git a/core-java-modules/core-java-8/src/main/resources/messages_fr.properties b/core-java-modules/core-java-8/src/main/resources/messages_fr.properties
index 6716102568..9c1c9f9322 100644
--- a/core-java-modules/core-java-8/src/main/resources/messages_fr.properties
+++ b/core-java-modules/core-java-8/src/main/resources/messages_fr.properties
@@ -1 +1 @@
-label=Alice vous a envoy� un message.
\ No newline at end of file
+label=Alice vous a envoyé un message.
\ No newline at end of file
diff --git a/core-java-modules/core-java-8/src/main/resources/messages_it.properties b/core-java-modules/core-java-8/src/main/resources/messages_it.properties
index 6929a8c091..be694a3ae7 100644
--- a/core-java-modules/core-java-8/src/main/resources/messages_it.properties
+++ b/core-java-modules/core-java-8/src/main/resources/messages_it.properties
@@ -1 +1 @@
-label=Alice ti ha inviato un messaggio.
\ No newline at end of file
+label=Alice ti ha inviato un messaggio.
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index a4cc3f186f..21cf3f48c0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -118,11 +118,15 @@
         <moneta.version>1.3</moneta.version>
         <jmh-core.version>1.33</jmh-core.version>
         <exec-maven-plugin.version>3.0.0</exec-maven-plugin.version>
-        <maven-surefire-plugin.version>3.0.0-M8</maven-surefire-plugin.version>
-        <maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
+
         <logback-classic.version>1.2.5</logback-classic.version>
         <rest-assured.version>3.1.1</rest-assured.version>
 
+        <!-- PLUGINS -->
+        <maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
+        <maven-surefire-plugin.version>3.0.0-M8</maven-surefire-plugin.version>
+        <maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
+
     </properties>
 
 
@@ -339,7 +343,6 @@
                 </plugin>
             </plugins>
         </pluginManagement>
-
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -347,6 +350,15 @@
                 <version>${maven-compiler-plugin.version}</version>
                 <configuration>
                     <release>${java.version}</release>
+                    <encoding>UTF-8</encoding>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>${maven-resources-plugin.version}</version>
+                <configuration>
+                    <encoding>UTF-8</encoding>
                 </configuration>
             </plugin>
             <plugin>