From 2fdc7c60eb59cadbe4175bcb66c438f43084176c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Aug 2021 17:16:26 +0000
Subject: [PATCH 01/11] Bump commons-compress from 1.20 to 1.21

Bumps commons-compress from 1.20 to 1.21.

---
updated-dependencies:
- dependency-name: org.apache.commons:commons-compress
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index aa62148453..88bc2cc7b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -87,7 +87,7 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-compress</artifactId>
-            <version>1.20</version>
+            <version>1.21</version>
         </dependency>
 
         <dependency>

From 25733d770720eb9cf399f6d64fe0f3a1191a32f7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 13 Aug 2021 15:39:48 +0000
Subject: [PATCH 02/11] Bump bcprov-jdk15on from 1.55 to 1.67 in
 /core-java-modules/core-java-io

Bumps [bcprov-jdk15on](https://github.com/bcgit/bc-java) from 1.55 to 1.67.
- [Release notes](https://github.com/bcgit/bc-java/releases)
- [Changelog](https://github.com/bcgit/bc-java/blob/master/docs/releasenotes.html)
- [Commits](https://github.com/bcgit/bc-java/commits)

---
updated-dependencies:
- dependency-name: org.bouncycastle:bcprov-jdk15on
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core-java-modules/core-java-io/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core-java-modules/core-java-io/pom.xml b/core-java-modules/core-java-io/pom.xml
index d97430f09e..04c37701e2 100644
--- a/core-java-modules/core-java-io/pom.xml
+++ b/core-java-modules/core-java-io/pom.xml
@@ -268,7 +268,7 @@
     <properties>
 
         <!-- util -->
-        <bouncycastle.version>1.55</bouncycastle.version>
+        <bouncycastle.version>1.67</bouncycastle.version>
         <commons-codec.version>1.10</commons-codec.version>
         <commons-math3.version>3.6.1</commons-math3.version>
         <decimal4j.version>1.0.3</decimal4j.version>

From 0f5fefab2fb8840a370d4e9ad1998f4c7c37ba90 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Aug 2021 20:59:31 +0000
Subject: [PATCH 03/11] Bump jsoup from 1.7.2 to 1.14.2

Bumps [jsoup](https://github.com/jhy/jsoup) from 1.7.2 to 1.14.2.
- [Release notes](https://github.com/jhy/jsoup/releases)
- [Changelog](https://github.com/jhy/jsoup/blob/master/CHANGES)
- [Commits](https://github.com/jhy/jsoup/compare/jsoup-1.7.2...jsoup-1.14.2)

---
updated-dependencies:
- dependency-name: org.jsoup:jsoup
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index aa62148453..b9dd594479 100644
--- a/pom.xml
+++ b/pom.xml
@@ -210,7 +210,7 @@
         <dependency>
             <groupId>org.jsoup</groupId>
             <artifactId>jsoup</artifactId>
-            <version>1.7.2</version>
+            <version>1.14.2</version>
         </dependency>
 
         <dependency>

From 43dcc02240dcee8bd5998ce7bf3601ac36c25ec2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 10 Feb 2022 05:44:24 +0000
Subject: [PATCH 04/11] Bump hibernate-core

Bumps [hibernate-core](https://github.com/hibernate/hibernate-orm) from 5.3.11.Final to 5.4.24.Final.
- [Release notes](https://github.com/hibernate/hibernate-orm/releases)
- [Changelog](https://github.com/hibernate/hibernate-orm/blob/5.4.24/changelog.txt)
- [Commits](https://github.com/hibernate/hibernate-orm/compare/5.3.11...5.4.24)

---
updated-dependencies:
- dependency-name: org.hibernate:hibernate-core
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 persistence-modules/spring-boot-persistence-h2-console/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/persistence-modules/spring-boot-persistence-h2-console/pom.xml b/persistence-modules/spring-boot-persistence-h2-console/pom.xml
index 0ae6e99d74..1e4c7bbdfd 100644
--- a/persistence-modules/spring-boot-persistence-h2-console/pom.xml
+++ b/persistence-modules/spring-boot-persistence-h2-console/pom.xml
@@ -55,7 +55,7 @@
         <!-- The main class to start by executing java -jar -->
         <start-class>com.ossez.h2db.demo.server.SpringBootApp</start-class>
         <spring-boot.version>2.2.4.RELEASE</spring-boot.version>
-        <hibernate.version>5.3.11.Final</hibernate.version>
+        <hibernate.version>5.4.24.Final</hibernate.version>
         <db-util.version>1.0.4</db-util.version>
     </properties>
 

From 67a82992fc8e00eaed4cd6553e4317c2583e3ca0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 10 Feb 2022 08:38:12 +0000
Subject: [PATCH 05/11] Bump hibernate-core in /persistence-modules/hibernate5

Bumps [hibernate-core](https://github.com/hibernate/hibernate-orm) from 5.4.12.Final to 5.4.24.Final.
- [Release notes](https://github.com/hibernate/hibernate-orm/releases)
- [Changelog](https://github.com/hibernate/hibernate-orm/blob/5.4.24/changelog.txt)
- [Commits](https://github.com/hibernate/hibernate-orm/compare/5.4.12...5.4.24)

---
updated-dependencies:
- dependency-name: org.hibernate:hibernate-core
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 persistence-modules/hibernate5/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/persistence-modules/hibernate5/pom.xml b/persistence-modules/hibernate5/pom.xml
index 899acb90ff..042f67118a 100644
--- a/persistence-modules/hibernate5/pom.xml
+++ b/persistence-modules/hibernate5/pom.xml
@@ -77,7 +77,7 @@
     </repositories>
 
     <properties>
-        <hibernate.version>5.4.12.Final</hibernate.version>
+        <hibernate.version>5.4.24.Final</hibernate.version>
         <mysql.version>8.0.24</mysql.version>
         <mariaDB4j.version>2.2.3</mariaDB4j.version>
         <assertj-core.version>3.8.0</assertj-core.version>

From a70533af832d02e48a0152b699e406884e79596a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 26 Feb 2022 02:04:24 +0000
Subject: [PATCH 06/11] Bump zip4j from 1.3.2 to 2.9.1

Bumps [zip4j](https://github.com/srikanth-lingala/zip4j) from 1.3.2 to 2.9.1.
- [Release notes](https://github.com/srikanth-lingala/zip4j/releases)
- [Commits](https://github.com/srikanth-lingala/zip4j/commits/v2.9.1)

---
updated-dependencies:
- dependency-name: net.lingala.zip4j:zip4j
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index aa62148453..d3fdbcc4e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -216,7 +216,7 @@
         <dependency>
             <groupId>net.lingala.zip4j</groupId>
             <artifactId>zip4j</artifactId>
-            <version>1.3.2</version>
+            <version>2.9.1</version>
         </dependency>
 
         <!-- RETS -->

From 85f2b551589670fe8c8b9df52b2b5109c3be82bf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 16 Apr 2022 12:46:28 +0000
Subject: [PATCH 07/11] Bump dom4j from 2.1.1 to 2.1.3 in /xml

Bumps [dom4j](https://github.com/dom4j/dom4j) from 2.1.1 to 2.1.3.
- [Release notes](https://github.com/dom4j/dom4j/releases)
- [Commits](https://github.com/dom4j/dom4j/compare/version-2.1.1...version-2.1.3)

---
updated-dependencies:
- dependency-name: org.dom4j:dom4j
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 xml/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xml/pom.xml b/xml/pom.xml
index 55ff86c89d..b3a04f02ac 100644
--- a/xml/pom.xml
+++ b/xml/pom.xml
@@ -359,7 +359,7 @@
     </profiles>
 
     <properties>
-        <dom4j.version>2.1.1</dom4j.version>
+        <dom4j.version>2.1.3</dom4j.version>
         <jaxen.version>1.2.0</jaxen.version>
         <jdom2.version>2.0.6</jdom2.version>
         <joox.version>1.6.2</joox.version>

From d4d2bf5ed04b3d24a02f291cc4d7e8c5307f7bf2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 16 Apr 2022 12:46:47 +0000
Subject: [PATCH 08/11] Bump hibernate-core in
 /persistence-modules/hibernate-annotations

Bumps [hibernate-core](https://github.com/hibernate/hibernate-orm) from 5.4.7.Final to 5.4.24.Final.
- [Release notes](https://github.com/hibernate/hibernate-orm/releases)
- [Changelog](https://github.com/hibernate/hibernate-orm/blob/5.4.24/changelog.txt)
- [Commits](https://github.com/hibernate/hibernate-orm/compare/5.4.7...5.4.24)

---
updated-dependencies:
- dependency-name: org.hibernate:hibernate-core
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 persistence-modules/hibernate-annotations/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/persistence-modules/hibernate-annotations/pom.xml b/persistence-modules/hibernate-annotations/pom.xml
index 4bee5c2196..0b47ee944a 100644
--- a/persistence-modules/hibernate-annotations/pom.xml
+++ b/persistence-modules/hibernate-annotations/pom.xml
@@ -55,7 +55,7 @@
     </repositories>
 
     <properties>
-        <hibernate-core.version>5.4.7.Final</hibernate-core.version>
+        <hibernate-core.version>5.4.24.Final</hibernate-core.version>
         <commons-lang3.version>3.8.1</commons-lang3.version>
         <maven.deploy.skip>true</maven.deploy.skip>
         <spring-boot.version>2.1.7.RELEASE</spring-boot.version>

From cba5c9aef53a22ca4ff84eb424214de715701948 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 27 Apr 2022 21:48:24 +0000
Subject: [PATCH 09/11] Bump esapi from 2.1.0.1 to 2.3.0.0 in
 /core-java-modules/core-java-io

Bumps [esapi](https://github.com/ESAPI/esapi-java-legacy) from 2.1.0.1 to 2.3.0.0.
- [Release notes](https://github.com/ESAPI/esapi-java-legacy/releases)
- [Commits](https://github.com/ESAPI/esapi-java-legacy/compare/esapi-2.1.0.1...esapi-2.3.0.0)

---
updated-dependencies:
- dependency-name: org.owasp.esapi:esapi
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 core-java-modules/core-java-io/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core-java-modules/core-java-io/pom.xml b/core-java-modules/core-java-io/pom.xml
index c91439d8a4..62971eb058 100644
--- a/core-java-modules/core-java-io/pom.xml
+++ b/core-java-modules/core-java-io/pom.xml
@@ -289,7 +289,7 @@
         <!-- maven plugins -->
         <maven-javadoc-plugin.version>3.3.1</maven-javadoc-plugin.version>
         <hsqldb.version>2.4.0</hsqldb.version>
-        <esapi.version>2.1.0.1</esapi.version>
+        <esapi.version>2.3.0.0</esapi.version>
         <jmh-generator-annprocess.version>1.19</jmh-generator-annprocess.version>
         <async-http-client.version>2.4.5</async-http-client.version>
         <!-- Mime Type Libraries -->

From 31dd65261a7c29facb28cf8221b0771a391f4403 Mon Sep 17 00:00:00 2001
From: YuCheng Hu <huyuchengus@gmail.com>
Date: Sat, 30 Apr 2022 19:23:18 -0400
Subject: [PATCH 10/11] =?UTF-8?q?=E5=B0=86=E6=89=80=E6=9C=89=E6=9C=AC?=
 =?UTF-8?q?=E5=9C=B0=E5=B7=B2=E6=9C=89=E7=9A=84=E6=96=87=E4=BB=B6=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E5=88=B0=20Git=20=E4=BB=A5=E4=BE=BF=E4=BA=8E=E5=90=8E?=
 =?UTF-8?q?=E7=BB=AD=E7=9A=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/compiler.xml       | 168 +++++++++++++++++++++++++++++++--------
 .idea/misc.xml           |   1 +
 .idea/thriftCompiler.xml |   6 ++
 .idea/workspace.xml      |  20 +----
 4 files changed, 144 insertions(+), 51 deletions(-)
 create mode 100644 .idea/thriftCompiler.xml

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 450847bd62..415d8be780 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -7,22 +7,120 @@
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
-        <module name="assertion-libraries" />
-        <module name="core-java-annotations" />
         <module name="codebank" />
         <module name="core-java-collections-list" />
-        <module name="junit5-migration" />
-        <module name="discourse" />
+        <module name="core-java-annotations" />
         <module name="core-java-8" />
+        <module name="junit-5-basics" />
+        <module name="discourse" />
       </profile>
     </annotationProcessing>
     <bytecodeTargetLevel>
-      <module name="cucumber" target="14" />
-      <module name="easy-random" target="11" />
-      <module name="easymock" target="1.5" />
+      <module name="assertion-libraries" target="1.8" />
+      <module name="core-java" target="1.8" />
+      <module name="core-java-8-2" target="1.8" />
+      <module name="core-java-8-datetime" target="1.8" />
+      <module name="core-java-8-datetime-2" target="1.8" />
+      <module name="core-java-arrays-convert" target="1.8" />
+      <module name="core-java-arrays-guides" target="1.8" />
+      <module name="core-java-arrays-multidimensional" target="1.8" />
+      <module name="core-java-arrays-operations-advanced" target="1.8" />
+      <module name="core-java-arrays-operations-basic" target="1.8" />
+      <module name="core-java-arrays-sorting" target="1.8" />
+      <module name="core-java-char" target="1.8" />
+      <module name="core-java-collections" target="1.8" />
+      <module name="core-java-collections-2" target="1.8" />
+      <module name="core-java-collections-3" target="1.8" />
+      <module name="core-java-collections-4" target="1.8" />
+      <module name="core-java-collections-array-list" target="1.8" />
+      <module name="core-java-collections-list-2" target="1.8" />
+      <module name="core-java-collections-list-3" target="1.8" />
+      <module name="core-java-collections-maps" target="1.8" />
+      <module name="core-java-collections-maps-2" target="1.8" />
+      <module name="core-java-collections-maps-3" target="1.8" />
+      <module name="core-java-concurrency-2" target="1.8" />
+      <module name="core-java-concurrency-advanced" target="1.8" />
+      <module name="core-java-concurrency-advanced-2" target="1.8" />
+      <module name="core-java-concurrency-advanced-3" target="1.8" />
+      <module name="core-java-concurrency-advanced-4" target="1.8" />
+      <module name="core-java-concurrency-basic" target="1.8" />
+      <module name="core-java-concurrency-basic-2" target="1.8" />
+      <module name="core-java-concurrency-basic-3" target="1.8" />
+      <module name="core-java-concurrency-collections" target="1.8" />
+      <module name="core-java-concurrency-collections-2" target="1.8" />
+      <module name="core-java-console" target="1.8" />
+      <module name="core-java-date-operations-2" target="1.8" />
+      <module name="core-java-exceptions" target="1.8" />
+      <module name="core-java-exceptions-2" target="1.8" />
+      <module name="core-java-exceptions-3" target="1.8" />
+      <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" />
+      <module name="core-java-io-apis" target="1.8" />
+      <module name="core-java-io-conversions" target="1.8" />
+      <module name="core-java-jar" target="1.8" />
+      <module name="core-java-jndi" target="1.8" />
+      <module name="core-java-jvm" target="1.8" />
+      <module name="core-java-jvm-2" target="1.8" />
+      <module name="core-java-lambdas" target="1.8" />
+      <module name="core-java-lang" target="1.8" />
+      <module name="core-java-lang-2" target="1.8" />
+      <module name="core-java-lang-3" target="1.8" />
+      <module name="core-java-lang-4" target="1.8" />
+      <module name="core-java-lang-math" target="1.8" />
+      <module name="core-java-lang-math-2" target="1.8" />
+      <module name="core-java-lang-math-3" target="1.8" />
+      <module name="core-java-lang-oop-constructors" target="1.8" />
+      <module name="core-java-lang-oop-generics" target="1.8" />
+      <module name="core-java-lang-oop-inheritance" target="1.8" />
+      <module name="core-java-lang-oop-methods" target="1.8" />
+      <module name="core-java-lang-oop-modifiers" target="1.8" />
+      <module name="core-java-lang-oop-others" target="1.8" />
+      <module name="core-java-lang-oop-patterns" target="1.8" />
+      <module name="core-java-lang-oop-types" target="1.8" />
+      <module name="core-java-lang-oop-types-2" target="1.8" />
+      <module name="core-java-lang-operators" target="1.8" />
+      <module name="core-java-lang-operators-2" target="1.8" />
+      <module name="core-java-lang-syntax" target="1.8" />
+      <module name="core-java-lang-syntax-2" target="1.8" />
+      <module name="core-java-networking" target="1.8" />
+      <module name="core-java-networking-2" target="1.8" />
+      <module name="core-java-nio" target="1.8" />
+      <module name="core-java-nio-2" target="1.8" />
+      <module name="core-java-optional" target="1.8" />
+      <module name="core-java-perf" target="1.8" />
+      <module name="core-java-reflection" target="1.8" />
+      <module name="core-java-reflection-2" target="1.8" />
+      <module name="core-java-regex" target="1.8" />
+      <module name="core-java-regex-2" target="1.8" />
+      <module name="core-java-security" target="1.8" />
+      <module name="core-java-security-2" target="1.8" />
+      <module name="core-java-security-3" target="1.8" />
+      <module name="core-java-security-algorithms" target="1.8" />
+      <module name="core-java-serialization" target="1.8" />
+      <module name="core-java-streams" target="1.8" />
+      <module name="core-java-streams-2" target="1.8" />
+      <module name="core-java-streams-3" target="1.8" />
+      <module name="core-java-streams-4" target="1.8" />
+      <module name="core-java-string-algorithms" target="1.8" />
+      <module name="core-java-string-algorithms-2" target="1.8" />
+      <module name="core-java-string-apis" target="1.8" />
+      <module name="core-java-string-conversions" target="1.8" />
+      <module name="core-java-string-conversions-2" target="1.8" />
+      <module name="core-java-string-operations" target="1.8" />
+      <module name="core-java-string-operations-2" target="1.8" />
+      <module name="core-java-sun" target="1.8" />
+      <module name="core-java-uuid" target="1.8" />
+      <module name="cucumber" target="1.8" />
+      <module name="easy-random" target="1.8" />
+      <module name="easymock" target="1.8" />
       <module name="gatling" target="1.8" />
-      <module name="groovy-spock" target="11" />
-      <module name="hamcrest" target="1.5" />
+      <module name="groovy-spock" target="1.8" />
+      <module name="hamcrest" target="1.8" />
       <module name="jackson" target="11" />
       <module name="jackson-annotations" target="11" />
       <module name="jackson-conversions" target="11" />
@@ -34,35 +132,37 @@
       <module name="java-numbers" target="11" />
       <module name="java-numbers-2" target="11" />
       <module name="jmh" target="11" />
-      <module name="junit-4" target="1.5" />
-      <module name="junit-5" target="11" />
-      <module name="junit-5-advanced" target="11" />
-      <module name="junit-5-basics" target="11" />
-      <module name="junit5-annotations" target="11" />
+      <module name="junit-4" target="1.8" />
+      <module name="junit-5" target="1.8" />
+      <module name="junit-5-advanced" target="1.8" />
+      <module name="junit5-annotations" target="1.8" />
+      <module name="junit5-migration" target="1.8" />
       <module name="load-testing-comparison" target="1.8" />
-      <module name="math-test-functions" target="1.5" />
-      <module name="mockito" target="1.5" />
-      <module name="mockito-2" target="11" />
-      <module name="mockito-3" target="1.5" />
-      <module name="mocks" target="1.5" />
-      <module name="mockserver" target="11" />
-      <module name="parallel-tests-junit" target="1.5" />
+      <module name="math-test-functions" target="1.8" />
+      <module name="mockito" target="1.8" />
+      <module name="mockito-2" target="1.8" />
+      <module name="mockito-3" target="1.8" />
+      <module name="mocks" target="1.8" />
+      <module name="mockserver" target="1.8" />
+      <module name="parallel-tests-junit" target="1.8" />
       <module name="parent-java" target="11" />
-      <module name="powermock" target="1.5" />
-      <module name="rest-assured" target="11" />
-      <module name="rest-testing" target="11" />
-      <module name="selenium-junit-testng" target="1.5" />
-      <module name="spring-testing" target="11" />
-      <module name="spring-testing-2" target="11" />
-      <module name="string-test-functions" target="1.5" />
-      <module name="test-containers" target="1.5" />
+      <module name="powermock" target="1.8" />
+      <module name="pre-jpms" target="1.8" />
+      <module name="rest-assured" target="1.8" />
+      <module name="rest-testing" target="1.8" />
+      <module name="selenium-junit-testng" target="1.8" />
+      <module name="spring-testing" target="1.8" />
+      <module name="spring-testing-2" target="1.8" />
+      <module name="string-test-functions" target="1.8" />
+      <module name="test-containers" target="1.8" />
       <module name="testing-assertions" target="1.5" />
-      <module name="testing-libraries" target="1.5" />
-      <module name="testing-libraries-2" target="1.5" />
-      <module name="testng" target="1.5" />
+      <module name="testing-libraries" target="1.8" />
+      <module name="testing-libraries-2" target="1.8" />
+      <module name="testng" target="1.8" />
+      <module name="testng-command-line" target="1.8" />
       <module name="xml" target="11" />
-      <module name="xmlunit-2" target="1.5" />
-      <module name="zerocode" target="8" />
+      <module name="xmlunit-2" target="1.8" />
+      <module name="zerocode" target="1.8" />
     </bytecodeTargetLevel>
   </component>
   <component name="JavacSettings">
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 44c4c0bfc4..5581558b26 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -8,6 +8,7 @@
         <option value="$PROJECT_DIR$/testing-modules/pom.xml" />
         <option value="$PROJECT_DIR$/core-java-modules/pom.xml" />
         <option value="$PROJECT_DIR$/testing-modules/junit5-migration/pom.xml" />
+        <option value="$PROJECT_DIR$/testing-modules/junit-5-basics/pom.xml" />
       </list>
     </option>
   </component>
diff --git a/.idea/thriftCompiler.xml b/.idea/thriftCompiler.xml
new file mode 100644
index 0000000000..7bc123c6bc
--- /dev/null
+++ b/.idea/thriftCompiler.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ThriftCompiler">
+    <compilers />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f109c1626f..755687eac1 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,20 +4,11 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="080575e3-7e62-4649-ae70-06fb6130a866" name="Changes" comment="提交所有代码，为将默认分支名从 master 切换到 main 做准备">
+    <list default="true" id="080575e3-7e62-4649-ae70-06fb6130a866" name="Changes" comment="将所有本地已有的文件提交到 Git 以便于后续的修改">
+      <change afterPath="$PROJECT_DIR$/.idea/thriftCompiler.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/encodings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/jarRepositories.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/jarRepositories.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/jpa-buddy.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/vcs.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jackson-modules/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/jackson-modules/pom.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/test/java/com/ossez/codebank/algorithm/tests/VariableTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/com/ossez/codebank/algorithm/tests/VariableTest.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/testing-modules/junit-5-basics/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/testing-modules/junit-5-basics/pom.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/toolkits/codebank/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/toolkits/codebank/pom.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/toolkits/codebank/src/test/java/com/ossez/toolkits/codebank/tests/BitOperationTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/toolkits/codebank/src/test/java/com/ossez/toolkits/codebank/tests/BitOperationTest.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -31,14 +22,8 @@
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
   <component name="HighlightingSettingsPerFile">
-    <setting file="file://$PROJECT_DIR$/core-java-modules/core-java-collections-list/src/test/resources/logback.xml" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/core-java-modules/core-java-collections-list/src/test/java/com/ossez/list/RemoveFirstElementTest.java" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/core-java-modules/core-java-collections-list/src/test/java/com/ossez/list/random/RandomListElementUnitTest.java" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/toolkits/codebank/src/test/resources/log4j2.xml" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/core-java-modules/pom.xml" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/core-java-modules/core-java-collections-list/pom.xml" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/src/test/resources/log4j2.xml" root0="FORCE_HIGHLIGHTING" />
-    <setting file="file://$PROJECT_DIR$/testing-modules/junit-5-advanced/src/test/resources/junit-platform.properties" root0="FORCE_HIGHLIGHTING" />
   </component>
   <component name="MarkdownSettingsMigration">
     <option name="stateVersion" value="1" />
@@ -59,6 +44,7 @@
     <property name="Git.Branch.Popup.ShowAllRemotes" value="true" />
     <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
     <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
+    <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
     <property name="TF_FMT" value="false" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="go.format.on.save.advertiser.fired" value="true" />

From 55df5ae46739ecffea61d7d399eee14fdff69ca2 Mon Sep 17 00:00:00 2001
From: YuCheng Hu <huyuchengus@gmail.com>
Date: Sat, 30 Apr 2022 19:23:44 -0400
Subject: [PATCH 11/11] =?UTF-8?q?=E9=92=88=E5=AF=B9=20testing-modules=20?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=EF=BC=8C=E6=8F=90=E4=BA=A4=20pom=20=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 testing-modules/pom.xml | 52 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 testing-modules/pom.xml

diff --git a/testing-modules/pom.xml b/testing-modules/pom.xml
new file mode 100644
index 0000000000..46ca3394fe
--- /dev/null
+++ b/testing-modules/pom.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    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>testing-modules</artifactId>
+    <name>testing-modules</name>
+    <packaging>pom</packaging>
+
+    <parent>
+        <groupId>com.ossez</groupId>
+        <artifactId>parent-modules</artifactId>
+        <version>0.0.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <modules>
+<!--        <module>assertion-libraries</module>-->
+<!--        <module>cucumber</module>-->
+<!--        <module>easy-random</module>-->
+<!--        <module>easymock</module>-->
+<!--        <module>gatling</module>-->
+<!--        <module>groovy-spock</module>-->
+<!--        <module>hamcrest</module>-->
+<!--        <module>junit-4</module>-->
+<!--        <module>junit-5-advanced</module>-->
+        <module>junit-5-basics</module>
+<!--        <module>junit-5</module>-->
+<!--        <module>junit5-annotations</module>-->
+<!--        <module>junit5-migration</module>-->
+<!--        <module>load-testing-comparison</module>-->
+<!--        <module>mockito-2</module>-->
+<!--        <module>mockito-3</module>-->
+<!--        <module>mockito</module>-->
+<!--        <module>mocks</module>-->
+<!--        <module>mockserver</module>-->
+<!--        <module>parallel-tests-junit</module>-->
+<!--        <module>powermock</module>-->
+<!--        <module>rest-assured</module>-->
+<!--        <module>rest-testing</module>-->
+<!--        <module>selenium-junit-testng</module>-->
+<!--        <module>spring-testing-2</module>-->
+<!--        <module>spring-testing</module>-->
+<!--        <module>test-containers</module>-->
+<!--        <module>testing-libraries-2</module>-->
+<!--        <module>testing-libraries</module>-->
+<!--        <module>testng</module>-->
+<!--        <module>xmlunit-2</module>-->
+<!--        <module>zerocode</module>-->
+    </modules>
+
+</project>
\ No newline at end of file