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

[feature] manage dependencies version by parent pom #2571

Merged
merged 17 commits into from
Aug 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
9622957
[type:feature] manage dependencies version by parent pom
Aias00 Aug 20, 2024
2439c8b
Merge branch 'master' into feature/manage_version_by_parent_pom
Calvin979 Aug 20, 2024
8c5d181
[type:feature] kingbase spotless apply
Aias00 Aug 20, 2024
caa9473
Merge branch 'master' into feature/manage_version_by_parent_pom
Aias00 Aug 21, 2024
6bac34a
Merge branch 'master' into feature/manage_version_by_parent_pom
Aias00 Aug 21, 2024
31a95e9
Merge branch 'master' into feature/manage_version_by_parent_pom
Aias00 Aug 21, 2024
f29473f
Merge branch 'master' into feature/manage_version_by_parent_pom
Aias00 Aug 21, 2024
21ad70a
Merge branch 'master' into feature/manage_version_by_parent_pom
Aias00 Aug 21, 2024
969f508
[type:feature] manage dependencies version by parent pom
Aias00 Aug 21, 2024
edbb189
Merge branch 'master' into feature/manage_version_by_parent_pom
Aias00 Aug 22, 2024
01a4bf8
Merge branch 'master' into feature/manage_version_by_parent_pom
Aias00 Aug 22, 2024
e6a529f
Merge branch 'master' into feature/manage_version_by_parent_pom
Aias00 Aug 22, 2024
550e4ad
Merge branch 'master' into feature/manage_version_by_parent_pom
Aias00 Aug 22, 2024
f432274
Merge branch 'master' into feature/manage_version_by_parent_pom
Aias00 Aug 23, 2024
a760784
Merge branch 'master' into feature/manage_version_by_parent_pom
Aias00 Aug 23, 2024
9d9ffe2
Merge branch 'master' into feature/manage_version_by_parent_pom
yuluo-yx Aug 23, 2024
9463133
Merge branch 'master' into feature/manage_version_by_parent_pom
Aias00 Aug 23, 2024
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
6 changes: 3 additions & 3 deletions alerter/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -73,19 +73,19 @@
<dependency>
<groupId>cn.afterturn</groupId>
<artifactId>easypoi-annotation</artifactId>
<version>4.3.0</version>
<version>${easy-poi.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
<version>4.1.1</version>
<version>${poi.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
<version>4.1.1</version>
<version>${poi.version}</version>
<scope>compile</scope>
</dependency>
</dependencies>
Expand Down
20 changes: 9 additions & 11 deletions collector/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@
<java.version>17</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
<maven-assembly-plugin.version>3.3.0</maven-assembly-plugin.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -89,7 +87,7 @@
<dependency>
<groupId>com.googlecode.concurrentlinkedhashmap</groupId>
<artifactId>concurrentlinkedhashmap-lru</artifactId>
<version>1.4.2</version>
<version>${concurrentlinkedhashmap-lru.version}</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
Expand Down Expand Up @@ -126,12 +124,12 @@
<dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-core</artifactId>
<version>2.13.1</version>
<version>${sshd-core.version}</version>
</dependency>
<dependency>
<groupId>net.i2p.crypto</groupId>
<artifactId>eddsa</artifactId>
<version>0.3.0</version>
<version>${eddsa.version}</version>
</dependency>
<!-- sql server -->
<dependency>
Expand Down Expand Up @@ -163,40 +161,40 @@
<dependency>
<groupId>org.snmp4j</groupId>
<artifactId>snmp4j</artifactId>
<version>3.6.7</version>
<version>${snmp4j.version}</version>
</dependency>

<!-- rocketmq -->
<dependency>
<groupId>org.apache.rocketmq</groupId>
<artifactId>rocketmq-tools</artifactId>
<version>4.9.4</version>
<version>${rocketmq-tools.version}</version>
</dependency>

<!--dns-->
<dependency>
<groupId>dnsjava</groupId>
<artifactId>dnsjava</artifactId>
<version>3.5.2</version>
<version>${dnsjava.version}</version>
</dependency>

<!-- consul -->
<dependency>
<groupId>com.ecwid.consul</groupId>
<artifactId>consul-api</artifactId>
<version>1.4.5</version>
<version>${consul-api.version}</version>
</dependency>
<!-- nacos -->
<dependency>
<groupId>com.alibaba.nacos</groupId>
<artifactId>nacos-client</artifactId>
<version>2.2.1</version>
<version>${nacos-client.version}</version>
</dependency>
<!-- nebula graph client -->
<dependency>
<groupId>com.vesoft</groupId>
<artifactId>client</artifactId>
<version>3.6.0</version>
<version>${vesoft-client.version}</version>
<exclusions>
<exclusion>
<groupId>javax.servlet</groupId>
Expand Down
4 changes: 2 additions & 2 deletions common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>org.eclipse.persistence.jpa</artifactId>
<version>4.0.2</version>
<version>${eclipse-jpa.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
Expand Down Expand Up @@ -126,7 +126,7 @@
<dependency>
<groupId>com.beetstra.jutf7</groupId>
<artifactId>jutf7</artifactId>
<version>1.0.0</version>
<version>${jutf7.version}</version>
</dependency>
</dependencies>
</project>
8 changes: 0 additions & 8 deletions manager/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,6 @@

<properties>
<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>
<nekohtml.version>1.9.22</nekohtml.version>
<spring-boot-starter-sureness.version>1.1.0</spring-boot-starter-sureness.version>
<warehouse.version>1.0</warehouse.version>
<easy-poi.version>4.3.0</easy-poi.version>
<huawei.sdk.version>3.1.37</huawei.sdk.version>
<huawei.obs.version>3.23.5</huawei.obs.version>
</properties>

<dependencies>
Expand Down
4 changes: 1 addition & 3 deletions plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@
<artifactId>hertzbeat-plugin</artifactId>
<name>${project.artifactId}</name>
<properties>
<maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
<maven-assembly-plugin.version>3.3.0</maven-assembly-plugin.version>
</properties>

<dependencies>
Expand All @@ -46,7 +44,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.3.0</version>
<version>${maven-assembly-plugin.version}</version>
<configuration>
<descriptors>
<descriptor>src/main/resources/assembly/assembly.xml</descriptor>
Expand Down
28 changes: 28 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,9 @@
<java.version>17</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
<maven-assembly-plugin.version>3.3.0</maven-assembly-plugin.version>


<p3c-pmd.version>2.1.1</p3c-pmd.version>
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
Expand Down Expand Up @@ -140,6 +143,31 @@
<commons-net>3.10.0</commons-net>
<jacoco-maven-plugin.version>0.8.11</jacoco-maven-plugin.version>
<spotless.version>2.40.0</spotless.version>

<easy-poi.version>4.3.0</easy-poi.version>
<poi.version>4.1.1</poi.version>
<concurrentlinkedhashmap-lru.version>1.4.2</concurrentlinkedhashmap-lru.version>
<sshd-core.version>2.13.1</sshd-core.version>
<eddsa.version>0.3.0</eddsa.version>
<snmp4j.version>3.6.7</snmp4j.version>
<rocketmq-tools.version>4.9.4</rocketmq-tools.version>
<dnsjava.version>3.5.2</dnsjava.version>
<consul-api.version>1.4.5</consul-api.version>
<nacos-client.version>2.2.1</nacos-client.version>
<vesoft-client.version>3.6.0</vesoft-client.version>
<eclipse-jpa.version>4.0.2</eclipse-jpa.version>
<jutf7.version>1.0.0</jutf7.version>
<spring-boot-starter-sureness.version>1.1.0</spring-boot-starter-sureness.version>
<huawei.sdk.version>3.1.37</huawei.sdk.version>
<huawei.obs.version>3.23.5</huawei.obs.version>


<iotdb-session.version>0.13.3</iotdb-session.version>
<influxdb.version>2.23</influxdb.version>
<spring-cloud-starter-openfeign.version>3.0.5</spring-cloud-starter-openfeign.version>
<taos-jdbcdriver.version>3.0.0</taos-jdbcdriver.version>
<greptimedb.version>0.7.3</greptimedb.version>
<mysql-jdbcdriver.version>8.0.33</mysql-jdbcdriver.version>
</properties>

<dependencyManagement>
Expand Down
4 changes: 0 additions & 4 deletions push/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,6 @@

<artifactId>hertzbeat-push</artifactId>
<name>${project.artifactId}</name>
<properties>
<maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
<maven-assembly-plugin.version>3.3.0</maven-assembly-plugin.version>
</properties>

<dependencies>
<!-- common -->
Expand Down
4 changes: 0 additions & 4 deletions remoting/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,6 @@

<artifactId>hertzbeat-remoting</artifactId>
<name>${project.artifactId}</name>
<properties>
<maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
<maven-assembly-plugin.version>3.3.0</maven-assembly-plugin.version>
</properties>

<dependencies>
<dependency>
Expand Down
9 changes: 0 additions & 9 deletions warehouse/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,6 @@
<groupId>org.apache.hertzbeat</groupId>
<version>2.0-SNAPSHOT</version>
</parent>
<properties>
<common.version>1.0</common.version>
<iotdb-session.version>0.13.3</iotdb-session.version>
<influxdb.version>2.23</influxdb.version>
<spring-cloud-starter-openfeign.version>3.0.5</spring-cloud-starter-openfeign.version>
<taos-jdbcdriver.version>3.0.0</taos-jdbcdriver.version>
<greptimedb.version>0.7.3</greptimedb.version>
<mysql-jdbcdriver.version>8.0.33</mysql-jdbcdriver.version>
</properties>
<modelVersion>4.0.0</modelVersion>

<artifactId>hertzbeat-warehouse</artifactId>
Expand Down
Loading