diff --git a/api/pom.xml b/api/pom.xml
index fce5cb6..ecb499a 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -10,8 +10,8 @@
4.0.0
- ${java.version}
- ${java.version}
+ ${jdk.version}
+ ${jdk.version}
UTF-8
UTF-8
diff --git a/example/demo/pom.xml b/demo/pom.xml
similarity index 95%
rename from example/demo/pom.xml
rename to demo/pom.xml
index a311629..d1f8d3c 100644
--- a/example/demo/pom.xml
+++ b/demo/pom.xml
@@ -6,13 +6,12 @@
easysql-parent
cc.carm.lib
0.3.16
- ../../pom.xml
4.0.0
- ${java.version}
- ${java.version}
+ ${jdk.version}
+ ${jdk.version}
UTF-8
UTF-8
true
diff --git a/example/demo/src/main/java/EasySQLDemo.java b/demo/src/main/java/EasySQLDemo.java
similarity index 100%
rename from example/demo/src/main/java/EasySQLDemo.java
rename to demo/src/main/java/EasySQLDemo.java
diff --git a/example/demo/src/test/java/cc/carm/lib/easysql/EasySQLTest.java b/demo/src/test/java/cc/carm/lib/easysql/EasySQLTest.java
similarity index 100%
rename from example/demo/src/test/java/cc/carm/lib/easysql/EasySQLTest.java
rename to demo/src/test/java/cc/carm/lib/easysql/EasySQLTest.java
diff --git a/example/demo/src/test/java/cc/carm/lib/easysql/TestHandler.java b/demo/src/test/java/cc/carm/lib/easysql/TestHandler.java
similarity index 100%
rename from example/demo/src/test/java/cc/carm/lib/easysql/TestHandler.java
rename to demo/src/test/java/cc/carm/lib/easysql/TestHandler.java
diff --git a/example/demo/src/test/java/cc/carm/lib/easysql/tests/DeleteTest.java b/demo/src/test/java/cc/carm/lib/easysql/tests/DeleteTest.java
similarity index 100%
rename from example/demo/src/test/java/cc/carm/lib/easysql/tests/DeleteTest.java
rename to demo/src/test/java/cc/carm/lib/easysql/tests/DeleteTest.java
diff --git a/example/demo/src/test/java/cc/carm/lib/easysql/tests/QueryCloseTest.java b/demo/src/test/java/cc/carm/lib/easysql/tests/QueryCloseTest.java
similarity index 100%
rename from example/demo/src/test/java/cc/carm/lib/easysql/tests/QueryCloseTest.java
rename to demo/src/test/java/cc/carm/lib/easysql/tests/QueryCloseTest.java
diff --git a/example/demo/src/test/java/cc/carm/lib/easysql/tests/QueryFunctionTest.java b/demo/src/test/java/cc/carm/lib/easysql/tests/QueryFunctionTest.java
similarity index 100%
rename from example/demo/src/test/java/cc/carm/lib/easysql/tests/QueryFunctionTest.java
rename to demo/src/test/java/cc/carm/lib/easysql/tests/QueryFunctionTest.java
diff --git a/example/demo/src/test/java/cc/carm/lib/easysql/tests/SQLUpdateBatchTests.java b/demo/src/test/java/cc/carm/lib/easysql/tests/SQLUpdateBatchTests.java
similarity index 100%
rename from example/demo/src/test/java/cc/carm/lib/easysql/tests/SQLUpdateBatchTests.java
rename to demo/src/test/java/cc/carm/lib/easysql/tests/SQLUpdateBatchTests.java
diff --git a/example/demo/src/test/java/cc/carm/lib/easysql/tests/SQLUpdateReturnKeysTest.java b/demo/src/test/java/cc/carm/lib/easysql/tests/SQLUpdateReturnKeysTest.java
similarity index 100%
rename from example/demo/src/test/java/cc/carm/lib/easysql/tests/SQLUpdateReturnKeysTest.java
rename to demo/src/test/java/cc/carm/lib/easysql/tests/SQLUpdateReturnKeysTest.java
diff --git a/example/demo/src/test/java/cc/carm/lib/easysql/tests/TableAlterTest.java b/demo/src/test/java/cc/carm/lib/easysql/tests/TableAlterTest.java
similarity index 100%
rename from example/demo/src/test/java/cc/carm/lib/easysql/tests/TableAlterTest.java
rename to demo/src/test/java/cc/carm/lib/easysql/tests/TableAlterTest.java
diff --git a/example/demo/src/test/java/cc/carm/lib/easysql/tests/TableCreateTest.java b/demo/src/test/java/cc/carm/lib/easysql/tests/TableCreateTest.java
similarity index 100%
rename from example/demo/src/test/java/cc/carm/lib/easysql/tests/TableCreateTest.java
rename to demo/src/test/java/cc/carm/lib/easysql/tests/TableCreateTest.java
diff --git a/example/demo/src/test/java/cc/carm/lib/easysql/tests/TableRenameTest.java b/demo/src/test/java/cc/carm/lib/easysql/tests/TableRenameTest.java
similarity index 100%
rename from example/demo/src/test/java/cc/carm/lib/easysql/tests/TableRenameTest.java
rename to demo/src/test/java/cc/carm/lib/easysql/tests/TableRenameTest.java
diff --git a/impl/pom.xml b/impl/pom.xml
index 7e56645..832cb9f 100644
--- a/impl/pom.xml
+++ b/impl/pom.xml
@@ -10,8 +10,8 @@
4.0.0
- ${java.version}
- ${java.version}
+ ${jdk.version}
+ ${jdk.version}
UTF-8
UTF-8
diff --git a/pom.xml b/pom.xml
index 8c26d3d..f0a96fc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,11 +5,13 @@
4.0.0
- 8
- ${java.version}
- ${java.version}
+ 8
+ ${jdk.version}
+ ${jdk.version}
+
UTF-8
UTF-8
+
carmjos
https://sonarcloud.io
@@ -26,7 +28,7 @@
with-pool/beecp
with-pool/hikaricp
- example/demo
+ demo
EasySQL
@@ -196,8 +198,8 @@
maven-compiler-plugin
3.10.1
-
- ${java.version}
+
+ ${jdk.version}
UTF-8
-parameters
diff --git a/with-pool/beecp/pom.xml b/with-pool/beecp/pom.xml
index 6c940b3..b485108 100644
--- a/with-pool/beecp/pom.xml
+++ b/with-pool/beecp/pom.xml
@@ -11,8 +11,8 @@
4.0.0
- ${java.version}
- ${java.version}
+ ${jdk.version}
+ ${jdk.version}
UTF-8
UTF-8
@@ -40,6 +40,12 @@
The MIT License
https://opensource.org/licenses/MIT
+ EasySQL的基础源代码采用MIT开源协议。
+
+
+ GNU Lesser General Public License v2.1
+ https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html
+ 该版本打包了BeeCP,因此相关代码继续遵循LGPL协议。
diff --git a/with-pool/hikaricp/pom.xml b/with-pool/hikaricp/pom.xml
index 3067812..8ce0f1d 100644
--- a/with-pool/hikaricp/pom.xml
+++ b/with-pool/hikaricp/pom.xml
@@ -11,8 +11,8 @@
4.0.0
- ${java.version}
- ${java.version}
+ ${jdk.version}
+ ${jdk.version}
UTF-8
UTF-8
@@ -39,6 +39,7 @@
The MIT License
https://opensource.org/licenses/MIT
+ EasySQL与HikariCP均采用MIT开源协议。