Setup common module dependencies
diff --git a/eventmesh-dashboard-common/pom.xml b/eventmesh-dashboard-common/pom.xml
index 52255b0..6b7da6b 100644
--- a/eventmesh-dashboard-common/pom.xml
+++ b/eventmesh-dashboard-common/pom.xml
@@ -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>
\ No newline at end of file
diff --git a/eventmesh-dashboard-core/pom.xml b/eventmesh-dashboard-core/pom.xml
index 651cad8..c886652 100644
--- a/eventmesh-dashboard-core/pom.xml
+++ b/eventmesh-dashboard-core/pom.xml
@@ -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>
@@ -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>
\ No newline at end of file
diff --git a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/EventMeshDashboardApplication.java b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/EventMeshDashboardApplication.java
deleted file mode 100644
index 7caeddb..0000000
--- a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/EventMeshDashboardApplication.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.eventmesh.dashboard.core;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.web.servlet.ServletComponentScan;
-
-@ServletComponentScan // Druid Monitor
-@SpringBootApplication
-public class EventMeshDashboardApplication {
-
- public static void main(String[] args) {
- SpringApplication.run(EventMeshDashboardApplication.class, args);
- }
-
-}
diff --git a/eventmesh-dashboard-core/src/main/resources/application-dev.yml b/eventmesh-dashboard-core/src/main/resources/application-dev.yml
index f61a3c3..b3c870a 100644
--- a/eventmesh-dashboard-core/src/main/resources/application-dev.yml
+++ b/eventmesh-dashboard-core/src/main/resources/application-dev.yml
@@ -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
\ No newline at end of file
+# 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
\ No newline at end of file
diff --git a/eventmesh-dashboard-core/src/main/resources/application.yml b/eventmesh-dashboard-core/src/main/resources/application.yml
deleted file mode 100644
index 434cf55..0000000
--- a/eventmesh-dashboard-core/src/main/resources/application.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-spring:
- application:
- name: eventmesh-dashboard
- profiles:
- active: dev
-
-server:
- port: 8080
- servlet:
- encoding:
- charset: UTF-8
- enabled: true
- force: true
-
-logging:
- config: classpath:logback.xml
-
-mybatis-plus:
- mapper-locations: classpath*:mappers/**/*.xml # Default value
- typeAliasesPackage: org.apache.eventmesh.dashboard.entity
- configuration:
- call-setters-on-nulls: true # Display fields with null values in query results
- map-underscore-to-camel-case: true # Convert database underscore naming convention to camel case (default is true)
-# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # Output SQL execution logs to console (for debugging)
\ No newline at end of file
diff --git a/eventmesh-dashboard-service/pom.xml b/eventmesh-dashboard-service/pom.xml
index f445ada..e64ecb5 100644
--- a/eventmesh-dashboard-service/pom.xml
+++ b/eventmesh-dashboard-service/pom.xml
@@ -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>
\ No newline at end of file
