chore(project): 修改项目文件结构

2024-09-19 21:35:47 +00:00 · 2022-06-02 21:41:09 +08:00 · 2022-06-02 21:41:09 +08:00 · 9bac83f739
commit 9bac83f739
parent 96ccc604ed
17 changed files with 25 additions and 17 deletions
--- a/api/pom.xml
+++ b/api/pom.xml
@ -10,8 +10,8 @@
    <modelVersion>4.0.0</modelVersion>

    <properties>
-        <maven.compiler.source>${java.version}</maven.compiler.source>
-        <maven.compiler.target>${java.version}</maven.compiler.target>
+        <maven.compiler.source>${jdk.version}</maven.compiler.source>
+        <maven.compiler.target>${jdk.version}</maven.compiler.target>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
    </properties>
--- a/example/demo/pom.xml
+++ b/example/demo/pom.xml
@ -6,13 +6,12 @@
        <artifactId>easysql-parent</artifactId>
        <groupId>cc.carm.lib</groupId>
        <version>0.3.16</version>
-        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>

    <properties>
-        <maven.compiler.source>${java.version}</maven.compiler.source>
-        <maven.compiler.target>${java.version}</maven.compiler.target>
+        <maven.compiler.source>${jdk.version}</maven.compiler.source>
+        <maven.compiler.target>${jdk.version}</maven.compiler.target>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
        <maven.javadoc.skip>true</maven.javadoc.skip>
--- a/example/demo/src/main/java/EasySQLDemo.java
+++ b/example/demo/src/main/java/EasySQLDemo.java
--- a/example/demo/src/test/java/cc/carm/lib/easysql/EasySQLTest.java
+++ b/example/demo/src/test/java/cc/carm/lib/easysql/EasySQLTest.java
--- a/example/demo/src/test/java/cc/carm/lib/easysql/TestHandler.java
+++ b/example/demo/src/test/java/cc/carm/lib/easysql/TestHandler.java
--- a/example/demo/src/test/java/cc/carm/lib/easysql/tests/DeleteTest.java
+++ b/example/demo/src/test/java/cc/carm/lib/easysql/tests/DeleteTest.java
--- a/example/demo/src/test/java/cc/carm/lib/easysql/tests/QueryCloseTest.java
+++ b/example/demo/src/test/java/cc/carm/lib/easysql/tests/QueryCloseTest.java
--- a/example/demo/src/test/java/cc/carm/lib/easysql/tests/QueryFunctionTest.java
+++ b/example/demo/src/test/java/cc/carm/lib/easysql/tests/QueryFunctionTest.java
--- a/example/demo/src/test/java/cc/carm/lib/easysql/tests/SQLUpdateBatchTests.java
+++ b/example/demo/src/test/java/cc/carm/lib/easysql/tests/SQLUpdateBatchTests.java
--- a/example/demo/src/test/java/cc/carm/lib/easysql/tests/SQLUpdateReturnKeysTest.java
+++ b/example/demo/src/test/java/cc/carm/lib/easysql/tests/SQLUpdateReturnKeysTest.java
--- a/example/demo/src/test/java/cc/carm/lib/easysql/tests/TableAlterTest.java
+++ b/example/demo/src/test/java/cc/carm/lib/easysql/tests/TableAlterTest.java
--- a/example/demo/src/test/java/cc/carm/lib/easysql/tests/TableCreateTest.java
+++ b/example/demo/src/test/java/cc/carm/lib/easysql/tests/TableCreateTest.java
--- a/example/demo/src/test/java/cc/carm/lib/easysql/tests/TableRenameTest.java
+++ b/example/demo/src/test/java/cc/carm/lib/easysql/tests/TableRenameTest.java
--- a/impl/pom.xml
+++ b/impl/pom.xml
@ -10,8 +10,8 @@
    <modelVersion>4.0.0</modelVersion>

    <properties>
-        <maven.compiler.source>${java.version}</maven.compiler.source>
-        <maven.compiler.target>${java.version}</maven.compiler.target>
+        <maven.compiler.source>${jdk.version}</maven.compiler.source>
+        <maven.compiler.target>${jdk.version}</maven.compiler.target>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
    </properties>
--- a/pom.xml
+++ b/pom.xml
@ -5,11 +5,13 @@
    <modelVersion>4.0.0</modelVersion>

    <properties>
-        <java.version>8</java.version>
-        <maven.compiler.source>${java.version}</maven.compiler.source>
-        <maven.compiler.target>${java.version}</maven.compiler.target>
+        <jdk.version>8</jdk.version>
+        <maven.compiler.source>${jdk.version}</maven.compiler.source>
+        <maven.compiler.target>${jdk.version}</maven.compiler.target>
+
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
+
        <sonar.organization>carmjos</sonar.organization>
        <sonar.host.url>https://sonarcloud.io</sonar.host.url>
    </properties>
@ -26,7 +28,7 @@
        <module>with-pool/beecp</module>
        <module>with-pool/hikaricp</module>

-        <module>example/demo</module>
+        <module>demo</module>
    </modules>

    <name>EasySQL</name>
@ -196,8 +198,8 @@
                    <artifactId>maven-compiler-plugin</artifactId>
                    <version>3.10.1</version>
                    <configuration>
-                        <source>${java.version}</source>
-                        <target>${java.version}</target>
+                        <source>${jdk.version}</source>
+                        <target>${jdk.version}</target>
                        <encoding>UTF-8</encoding>
                        <compilerArgument>-parameters</compilerArgument>
                    </configuration>
--- a/with-pool/beecp/pom.xml
+++ b/with-pool/beecp/pom.xml
@ -11,8 +11,8 @@
    <modelVersion>4.0.0</modelVersion>

    <properties>
-        <maven.compiler.source>${java.version}</maven.compiler.source>
-        <maven.compiler.target>${java.version}</maven.compiler.target>
+        <maven.compiler.source>${jdk.version}</maven.compiler.source>
+        <maven.compiler.target>${jdk.version}</maven.compiler.target>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
    </properties>
@ -40,6 +40,12 @@
        <license>
            <name>The MIT License</name>
            <url>https://opensource.org/licenses/MIT</url>
+            <comments>EasySQL的基础源代码采用MIT开源协议。</comments>
+        </license>
+        <license>
+            <name>GNU Lesser General Public License v2.1</name>
+            <url>https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html</url>
+            <comments>该版本打包了BeeCP，因此相关代码继续遵循LGPL协议。</comments>
        </license>
    </licenses>

--- a/with-pool/hikaricp/pom.xml
+++ b/with-pool/hikaricp/pom.xml
@ -11,8 +11,8 @@
    <modelVersion>4.0.0</modelVersion>

    <properties>
-        <maven.compiler.source>${java.version}</maven.compiler.source>
-        <maven.compiler.target>${java.version}</maven.compiler.target>
+        <maven.compiler.source>${jdk.version}</maven.compiler.source>
+        <maven.compiler.target>${jdk.version}</maven.compiler.target>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
    </properties>
@ -39,6 +39,7 @@
        <license>
            <name>The MIT License</name>
            <url>https://opensource.org/licenses/MIT</url>
+            <comments>EasySQL与HikariCP均采用MIT开源协议。</comments>
        </license>
    </licenses>