From f86390cbc2c7e9923b253f1d6e1b971cf4db6d8a Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Sat, 4 Nov 2023 12:54:30 -0400
Subject: [PATCH 1/2] [pom] Patch insecure bcel in clirr plugin

---
 pom.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pom.xml b/pom.xml
index dcedd2a2f..16960c65b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -876,6 +876,13 @@
             <failOnError>false</failOnError>
             <failOnWarning>false</failOnWarning>
           </configuration>
+          <dependencies>
+            <dependency>
+              <groupId>org.apache.bcel</groupId>
+              <artifactId>bcel</artifactId>
+              <version>6.7.0</version>
+            </dependency>
+          </dependencies>
         </plugin>
 
         <plugin>

From 0fc554546c48487c4f614b58fd5d51d55847737d Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Sat, 4 Nov 2023 12:56:52 -0400
Subject: [PATCH 2/2] [pom] Sort pom

---
 pom.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 16960c65b..8e9fd4ab8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -272,7 +272,7 @@
     <html.javadocType>-html5</html.javadocType>
     <impsortGroups>au,ch,com,de,io,jakarta,java,javassist,javax,lombok,mockit,net,nl,ognl,org</impsortGroups>
     <module.name>org.mybatis.parent</module.name>
-    <spotbugs.onlyAnalyze />
+    <spotbugs.onlyAnalyze/>
 
     <!-- Maven date configuration -->
     <maven.build.timestamp.format>yyyy-MM-dd HH:mm:ssZ</maven.build.timestamp.format>
@@ -365,12 +365,12 @@
     <osgi.symbolicName>${project.groupId}.${project.artifactId}</osgi.symbolicName>
     <osgi.export>${project.groupId}.*;version=${project.version};-noimport:=true</osgi.export>
     <osgi.import>*</osgi.import>
-    <osgi.dynamicImport />
-    <osgi.private />
+    <osgi.dynamicImport/>
+    <osgi.private/>
 
     <!-- Add slow test groups here and annotate classes similar to @Tag('groupName'). -->
     <!-- Excluded groups are ran on github ci, to force here, pass -D"excludedGroups=" -->
-    <excludedGroups />
+    <excludedGroups/>
   </properties>
 
   <build>