Skip to content

Commit

Permalink
refactor module name, optimize pom dependency management (#888)
Browse files Browse the repository at this point in the history 
* 模块优化命名，优化pom依赖管理

* 优化pom依赖管理

* 恢复模块目录名；修改pom坐标名加前缀 hertzbeat-，如原 alerter ,修改后：hertzbeat-alerter

* Update pom.xml
  • Loading branch information
@sunqinbo
sunqinbo authored Apr 17, 2023
1 parent ea90af6 commit 08a423a
Show file tree
Hide file tree
Showing 6 changed files with 265 additions and 115 deletions.
7 changes: 3 additions & 4 deletions alerter/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,17 @@
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>alerter</artifactId>
<artifactId>hertzbeat-alerter</artifactId>
<name>${project.artifactId}</name>

<properties>
<common.version>1.0</common.version>
</properties>

<dependencies>
<!-- common -->
<dependency>
<groupId>org.dromara.hertzbeat</groupId>
<artifactId>common</artifactId>
<version>${common.version}</version>
<artifactId>hertzbeat-common</artifactId>
<scope>provided</scope>
</dependency>
<!-- spring -->
Expand Down
15 changes: 3 additions & 12 deletions collector/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>collector</artifactId>
<artifactId>hertzbeat-collector</artifactId>
<name>${project.artifactId}</name>

<dependencies>
<!-- spring -->
Expand All @@ -45,8 +46,7 @@
<!-- common -->
<dependency>
<groupId>org.dromara.hertzbeat</groupId>
<artifactId>common</artifactId>
<version>1.0</version>
<artifactId>hertzbeat-common</artifactId>
</dependency>
<!-- validation -->
<dependency>
Expand Down Expand Up @@ -74,7 +74,6 @@
<dependency>
<groupId>com.jayway.jsonpath</groupId>
<artifactId>json-path</artifactId>
<version>2.6.0</version>
</dependency>
<!-- lru hashmap -->
<dependency>
Expand All @@ -95,25 +94,21 @@
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>8.0.28</version>
</dependency>
<!-- clickhouse -->
<dependency>
<groupId>cc.blynk.clickhouse</groupId>
<artifactId>clickhouse4j</artifactId>
<version>1.4.4</version>
</dependency>
<!-- dm -->
<dependency>
<groupId>com.dameng</groupId>
<artifactId>DmJdbcDriver18</artifactId>
<version>8.1.2.141</version>
</dependency>
<!-- postgresql -->
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>42.5.1</version>
</dependency>
<!-- linux ssh -->
<dependency>
Expand All @@ -130,18 +125,15 @@
<dependency>
<groupId>com.microsoft.sqlserver</groupId>
<artifactId>mssql-jdbc</artifactId>
<version>10.2.0.jre8</version>
</dependency>
<!-- oracle -->
<dependency>
<groupId>com.oracle.database.jdbc</groupId>
<artifactId>ojdbc8</artifactId>
<version>21.5.0.0</version>
</dependency>
<dependency>
<groupId>com.oracle.database.nls</groupId>
<artifactId>orai18n</artifactId>
<version>21.5.0.0</version>
</dependency>
<!--redis-->
<dependency>
Expand All @@ -152,7 +144,6 @@
<dependency>
<groupId>org.mongodb</groupId>
<artifactId>mongodb-driver-sync</artifactId>
<version>4.6.1</version>
</dependency>
<!--snmp-->
<dependency>
Expand Down
23 changes: 2 additions & 21 deletions common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,8 @@

<modelVersion>4.0.0</modelVersion>

<artifactId>common</artifactId>

<properties>
<aviator.version>5.2.7</aviator.version>
<gson.version>2.8.9</gson.version>
<guava.version>31.0.1-jre</guava.version>
<jetcd-core.version>0.5.11</jetcd-core.version>
<protobuf-java-util.version>3.19.1</protobuf-java-util.version>
<tencentcloud-sdk-java-sms.version>3.1.648</tencentcloud-sdk-java-sms.version>
<caffeine.version>2.9.3</caffeine.version>
</properties>
<artifactId>hertzbeat-common</artifactId>
<name>${project.artifactId}</name>

<dependencies>
<!-- spring -->
Expand Down Expand Up @@ -82,7 +73,6 @@
<dependency>
<groupId>com.googlecode.aviator</groupId>
<artifactId>aviator</artifactId>
<version>${aviator.version}</version>
</dependency>
<!-- 工具依赖 -->
<dependency>
Expand All @@ -96,12 +86,6 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java-util</artifactId>
<exclusions>
<exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- 使用apache.http.conn.util代替sun.net.util -->
<dependency>
Expand All @@ -112,14 +96,11 @@
<dependency>
<groupId>com.tencentcloudapi</groupId>
<artifactId>tencentcloud-sdk-java-sms</artifactId>
<version>${tencentcloud-sdk-java-sms.version}</version>
</dependency>
<!-- caffeine-->
<dependency>
<groupId>com.github.ben-manes.caffeine</groupId>
<artifactId>caffeine</artifactId>
<!-- 3.x版本支持Java11及以上, 因此这边还是使用2.x的版本-->
<version>${caffeine.version}</version>
</dependency>
</dependencies>
</project>
27 changes: 7 additions & 20 deletions manager/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,46 +23,36 @@
<version>1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>manager</artifactId>
<artifactId>hertzbeat-manager</artifactId>
<name>${project.artifactId}</name>
<packaging>jar</packaging>

<properties>
<alerter.version>1.0</alerter.version>
<collector.version>1.0</collector.version>
<common.version>1.0</common.version>
<h2.version>2.1.214</h2.version>
<maven.install.skip>true</maven.install.skip>
<maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
<maven-assembly-plugin.version>3.3.0</maven-assembly-plugin.version>
<mysql.version>8.0.28</mysql.version>
<nekohtml.version>1.9.22</nekohtml.version>
<spring-boot-starter-sureness.version>1.0.8</spring-boot-starter-sureness.version>
<warehouse.version>1.0</warehouse.version>
</properties>

<dependencies>
<!-- common -->
<dependency>
<groupId>org.dromara.hertzbeat</groupId>
<artifactId>common</artifactId>
<version>${common.version}</version>
<artifactId>hertzbeat-common</artifactId>
</dependency>
<!-- data warehouse -->
<dependency>
<groupId>org.dromara.hertzbeat</groupId>
<artifactId>warehouse</artifactId>
<version>${warehouse.version}</version>
<artifactId>hertzbeat-warehouse</artifactId>
</dependency>
<!-- alerter -->
<dependency>
<groupId>org.dromara.hertzbeat</groupId>
<artifactId>alerter</artifactId>
<version>${alerter.version}</version>
<artifactId>hertzbeat-alerter</artifactId>
</dependency>
<!-- collector -->
<dependency>
<groupId>org.dromara.hertzbeat</groupId>
<artifactId>collector</artifactId>
<version>${collector.version}</version>
<artifactId>hertzbeat-collector</artifactId>
</dependency>
<!-- spring -->
<dependency>
Expand Down Expand Up @@ -101,7 +91,6 @@
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql.version}</version>
</dependency>
<!-- email -->
<dependency>
Expand All @@ -127,13 +116,11 @@
<dependency>
<groupId>com.usthe.sureness</groupId>
<artifactId>spring-boot-starter-sureness</artifactId>
<version>${spring-boot-starter-sureness.version}</version>
</dependency>
<!-- h2 database-->
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>${h2.version}</version>
<scope>runtime</scope>
</dependency>
</dependencies>
Expand Down
Loading

0 comments on commit 08a423a

Please sign in to comment.