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 @@ cc.carm.lib easysql-parent - 0.2.3 + 0.2.4 4.0.0 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 @@ easysql-parent cc.carm.lib - 0.2.3 + 0.2.4 4.0.0 @@ -67,6 +67,7 @@ com.github.chris2018998 beecp 3.3.0 + true compile @@ -89,6 +90,36 @@ org.apache.maven.plugins maven-shade-plugin + 3.2.3 + + + package + + shade + + + + + + + org.slf4j + cc.carm.lib.easysql.slf4j + + + cn.beecp + cc.carm.lib.easysql.beecp + + + + + *:* + + META-INF/MANIFEST.MF + META-INF/*.txt + + + + 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 @@ easysql-parent cc.carm.lib - 0.2.3 + 0.2.4 4.0.0 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 @@ easysql-parent cc.carm.lib - 0.2.3 + 0.2.4 4.0.0 @@ -66,6 +66,7 @@ com.zaxxer HikariCP 4.0.3 + true compile @@ -88,6 +89,36 @@ org.apache.maven.plugins maven-shade-plugin + 3.2.3 + + + package + + shade + + + + + + + org.slf4j + cc.carm.lib.easysql.slf4j + + + com.zaxxer.hikari + cc.carm.lib.easysql.hikari + + + + + *:* + + META-INF/MANIFEST.MF + META-INF/*.txt + + + + 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 @@ easysql-parent cc.carm.lib - 0.2.3 + 0.2.4 4.0.0 diff --git a/pom.xml b/pom.xml index 2e4fc95..137ab8d 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ cc.carm.lib easysql-parent pom - 0.2.3 + 0.2.4 easysql-api