[ISSUE #16] Set up Maven CI & Add .asf.yaml & Rename core packages (#17)

* Set up CI * Add LICENSE * Add CheckStyle * Set up DB * Add druid StatFilter controller * sync CI change in apache/eventmesh#4722 * Supplement module dependency relation and fix project info * Move original Admin into Core & rewrite dependencies * Rename package to .core * Add .asf.yaml * Enable branches with namespace triggering CI * Set up Maven CI * Downgrade JDK from 17 to 8 * Remove failed empty test * Remove failed dependabot task * Unify version number (using maven 3.8.1, maven wrapper to be added) --------- Co-authored-by: laohu <[email protected]>
apache · Jan 16, 2024 · fdba35b · fdba35b
1 parent 818372d
commit fdba35b
Show file tree

Hide file tree

Showing 41 changed files with 172 additions and 124 deletions.
diff --git a/.asf.yaml b/.asf.yaml
@@ -0,0 +1,55 @@
+#
+# 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.
+#
+
+github:
+  description: EventMesh Dashboard
+  features:
+    # Enable issue management
+    issues: true
+    # Enable wiki
+    wiki: true
+  homepage: https://eventmesh.apache.org/
+  labels:
+    - pubsub
+    - event-mesh
+    - admin
+    - dashboard
+    - event-driven
+    - cloud-native
+    - serverless
+    - serverless-workflow
+    - message-bus
+  enabled_merge_buttons:
+    squash:  true
+    merge:   false
+    rebase:  false
+  protected_branches:
+    main:
+      required_status_checks:
+        strict: true
+      required_pull_request_reviews:
+        dismiss_stale_reviews: true
+        required_approving_review_count: 1
+notifications:
+    commits:      [email protected]
+    # Send all issue emails (new, closed, comments) to issues@
+    issues:       [email protected]
+    # Send new/closed PR notifications to dev@
+    pullrequests_status: [email protected]
+    # Send individual PR comments/reviews to issues@
+    pullrequests_comment: [email protected]
+    jira_options: link label worklog
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -21,9 +21,9 @@ name: "Continuous Integration"
 
 on:
   push:
-    branches: [ '*' ]
+    branches: [ '**' ]
   pull_request:
-    branches: [ '*' ]
+    branches: [ '**' ]
 
 jobs:
   build:
@@ -32,24 +32,20 @@ jobs:
       fail-fast: false
       matrix:
         os: [ ubuntu-latest ]
-        java: [ 8 ]
+        java: [ 8, 11 ]
         language: ['java']
     runs-on: ${{ matrix.os }}
 
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
 
-      - name: Setup Gradle
-        uses: gradle/gradle-build-action@v2
-
       - name: Set up JDK ${{ matrix.java }}
         uses: actions/setup-java@v3
         with:
           distribution: 'corretto'
           java-version: ${{ matrix.java }}
+          cache: maven
 
-      - name: Build
-        run: ./gradlew clean build bootJar --parallel --daemon
-        env:
-          GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
+      - name: Build with Maven
+        run: mvn -B package --file pom.xml
diff --git a/README.md b/README.md
@@ -6,6 +6,12 @@
 
 ## 技术架构
 
+### 环境
+
+- JDK 8/11
+- Maven 3.8.1
+- Spring Boot 2.7.x
+
 ### 模块依赖图
 
 ### 模块介绍

diff --git a/eventmesh-dashboard-common/pom.xml b/eventmesh-dashboard-common/pom.xml
@@ -6,15 +6,15 @@
     <parent>
         <groupId>org.apache.eventmesh.dashboard</groupId>
         <artifactId>eventmesh-dashboard</artifactId>
-        <version>0.0.1</version>
+        <version>0.0.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.eventmesh.dashboard.common</groupId>
     <artifactId>eventmesh-dashboard-common</artifactId>
 
     <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 

diff --git a/eventmesh-dashboard-console/pom.xml b/eventmesh-dashboard-console/pom.xml
@@ -6,15 +6,15 @@
     <parent>
         <groupId>org.apache.eventmesh.dashboard</groupId>
         <artifactId>eventmesh-dashboard</artifactId>
-        <version>0.0.1</version>
+        <version>0.0.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.eventmesh.dashboard.console</groupId>
     <artifactId>eventmesh-dashboard-console</artifactId>
 
     <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 

diff --git a/eventmesh-dashboard-core/pom.xml b/eventmesh-dashboard-core/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.eventmesh.dashboard</groupId>
         <artifactId>eventmesh-dashboard</artifactId>
-        <version>0.0.1</version>
+        <version>0.0.1-SNAPSHOT</version>
     </parent>
     <groupId>org.apache.eventmesh.dashboard.core</groupId>
     <artifactId>eventmesh-dashboard-core</artifactId>

diff --git a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/Main.java b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/Main.java
diff --git a/...hboard-core/src/main/java/org/apache/eventmesh/dashboard/core/config/AdminProperties.java b/...hboard-core/src/main/java/org/apache/eventmesh/dashboard/core/config/AdminProperties.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.apache.eventmesh.dashboard.config;
+package org.apache.eventmesh.dashboard.core.config;
 
-import org.apache.eventmesh.dashboard.constant.ConfigConst;
+import org.apache.eventmesh.dashboard.core.constant.ConfigConst;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;

diff --git a/...shboard-core/src/main/java/org/apache/eventmesh/dashboard/core/config/BeanTypeConfig.java b/...shboard-core/src/main/java/org/apache/eventmesh/dashboard/core/config/BeanTypeConfig.java
@@ -15,17 +15,17 @@
  * limitations under the License.
  */
 
-package org.apache.eventmesh.dashboard.config;
+package org.apache.eventmesh.dashboard.core.config;
 
-import org.apache.eventmesh.dashboard.constant.ConfigConst;
-import org.apache.eventmesh.dashboard.service.ConnectionService;
-import org.apache.eventmesh.dashboard.service.SubscriptionService;
-import org.apache.eventmesh.dashboard.service.TopicService;
-import org.apache.eventmesh.dashboard.service.meta.EtcdConnectionService;
-import org.apache.eventmesh.dashboard.service.meta.EtcdSubscriptionService;
-import org.apache.eventmesh.dashboard.service.meta.NacosConnectionService;
-import org.apache.eventmesh.dashboard.service.meta.NacosSubscriptionService;
-import org.apache.eventmesh.dashboard.service.store.RocketmqTopicService;
+import org.apache.eventmesh.dashboard.core.constant.ConfigConst;
+import org.apache.eventmesh.dashboard.core.service.ConnectionService;
+import org.apache.eventmesh.dashboard.core.service.SubscriptionService;
+import org.apache.eventmesh.dashboard.core.service.TopicService;
+import org.apache.eventmesh.dashboard.core.service.meta.EtcdConnectionService;
+import org.apache.eventmesh.dashboard.core.service.meta.EtcdSubscriptionService;
+import org.apache.eventmesh.dashboard.core.service.meta.NacosConnectionService;
+import org.apache.eventmesh.dashboard.core.service.meta.NacosSubscriptionService;
+import org.apache.eventmesh.dashboard.core.service.store.RocketmqTopicService;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

diff --git a/...ashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/constant/ConfigConst.java b/...ashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/constant/ConfigConst.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.eventmesh.dashboard.constant;
+package org.apache.eventmesh.dashboard.core.constant;
 
 public class ConfigConst {
 

diff --git a/...dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/constant/NacosConst.java b/...dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/constant/NacosConst.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.eventmesh.dashboard.constant;
+package org.apache.eventmesh.dashboard.core.constant;
 
 public class NacosConst {
 

diff --git a/...re/src/main/java/org/apache/eventmesh/dashboard/core/controller/ConnectionController.java b/...re/src/main/java/org/apache/eventmesh/dashboard/core/controller/ConnectionController.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.apache.eventmesh.dashboard.controller;
+package org.apache.eventmesh.dashboard.core.controller;
 
-import org.apache.eventmesh.dashboard.service.ConnectionService;
+import org.apache.eventmesh.dashboard.core.service.ConnectionService;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;

diff --git a/...-core/src/main/java/org/apache/eventmesh/dashboard/core/controller/MetricsController.java b/...-core/src/main/java/org/apache/eventmesh/dashboard/core/controller/MetricsController.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.eventmesh.dashboard.controller;
+package org.apache.eventmesh.dashboard.core.controller;
 
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;

diff --git a/.../src/main/java/org/apache/eventmesh/dashboard/core/controller/SubscriptionController.java b/.../src/main/java/org/apache/eventmesh/dashboard/core/controller/SubscriptionController.java
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package org.apache.eventmesh.dashboard.controller;
+package org.apache.eventmesh.dashboard.core.controller;
 
-import org.apache.eventmesh.dashboard.dto.Result;
-import org.apache.eventmesh.dashboard.model.SubscriptionInfo;
-import org.apache.eventmesh.dashboard.service.SubscriptionService;
+import org.apache.eventmesh.dashboard.core.dto.Result;
+import org.apache.eventmesh.dashboard.core.model.SubscriptionInfo;
+import org.apache.eventmesh.dashboard.core.service.SubscriptionService;
 
 import java.util.List;
 

diff --git a/...rd-core/src/main/java/org/apache/eventmesh/dashboard/core/controller/TopicController.java b/...rd-core/src/main/java/org/apache/eventmesh/dashboard/core/controller/TopicController.java
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-package org.apache.eventmesh.dashboard.controller;
+package org.apache.eventmesh.dashboard.core.controller;
 
-import org.apache.eventmesh.dashboard.dto.CreateTopicRequest;
-import org.apache.eventmesh.dashboard.dto.DeleteTopicRequest;
-import org.apache.eventmesh.dashboard.dto.Result;
-import org.apache.eventmesh.dashboard.model.TopicProperties;
-import org.apache.eventmesh.dashboard.service.TopicService;
+import org.apache.eventmesh.dashboard.core.dto.CreateTopicRequest;
+import org.apache.eventmesh.dashboard.core.dto.DeleteTopicRequest;
+import org.apache.eventmesh.dashboard.core.dto.Result;
+import org.apache.eventmesh.dashboard.core.model.TopicProperties;
+import org.apache.eventmesh.dashboard.core.service.TopicService;
 
 import java.util.List;
 

diff --git a/...hboard-core/src/main/java/org/apache/eventmesh/dashboard/core/dto/CreateTopicRequest.java b/...hboard-core/src/main/java/org/apache/eventmesh/dashboard/core/dto/CreateTopicRequest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.eventmesh.dashboard.dto;
+package org.apache.eventmesh.dashboard.core.dto;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;

diff --git a/...hboard-core/src/main/java/org/apache/eventmesh/dashboard/core/dto/DeleteTopicRequest.java b/...hboard-core/src/main/java/org/apache/eventmesh/dashboard/core/dto/DeleteTopicRequest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.eventmesh.dashboard.dto;
+package org.apache.eventmesh.dashboard.core.dto;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;

diff --git a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/dto/Result.java b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/dto/Result.java
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-package org.apache.eventmesh.dashboard.dto;
+package org.apache.eventmesh.dashboard.core.dto;
 
-import static org.apache.eventmesh.dashboard.enums.Status.SUCCESS;
+import static org.apache.eventmesh.dashboard.core.enums.Status.SUCCESS;
 
-import org.apache.eventmesh.dashboard.enums.Status;
-import org.apache.eventmesh.dashboard.exception.BaseException;
+import org.apache.eventmesh.dashboard.core.enums.Status;
+import org.apache.eventmesh.dashboard.core.exception.BaseException;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;

diff --git a/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/enums/Status.java b/eventmesh-dashboard-core/src/main/java/org/apache/eventmesh/dashboard/core/enums/Status.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.apache.eventmesh.dashboard.enums;
+package org.apache.eventmesh.dashboard.core.enums;
 
-import static org.apache.eventmesh.dashboard.constant.ConfigConst.COLON;
+import static org.apache.eventmesh.dashboard.core.constant.ConfigConst.COLON;
 
 import org.springframework.http.HttpStatus;
 

diff --git a/...board-core/src/main/java/org/apache/eventmesh/dashboard/core/exception/BaseException.java b/...board-core/src/main/java/org/apache/eventmesh/dashboard/core/exception/BaseException.java
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-package org.apache.eventmesh.dashboard.exception;
+package org.apache.eventmesh.dashboard.core.exception;
 
-import static org.apache.eventmesh.dashboard.constant.ConfigConst.COLON;
+import static org.apache.eventmesh.dashboard.core.constant.ConfigConst.COLON;
 
-import org.apache.eventmesh.dashboard.enums.Status;
-import org.apache.eventmesh.dashboard.util.ExceptionUtil;
+import org.apache.eventmesh.dashboard.core.enums.Status;
+import org.apache.eventmesh.dashboard.core.util.ExceptionUtil;
 
 import lombok.Getter;
 

diff --git a/.../src/main/java/org/apache/eventmesh/dashboard/core/exception/EventMeshAdminException.java b/.../src/main/java/org/apache/eventmesh/dashboard/core/exception/EventMeshAdminException.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.apache.eventmesh.dashboard.exception;
+package org.apache.eventmesh.dashboard.core.exception;
 
-import org.apache.eventmesh.dashboard.enums.Status;
+import org.apache.eventmesh.dashboard.core.enums.Status;
 
 /**
  * EventMeshAdmin Application side exception

diff --git a/...-core/src/main/java/org/apache/eventmesh/dashboard/core/exception/EventMeshException.java b/...-core/src/main/java/org/apache/eventmesh/dashboard/core/exception/EventMeshException.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.eventmesh.dashboard.exception;
+package org.apache.eventmesh.dashboard.core.exception;
 
 /**
  * EventMesh Runtime side exception

diff --git a/...e/src/main/java/org/apache/eventmesh/dashboard/core/exception/GlobalExceptionHandler.java b/...e/src/main/java/org/apache/eventmesh/dashboard/core/exception/GlobalExceptionHandler.java
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package org.apache.eventmesh.dashboard.exception;
+package org.apache.eventmesh.dashboard.core.exception;
 
-import org.apache.eventmesh.dashboard.dto.Result;
-import org.apache.eventmesh.dashboard.dto.Result.StatusMessage;
+import org.apache.eventmesh.dashboard.core.dto.Result;
+import org.apache.eventmesh.dashboard.core.dto.Result.StatusMessage;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -29,7 +29,7 @@
 import lombok.extern.slf4j.Slf4j;
 
 /**
- * This class, in conjunction with {@linkplain org.apache.eventmesh.dashboard.enums.Status Status} and {@link BaseException},
+ * This class, in conjunction with {@linkplain org.apache.eventmesh.dashboard.core.enums.Status Status} and {@link BaseException},
  * collectively implements customized error reporting.
  */