This is an automated email from the ASF dual-hosted git repository. jin pushed a commit to branch pd-store in repository https://gitbox.apache.org/repos/asf/incubator-hugegraph.git
commit 8b3624aa03b94a91db431a469ca56fc6ea8ae284 Author: V_Galaxy <[email protected]> AuthorDate: Wed Nov 8 18:08:08 2023 +0800 refact: adjust project structure for merge PD & Store[Breaking Change] (#2338) Subtask of #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 https://github.com/apache/incubator-hugegraph/pull/2266 was merged on `pd-store` and incorporate the latest changes in `master`. For more detailed information, please refer to https://github.com/apache/incubator-hugegraph/pull/2266#issue-1834369489. --------- Co-authored-by: M <[email protected]> --- .licenserc.yaml | 7 +- hugegraph-pd/pom.xml | 126 +++++- .../scripts/dependency/known-dependencies.txt | 50 ++- hugegraph-server/hugegraph-postgresql/pom.xml | 2 +- hugegraph-server/pom.xml | 197 ++++----- hugegraph-store/pom.xml | 150 ++++++- pom.xml | 450 ++++----------------- 7 files changed, 473 insertions(+), 509 deletions(-) diff --git a/.licenserc.yaml b/.licenserc.yaml index be040a8a1..70bba11e1 100644 --- a/.licenserc.yaml +++ b/.licenserc.yaml @@ -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' @@ -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' @@ -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, diff --git a/hugegraph-pd/pom.xml b/hugegraph-pd/pom.xml index 86c1fa74d..743ead0d1 100644 --- a/hugegraph-pd/pom.xml +++ b/hugegraph-pd/pom.xml @@ -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> diff --git a/hugegraph-server/hugegraph-dist/scripts/dependency/known-dependencies.txt b/hugegraph-server/hugegraph-dist/scripts/dependency/known-dependencies.txt index d40b20433..e115031d4 100644 --- a/hugegraph-server/hugegraph-dist/scripts/dependency/known-dependencies.txt +++ b/hugegraph-server/hugegraph-dist/scripts/dependency/known-dependencies.txt @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/hugegraph-server/hugegraph-postgresql/pom.xml b/hugegraph-server/hugegraph-postgresql/pom.xml index aa6068b1a..57c9ad840 100644 --- a/hugegraph-server/hugegraph-postgresql/pom.xml +++ b/hugegraph-server/hugegraph-postgresql/pom.xml @@ -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> diff --git a/hugegraph-server/pom.xml b/hugegraph-server/pom.xml index a112647f9..4e33703f5 100644 --- a/hugegraph-server/pom.xml +++ b/hugegraph-server/pom.xml @@ -35,59 +35,6 @@ <relativePath>../pom.xml</relativePath> </parent> - <inceptionYear>2017</inceptionYear> - <licenses> - <license> - <name>The Apache Software License, Version 2.0</name> - <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url> - <distribution>repo</distribution> - </license> - </licenses> - - <developers> - <developer> - <id>Apache Hugegraph(incubating)</id> - <email>[email protected]</email> - <url>https://hugegraph.apache.org/</url> - </developer> - </developers> - - <mailingLists> - <mailingList> - <name>Development Mailing List</name> - <subscribe>[email protected]</subscribe> - <unsubscribe>[email protected]</unsubscribe> - <post>[email protected]</post> - </mailingList> - <mailingList> - <name>Commits List</name> - <subscribe>[email protected]</subscribe> - <unsubscribe>[email protected]</unsubscribe> - <post>[email protected]</post> - </mailingList> - <mailingList> - <name>Issues List</name> - <subscribe>[email protected]</subscribe> - <unsubscribe>[email protected]</unsubscribe> - <post>[email protected]</post> - </mailingList> - </mailingLists> - - <issueManagement> - <system>Github Issues</system> - <url>https://github.com/apache/hugegraph/issues</url> - </issueManagement> - - <scm> - <url>https://github.com/apache/hugegraph</url> - <connection>scm:git:https://github.com/apache/hugegraph.git</connection> - <developerConnection>scm:git:https://github.com/apache/hugegraph.git</developerConnection> - </scm> - - <prerequisites> - <maven>3.5.0</maven> - </prerequisites> - <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <top.level.dir>${project.basedir}/..</top.level.dir> @@ -99,7 +46,7 @@ <slf4j.version>1.7.5</slf4j.version> <log4j.version>1.2.17</log4j.version> <log4j2.version>2.17.1</log4j2.version> - <junit.version>4.12</junit.version> + <junit.version>4.13.1</junit.version> <tinkerpop.version>3.5.1</tinkerpop.version> <commons.io.version>2.7</commons.io.version> <guava.version>25.1-jre</guava.version> @@ -238,11 +185,6 @@ <artifactId>commons-io</artifactId> <version>${commons.io.version}</version> </dependency> - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - <version>${guava.version}</version> - </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> @@ -300,16 +242,13 @@ <groupId>io.grpc</groupId> <artifactId>grpc-netty</artifactId> <version>${grpc.version}</version> - </dependency> - <dependency> - <groupId>io.grpc</groupId> - <artifactId>grpc-protobuf</artifactId> - <version>${grpc.version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>io.grpc</groupId> <artifactId>grpc-stub</artifactId> <version>${grpc.version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>com.google.protobuf</groupId> @@ -340,38 +279,6 @@ <build> <pluginManagement> <plugins> - <!-- TODO: move necessary plugin out of pluginManagement? --> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>license-maven-plugin</artifactId> - <version>1.19</version> - <executions> - <execution> - <id>default-cli</id> - <configuration> - <!-- Accept the pom module --> - <acceptPomPackaging>true</acceptPomPackaging> - <!-- Using the template which is grouped by License file --> - <fileTemplate>/org/codehaus/mojo/license/third-party-file-groupByMultiLicense.ftl</fileTemplate> - <licenseMerges> - <licenseMerge>The Apache Software License, Version 2.0|The Apache License, Version 2.0</licenseMerge> - <licenseMerge>The Apache Software License, Version 2.0|Apache License, Version 2.0</licenseMerge> - <licenseMerge>The Apache Software License, Version 2.0|Apache Public License 2.0</licenseMerge> - <licenseMerge>The Apache Software License, Version 2.0|Apache 2</licenseMerge> - <licenseMerge>The Apache Software License, Version 2.0|Apache 2.0</licenseMerge> - <licenseMerge>The Apache Software License, Version 2.0|Apache-2.0</licenseMerge> - <licenseMerge>The Apache Software License, Version 2.0|Apache License 2.0</licenseMerge> - <licenseMerge>The Apache Software License, Version 2.0|Apache License, version 2.0</licenseMerge> - <licenseMerge>3-Clause BSD License|BSD 3-clause</licenseMerge> - <licenseMerge>3-Clause BSD License|BSD 3-Clause</licenseMerge> - <licenseMerge>Eclipse Public License v1.0|Eclipse Public License 1.0</licenseMerge> - <licenseMerge>Eclipse Public License v1.0|Eclipse Public License - v 1.0</licenseMerge> - <licenseMerge>The MIT License|MIT License</licenseMerge> - </licenseMerges> - </configuration> - </execution> - </executions> - </plugin> <plugin> <artifactId>maven-compiler-plugin</artifactId> <version>3.1</version> @@ -467,65 +374,109 @@ </executions> </plugin> </plugins> - </build> <profiles> + <!-- hugegraph server test profiles --> <profile> - <id>apache-release</id> + <id>core-test</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> <build> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> + <artifactId>maven-surefire-plugin</artifactId> <executions> <execution> - <id>attach-sources</id> + <id>core-test</id> <goals> - <goal>jar-no-fork</goal> + <goal>test</goal> </goals> + <phase>test</phase> </execution> </executions> </plugin> + </plugins> + </build> + </profile> + <profile> + <id>unit-test</id> + <build> + <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> + <artifactId>maven-surefire-plugin</artifactId> <executions> <execution> - <id>attach-javadocs</id> + <id>unit-test</id> <goals> - <goal>jar</goal> + <goal>test</goal> </goals> - <configuration> - <doclint>none</doclint> - <failOnError>false</failOnError> - </configuration> + <phase>test</phase> </execution> </executions> - <configuration> - <doclint>none</doclint> - <failOnError>false</failOnError> - </configuration> </plugin> + </plugins> + </build> + </profile> + <profile> + <id>api-test</id> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <executions> + <execution> + <id>api-test</id> + <goals> + <goal>test</goal> + </goals> + <phase>test</phase> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>tinkerpop-structure-test</id> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <executions> + <execution> + <id>tinkerpop-structure-test</id> + <goals> + <goal>test</goal> + </goals> + <phase>test</phase> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>tinkerpop-process-test</id> + <build> + <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-gpg-plugin</artifactId> + <artifactId>maven-surefire-plugin</artifactId> <executions> <execution> - <id>sign-artifacts</id> - <phase>verify</phase> + <id>tinkerpop-process-test</id> <goals> - <goal>sign</goal> + <goal>test</goal> </goals> + <phase>test</phase> </execution> </executions> - <configuration> - <!-- Prevent `gpg` from using pinentry programs --> - <gpgArguments> - <arg>--pinentry-mode</arg> - <arg>loopback</arg> - </gpgArguments> - </configuration> </plugin> </plugins> </build> diff --git a/hugegraph-store/pom.xml b/hugegraph-store/pom.xml index c2b13f666..bc6154ad1 100644 --- a/hugegraph-store/pom.xml +++ b/hugegraph-store/pom.xml @@ -157,10 +157,158 @@ </includes> <followSymlinks>false</followSymlinks> </fileset> - <!-- <fileset><directory>${final.name}</directory></fileset>--> + <!-- <fileset><directory>${final.name}</directory></fileset> --> </filesets> </configuration> </plugin> </plugins> </build> + + <profiles> + <!-- hugegraph store test profiles --> + <profile> + <id>store-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>store-client-test</id> + <goals> + <goal>test</goal> + </goals> + <phase>test</phase> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>store-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>store-core-test</id> + <goals> + <goal>test</goal> + </goals> + <phase>test</phase> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>store-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>store-common-test</id> + <goals> + <goal>test</goal> + </goals> + <phase>test</phase> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>store-rocksdb-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>store-rocksdb-test</id> + <goals> + <goal>test</goal> + </goals> + <phase>test</phase> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>store-server-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>store-server-test</id> + <goals> + <goal>test</goal> + </goals> + <phase>test</phase> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>store-raftcore-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>store-raftcore-test</id> + <goals> + <goal>test</goal> + </goals> + <phase>test</phase> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> diff --git a/pom.xml b/pom.xml index aacd037ed..207b9f68d 100644 --- a/pom.xml +++ b/pom.xml @@ -45,37 +45,37 @@ </licenses> <developers> - <developer> - <id>Apache Hugegraph(incubating)</id> - <email>[email protected]</email> - <url>https://hugegraph.apache.org/</url> - </developer> + <developer> + <id>Apache Hugegraph(incubating)</id> + <email>[email protected]</email> + <url>https://hugegraph.apache.org/</url> + </developer> </developers> <mailingLists> - <mailingList> - <name>Development Mailing List</name> - <subscribe>[email protected]</subscribe> - <unsubscribe>[email protected]</unsubscribe> - <post>[email protected]</post> - </mailingList> - <mailingList> - <name>Commits List</name> - <subscribe>[email protected]</subscribe> - <unsubscribe>[email protected]</unsubscribe> - <post>[email protected]</post> - </mailingList> - <mailingList> - <name>Issues List</name> - <subscribe>[email protected]</subscribe> - <unsubscribe>[email protected]</unsubscribe> - <post>[email protected]</post> - </mailingList> + <mailingList> + <name>Development Mailing List</name> + <subscribe>[email protected]</subscribe> + <unsubscribe>[email protected]</unsubscribe> + <post>[email protected]</post> + </mailingList> + <mailingList> + <name>Commits List</name> + <subscribe>[email protected]</subscribe> + <unsubscribe>[email protected]</unsubscribe> + <post>[email protected]</post> + </mailingList> + <mailingList> + <name>Issues List</name> + <subscribe>[email protected]</subscribe> + <unsubscribe>[email protected]</unsubscribe> + <post>[email protected]</post> + </mailingList> </mailingLists> <issueManagement> - <system>Github Issues</system> - <url>https://github.com/apache/hugegraph/issues</url> + <system>Github Issues</system> + <url>https://github.com/apache/hugegraph/issues</url> </issueManagement> <scm> @@ -101,7 +101,39 @@ <build> <pluginManagement> <plugins> - <!-- Apache RAT for license check --> + <!-- TODO: move necessary plugin out of pluginManagement? --> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>license-maven-plugin</artifactId> + <version>1.19</version> + <executions> + <execution> + <id>default-cli</id> + <configuration> + <!-- Accept the pom module --> + <acceptPomPackaging>true</acceptPomPackaging> + <!-- Using the template which is grouped by License file --> + <fileTemplate>/org/codehaus/mojo/license/third-party-file-groupByMultiLicense.ftl</fileTemplate> + <licenseMerges> + <licenseMerge>The Apache Software License, Version 2.0|The Apache License, Version 2.0</licenseMerge> + <licenseMerge>The Apache Software License, Version 2.0|Apache License, Version 2.0</licenseMerge> + <licenseMerge>The Apache Software License, Version 2.0|Apache Public License 2.0</licenseMerge> + <licenseMerge>The Apache Software License, Version 2.0|Apache 2</licenseMerge> + <licenseMerge>The Apache Software License, Version 2.0|Apache 2.0</licenseMerge> + <licenseMerge>The Apache Software License, Version 2.0|Apache-2.0</licenseMerge> + <licenseMerge>The Apache Software License, Version 2.0|Apache License 2.0</licenseMerge> + <licenseMerge>The Apache Software License, Version 2.0|Apache License, version 2.0</licenseMerge> + <licenseMerge>3-Clause BSD License|BSD 3-clause</licenseMerge> + <licenseMerge>3-Clause BSD License|BSD 3-Clause</licenseMerge> + <licenseMerge>Eclipse Public License v1.0|Eclipse Public License 1.0</licenseMerge> + <licenseMerge>Eclipse Public License v1.0|Eclipse Public License - v 1.0</licenseMerge> + <licenseMerge>The MIT License|MIT License</licenseMerge> + </licenseMerges> + </configuration> + </execution> + </executions> + </plugin> + <!-- Apache RAT for license check --> <plugin> <groupId>org.apache.rat</groupId> <artifactId>apache-rat-plugin</artifactId> @@ -202,375 +234,61 @@ <module>hugegraph-pd</module> </modules> </profile> - <!-- hugegraph server test profiles --> - <profile> - <id>core-test</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <executions> - <execution> - <id>core-test</id> - <goals> - <goal>test</goal> - </goals> - <phase>test</phase> - </execution> - </executions> - </plugin> - </plugins> - </build> -<!-- <modules>--> -<!-- <module>hugegraph-server</module>--> -<!-- </modules>--> - </profile> - <profile> - <id>unit-test</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <executions> - <execution> - <id>unit-test</id> - <goals> - <goal>test</goal> - </goals> - <phase>test</phase> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>api-test</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <executions> - <execution> - <id>api-test</id> - <goals> - <goal>test</goal> - </goals> - <phase>test</phase> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>tinkerpop-structure-test</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <executions> - <execution> - <id>tinkerpop-structure-test</id> - <goals> - <goal>test</goal> - </goals> - <phase>test</phase> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>tinkerpop-process-test</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <executions> - <execution> - <id>tinkerpop-process-test</id> - <goals> - <goal>test</goal> - </goals> - <phase>test</phase> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - <!-- 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> + <id>apache-release</id> <build> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.20</version> + <artifactId>maven-source-plugin</artifactId> <executions> <execution> - <id>pd-core-test</id> + <id>attach-sources</id> <goals> - <goal>test</goal> + <goal>jar-no-fork</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> + <artifactId>maven-javadoc-plugin</artifactId> <executions> <execution> - <id>pd-cli-tools-test</id> + <id>attach-javadocs</id> <goals> - <goal>test</goal> + <goal>jar</goal> </goals> - <phase>test</phase> + <configuration> + <doclint>none</doclint> + <failOnError>false</failOnError> + </configuration> </execution> </executions> + <configuration> + <doclint>none</doclint> + <failOnError>false</failOnError> + </configuration> </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> - <!-- hugegraph store test profiles --> - <profile> - <id>store-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>store-client-test</id> - <goals> - <goal>test</goal> - </goals> - <phase>test</phase> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>store-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>store-core-test</id> - <goals> - <goal>test</goal> - </goals> - <phase>test</phase> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>store-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>store-common-test</id> - <goals> - <goal>test</goal> - </goals> - <phase>test</phase> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>store-rocksdb-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>store-rocksdb-test</id> - <goals> - <goal>test</goal> - </goals> - <phase>test</phase> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>store-server-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>store-server-test</id> - <goals> - <goal>test</goal> - </goals> - <phase>test</phase> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>store-raftcore-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> + <artifactId>maven-gpg-plugin</artifactId> <executions> <execution> - <id>store-raftcore-test</id> + <id>sign-artifacts</id> + <phase>verify</phase> <goals> - <goal>test</goal> + <goal>sign</goal> </goals> - <phase>test</phase> </execution> </executions> + <configuration> + <!-- Prevent `gpg` from using pinentry programs --> + <gpgArguments> + <arg>--pinentry-mode</arg> + <arg>loopback</arg> + </gpgArguments> + </configuration> </plugin> </plugins> </build>
