Skip to content

Commit

Permalink
refact: adjust project structure for merge PD & Store[Breaking Change] (
Browse files Browse the repository at this point in the history 
apache#2338)

Subtask of apache#2265.

Adjust the project structure of this repository to include three sub-modules: hugegraph-server, hugegraph-pd, hugegraph-store at the root level.

Roll back to the moment when apache#2266 was merged on `pd-store` and incorporate the latest changes in `master`.

For more detailed information, please refer to apache#2266 (comment).

---------

Co-authored-by: M <87920097+msgui@users.noreply.github.com>
  • Loading branch information
@VGalaxies @msgui
VGalaxies and msgui committed Nov 10, 2023
1 parent 0e63991 commit 2e623fe
Show file tree
Hide file tree
Showing 7 changed files with 473 additions and 509 deletions.
7 changes: 2 additions & 5 deletions .licenserc.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ header: # `header` section is configurations for source codes license header.
- '**/*.properties'
- '**/RaftRequests.java'
- 'dist/**/*'
- 'hugegraph-dist'
- 'hugegraph-server/hugegraph-dist'
- '**/assembly/static/bin/hugegraph.service'
- 'scripts/dev/reviewers'
- 'scripts/dev/reviewers'
Expand All @@ -89,13 +89,10 @@ header: # `header` section is configurations for source codes license header.
- '**/META-INF/MANIFEST.MF'
- '.repository/**'
- '**/.flattened-pom.xml'
- 'hugegraph-core/src/main/java/org/apache/hugegraph/backend/id/SnowflakeIdGenerator.java'
- '**/optimize/HugeScriptTraversal.java'
- '**/type/Nameable.java'
- '**/define/Cardinality.java'
- '**/util/StringEncoding.java'
- 'hugegraph-api/src/main/java/org/apache/hugegraph/opencypher/CypherOpProcessor.java'
- 'hugegraph-api/src/main/java/org/apache/hugegraph/opencypher/CypherPlugin.java'
# TODO: temporarily added to the ignore list, need handle them before releases ( ↓ )
- 'hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/opencypher/CypherOpProcessor.java'
- 'hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/opencypher/CypherPlugin.java'
Expand All @@ -104,7 +101,7 @@ header: # `header` section is configurations for source codes license header.
- 'hugegraph-store/hg-store-node/src/main/java/org/apache/hugegraph/store/node/metrics/ProcfsReader.java'
- 'hugegraph-store/hg-store-node/src/main/java/org/apache/hugegraph/store/node/metrics/ProcfsSmaps.java'
# TODO: temporarily added to the ignore list, need handle them before releases ( ↑ )
- 'hugegraph-dist/src/assembly/static/bin/wait-storage.sh'
- 'hugegraph-server/hugegraph-dist/src/assembly/static/bin/wait-storage.sh'
comment: on-failure # on what condition license-eye will comment on the pull request, `on-failure`, `always`, `never`.

# license-location-threshold specifies the index threshold where the license header can be located,
Expand Down
126 changes: 125 additions & 1 deletion hugegraph-pd/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,10 +139,134 @@
</includes>
<followSymlinks>false</followSymlinks>
</fileset>
<!-- <fileset><directory>${final.name}</directory></fileset>-->
<!-- <fileset><directory>${final.name}</directory></fileset> -->
</filesets>
</configuration>
</plugin>
</plugins>
</build>

<profiles>
<!-- hugegraph pd test profiles -->
<profile>
<id>pd-client-test</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.20</version>
<executions>
<execution>
<id>pd-client-test</id>
<goals>
<goal>test</goal>
</goals>
<phase>test</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>pd-core-test</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.20</version>
<executions>
<execution>
<id>pd-core-test</id>
<goals>
<goal>test</goal>
</goals>
<phase>test</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>pd-cli-tools-test</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.20</version>
<executions>
<execution>
<id>pd-cli-tools-test</id>
<goals>
<goal>test</goal>
</goals>
<phase>test</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>pd-common-test</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.20</version>
<executions>
<execution>
<id>pd-common-test</id>
<goals>
<goal>test</goal>
</goals>
<phase>test</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>pd-service-test</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.20</version>
<executions>
<execution>
<id>pd-service-test</id>
<goals>
<goal>test</goal>
</goals>
<phase>test</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
50 changes: 38 additions & 12 deletions hugegraph-server/hugegraph-dist/scripts/dependency/known-dependencies.txt
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
HdrHistogram-2.1.9.jar
ST4-4.0.8.jar
accessors-smart-1.2.jar
airline-0.8.jar
animal-sniffer-annotations-1.14.jar
animal-sniffer-annotations-1.19.jar
annotations-4.1.1.4.jar
ansj_seg-5.1.6.jar
antlr-runtime-3.5.2.jar
Expand All @@ -17,6 +15,7 @@ asm-tree-5.0.3.jar
asm-util-5.0.3.jar
ast-9.0-9.0.20190305.jar
audience-annotations-0.5.0.jar
auto-service-annotations-1.0.jar
bolt-1.6.4.jar
byte-buddy-1.10.5.jar
byte-buddy-agent-1.10.5.jar
Expand All @@ -25,7 +24,8 @@ caffeine-2.3.1.jar
caffeine-2.5.6.jar
cassandra-all-4.0.10.jar
cassandra-driver-core-3.6.0.jar
checker-qual-2.0.0.jar
checker-compat-qual-2.5.5.jar
checker-qual-3.12.0.jar
checker-qual-3.5.0.jar
chronicle-bytes-2.20.111.jar
chronicle-core-2.20.126.jar
Expand All @@ -40,6 +40,7 @@ commons-codec-1.13.jar
commons-codec-1.15.jar
commons-codec-1.9.jar
commons-collections-3.2.2.jar
commons-collections4-4.4.jar
commons-compress-1.21.jar
commons-configuration-1.10.jar
commons-configuration2-2.8.0.jar
Expand All @@ -55,10 +56,12 @@ cypher-gremlin-extensions-1.0.4.jar
disruptor-3.3.7.jar
eclipse-collections-11.1.0.jar
eclipse-collections-api-11.1.0.jar
error_prone_annotations-2.1.3.jar
error_prone_annotations-2.10.0.jar
error_prone_annotations-2.3.4.jar
exp4j-0.4.8.jar
expressions-9.0-9.0.20190305.jar
failsafe-2.4.1.jar
failureaccess-1.0.1.jar
fastparse_2.12-2.0.4.jar
fastutil-8.5.9.jar
findbugs-annotations-1.3.9-1.jar
Expand All @@ -84,17 +87,33 @@ groovy-jsr223-2.5.14-indy.jar
groovy-swing-2.5.14.jar
groovy-templates-2.5.14.jar
groovy-xml-2.5.14.jar
grpc-api-1.39.0.jar
grpc-api-1.47.0.jar
grpc-context-1.39.0.jar
grpc-context-1.47.0.jar
grpc-core-1.39.0.jar
grpc-core-1.47.0.jar
grpc-grpclb-1.39.0.jar
grpc-netty-shaded-1.39.0.jar
grpc-netty-shaded-1.47.0.jar
gson-2.9.0.jar
guava-25.1-jre.jar
grpc-protobuf-1.39.0.jar
grpc-protobuf-lite-1.39.0.jar
gson-2.8.9.jar
guava-27.0-jre.jar
guava-30.0-jre.jar
guava-31.0.1-android.jar
hamcrest-2.2.jar
hamcrest-core-1.3.jar
hanlp-portable-1.8.3.jar
hbase-shaded-endpoint-2.0.6.jar
HdrHistogram-2.1.9.jar
hessian-3.3.6.jar
hg-pd-client-1.5.0.1.jar
hg-pd-common-1.5.0.1.jar
hg-pd-grpc-1.5.0.1.jar
hg-store-client-1.5.0.1.jar
hg-store-common-1.5.0.1.jar
hg-store-grpc-1.5.0.1.jar
high-scale-lib-1.0.6.jar
hk2-api-3.0.1.jar
hk2-locator-3.0.1.jar
Expand All @@ -106,7 +125,6 @@ httpclient-4.5.13.jar
httpcore-4.4.13.jar
ikanalyzer-2012_u6.jar
ivy-2.4.0.jar
j2objc-annotations-1.1.jar
j2objc-annotations-1.3.jar
jackson-annotations-2.13.2.jar
jackson-annotations-2.14.0-rc1.jar
Expand Down Expand Up @@ -137,6 +155,7 @@ javapoet-1.8.0.jar
javassist-3.21.0-GA.jar
javatuples-1.2.jar
javax.activation-api-1.2.0.jar
javax.annotation-api-1.3.2.jar
javax.inject-1.jar
javax.json-1.0.jar
jaxb-api-2.3.1.jar
Expand Down Expand Up @@ -165,8 +184,10 @@ jersey-media-json-jackson-3.0.3.jar
jersey-server-3.0.3.jar
jersey-test-framework-core-3.0.3.jar
jersey-test-framework-provider-grizzly2-3.0.3.jar
jffi-1.2.16-native.jar
jetcd-common-0.5.9.jar
jetcd-core-0.5.9.jar
jffi-1.2.16.jar
jffi-1.2.16-native.jar
jflex-1.8.2.jar
jieba-analysis-1.0.2.jar
jjwt-api-0.11.5.jar
Expand All @@ -181,7 +202,7 @@ jraft-core-1.3.11.jar
json-simple-1.1.jar
json-smart-2.3.jar
jsr305-3.0.1.jar
junit-4.12.jar
junit-4.13.1.jar
jvm-attach-api-1.5.jar
kerb-admin-2.0.0.jar
kerb-client-2.0.0.jar
Expand All @@ -197,9 +218,11 @@ kerby-config-2.0.0.jar
kerby-pkix-2.0.0.jar
kerby-util-2.0.0.jar
kerby-xdr-2.0.0.jar
listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar
log4j-api-2.17.1.jar
log4j-core-2.17.1.jar
log4j-slf4j-impl-2.17.1.jar
lombok-1.18.20.jar
lookout-api-1.4.1.jar
lucene-analyzers-common-8.11.2.jar
lucene-analyzers-smartcn-8.11.2.jar
Expand Down Expand Up @@ -237,11 +260,13 @@ parboiled-scala_2.12-1.2.0.jar
parser-9.0-9.0.20190305.jar
perfmark-api-0.25.0.jar
picocli-4.3.2.jar
postgresql-42.4.1.jar
postgresql-42.4.3.jar
protobuf-java-3.21.7.jar
protobuf-java-util-3.17.2.jar
proto-google-common-protos-2.0.1.jar
psjava-0.1.19.jar
reporter-config-base-3.0.3.jar
reporter-config3-3.0.3.jar
reporter-config-base-3.0.3.jar
rewriting-9.0-9.0.20190305.jar
rocksdbjni-7.2.2.jar
scala-java8-compat_2.12-0.8.0.jar
Expand All @@ -261,6 +286,7 @@ snowball-stemmer-1.3.0.581.1.jar
sofa-common-tools-1.0.12.jar
sofa-rpc-all-5.7.6.jar
sourcecode_2.12-0.1.4.jar
ST4-4.0.8.jar
stream-2.5.2.jar
swagger-annotations-1.5.18.jar
swagger-annotations-jakarta-2.2.18.jar
Expand Down
2 changes: 1 addition & 1 deletion hugegraph-server/hugegraph-postgresql/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>42.4.1</version>
<version>42.4.3</version>
</dependency>
</dependencies>
</project>
Loading

0 comments on commit 2e623fe

Please sign in to comment.