From 37bb74b4103d37f5f6390aea28a7ae7a9a42f00c Mon Sep 17 00:00:00 2001 From: baifuyu <147798664+baifuyu@users.noreply.github.com> Date: Mon, 11 Dec 2023 11:55:27 +0800 Subject: [PATCH] refactor(directory): adjust directory structure (#23) --- .github/workflows/pr-title-checker.yml | 1 + builder/core/pom.xml | 12 ++--- builder/model/pom.xml | 6 +-- builder/pom.xml | 53 +++++++++++++++++++ cloudext/impl/graph-store/tugraph/pom.xml | 8 +-- cloudext/impl/object-store/local/pom.xml | 8 +-- .../impl/search-engine/elasticsearch/pom.xml | 8 +-- cloudext/impl/table-store/local/pom.xml | 8 +-- cloudext/interface/graph-store/pom.xml | 8 +-- cloudext/interface/object-store/pom.xml | 6 +-- cloudext/interface/search-engine/pom.xml | 8 +-- cloudext/interface/table-store/pom.xml | 6 +-- cloudext/pom.xml | 53 +++++++++++++++++++ pom.xml | 32 +++++------ server/api/facade/pom.xml | 2 +- server/api/http-client/pom.xml | 2 +- server/api/http-server/pom.xml | 2 +- server/arks/sofaboot/pom.xml | 2 +- server/biz/builder/pom.xml | 2 +- server/biz/common/pom.xml | 2 +- server/biz/reasoner/pom.xml | 2 +- server/biz/schema/pom.xml | 2 +- server/cloudext/impl/computing/local/pom.xml | 6 +-- .../cloudext/impl/job-scheduler/local/pom.xml | 2 +- server/cloudext/interface/computing/pom.xml | 2 +- .../cloudext/interface/job-scheduler/pom.xml | 2 +- server/common/model/pom.xml | 2 +- server/common/service/pom.xml | 10 ++-- server/core/builder/model/pom.xml | 4 +- server/core/builder/service/pom.xml | 4 +- server/core/reasoner/model/pom.xml | 2 +- server/core/reasoner/service/pom.xml | 2 +- server/core/schema/model/pom.xml | 2 +- server/core/schema/service/pom.xml | 10 ++-- server/infra/dao/pom.xml | 2 +- server/pom.xml | 2 +- server/test/pom.xml | 4 +- 37 files changed, 194 insertions(+), 95 deletions(-) create mode 100644 builder/pom.xml create mode 100644 cloudext/pom.xml diff --git a/.github/workflows/pr-title-checker.yml b/.github/workflows/pr-title-checker.yml index 827f619b6..ae7befd49 100644 --- a/.github/workflows/pr-title-checker.yml +++ b/.github/workflows/pr-title-checker.yml @@ -12,6 +12,7 @@ jobs: name: Validate PR title runs-on: ubuntu-latest steps: + # https://www.conventionalcommits.org/en/v1.0.0/#summary - uses: amannn/action-semantic-pull-request@v5 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/builder/core/pom.xml b/builder/core/pom.xml index 2eb5b0da8..46b162371 100644 --- a/builder/core/pom.xml +++ b/builder/core/pom.xml @@ -15,10 +15,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.antgroup.openspg - openspg-parent + com.antgroup.openspg.builder + builder-parent 0.0.1-SNAPSHOT - ../../pom.xml + ../pom.xml builder-core @@ -28,15 +28,15 @@ api-http-client - com.antgroup.openspg + com.antgroup.openspg.cloudext cloudext-interface-graph-store - com.antgroup.openspg + com.antgroup.openspg.cloudext cloudext-interface-table-store - com.antgroup.openspg + com.antgroup.openspg.cloudext cloudext-interface-search-engine diff --git a/builder/model/pom.xml b/builder/model/pom.xml index 64a8b5516..d6307732b 100644 --- a/builder/model/pom.xml +++ b/builder/model/pom.xml @@ -15,10 +15,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.antgroup.openspg - openspg-parent + com.antgroup.openspg.builder + builder-parent 0.0.1-SNAPSHOT - ../../pom.xml + ../pom.xml builder-model diff --git a/builder/pom.xml b/builder/pom.xml new file mode 100644 index 000000000..8184360c9 --- /dev/null +++ b/builder/pom.xml @@ -0,0 +1,53 @@ + + + + 4.0.0 + + + com.antgroup.openspg + openspg-parent + 0.0.1-SNAPSHOT + ../pom.xml + + + com.antgroup.openspg.builder + builder-parent + 0.0.1-SNAPSHOT + pom + + + Apache 2.0 License + http://www.apache.org/licenses/LICENSE-2.0.html + repo + + + + + core + model + + + + + + + + com.antgroup.openspg.builder + builder-core + ${project.version} + + + + diff --git a/cloudext/impl/graph-store/tugraph/pom.xml b/cloudext/impl/graph-store/tugraph/pom.xml index 8e557b6bc..7197cd76c 100644 --- a/cloudext/impl/graph-store/tugraph/pom.xml +++ b/cloudext/impl/graph-store/tugraph/pom.xml @@ -15,17 +15,17 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.antgroup.openspg - openspg-parent + com.antgroup.openspg.cloudext + cloudext-parent 0.0.1-SNAPSHOT - ../../../../pom.xml + ../../../pom.xml cloudext-impl-graph-store-tugraph - com.antgroup.openspg + com.antgroup.openspg.cloudext cloudext-interface-graph-store diff --git a/cloudext/impl/object-store/local/pom.xml b/cloudext/impl/object-store/local/pom.xml index 901c30a20..a20049d3b 100644 --- a/cloudext/impl/object-store/local/pom.xml +++ b/cloudext/impl/object-store/local/pom.xml @@ -15,17 +15,17 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.antgroup.openspg - openspg-parent + com.antgroup.openspg.cloudext + cloudext-parent 0.0.1-SNAPSHOT - ../../../../pom.xml + ../../../pom.xml cloudext-impl-object-store-local - com.antgroup.openspg + com.antgroup.openspg.cloudext cloudext-interface-object-store diff --git a/cloudext/impl/search-engine/elasticsearch/pom.xml b/cloudext/impl/search-engine/elasticsearch/pom.xml index 3d311fce1..444130407 100644 --- a/cloudext/impl/search-engine/elasticsearch/pom.xml +++ b/cloudext/impl/search-engine/elasticsearch/pom.xml @@ -15,17 +15,17 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.antgroup.openspg - openspg-parent + com.antgroup.openspg.cloudext + cloudext-parent 0.0.1-SNAPSHOT - ../../../../pom.xml + ../../../pom.xml cloudext-impl-search-engine-elasticsearch - com.antgroup.openspg + com.antgroup.openspg.cloudext cloudext-interface-search-engine diff --git a/cloudext/impl/table-store/local/pom.xml b/cloudext/impl/table-store/local/pom.xml index 51e9d5d02..88b3a7dd4 100644 --- a/cloudext/impl/table-store/local/pom.xml +++ b/cloudext/impl/table-store/local/pom.xml @@ -15,17 +15,17 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.antgroup.openspg - openspg-parent + com.antgroup.openspg.cloudext + cloudext-parent 0.0.1-SNAPSHOT - ../../../../pom.xml + ../../../pom.xml cloudext-impl-table-store-local - com.antgroup.openspg + com.antgroup.openspg.cloudext cloudext-interface-table-store diff --git a/cloudext/interface/graph-store/pom.xml b/cloudext/interface/graph-store/pom.xml index e8a4cb398..fb00db04d 100644 --- a/cloudext/interface/graph-store/pom.xml +++ b/cloudext/interface/graph-store/pom.xml @@ -15,10 +15,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.antgroup.openspg - openspg-parent + com.antgroup.openspg.cloudext + cloudext-parent 0.0.1-SNAPSHOT - ../../../pom.xml + ../../pom.xml cloudext-interface-graph-store @@ -29,7 +29,7 @@ common-util - com.antgroup.openspg + com.antgroup.openspg.builder builder-model diff --git a/cloudext/interface/object-store/pom.xml b/cloudext/interface/object-store/pom.xml index 1f828bcff..d9525030f 100644 --- a/cloudext/interface/object-store/pom.xml +++ b/cloudext/interface/object-store/pom.xml @@ -15,10 +15,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.antgroup.openspg - openspg-parent + com.antgroup.openspg.cloudext + cloudext-parent 0.0.1-SNAPSHOT - ../../../pom.xml + ../../pom.xml cloudext-interface-object-store diff --git a/cloudext/interface/search-engine/pom.xml b/cloudext/interface/search-engine/pom.xml index ba400922b..ce9663777 100644 --- a/cloudext/interface/search-engine/pom.xml +++ b/cloudext/interface/search-engine/pom.xml @@ -15,10 +15,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.antgroup.openspg - openspg-parent + com.antgroup.openspg.cloudext + cloudext-parent 0.0.1-SNAPSHOT - ../../../pom.xml + ../../pom.xml cloudext-interface-search-engine @@ -28,7 +28,7 @@ common-util - com.antgroup.openspg + com.antgroup.openspg.builder builder-model diff --git a/cloudext/interface/table-store/pom.xml b/cloudext/interface/table-store/pom.xml index d08c73cfe..7246377ee 100644 --- a/cloudext/interface/table-store/pom.xml +++ b/cloudext/interface/table-store/pom.xml @@ -15,10 +15,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.antgroup.openspg - openspg-parent + com.antgroup.openspg.cloudext + cloudext-parent 0.0.1-SNAPSHOT - ../../../pom.xml + ../../pom.xml cloudext-interface-table-store diff --git a/cloudext/pom.xml b/cloudext/pom.xml new file mode 100644 index 000000000..9923c6a08 --- /dev/null +++ b/cloudext/pom.xml @@ -0,0 +1,53 @@ + + + + 4.0.0 + + + com.antgroup.openspg + openspg-parent + 0.0.1-SNAPSHOT + ../pom.xml + + + com.antgroup.openspg.cloudext + cloudext-parent + 0.0.1-SNAPSHOT + pom + + + Apache 2.0 License + http://www.apache.org/licenses/LICENSE-2.0.html + repo + + + + + interface/graph-store + interface/object-store + interface/table-store + interface/search-engine + impl/graph-store/tugraph + impl/object-store/local + impl/table-store/local + impl/search-engine/elasticsearch + + + + + + + + diff --git a/pom.xml b/pom.xml index 3e86ce360..1c17b700f 100644 --- a/pom.xml +++ b/pom.xml @@ -28,19 +28,11 @@ - builder/model - builder/core common/util server reasoner - cloudext/interface/graph-store - cloudext/interface/object-store - cloudext/interface/table-store - cloudext/interface/search-engine - cloudext/impl/graph-store/tugraph - cloudext/impl/object-store/local - cloudext/impl/table-store/local - cloudext/impl/search-engine/elasticsearch + builder + cloudext @@ -86,12 +78,12 @@ ${project.version} - com.antgroup.openspg + com.antgroup.openspg.builder builder-model ${project.version} - com.antgroup.openspg + com.antgroup.openspg.builder builder-core ${project.version} @@ -101,42 +93,42 @@ ${project.version} - com.antgroup.openspg + com.antgroup.openspg.cloudext cloudext-interface-graph-store ${project.version} - com.antgroup.openspg + com.antgroup.openspg.cloudext cloudext-interface-search-engine ${project.version} - com.antgroup.openspg + com.antgroup.openspg.cloudext cloudext-interface-object-store ${project.version} - com.antgroup.openspg + com.antgroup.openspg.cloudext cloudext-interface-table-store ${project.version} - com.antgroup.openspg + com.antgroup.openspg.cloudext cloudext-impl-graph-store-tugraph ${project.version} - com.antgroup.openspg + com.antgroup.openspg.cloudext cloudext-impl-object-store-local ${project.version} - com.antgroup.openspg + com.antgroup.openspg.cloudext cloudext-impl-table-store-local ${project.version} - com.antgroup.openspg + com.antgroup.openspg.cloudext cloudext-impl-search-engine-elasticsearch ${project.version} diff --git a/server/api/facade/pom.xml b/server/api/facade/pom.xml index e1881c26d..5ca79eb15 100644 --- a/server/api/facade/pom.xml +++ b/server/api/facade/pom.xml @@ -16,7 +16,7 @@ 4.0.0 com.antgroup.openspg.server - openspg-server-parent + server-parent 0.0.1-SNAPSHOT ../../pom.xml diff --git a/server/api/http-client/pom.xml b/server/api/http-client/pom.xml index 5fff850df..267c68495 100644 --- a/server/api/http-client/pom.xml +++ b/server/api/http-client/pom.xml @@ -16,7 +16,7 @@ 4.0.0 com.antgroup.openspg.server - openspg-server-parent + server-parent 0.0.1-SNAPSHOT ../../pom.xml diff --git a/server/api/http-server/pom.xml b/server/api/http-server/pom.xml index 9c1f4b3fd..0f1192d9d 100644 --- a/server/api/http-server/pom.xml +++ b/server/api/http-server/pom.xml @@ -16,7 +16,7 @@ 4.0.0 com.antgroup.openspg.server - openspg-server-parent + server-parent 0.0.1-SNAPSHOT ../../pom.xml diff --git a/server/arks/sofaboot/pom.xml b/server/arks/sofaboot/pom.xml index 4d842ec53..a330e7ca5 100644 --- a/server/arks/sofaboot/pom.xml +++ b/server/arks/sofaboot/pom.xml @@ -16,7 +16,7 @@ 4.0.0 com.antgroup.openspg.server - openspg-server-parent + server-parent 0.0.1-SNAPSHOT ../../pom.xml diff --git a/server/biz/builder/pom.xml b/server/biz/builder/pom.xml index d8b64099a..cb4ecec6a 100644 --- a/server/biz/builder/pom.xml +++ b/server/biz/builder/pom.xml @@ -16,7 +16,7 @@ 4.0.0 com.antgroup.openspg.server - openspg-server-parent + server-parent 0.0.1-SNAPSHOT ../../pom.xml diff --git a/server/biz/common/pom.xml b/server/biz/common/pom.xml index d70895d16..9be0f0677 100644 --- a/server/biz/common/pom.xml +++ b/server/biz/common/pom.xml @@ -16,7 +16,7 @@ 4.0.0 com.antgroup.openspg.server - openspg-server-parent + server-parent 0.0.1-SNAPSHOT ../../pom.xml diff --git a/server/biz/reasoner/pom.xml b/server/biz/reasoner/pom.xml index 89aec95ba..a06d34b98 100644 --- a/server/biz/reasoner/pom.xml +++ b/server/biz/reasoner/pom.xml @@ -16,7 +16,7 @@ 4.0.0 com.antgroup.openspg.server - openspg-server-parent + server-parent 0.0.1-SNAPSHOT ../../pom.xml diff --git a/server/biz/schema/pom.xml b/server/biz/schema/pom.xml index 5bb7c8aa2..d46d8ff61 100644 --- a/server/biz/schema/pom.xml +++ b/server/biz/schema/pom.xml @@ -16,7 +16,7 @@ 4.0.0 com.antgroup.openspg.server - openspg-server-parent + server-parent 0.0.1-SNAPSHOT ../../pom.xml diff --git a/server/cloudext/impl/computing/local/pom.xml b/server/cloudext/impl/computing/local/pom.xml index fde69d32c..976f5e8f2 100644 --- a/server/cloudext/impl/computing/local/pom.xml +++ b/server/cloudext/impl/computing/local/pom.xml @@ -16,7 +16,7 @@ 4.0.0 com.antgroup.openspg.server - openspg-server-parent + server-parent 0.0.1-SNAPSHOT ../../../../pom.xml @@ -25,7 +25,7 @@ - com.antgroup.openspg + com.antgroup.openspg.builder builder-core @@ -37,7 +37,7 @@ cloudext-interface-computing - com.antgroup.openspg + com.antgroup.openspg.cloudext cloudext-interface-table-store diff --git a/server/cloudext/impl/job-scheduler/local/pom.xml b/server/cloudext/impl/job-scheduler/local/pom.xml index e1a8e0ad1..567ac9944 100644 --- a/server/cloudext/impl/job-scheduler/local/pom.xml +++ b/server/cloudext/impl/job-scheduler/local/pom.xml @@ -16,7 +16,7 @@ 4.0.0 com.antgroup.openspg.server - openspg-server-parent + server-parent 0.0.1-SNAPSHOT ../../../../pom.xml diff --git a/server/cloudext/interface/computing/pom.xml b/server/cloudext/interface/computing/pom.xml index 8f3aa0183..1d6360230 100644 --- a/server/cloudext/interface/computing/pom.xml +++ b/server/cloudext/interface/computing/pom.xml @@ -16,7 +16,7 @@ 4.0.0 com.antgroup.openspg.server - openspg-server-parent + server-parent 0.0.1-SNAPSHOT ../../../pom.xml diff --git a/server/cloudext/interface/job-scheduler/pom.xml b/server/cloudext/interface/job-scheduler/pom.xml index ed1172adf..b08bd31ab 100644 --- a/server/cloudext/interface/job-scheduler/pom.xml +++ b/server/cloudext/interface/job-scheduler/pom.xml @@ -16,7 +16,7 @@ 4.0.0 com.antgroup.openspg.server - openspg-server-parent + server-parent 0.0.1-SNAPSHOT ../../../pom.xml diff --git a/server/common/model/pom.xml b/server/common/model/pom.xml index 329f1814b..c8ead0bbb 100644 --- a/server/common/model/pom.xml +++ b/server/common/model/pom.xml @@ -16,7 +16,7 @@ 4.0.0 com.antgroup.openspg.server - openspg-server-parent + server-parent 0.0.1-SNAPSHOT ../../pom.xml diff --git a/server/common/service/pom.xml b/server/common/service/pom.xml index 6f7023f47..b5fd962c2 100644 --- a/server/common/service/pom.xml +++ b/server/common/service/pom.xml @@ -16,7 +16,7 @@ 4.0.0 com.antgroup.openspg.server - openspg-server-parent + server-parent 0.0.1-SNAPSHOT ../../pom.xml @@ -33,15 +33,15 @@ api-http-client - com.antgroup.openspg + com.antgroup.openspg.cloudext cloudext-interface-graph-store - com.antgroup.openspg + com.antgroup.openspg.cloudext cloudext-interface-object-store - com.antgroup.openspg + com.antgroup.openspg.cloudext cloudext-interface-search-engine @@ -53,7 +53,7 @@ cloudext-interface-computing - com.antgroup.openspg + com.antgroup.openspg.cloudext cloudext-interface-table-store diff --git a/server/core/builder/model/pom.xml b/server/core/builder/model/pom.xml index d4bface09..31a30db3f 100644 --- a/server/core/builder/model/pom.xml +++ b/server/core/builder/model/pom.xml @@ -16,7 +16,7 @@ 4.0.0 com.antgroup.openspg.server - openspg-server-parent + server-parent 0.0.1-SNAPSHOT ../../../pom.xml @@ -28,7 +28,7 @@ core-schema-model - com.antgroup.openspg + com.antgroup.openspg.builder builder-model diff --git a/server/core/builder/service/pom.xml b/server/core/builder/service/pom.xml index d2233d6c6..66b96ddb8 100644 --- a/server/core/builder/service/pom.xml +++ b/server/core/builder/service/pom.xml @@ -16,7 +16,7 @@ 4.0.0 com.antgroup.openspg.server - openspg-server-parent + server-parent 0.0.1-SNAPSHOT ../../../pom.xml @@ -32,7 +32,7 @@ common-service - com.antgroup.openspg + com.antgroup.openspg.builder builder-core diff --git a/server/core/reasoner/model/pom.xml b/server/core/reasoner/model/pom.xml index bfb2cfd0d..5d74ea752 100644 --- a/server/core/reasoner/model/pom.xml +++ b/server/core/reasoner/model/pom.xml @@ -16,7 +16,7 @@ 4.0.0 com.antgroup.openspg.server - openspg-server-parent + server-parent 0.0.1-SNAPSHOT ../../../pom.xml diff --git a/server/core/reasoner/service/pom.xml b/server/core/reasoner/service/pom.xml index 51af7c272..3b86f0bb4 100644 --- a/server/core/reasoner/service/pom.xml +++ b/server/core/reasoner/service/pom.xml @@ -16,7 +16,7 @@ 4.0.0 com.antgroup.openspg.server - openspg-server-parent + server-parent 0.0.1-SNAPSHOT ../../../pom.xml diff --git a/server/core/schema/model/pom.xml b/server/core/schema/model/pom.xml index 45290b290..716a61feb 100644 --- a/server/core/schema/model/pom.xml +++ b/server/core/schema/model/pom.xml @@ -16,7 +16,7 @@ 4.0.0 com.antgroup.openspg.server - openspg-server-parent + server-parent 0.0.1-SNAPSHOT ../../../pom.xml diff --git a/server/core/schema/service/pom.xml b/server/core/schema/service/pom.xml index 0c5fb39d2..3091b9bde 100644 --- a/server/core/schema/service/pom.xml +++ b/server/core/schema/service/pom.xml @@ -16,7 +16,7 @@ 4.0.0 com.antgroup.openspg.server - openspg-server-parent + server-parent 0.0.1-SNAPSHOT ../../../pom.xml @@ -33,19 +33,19 @@ common-service - com.antgroup.openspg + com.antgroup.openspg.cloudext cloudext-impl-graph-store-tugraph - com.antgroup.openspg + com.antgroup.openspg.cloudext cloudext-impl-object-store-local - com.antgroup.openspg + com.antgroup.openspg.cloudext cloudext-impl-table-store-local - com.antgroup.openspg + com.antgroup.openspg.cloudext cloudext-impl-search-engine-elasticsearch diff --git a/server/infra/dao/pom.xml b/server/infra/dao/pom.xml index 97344b256..e9f40ef47 100644 --- a/server/infra/dao/pom.xml +++ b/server/infra/dao/pom.xml @@ -16,7 +16,7 @@ 4.0.0 com.antgroup.openspg.server - openspg-server-parent + server-parent 0.0.1-SNAPSHOT ../../pom.xml diff --git a/server/pom.xml b/server/pom.xml index 86bae5fe7..f941595d1 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -23,7 +23,7 @@ com.antgroup.openspg.server - openspg-server-parent + server-parent 0.0.1-SNAPSHOT pom diff --git a/server/test/pom.xml b/server/test/pom.xml index e8c6ee1a5..e99aa0e55 100644 --- a/server/test/pom.xml +++ b/server/test/pom.xml @@ -16,7 +16,7 @@ 4.0.0 com.antgroup.openspg.server - openspg-server-parent + server-parent 0.0.1-SNAPSHOT @@ -40,7 +40,7 @@ test - com.antgroup.openspg + com.antgroup.openspg.cloudext cloudext-impl-graph-store-tugraph test