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.

Sign up for GitHub

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

Jump to bottom

fix: assemble executable jar for pd and store #2289

Merged
merged 9 commits into from
Aug 29, 2023
Merged

fix: assemble executable jar for pd and store #2289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4e3da3a
fix: executable jar name in maven-assembly-plugin descriptor
VGalaxies Aug 18, 2023
b636964
fix: executable jar name in start script
VGalaxies Aug 18, 2023
0e47982
fix: repackage hg-pd-service
VGalaxies Aug 18, 2023
ebfad80
fix: log4j dep in hg-store-node
VGalaxies Aug 18, 2023
8a52a5f
Merge branch 'apache:pd-store' into pd-store
VGalaxies Aug 23, 2023
70b7674
fix: store repackage include sys dep
VGalaxies Aug 24, 2023
27c9e8b
chore: add process name param in start-hugegraph-pd.sh
VGalaxies Aug 29, 2023
8718694
chore: add comment for repackage goal in spring-boot-maven-plugin
VGalaxies Aug 29, 2023
a689089
Update hugegraph-pd/hg-pd-dist/src/assembly/static/bin/start-hugegrap…
imbajin Aug 29, 2023
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
2 changes: 1 addition & 1 deletion hugegraph-pd/hg-pd-dist/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<assembly.descriptor.dir>${assembly.dir}/descriptor</assembly.descriptor.dir>
<assembly.static.dir>${assembly.dir}/static</assembly.static.dir>
<final.name>hugegraph-pd-${project.parent.version}</final.name>
<executable.jar.name>hugegraph-pd</executable.jar.name>
<executable.jar.name>hg-pd-service</executable.jar.name>
</properties>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions hugegraph-pd/hg-pd-dist/src/assembly/static/bin/start-hugegraph-pd.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,8 @@ fi
echo "Starting HugeGraphPDServer..."

# Turn on security check
exec ${JAVA} ${JAVA_OPTIONS} -jar -Dspring.config.location=${CONF}/application.yml \
${LIB}/hugegraph-pd-*.jar >> ${OUTPUT} 2>&1 &
exec ${JAVA} -Dname="HugeGraphPD" ${JAVA_OPTIONS} -jar \
-Dspring.config.location=${CONF}/application.yml ${LIB}/hg-pd-service-*.jar >> ${OUTPUT} 2>&1 &

PID="$!"
# Write pid to file
Expand Down
11 changes: 10 additions & 1 deletion hugegraph-pd/hg-pd-service/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,12 @@
<groupId>org.apache.hugegraph</groupId>
<artifactId>hugegraph-common</artifactId>
<version>1.0.1</version>
<exclusions>
<exclusion>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>commons-io</groupId>
Expand All @@ -138,11 +144,14 @@
<executions>
<execution>
<configuration>
<classifier>spring-boot</classifier>
<mainClass>
org.apache.hugegraph.pd.boot.HugePDServer
</mainClass>
</configuration>
<!-- should configure explicitly without spring-boot-starter-parent -->
<goals>
<goal>repackage</goal>
</goals>
</execution>
</executions>
</plugin>
Expand Down
3 changes: 2 additions & 1 deletion hugegraph-pd/hg-pd-service/src/main/java/org/apache/hugegraph/pd/rest/IndexAPI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
* under the License.
*/

package org.apache.hugegraph.pd.rest;

import java.lang.management.ManagementFactory;
import java.util.ArrayList;
import java.util.List;
Expand All @@ -25,7 +27,6 @@
import org.apache.hugegraph.pd.grpc.Pdpb;
import org.apache.hugegraph.pd.model.RestApiResponse;
import org.apache.hugegraph.pd.raft.RaftEngine;
import org.apache.hugegraph.pd.rest.API;
import org.apache.hugegraph.pd.rest.MemberAPI.CallStreamObserverWrap;
import org.apache.hugegraph.pd.service.PDRestService;
import org.apache.hugegraph.pd.service.PDService;
Expand Down
1 change: 1 addition & 0 deletions hugegraph-store/hg-store-dist/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
<assembly.descriptor.dir>${assembly.dir}/descriptor</assembly.descriptor.dir>
<assembly.static.dir>${assembly.dir}/static</assembly.static.dir>
<final.name>hugegraph-store-${revision}</final.name>
<executable.jar.name>hg-store-node</executable.jar.name>
</properties>
<dependencies>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions hugegraph-store/hg-store-dist/src/assembly/descriptor/server-assembly.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@
<scope>runtime</scope>
<useProjectArtifact>false</useProjectArtifact>
<includes>
<include>org.apache.hugegraph:hugegraph-store:jar:*</include>
<include>org.apache.hugegraph:${executable.jar.name}:jar:*</include>
</includes>
</dependencySet>
</dependencySets>

</assembly>
</assembly>
2 changes: 1 addition & 1 deletion hugegraph-store/hg-store-dist/src/assembly/static/bin/start-hugegraph-store.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ echo "Starting HG-StoreServer..."

exec ${JAVA} -Dname="HugeGraphStore" ${JVM_OPTIONS} ${JAVA_OPTIONS} -jar \
-Dspring.config.location=${CONF}/application.yml \
${LIB}/hugegraph-store-*.jar >> ${OUTPUT} 2>&1 &
${LIB}/hg-store-node-*.jar >> ${OUTPUT} 2>&1 &

PID="$!"
# Write pid to file
Expand Down
17 changes: 11 additions & 6 deletions hugegraph-store/hg-store-node/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-log4j2</artifactId>
<version>2.5.14</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
Expand Down Expand Up @@ -149,7 +144,16 @@
<version>3.6.4</version>
</dependency>


<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.2</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>2.17.2</version>
</dependency>
<!-- module end -->
</dependencies>

Expand All @@ -168,6 +172,7 @@
<mainClass>
org.apache.hugegraph.store.node.StoreNodeApplication
</mainClass>
<includeSystemScope>true</includeSystemScope>
</configuration>
</execution>
</executions>
Expand Down
Loading