diff --git a/alerter/pom.xml b/alerter/pom.xml index 4f9e62db728..17d148c1339 100644 --- a/alerter/pom.xml +++ b/alerter/pom.xml @@ -25,18 +25,17 @@ 4.0.0 - alerter + hertzbeat-alerter + ${project.artifactId} - 1.0 org.dromara.hertzbeat - common - ${common.version} + hertzbeat-common provided diff --git a/collector/pom.xml b/collector/pom.xml index 475bcee5d85..4dadd9bdd39 100644 --- a/collector/pom.xml +++ b/collector/pom.xml @@ -24,7 +24,8 @@ 4.0.0 - collector + hertzbeat-collector + ${project.artifactId} @@ -45,8 +46,7 @@ org.dromara.hertzbeat - common - 1.0 + hertzbeat-common @@ -74,7 +74,6 @@ com.jayway.jsonpath json-path - 2.6.0 @@ -95,25 +94,21 @@ mysql mysql-connector-java - 8.0.28 cc.blynk.clickhouse clickhouse4j - 1.4.4 com.dameng DmJdbcDriver18 - 8.1.2.141 org.postgresql postgresql - 42.5.1 @@ -130,18 +125,15 @@ com.microsoft.sqlserver mssql-jdbc - 10.2.0.jre8 com.oracle.database.jdbc ojdbc8 - 21.5.0.0 com.oracle.database.nls orai18n - 21.5.0.0 @@ -152,7 +144,6 @@ org.mongodb mongodb-driver-sync - 4.6.1 diff --git a/common/pom.xml b/common/pom.xml index 203f400b9f5..e89deb3f2ca 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -26,17 +26,8 @@ 4.0.0 - common - - - 5.2.7 - 2.8.9 - 31.0.1-jre - 0.5.11 - 3.19.1 - 3.1.648 - 2.9.3 - + hertzbeat-common + ${project.artifactId} @@ -82,7 +73,6 @@ com.googlecode.aviator aviator - ${aviator.version} @@ -96,12 +86,6 @@ com.google.protobuf protobuf-java-util - - - com.google.guava - guava - - @@ -112,14 +96,11 @@ com.tencentcloudapi tencentcloud-sdk-java-sms - ${tencentcloud-sdk-java-sms.version} com.github.ben-manes.caffeine caffeine - - ${caffeine.version} diff --git a/manager/pom.xml b/manager/pom.xml index de0a0707a0f..9c6d5859d3b 100644 --- a/manager/pom.xml +++ b/manager/pom.xml @@ -23,46 +23,36 @@ 1.0 4.0.0 - manager + hertzbeat-manager + ${project.artifactId} jar - 1.0 - 1.0 - 1.0 - 2.1.214 + true 3.2.0 3.3.0 - 8.0.28 - 1.9.22 - 1.0.8 - 1.0 org.dromara.hertzbeat - common - ${common.version} + hertzbeat-common org.dromara.hertzbeat - warehouse - ${warehouse.version} + hertzbeat-warehouse org.dromara.hertzbeat - alerter - ${alerter.version} + hertzbeat-alerter org.dromara.hertzbeat - collector - ${collector.version} + hertzbeat-collector @@ -101,7 +91,6 @@ mysql mysql-connector-java - ${mysql.version} @@ -127,13 +116,11 @@ com.usthe.sureness spring-boot-starter-sureness - ${spring-boot-starter-sureness.version} com.h2database h2 - ${h2.version} runtime diff --git a/pom.xml b/pom.xml index e91ff2eecb8..8001efcf8e1 100644 --- a/pom.xml +++ b/pom.xml @@ -17,28 +17,85 @@ - 1.18.20 + 11 + ${java.version} + ${java.version} + + 2.1.1 3.8.1 2.22.2 3.12.0 - 11 - 11 - 2.1.1 UTF-8 - 1.7.21 - 1.6.11 + + 1.0 + 2.7.4 + 3.0.5 + 1.6.11 + 1.0.8 + + 1.9.22 + 3.19.0 + 2.14.0 + 2.7.0 + + 5.2.7 + 2.8.9 + 31.0.1-jre + 0.5.11 + 3.19.4 + 3.1.648 + 2.9.3 + 1.12.0 + + 1.18.20 + 1.7.36 2.3.0 1.32 3.4.0 - 2.8.9 - 31.0.1-jre - 3.19.1 + + 8.0.30 + 10.2.0.jre8 + 21.5.0.0 + 4.6.1 + 1.4.4 + 8.1.2.141 + 42.5.1 + 2.1.214 + 3.0.0 + 0.13.3 + 0.1.3 + + + + org.dromara.hertzbeat + hertzbeat-common + ${hertzbeat.version} + + + + org.dromara.hertzbeat + hertzbeat-warehouse + ${hertzbeat.version} + + + + org.dromara.hertzbeat + hertzbeat-alerter + ${hertzbeat.version} + + + + org.dromara.hertzbeat + hertzbeat-collector + ${hertzbeat.version} + + org.springframework.boot @@ -47,6 +104,12 @@ pom import + + org.springframework.boot + spring-boot-devtools + ${spring-boot-dependencies.version} + provided + javax.xml.bind jaxb-api @@ -79,10 +142,184 @@ gson ${gson.version} + + com.google.protobuf + protobuf-java + ${protobuf.version} + + + + mysql + mysql-connector-java + ${mysql.version} + + + + com.microsoft.sqlserver + mssql-jdbc + ${mssql-jdbc.version} + + + + com.oracle.database.jdbc + ojdbc8 + ${ojdbc8.version} + + + com.oracle.database.nls + orai18n + ${ojdbc8.version} + + + + org.mongodb + mongodb-driver-sync + ${mongodb-driver.version} + + + + cc.blynk.clickhouse + clickhouse4j + ${clickhouse.version} + + + + com.dameng + DmJdbcDriver18 + ${damengc-driver.version} + + + + org.postgresql + postgresql + ${postgresql.version} + + + + com.taosdata.jdbc + taos-jdbcdriver + ${taos-jdbcdriver.version} + + + + org.apache.iotdb + iotdb-session + ${iotdb-session.version} + + + io.greptime + greptimedb-protocol + ${greptimedb.version} + + + io.grpc + grpc-all + + + com.google.code.gson + gson + + + com.google.guava + guava + + + com.google.protobuf + protobuf-java + + + + + io.greptime + greptimedb-grpc + ${greptimedb.version} + + + io.grpc + grpc-all + + + com.google.code.gson + gson + + + com.google.guava + guava + + + com.google.protobuf + protobuf-java + + + + + + com.h2database + h2 + ${h2.version} + provided + + + + com.usthe.sureness + spring-boot-starter-sureness + ${spring-boot-starter-sureness.version} + + + net.sourceforge.nekohtml + nekohtml + ${nekohtml.version} + + + org.checkerframework + checker-qual + ${checker-qual.version} + + + com.google.errorprone + error_prone_annotations + ${error_prone_annotations.version} + + + + com.jayway.jsonpath + json-path + ${json-path.version} + + + + com.googlecode.aviator + aviator + ${aviator.version} + com.google.protobuf protobuf-java-util - ${protobuf-java-util.version} + ${protobuf.version} + + + com.google.guava + guava + + + + + com.squareup.okio + okio + ${okio.version} + + + + com.tencentcloudapi + tencentcloud-sdk-java-sms + ${tencentcloud-sdk-java-sms.version} + + + + com.github.ben-manes.caffeine + caffeine + + ${caffeine.version} diff --git a/warehouse/pom.xml b/warehouse/pom.xml index 28b20f59cc6..515a878a367 100644 --- a/warehouse/pom.xml +++ b/warehouse/pom.xml @@ -24,22 +24,17 @@ 1.0 - 1.0 - 0.13.3 - 3.0.5 - 3.0.0 - 0.1.3 4.0.0 - warehouse + hertzbeat-warehouse + ${project.artifactId} org.dromara.hertzbeat - common - ${common.version} + hertzbeat-common provided @@ -71,59 +66,19 @@ com.taosdata.jdbc taos-jdbcdriver - ${taos-jdbcdriver.version} org.apache.iotdb iotdb-session - ${iotdb-session.version} io.greptime greptimedb-protocol - ${greptimedb.version} - - - io.grpc - grpc-all - - - com.google.code.gson - gson - - - com.google.guava - guava - - - com.google.protobuf - protobuf-java - - io.greptime greptimedb-grpc - ${greptimedb.version} - - - io.grpc - grpc-all - - - com.google.code.gson - gson - - - com.google.guava - guava - - - com.google.protobuf - protobuf-java - -