You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hugegraph.apache.org by vg...@apache.org on 2024/07/10 10:32:56 UTC
(incubator-hugegraph) branch pom-chore created (now 532ecb972)
This is an automated email from the ASF dual-hosted git repository.
vgalaxies pushed a change to branch pom-chore
in repository https://gitbox.apache.org/repos/asf/incubator-hugegraph.git
at 532ecb972 setup
This branch includes the following new commits:
new 532ecb972 setup
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(incubator-hugegraph) 01/01: setup
Posted by vg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vgalaxies pushed a commit to branch pom-chore
in repository https://gitbox.apache.org/repos/asf/incubator-hugegraph.git
commit 532ecb972616c4caaa594be96a1fadc0a7f231a4
Author: VGalaxies <vg...@apache.org>
AuthorDate: Wed Jul 10 18:32:41 2024 +0800
setup
---
hugegraph-pd/hg-pd-client/pom.xml | 1 -
hugegraph-pd/hg-pd-common/pom.xml | 5 -----
hugegraph-pd/hg-pd-dist/pom.xml | 1 -
hugegraph-pd/pom.xml | 22 ++++++----------------
hugegraph-server/hugegraph-dist/pom.xml | 1 +
hugegraph-server/pom.xml | 21 ++-------------------
hugegraph-store/hg-store-client/pom.xml | 3 ---
hugegraph-store/hg-store-dist/pom.xml | 1 -
hugegraph-store/hg-store-grpc/pom.xml | 4 ----
hugegraph-store/hg-store-rocksdb/pom.xml | 2 +-
hugegraph-store/hg-store-test/pom.xml | 1 -
hugegraph-store/pom.xml | 23 ++++++-----------------
pom.xml | 5 +++++
13 files changed, 21 insertions(+), 69 deletions(-)
diff --git a/hugegraph-pd/hg-pd-client/pom.xml b/hugegraph-pd/hg-pd-client/pom.xml
index a64756fe9..f3cb23cf8 100644
--- a/hugegraph-pd/hg-pd-client/pom.xml
+++ b/hugegraph-pd/hg-pd-client/pom.xml
@@ -39,7 +39,6 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
- <version>2.17.0</version>
</dependency>
<dependency>
<groupId>org.apache.hugegraph</groupId>
diff --git a/hugegraph-pd/hg-pd-common/pom.xml b/hugegraph-pd/hg-pd-common/pom.xml
index 918c8deab..4885b1b0b 100644
--- a/hugegraph-pd/hg-pd-common/pom.xml
+++ b/hugegraph-pd/hg-pd-common/pom.xml
@@ -29,11 +29,6 @@
</parent>
<artifactId>hg-pd-common</artifactId>
- <properties>
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.hugegraph</groupId>
diff --git a/hugegraph-pd/hg-pd-dist/pom.xml b/hugegraph-pd/hg-pd-dist/pom.xml
index 5c879439a..948d9e36a 100644
--- a/hugegraph-pd/hg-pd-dist/pom.xml
+++ b/hugegraph-pd/hg-pd-dist/pom.xml
@@ -35,7 +35,6 @@
<assembly.dir>${project.basedir}/src/assembly</assembly.dir>
<assembly.descriptor.dir>${assembly.dir}/descriptor</assembly.descriptor.dir>
<assembly.static.dir>${assembly.dir}/static</assembly.static.dir>
- <final.name>apache-hugegraph-incubating-pd-${project.parent.version}</final.name>
<executable.jar.name>hg-pd-service</executable.jar.name>
</properties>
diff --git a/hugegraph-pd/pom.xml b/hugegraph-pd/pom.xml
index b5db57f26..9b930fd5c 100644
--- a/hugegraph-pd/pom.xml
+++ b/hugegraph-pd/pom.xml
@@ -42,9 +42,8 @@
</modules>
<properties>
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
<log4j2.version>2.17.0</log4j2.version>
+ <final.name>apache-${release.name}-incubating-pd-${project.version}</final.name>
</properties>
<dependencyManagement>
@@ -52,7 +51,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
- <version>2.17.0</version>
+ <version>${log4j2.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hugegraph</groupId>
@@ -67,15 +66,6 @@
</dependencies>
</dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.13.2</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
<build>
<plugins>
<plugin>
@@ -140,13 +130,13 @@
<include>*.tar</include>
<include>*.tar.gz</include>
<include>.flattened-pom.xml</include>
- <!-- WARN: delete dist dir may influence dev? -->
- <!-- TODO: replace with ${final.name} in pd-dist -->
- <include>dist/**</include>
+ <include>${final.name}/**</include>
</includes>
<followSymlinks>false</followSymlinks>
</fileset>
- <!-- <fileset><directory>${final.name}</directory></fileset> -->
+ <fileset>
+ <directory>${final.name}</directory>
+ </fileset>
</filesets>
</configuration>
</plugin>
diff --git a/hugegraph-server/hugegraph-dist/pom.xml b/hugegraph-server/hugegraph-dist/pom.xml
index ee954741d..50e232ba3 100644
--- a/hugegraph-server/hugegraph-dist/pom.xml
+++ b/hugegraph-server/hugegraph-dist/pom.xml
@@ -29,6 +29,7 @@
<artifactId>hugegraph-dist</artifactId>
<properties>
+ <final.destfile>${top.level.dir}/${final.name}.tar.gz</final.destfile>
<assembly.dir>${project.basedir}/src/assembly</assembly.dir>
<assembly.descriptor.dir>${assembly.dir}/descriptor</assembly.descriptor.dir>
<assembly.static.dir>${assembly.dir}/static</assembly.static.dir>
diff --git a/hugegraph-server/pom.xml b/hugegraph-server/pom.xml
index 87c6f038f..2fc6f7199 100644
--- a/hugegraph-server/pom.xml
+++ b/hugegraph-server/pom.xml
@@ -36,13 +36,8 @@
</parent>
<properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<top.level.dir>${project.basedir}/..</top.level.dir>
- <release.name>hugegraph</release.name>
<final.name>apache-${release.name}-incubating-server-${project.version}</final.name>
- <final.destfile>${top.level.dir}/${final.name}.tar.gz</final.destfile>
- <compiler.source>1.8</compiler.source>
- <compiler.target>1.8</compiler.target>
<slf4j.version>1.7.5</slf4j.version>
<log4j.version>1.2.17</log4j.version>
<log4j2.version>2.17.1</log4j2.version>
@@ -57,7 +52,6 @@
<shell-executable>bash</shell-executable>
<checkstyle.plugin.version>3.1.2</checkstyle.plugin.version>
<checkstyle.version>8.45</checkstyle.version>
- <hugegraph-commons.version>1.3.0</hugegraph-commons.version>
<grpc.version>1.47.0</grpc.version>
<protobuf.version>3.21.7</protobuf.version>
<jmh.version>1.36</jmh.version>
@@ -283,8 +277,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
- <source>${compiler.source}</source>
- <target>${compiler.target}</target>
+ <source>${maven.compiler.source}</source>
+ <target>${maven.compiler.target}</target>
<compilerArguments>
<Xmaxerrs>500</Xmaxerrs>
</compilerArguments>
@@ -311,17 +305,6 @@
<fileset>
<directory>${final.name}</directory>
</fileset>
- <!-- remove the artifacts in root directory -->
- <!-- REMOVE ME after revision 1.5.0 -->
- <fileset>
- <directory>../${project.basedir}</directory>
- <includes>
- <include>*.tar.gz</include>
- </includes>
- </fileset>
- <fileset>
- <directory>../${final.name}</directory>
- </fileset>
</filesets>
</configuration>
</plugin>
diff --git a/hugegraph-store/hg-store-client/pom.xml b/hugegraph-store/hg-store-client/pom.xml
index 2c402d37a..afa97fa0c 100644
--- a/hugegraph-store/hg-store-client/pom.xml
+++ b/hugegraph-store/hg-store-client/pom.xml
@@ -31,10 +31,7 @@
<artifactId>hg-store-client</artifactId>
<properties>
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
<maven.test.skip>true</maven.test.skip>
- <log4j2.version>2.15.0</log4j2.version>
<lombok.version>1.18.20</lombok.version>
</properties>
diff --git a/hugegraph-store/hg-store-dist/pom.xml b/hugegraph-store/hg-store-dist/pom.xml
index 8d29f4815..26871765d 100644
--- a/hugegraph-store/hg-store-dist/pom.xml
+++ b/hugegraph-store/hg-store-dist/pom.xml
@@ -36,7 +36,6 @@
<assembly.dir>${project.basedir}/src/assembly</assembly.dir>
<assembly.descriptor.dir>${assembly.dir}/descriptor</assembly.descriptor.dir>
<assembly.static.dir>${assembly.dir}/static</assembly.static.dir>
- <final.name>apache-hugegraph-incubating-store-${project.parent.version}</final.name>
<executable.jar.name>hg-store-node</executable.jar.name>
</properties>
<dependencies>
diff --git a/hugegraph-store/hg-store-grpc/pom.xml b/hugegraph-store/hg-store-grpc/pom.xml
index dac8a811d..3e7cc6add 100644
--- a/hugegraph-store/hg-store-grpc/pom.xml
+++ b/hugegraph-store/hg-store-grpc/pom.xml
@@ -31,14 +31,10 @@
<artifactId>hg-store-grpc</artifactId>
<properties>
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
-
<os.plugin.version>1.6.2</os.plugin.version>
<grpc.version>1.39.0</grpc.version>
<protoc.version>3.17.2</protoc.version>
<protobuf.plugin.version>0.6.1</protobuf.plugin.version>
-
</properties>
<dependencies>
diff --git a/hugegraph-store/hg-store-rocksdb/pom.xml b/hugegraph-store/hg-store-rocksdb/pom.xml
index 73c07b1c9..758a283ab 100644
--- a/hugegraph-store/hg-store-rocksdb/pom.xml
+++ b/hugegraph-store/hg-store-rocksdb/pom.xml
@@ -34,7 +34,7 @@
<dependency>
<groupId>org.apache.hugegraph</groupId>
<artifactId>hugegraph-common</artifactId>
- <version>1.3.0</version>
+ <version>${hugegraph-commons.version}</version>
<exclusions>
<exclusion>
<groupId>org.glassfish.jersey.inject</groupId>
diff --git a/hugegraph-store/hg-store-test/pom.xml b/hugegraph-store/hg-store-test/pom.xml
index bd66c9944..2ecadb7de 100644
--- a/hugegraph-store/hg-store-test/pom.xml
+++ b/hugegraph-store/hg-store-test/pom.xml
@@ -31,7 +31,6 @@
<properties>
<!--maven.test.skip>true</maven.test.skip-->
- <log4j2.version>2.15.0</log4j2.version>
<lombok.version>1.18.20</lombok.version>
</properties>
diff --git a/hugegraph-store/pom.xml b/hugegraph-store/pom.xml
index 2965bc855..be1bbfc7f 100644
--- a/hugegraph-store/pom.xml
+++ b/hugegraph-store/pom.xml
@@ -46,11 +46,8 @@
</modules>
<properties>
- <hugegraph.core.version>1.5.0</hugegraph.core.version>
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
<log4j2.version>2.15.0</log4j2.version>
- <top.level.dir>${project.basedir}/..</top.level.dir>
+ <final.name>apache-${release.name}-incubating-store-${project.version}</final.name>
</properties>
<dependencyManagement>
@@ -89,20 +86,11 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
- <version>2.15.0</version>
+ <version>${log4j2.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.13.2</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
<build>
<plugins>
<plugin>
@@ -153,12 +141,13 @@
<include>*.tar</include>
<include>*.tar.gz</include>
<include>.flattened-pom.xml</include>
- <!-- TODO: replace with ${final.name} in store-dist -->
- <include>dist/**</include>
+ <include>${final.name}/**</include>
</includes>
<followSymlinks>false</followSymlinks>
</fileset>
- <!-- <fileset><directory>${final.name}</directory></fileset> -->
+ <fileset>
+ <directory>${final.name}</directory>
+ </fileset>
</filesets>
</configuration>
</plugin>
diff --git a/pom.xml b/pom.xml
index 0ba25f994..4489baafe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -87,6 +87,11 @@
<properties>
<revision>1.3.0</revision>
+ <hugegraph-commons.version>1.3.0</hugegraph-commons.version>
+ <release.name>hugegraph</release.name>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <maven.compiler.source>11</maven.compiler.source>
+ <maven.compiler.target>11</maven.compiler.target>
</properties>
<modules>