Skip to content

Commit cd40699

Browse files
zqr10159Copilottomsun28
authored
refactor: Split hertzbeat-common into core and spring modules (#4035)
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: zqr10159 <30048352+zqr10159@users.noreply.github.com> Co-authored-by: Tomsun28 <tomsun28@outlook.com>
1 parent 7001556 commit cd40699

294 files changed

Lines changed: 461 additions & 95 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/backend-build-test.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,11 @@ jobs:
6666
run: |
6767
sudo curl -L https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-linux-x86_64 -o /usr/local/bin/docker-compose
6868
sudo chmod u+x /usr/local/bin/docker-compose
69-
69+
7070
cd e2e
7171
sudo docker-compose version
7272
sudo docker-compose up --exit-code-from testing --remove-orphans
73-
73+
7474
# upload application logs
7575
- name: Upload logs & API test reports
7676
uses: actions/upload-artifact@v4

‎hertzbeat-ai/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
</dependency>
6060
<dependency>
6161
<groupId>org.apache.hertzbeat</groupId>
62-
<artifactId>hertzbeat-common</artifactId>
62+
<artifactId>hertzbeat-common-spring</artifactId>
6363
</dependency>
6464
<!-- common -->
6565
<dependency>

‎hertzbeat-base/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<!-- common -->
3636
<dependency>
3737
<groupId>org.apache.hertzbeat</groupId>
38-
<artifactId>hertzbeat-common</artifactId>
38+
<artifactId>hertzbeat-common-spring</artifactId>
3939
<exclusions>
4040
<exclusion>
4141
<artifactId>commons-logging</artifactId>

‎hertzbeat-collector/hertzbeat-collector-common/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<!-- common -->
5050
<dependency>
5151
<groupId>org.apache.hertzbeat</groupId>
52-
<artifactId>hertzbeat-common</artifactId>
52+
<artifactId>hertzbeat-common-core</artifactId>
5353
</dependency>
5454
<!-- linux ssh -->
5555
<dependency>

‎hertzbeat-collector/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
<dependencies>
8282
<dependency>
8383
<groupId>org.apache.hertzbeat</groupId>
84-
<artifactId>hertzbeat-common</artifactId>
84+
<artifactId>hertzbeat-common-core</artifactId>
8585
</dependency>
8686
</dependencies>
8787

hertzbeat-common/pom.xml renamed to hertzbeat-common-core/pom.xml

Lines changed: 34 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -26,62 +26,10 @@
2626

2727
<modelVersion>4.0.0</modelVersion>
2828

29-
<artifactId>hertzbeat-common</artifactId>
29+
<artifactId>hertzbeat-common-core</artifactId>
3030
<name>${project.artifactId}</name>
3131

3232
<dependencies>
33-
<!-- spring -->
34-
<dependency>
35-
<groupId>org.springframework.boot</groupId>
36-
<artifactId>spring-boot-starter-web</artifactId>
37-
<scope>provided</scope>
38-
</dependency>
39-
<dependency>
40-
<groupId>org.springframework.boot</groupId>
41-
<artifactId>spring-boot-configuration-processor</artifactId>
42-
<optional>true</optional>
43-
</dependency>
44-
<dependency>
45-
<groupId>org.springframework.boot</groupId>
46-
<artifactId>spring-boot-autoconfigure</artifactId>
47-
</dependency>
48-
<!-- jpa -->
49-
<dependency>
50-
<groupId>org.eclipse.persistence</groupId>
51-
<artifactId>org.eclipse.persistence.jpa</artifactId>
52-
<version>${eclipse-jpa.version}</version>
53-
</dependency>
54-
<dependency>
55-
<groupId>org.springframework.boot</groupId>
56-
<artifactId>spring-boot-starter-data-jpa</artifactId>
57-
<exclusions>
58-
<exclusion>
59-
<groupId>org.hibernate.orm</groupId>
60-
<artifactId>hibernate-core</artifactId>
61-
</exclusion>
62-
</exclusions>
63-
</dependency>
64-
<!-- validation -->
65-
<dependency>
66-
<groupId>org.springframework.boot</groupId>
67-
<artifactId>spring-boot-starter-validation</artifactId>
68-
</dependency>
69-
<!-- jackson -->
70-
<dependency>
71-
<groupId>com.fasterxml.jackson.core</groupId>
72-
<artifactId>jackson-annotations</artifactId>
73-
<scope>provided</scope>
74-
</dependency>
75-
<dependency>
76-
<groupId>com.fasterxml.jackson.dataformat</groupId>
77-
<artifactId>jackson-dataformat-xml</artifactId>
78-
</dependency>
79-
<!-- swagger -->
80-
<dependency>
81-
<groupId>org.springdoc</groupId>
82-
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
83-
<scope>provided</scope>
84-
</dependency>
8533
<!-- Tool dependencies -->
8634
<dependency>
8735
<groupId>com.google.guava</groupId>
@@ -187,6 +135,39 @@
187135
<groupId>com.github.jsqlparser</groupId>
188136
<artifactId>jsqlparser</artifactId>
189137
</dependency>
138+
<!-- jackson for optional json processing -->
139+
<dependency>
140+
<groupId>com.fasterxml.jackson.core</groupId>
141+
<artifactId>jackson-databind</artifactId>
142+
<scope>provided</scope>
143+
</dependency>
144+
<dependency>
145+
<groupId>com.fasterxml.jackson.core</groupId>
146+
<artifactId>jackson-annotations</artifactId>
147+
<scope>provided</scope>
148+
</dependency>
149+
<dependency>
150+
<groupId>com.fasterxml.jackson.dataformat</groupId>
151+
<artifactId>jackson-dataformat-xml</artifactId>
152+
<scope>provided</scope>
153+
</dependency>
154+
<!-- swagger annotations (optional) -->
155+
<dependency>
156+
<groupId>org.springdoc</groupId>
157+
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
158+
<scope>provided</scope>
159+
</dependency>
160+
<!-- validation annotations (optional) -->
161+
<dependency>
162+
<groupId>jakarta.validation</groupId>
163+
<artifactId>jakarta.validation-api</artifactId>
164+
<scope>provided</scope>
165+
</dependency>
166+
<!-- jakarta annotations -->
167+
<dependency>
168+
<groupId>jakarta.annotation</groupId>
169+
<artifactId>jakarta.annotation-api</artifactId>
170+
</dependency>
190171
</dependencies>
191172

192173
</project>

hertzbeat-common/src/main/java/org/apache/arrow/vector/table/ArrowTable.java renamed to hertzbeat-common-core/src/main/java/org/apache/arrow/vector/table/ArrowTable.java

File renamed without changes.

hertzbeat-common/src/main/java/org/apache/hertzbeat/common/cache/CommonCacheService.java renamed to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/cache/CommonCacheService.java

File renamed without changes.

hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/AiConstants.java renamed to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/AiConstants.java

File renamed without changes.

hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/AiTypeEnum.java renamed to hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/constants/AiTypeEnum.java

File renamed without changes.

0 commit comments

Comments
 (0)