Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: minor improve for pom properties #2574

Merged
merged 6 commits into from
Jul 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions .github/workflows/pd-store-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,6 @@ jobs:
cp $HOME/.m2/settings.xml /tmp/settings.xml
mv -vf .github/configs/settings.xml $HOME/.m2/settings.xml

- name: Package
run: |
mvn clean package -U -Dmaven.javadoc.skip=true -Dmaven.test.skip=true -ntp

- name: Run common test
run: |
mvn test -pl hugegraph-pd/hg-pd-test -am -P pd-common-test
Expand All @@ -57,6 +53,11 @@ jobs:
mvn test -pl hugegraph-pd/hg-pd-test -am -P pd-core-test

# The above tests do not require starting a PD instance.

- name: Package
run: |
mvn clean package -U -Dmaven.javadoc.skip=true -Dmaven.test.skip=true -ntp

- name: Prepare env and service
run: |
$TRAVIS_DIR/start-pd.sh
Expand Down
1 change: 0 additions & 1 deletion hugegraph-pd/hg-pd-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
5 changes: 0 additions & 5 deletions hugegraph-pd/hg-pd-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 1 addition & 2 deletions hugegraph-pd/hg-pd-dist/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down Expand Up @@ -83,7 +82,7 @@
</configuration>
<executions>
<execution>
<phase>initialize</phase>
<phase>clean</phase>
<goals>
<goal>clean</goal>
</goals>
Expand Down
22 changes: 6 additions & 16 deletions hugegraph-pd/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,17 +42,16 @@
</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>
<dependencies>
<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>
Expand All @@ -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>
Expand Down Expand Up @@ -132,13 +122,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>
Expand Down
1 change: 1 addition & 0 deletions hugegraph-server/hugegraph-dist/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
21 changes: 2 additions & 19 deletions hugegraph-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand Down
3 changes: 0 additions & 3 deletions hugegraph-store/hg-store-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
3 changes: 1 addition & 2 deletions hugegraph-store/hg-store-dist/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -83,7 +82,7 @@
</configuration>
<executions>
<execution>
<phase>initialize</phase>
<phase>clean</phase>
<goals>
<goal>clean</goal>
</goals>
Expand Down
4 changes: 0 additions & 4 deletions hugegraph-store/hg-store-grpc/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion hugegraph-store/hg-store-rocksdb/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion hugegraph-store/hg-store-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
23 changes: 6 additions & 17 deletions hugegraph-store/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
5 changes: 5 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,11 @@

<properties>
<revision>1.5.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>
Expand Down
Loading