This is an automated email from the ASF dual-hosted git repository. gongchao pushed a commit to branch new-startup in repository https://gitbox.apache.org/repos/asf/hertzbeat.git
commit b51a7fbcdba156bf2f20e116f87e9a8fd7c68d87 Author: tomsun28 <[email protected]> AuthorDate: Sat Oct 25 16:55:07 2025 +0800 fix build Signed-off-by: tomsun28 <[email protected]> --- hertzbeat-manager/pom.xml | 218 +------------------------------ hertzbeat-startup/pom.xml | 216 +++++++++++++++++++++++++++++- script/assembly/server/bin/entrypoint.sh | 2 +- script/assembly/server/bin/startup.bat | 2 +- script/assembly/server/bin/startup.sh | 2 +- 5 files changed, 219 insertions(+), 221 deletions(-) diff --git a/hertzbeat-manager/pom.xml b/hertzbeat-manager/pom.xml index 90ee461f8..31650f8a2 100644 --- a/hertzbeat-manager/pom.xml +++ b/hertzbeat-manager/pom.xml @@ -27,10 +27,7 @@ <name>${project.artifactId}</name> <packaging>jar</packaging> - <properties> - <maven.install.skip>true</maven.install.skip> - </properties> - + <dependencies> <!-- common --> <dependency> @@ -226,217 +223,4 @@ </dependency> </dependencies> - <build> - <finalName>apache-hertzbeat-${hzb.version}</finalName> - <resources> - <resource> - <directory>src/main/resources</directory> - <filtering>true</filtering> - <includes> - <include>*.yml</include> - <include>*.properties</include> - <include>*.xml</include> - <include>banner.txt</include> - <include>define/**</include> - <include>db/**</include> - <include>templates/**</include> - <include>**/*.html</include> - </includes> - </resource> - </resources> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <version>${maven-jar-plugin.version}</version> - <configuration> - <classesDirectory>target/classes/</classesDirectory> - <archive> - <!--Exclude maven descriptors from generated JAR--> - <addMavenDescriptor>false</addMavenDescriptor> - <manifest> - <!--Main class of the project--> - <mainClass>org.apache.hertzbeat.manager.Manager</mainClass> - <useUniqueVersions>false</useUniqueVersions> - <!--Add third-party JARs to the classpath using maven-dependency-plugin--> - <addClasspath>true</addClasspath> - <!--Location of external dependency JARs--> - <classpathPrefix>lib/</classpathPrefix> - </manifest> - <manifestEntries> - <Class-Path>. config</Class-Path> - </manifestEntries> - </archive> - </configuration> - </plugin> - </plugins> - </build> - - <profiles> - <profile> - <id>release</id> - <build> - <plugins> - <!--Critical plugin, assembly plugin provided by maven, should be placed last--> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <version>${maven-assembly-plugin.version}</version> - <executions> - <execution> - <id>make-zip</id> - <!--Bound maven operation--> - <phase>package</phase> - <!--Run once--> - <goals> - <goal>single</goal> - </goals> - <configuration> - <outputDirectory>../dist</outputDirectory> - <descriptors> - <descriptor>../script/assembly/server/assembly.xml</descriptor> - </descriptors> - </configuration> - </execution> - <execution> - <id>make-docker-zip</id> - <!--Bound maven operation--> - <phase>package</phase> - <!--Run once--> - <goals> - <goal>single</goal> - </goals> - <configuration> - <outputDirectory>../dist</outputDirectory> - <descriptors> - <descriptor>../script/assembly/server/assembly-docker.xml</descriptor> - </descriptors> - </configuration> - </execution> - <execution> - <id>make-docker-compose-script</id> - <!--Bound maven operation--> - <phase>package</phase> - <!--Run once--> - <goals> - <goal>single</goal> - </goals> - <configuration> - <outputDirectory>../dist</outputDirectory> - <descriptors> - <descriptor>../script/assembly/server/assembly-docker-compose.xml</descriptor> - </descriptors> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>runtime</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <version>${maven-assembly-plugin.version}</version> - <executions> - <execution> - <id>make-macos-arm64</id> - <!--Bound maven operation--> - <phase>package</phase> - <!--Run once--> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptors> - <descriptor>../script/assembly/server/assembly-macos-arm64.xml</descriptor> - </descriptors> - <outputDirectory>../dist</outputDirectory> - </configuration> - </execution> - <execution> - <id>make-macos-amd64</id> - <!--Bound maven operation--> - <phase>package</phase> - <!--Run once--> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptors> - <descriptor>../script/assembly/server/assembly-macos-amd64.xml</descriptor> - </descriptors> - <outputDirectory>../dist</outputDirectory> - </configuration> - </execution> - <execution> - <id>make-linux-arm64</id> - <!--Bound maven operation--> - <phase>package</phase> - <!--Run once--> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptors> - <descriptor>../script/assembly/server/assembly-linux-arm64.xml</descriptor> - </descriptors> - <outputDirectory>../dist</outputDirectory> - </configuration> - </execution> - <execution> - <id>make-linux-amd64</id> - <!--Bound maven operation--> - <phase>package</phase> - <!--Run once--> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptors> - <descriptor>../script/assembly/server/assembly-linux-amd64.xml</descriptor> - </descriptors> - <outputDirectory>../dist</outputDirectory> - </configuration> - </execution> - <execution> - <id>make-windows-64</id> - <!--Bound maven operation--> - <phase>package</phase> - <!--Run once--> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptors> - <descriptor>../script/assembly/server/assembly-windows-64.xml</descriptor> - </descriptors> - <outputDirectory>../dist</outputDirectory> - </configuration> - </execution> - <execution> - <id>make-docker-compose-script</id> - <!--Bound maven operation--> - <phase>package</phase> - <!--Run once--> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptors> - <descriptor>../script/assembly/server/assembly-docker-compose.xml</descriptor> - </descriptors> - <outputDirectory>../dist</outputDirectory> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> - </project> diff --git a/hertzbeat-startup/pom.xml b/hertzbeat-startup/pom.xml index 31066e8f1..1781f4835 100644 --- a/hertzbeat-startup/pom.xml +++ b/hertzbeat-startup/pom.xml @@ -130,7 +130,7 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <scope>provided</scope> + <scope>runtime</scope> </dependency> <!-- Lombok --> @@ -147,4 +147,218 @@ <scope>test</scope> </dependency> </dependencies> + + <build> + <finalName>apache-hertzbeat-${hzb.version}</finalName> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + <includes> + <include>*.yml</include> + <include>*.properties</include> + <include>*.xml</include> + <include>banner.txt</include> + <include>define/**</include> + <include>db/**</include> + <include>templates/**</include> + <include>**/*.html</include> + </includes> + </resource> + </resources> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <version>${maven-jar-plugin.version}</version> + <configuration> + <classesDirectory>target/classes/</classesDirectory> + <archive> + <!--Exclude maven descriptors from generated JAR--> + <addMavenDescriptor>false</addMavenDescriptor> + <manifest> + <!--Main class of the project--> + <mainClass>org.apache.hertzbeat.startup.HertzBeatApplication</mainClass> + <useUniqueVersions>false</useUniqueVersions> + <!--Add third-party JARs to the classpath using maven-dependency-plugin--> + <addClasspath>true</addClasspath> + <!--Location of external dependency JARs--> + <classpathPrefix>lib/</classpathPrefix> + </manifest> + <manifestEntries> + <Class-Path>. config</Class-Path> + </manifestEntries> + </archive> + </configuration> + </plugin> + </plugins> + </build> + + <profiles> + <profile> + <id>release</id> + <build> + <plugins> + <!--Critical plugin, assembly plugin provided by maven, should be placed last--> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <version>${maven-assembly-plugin.version}</version> + <executions> + <execution> + <id>make-zip</id> + <!--Bound maven operation--> + <phase>package</phase> + <!--Run once--> + <goals> + <goal>single</goal> + </goals> + <configuration> + <outputDirectory>../dist</outputDirectory> + <descriptors> + <descriptor>../script/assembly/server/assembly.xml</descriptor> + </descriptors> + </configuration> + </execution> + <execution> + <id>make-docker-zip</id> + <!--Bound maven operation--> + <phase>package</phase> + <!--Run once--> + <goals> + <goal>single</goal> + </goals> + <configuration> + <outputDirectory>../dist</outputDirectory> + <descriptors> + <descriptor>../script/assembly/server/assembly-docker.xml</descriptor> + </descriptors> + </configuration> + </execution> + <execution> + <id>make-docker-compose-script</id> + <!--Bound maven operation--> + <phase>package</phase> + <!--Run once--> + <goals> + <goal>single</goal> + </goals> + <configuration> + <outputDirectory>../dist</outputDirectory> + <descriptors> + <descriptor>../script/assembly/server/assembly-docker-compose.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>runtime</id> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <version>${maven-assembly-plugin.version}</version> + <executions> + <execution> + <id>make-macos-arm64</id> + <!--Bound maven operation--> + <phase>package</phase> + <!--Run once--> + <goals> + <goal>single</goal> + </goals> + <configuration> + <descriptors> + <descriptor>../script/assembly/server/assembly-macos-arm64.xml</descriptor> + </descriptors> + <outputDirectory>../dist</outputDirectory> + </configuration> + </execution> + <execution> + <id>make-macos-amd64</id> + <!--Bound maven operation--> + <phase>package</phase> + <!--Run once--> + <goals> + <goal>single</goal> + </goals> + <configuration> + <descriptors> + <descriptor>../script/assembly/server/assembly-macos-amd64.xml</descriptor> + </descriptors> + <outputDirectory>../dist</outputDirectory> + </configuration> + </execution> + <execution> + <id>make-linux-arm64</id> + <!--Bound maven operation--> + <phase>package</phase> + <!--Run once--> + <goals> + <goal>single</goal> + </goals> + <configuration> + <descriptors> + <descriptor>../script/assembly/server/assembly-linux-arm64.xml</descriptor> + </descriptors> + <outputDirectory>../dist</outputDirectory> + </configuration> + </execution> + <execution> + <id>make-linux-amd64</id> + <!--Bound maven operation--> + <phase>package</phase> + <!--Run once--> + <goals> + <goal>single</goal> + </goals> + <configuration> + <descriptors> + <descriptor>../script/assembly/server/assembly-linux-amd64.xml</descriptor> + </descriptors> + <outputDirectory>../dist</outputDirectory> + </configuration> + </execution> + <execution> + <id>make-windows-64</id> + <!--Bound maven operation--> + <phase>package</phase> + <!--Run once--> + <goals> + <goal>single</goal> + </goals> + <configuration> + <descriptors> + <descriptor>../script/assembly/server/assembly-windows-64.xml</descriptor> + </descriptors> + <outputDirectory>../dist</outputDirectory> + </configuration> + </execution> + <execution> + <id>make-docker-compose-script</id> + <!--Bound maven operation--> + <phase>package</phase> + <!--Run once--> + <goals> + <goal>single</goal> + </goals> + <configuration> + <descriptors> + <descriptor>../script/assembly/server/assembly-docker-compose.xml</descriptor> + </descriptors> + <outputDirectory>../dist</outputDirectory> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> + </project> diff --git a/script/assembly/server/bin/entrypoint.sh b/script/assembly/server/bin/entrypoint.sh index 5a22566a8..7513083dd 100644 --- a/script/assembly/server/bin/entrypoint.sh +++ b/script/assembly/server/bin/entrypoint.sh @@ -35,7 +35,7 @@ DEPLOY_DIR=`pwd` # absolute directory of external configuration files, if it is a directory, it should end with '/'，you can also directly specify a file. # if a directory is specified, spring will read all configuration files in the directory CONF_DIR=$DEPLOY_DIR/config -MAIN_CLASS="org.apache.hertzbeat.manager.Manager" +MAIN_CLASS="org.apache.hertzbeat.startup.HertzBeatApplication" EXT_LIB_PATH="$DEPLOY_DIR/ext-lib" CLASSPATH="$DEPLOY_DIR/$JAR_NAME:$EXT_LIB_PATH/*" # log dir diff --git a/script/assembly/server/bin/startup.bat b/script/assembly/server/bin/startup.bat index 123506964..2d5dfd6dc 100644 --- a/script/assembly/server/bin/startup.bat +++ b/script/assembly/server/bin/startup.bat @@ -41,7 +41,7 @@ for /f "tokens=1-5" %%i in ('netstat -ano^|findstr "0.0.0.0:%SERVER_PORT%"') do echo exit! goto q ) -set MAIN_CLASS=org.apache.hertzbeat.manager.Manager +set MAIN_CLASS=org.apache.hertzbeat.startup.HertzBeatApplication set LOGS_DIR=%DEPLOY_DIR%\logs set EXT_LIB_PATH=%DEPLOY_DIR%\ext-lib set CLASSPATH=%DEPLOY_DIR%\%JAR_NAME%;%EXT_LIB_PATH%\* diff --git a/script/assembly/server/bin/startup.sh b/script/assembly/server/bin/startup.sh index 27523ee9c..f6b63db4f 100644 --- a/script/assembly/server/bin/startup.sh +++ b/script/assembly/server/bin/startup.sh @@ -73,7 +73,7 @@ if [ -n "$SERVER_PORT" ]; then fi fi fi -MAIN_CLASS="org.apache.hertzbeat.manager.Manager" +MAIN_CLASS="org.apache.hertzbeat.startup.HertzBeatApplication" EXT_LIB_PATH="$DEPLOY_DIR/ext-lib" CLASSPATH="$DEPLOY_DIR/$JAR_NAME:$EXT_LIB_PATH/*" # log dir --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
