From df94272c73bdea550bec062c7e23e60da8005ec7 Mon Sep 17 00:00:00 2001
From: CarmJos <KarmunJ@outlook.com>
Date: Wed, 5 Jan 2022 02:32:09 +0800
Subject: [PATCH] =?UTF-8?q?[v0.2.4]=20=E4=BE=9D=E8=B5=96relocation?=
 =?UTF-8?q?=E5=B9=B6=E6=B7=BB=E5=8A=A0Optional=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 easysql-api/pom.xml                           |  2 +-
 easysql-beecp/pom.xml                         | 33 ++++++++++++++++++-
 easysql-demo/pom.xml                          |  2 +-
 easysql-hikaricp/pom.xml                      | 33 ++++++++++++++++++-
 .../{ => cc/carm/lib}/easysql/EasySQL.java    |  2 +-
 easysql-impl/pom.xml                          |  2 +-
 pom.xml                                       |  2 +-
 7 files changed, 69 insertions(+), 7 deletions(-)
 rename easysql-hikaricp/src/main/java/{ => cc/carm/lib}/easysql/EasySQL.java (98%)

diff --git a/easysql-api/pom.xml b/easysql-api/pom.xml
index 836ecec..2fd6c18 100644
--- a/easysql-api/pom.xml
+++ b/easysql-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>cc.carm.lib</groupId>
         <artifactId>easysql-parent</artifactId>
-        <version>0.2.3</version>
+        <version>0.2.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/easysql-beecp/pom.xml b/easysql-beecp/pom.xml
index 7e385ee..7a272b7 100644
--- a/easysql-beecp/pom.xml
+++ b/easysql-beecp/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easysql-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>0.2.3</version>
+        <version>0.2.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -67,6 +67,7 @@
             <groupId>com.github.chris2018998</groupId>
             <artifactId>beecp</artifactId>
             <version>3.3.0</version>
+            <optional>true</optional>
             <scope>compile</scope>
         </dependency>
 
@@ -89,6 +90,36 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
+                <version>3.2.3</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <relocations>
+                        <relocation>
+                            <pattern>org.slf4j</pattern>
+                            <shadedPattern>cc.carm.lib.easysql.slf4j</shadedPattern>
+                        </relocation>
+                        <relocation>
+                            <pattern>cn.beecp</pattern>
+                            <shadedPattern>cc.carm.lib.easysql.beecp</shadedPattern>
+                        </relocation>
+                    </relocations>
+                    <filters>
+                        <filter>
+                            <artifact>*:*</artifact>
+                            <excludes>
+                                <exclude>META-INF/MANIFEST.MF</exclude>
+                                <exclude>META-INF/*.txt</exclude>
+                            </excludes>
+                        </filter>
+                    </filters>
+                </configuration>
             </plugin>
         </plugins>
     </build>
diff --git a/easysql-demo/pom.xml b/easysql-demo/pom.xml
index 54ba132..96a82fe 100644
--- a/easysql-demo/pom.xml
+++ b/easysql-demo/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easysql-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>0.2.3</version>
+        <version>0.2.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/easysql-hikaricp/pom.xml b/easysql-hikaricp/pom.xml
index 1b5e7dc..837eb07 100644
--- a/easysql-hikaricp/pom.xml
+++ b/easysql-hikaricp/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easysql-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>0.2.3</version>
+        <version>0.2.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -66,6 +66,7 @@
             <groupId>com.zaxxer</groupId>
             <artifactId>HikariCP</artifactId>
             <version>4.0.3</version>
+            <optional>true</optional>
             <scope>compile</scope>
         </dependency>
 
@@ -88,6 +89,36 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
+                <version>3.2.3</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <relocations>
+                        <relocation>
+                            <pattern>org.slf4j</pattern>
+                            <shadedPattern>cc.carm.lib.easysql.slf4j</shadedPattern>
+                        </relocation>
+                        <relocation>
+                            <pattern>com.zaxxer.hikari</pattern>
+                            <shadedPattern>cc.carm.lib.easysql.hikari</shadedPattern>
+                        </relocation>
+                    </relocations>
+                    <filters>
+                        <filter>
+                            <artifact>*:*</artifact>
+                            <excludes>
+                                <exclude>META-INF/MANIFEST.MF</exclude>
+                                <exclude>META-INF/*.txt</exclude>
+                            </excludes>
+                        </filter>
+                    </filters>
+                </configuration>
             </plugin>
         </plugins>
     </build>
diff --git a/easysql-hikaricp/src/main/java/easysql/EasySQL.java b/easysql-hikaricp/src/main/java/cc/carm/lib/easysql/EasySQL.java
similarity index 98%
rename from easysql-hikaricp/src/main/java/easysql/EasySQL.java
rename to easysql-hikaricp/src/main/java/cc/carm/lib/easysql/EasySQL.java
index 1b57170..cee74a9 100644
--- a/easysql-hikaricp/src/main/java/easysql/EasySQL.java
+++ b/easysql-hikaricp/src/main/java/cc/carm/lib/easysql/EasySQL.java
@@ -1,4 +1,4 @@
-package easysql;
+package cc.carm.lib.easysql;
 
 import cc.carm.lib.easysql.api.SQLManager;
 import cc.carm.lib.easysql.api.action.query.SQLQuery;
diff --git a/easysql-impl/pom.xml b/easysql-impl/pom.xml
index 2a3e4f6..bbb193b 100644
--- a/easysql-impl/pom.xml
+++ b/easysql-impl/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easysql-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>0.2.3</version>
+        <version>0.2.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/pom.xml b/pom.xml
index 2e4fc95..137ab8d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
     <groupId>cc.carm.lib</groupId>
     <artifactId>easysql-parent</artifactId>
     <packaging>pom</packaging>
-    <version>0.2.3</version>
+    <version>0.2.4</version>
 
     <modules>
         <module>easysql-api</module>