Skip to content

Commit

Permalink
Setup common module dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
Pil0tXia committed Mar 1, 2024
1 parent d816839 commit 5ef2c32
Show file tree
Hide file tree
Showing 6 changed files with 62 additions and 237 deletions.
20 changes: 19 additions & 1 deletion eventmesh-dashboard-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,32 @@
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<spring-boot.version>2.7.6</spring-boot.version>
</properties>

<dependencies>
<!-- utility -->
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.13.0</version>
</dependency>
<dependency>
<groupId>com.alibaba.fastjson2</groupId>
<artifactId>fastjson2</artifactId>
<version>2.0.40</version>
</dependency>

<!-- unit test -->
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>5.5.0</version>
<scope>test</scope>
</dependency>
</dependencies>

</project>
103 changes: 0 additions & 103 deletions eventmesh-dashboard-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,56 +37,14 @@
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<spring-boot.version>2.7.6</spring-boot.version>
</properties>

<dependencies>
<!-- versions managed by spring dependency management -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-devtools</artifactId>
<scope>runtime</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>

<!-- utility -->
<dependency>
<groupId>org.apache.eventmesh.dashboard.common</groupId>
<artifactId>eventmesh-dashboard-common</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.13.0</version>
</dependency>
<dependency>
<groupId>com.alibaba.fastjson2</groupId>
<artifactId>fastjson2</artifactId>
<version>2.0.40</version>
</dependency>

<!-- unit test -->
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>5.5.0</version>
<scope>test</scope>
</dependency>

<!-- meta -->
<dependency>
Expand All @@ -101,66 +59,5 @@
<artifactId>rocketmq-client</artifactId>
<version>4.9.7</version>
</dependency>

<!-- Database -->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid-spring-boot-starter</artifactId>
<version>1.2.21</version>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
<version>3.5.5</version>
</dependency>
<dependency>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
<scope>runtime</scope>
</dependency>
</dependencies>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>${spring-boot.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>${spring-boot.version}</version>
<configuration>
<mainClass>org.apache.eventmesh.dashboard.core.EventMeshDashboardApplication</mainClass>
<skip>true</skip>
</configuration>
<executions>
<execution>
<id>repackage</id>
<goals>
<goal>repackage</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

This file was deleted.

91 changes: 33 additions & 58 deletions eventmesh-dashboard-core/src/main/resources/application-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,62 +14,37 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
spring:
datasource:
type: com.alibaba.druid.pool.DruidDataSource
druid:
driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://localhost:3306/eventmesh-dashboard?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
username: root
password: root

initial-size: 1
max-active: 50
min-idle: 5
max-wait: 6000
validation-query: select 'x'
validation-query-timeout: 15
test-on-borrow: false
test-while-idle: true
min-evictable-idle-time-millis: 300000

stat-view-servlet:
enabled: true
url-pattern: /druid/*
filter:
wall:
config:
multi-statement-allow: true # corresponds to allowMultiQueries

eventmesh:
meta:
# registry type: nacos, etcd
type: nacos
nacos:
addr: 127.0.0.1:8848
namespace: # namespace id, empty by default
authEnabled: false
protocol: http # http or https
username:
password:
# Alibaba Cloud MSE Nacos auth, not nacos.token.secret.key
accessKey:
secretKey:
etcd:
addr: # TODO
# timeout for admin client
timeoutMs: 5000
store:
# Event Store type, should be consistent with the EventMesh Runtime configuration.
type: rocketmq
standalone:
# TODO
rocketmq:
namesrvAddr: 127.0.0.1:9876;127.0.0.1:9876
clusterName: DefaultCluster
accessKey: '********'
secretKey: '********'
kafka:
namesrvAddr: localhost:9092;localhost:9092
partitions: 1
replicationFactors: 1
# eventmesh cluster configs are stored in DB and below is a example which can be deleted after config mgmt completed
#eventmesh:
# meta:
# # registry type: nacos, etcd
# type: nacos
# nacos:
# addr: 127.0.0.1:8848
# namespace: # namespace id, empty by default
# authEnabled: false
# protocol: http # http or https
# username:
# password:
# # Alibaba Cloud MSE Nacos auth, not nacos.token.secret.key
# accessKey:
# secretKey:
# etcd:
# addr: # TODO
# # timeout for admin client
# timeoutMs: 5000
# store:
# # Event Store type, should be consistent with the EventMesh Runtime configuration.
# type: rocketmq
# standalone:
# # TODO
# rocketmq:
# namesrvAddr: 127.0.0.1:9876;127.0.0.1:9876
# clusterName: DefaultCluster
# accessKey: '********'
# secretKey: '********'
# kafka:
# namesrvAddr: localhost:9092;localhost:9092
# partitions: 1
# replicationFactors: 1
40 changes: 0 additions & 40 deletions eventmesh-dashboard-core/src/main/resources/application.yml

This file was deleted.

13 changes: 10 additions & 3 deletions eventmesh-dashboard-service/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,21 @@
<artifactId>eventmesh-dashboard</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>

<groupId>org.apache.eventmesh.dashboard.service</groupId>
<artifactId>eventmesh-dashboard-service</artifactId>
<version>0.0.1-SNAPSHOT</version>
<name>eventmesh-dashboard-core</name>

<properties>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<dependencies>
<dependency>
<groupId>org.apache.eventmesh.dashboard.common</groupId>
<artifactId>eventmesh-dashboard-common</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
</dependencies>
</project>

0 comments on commit 5ef2c32

Please sign in to comment.