feat: uni-architecture redesign

Author: qqeasonchen

.dockerignore

@@ -1,9 +1,15 @@
+# Build outputs — regenerated inside the image, never shipped from context.
 dist/
+dist-connector/
 build/
+**/build/
 
-# VCS
+# VCS and gradle caches (the wrapper is not used; system gradle lives in the
+# builder image).
 .git/
 .gitignore
+.gradle/
+**/.gradle/
 
 # Non-Java SDKs (not included in Gradle build)
 eventmesh-sdks/eventmesh-sdk-rust/
@@ -14,10 +20,12 @@ eventmesh-sdks/eventmesh-sdk-c/
 **/target/
 **/node_modules/
 
-# IDE
+# IDE / editor cruft.
 .idea/
 .vscode/
 *.iml
+*.ipr
+*.iws
 
 # Docs & misc
 docs/

.github/workflows/docker.yml

@@ -23,6 +23,16 @@ on:
 jobs:
   docker:
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          # EventMesh unified runtime (traffic HTTP + admin).
+          - image: apache/eventmesh
+            dockerfile: ./docker/Dockerfile
+          # Connector-runtime (separate process, talks HTTP+CloudEvents to the runtime).
+          - image: apache/eventmesh-connector
+            dockerfile: ./docker/Dockerfile.connector
     steps:
       - name: Checkout repository
         uses: actions/checkout@v6
@@ -37,14 +47,13 @@ jobs:
         id: meta
         uses: docker/metadata-action@v5
         with:
-          images: |
-            apache/eventmesh
+          images: ${{ matrix.image }}
 
       - name: Build and push
         uses: docker/build-push-action@v6
         with:
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          file: ./docker/Dockerfile_jdk8
-          context: ./
+          file: ${{ matrix.dockerfile }}
+          context: ./

.gitignore

@@ -44,10 +44,15 @@ x86/
 [Aa][Rr][Mm]64/
 bld/
 [Bb]in/
+# … but keep source service scripts shipped from module bin/ dirs (dist copies them to dist/bin).
+!eventmesh-runtime/bin/
+!eventmesh-connector-runtime/bin/
 [Oo]bj/
 [Ll]og/
 [Ll]ogs/
 **/org/apache/eventmesh/connector/jdbc/antlr4/autogeneration/*
 
 #rust
 Cargo.lock
+rocketmq-pull-offsets.properties
+kafka-pull-offsets.properties

build.gradle

@@ -32,9 +32,6 @@ import java.util.concurrent.TimeUnit
 buildscript {
     repositories {
         mavenCentral()
-        maven {
-            url "https://maven.aliyun.com/repository/public"
-        }
         maven {
             url "https://plugins.gradle.org/m2/"
         }
@@ -74,8 +71,8 @@ allprojects {
     compileJava.options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"
 
     java {
-        sourceCompatibility = "1.8"
-        targetCompatibility = "1.8"
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
     }
 
     clean.doFirst {
@@ -105,9 +102,6 @@ allprojects {
     dependencies {
         repositories {
             mavenCentral()
-            maven {
-                url "https://maven.aliyun.com/repository/public"
-            }
         }
         testImplementation "org.junit.jupiter:junit-jupiter:5.11.0"
     }
@@ -159,22 +153,18 @@ tasks.register('dist') {
         dependsOn("${subProject.path}:jar")
     }
     dependsOn('generateDistLicense', 'generateDistNotice')
+    // Only modules that ship on the runtime classpath of the unified runtime
+    // (EventMeshApplication). Legacy api/registry/retry/security/trace/meta/
+    // metrics/starter/runtime-v2/openconnect modules were deleted in the uni
+    // rewrite; listing them here made `findProject` return null and NPE.
     def includedProjects =
             ["eventmesh-common",
-             "eventmesh-meta:eventmesh-meta-api",
-             "eventmesh-metrics-plugin:eventmesh-metrics-api",
-             "eventmesh-openconnect:eventmesh-openconnect-java",
-             "eventmesh-openconnect:eventmesh-openconnect-offsetmgmt-plugin:eventmesh-openconnect-offsetmgmt-api",
-             "eventmesh-protocol-plugin:eventmesh-protocol-api",
-             "eventmesh-registry:eventmesh-registry-api",
-             "eventmesh-retry:eventmesh-retry-api",
              "eventmesh-runtime",
-             "eventmesh-runtime-v2",
-             "eventmesh-security-plugin:eventmesh-security-api",
              "eventmesh-spi",
-             "eventmesh-starter",
              "eventmesh-storage-plugin:eventmesh-storage-api",
-             "eventmesh-trace-plugin:eventmesh-trace-api"]
+             "eventmesh-protocol-plugin:eventmesh-protocol-api",
+             "eventmesh-protocol-plugin:eventmesh-protocol-meshmessage",
+             "eventmesh-protocol-plugin:eventmesh-protocol-a2a"]
     doLast {
         includedProjects.each {
             def subProject = findProject(it)
@@ -207,53 +197,13 @@ tasks.register('dist') {
     }
 }
 
-tasks.register('dist-admin') {
-    subprojects.forEach { subProject ->
-        dependsOn("${subProject.path}:jar")
-    }
-    def includedProjects =
-            [
-                    "eventmesh-admin-server",
-                    "eventmesh-common",
-                    "eventmesh-spi",
-                    "eventmesh-registry:eventmesh-registry-api",
-                    "eventmesh-registry:eventmesh-registry-nacos",
-                    "eventmesh-openconnect:eventmesh-openconnect-offsetmgmt-plugin:eventmesh-openconnect-offsetmgmt-api"
-            ]
-    doLast {
-        includedProjects.each {
-            def subProject = findProject(it)
-            copy {
-                from subProject.jar.archivePath
-                into rootProject.file('dist/apps')
-            }
-            copy {
-                from subProject.configurations.runtimeClasspath
-                into rootProject.file('dist/lib')
-                exclude 'eventmesh-*'
-            }
-            copy {
-                from subProject.file('bin')
-                into rootProject.file('dist/bin')
-            }
-            copy {
-                from subProject.file('conf')
-                from subProject.sourceSets.main.resources.srcDirs
-                into rootProject.file('dist/conf')
-                duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-                exclude 'META-INF'
-            }
-
-        }
-    }
-
-}
-
 tasks.register('installPlugin') {
     var pluginProjects = subprojects.findAll {
         it.file('gradle.properties').exists()
                 && it.properties.containsKey('pluginType')
                 && it.properties.containsKey('pluginName')
+                // connectors ship in the connector-runtime image (dist-connector), not the runtime image
+                && it.properties.get('pluginType') != 'connector'
     }
     doLast {
         String[] libJars = java.util.Optional.ofNullable(file('dist/lib').list()).orElse(new String[0])
@@ -281,6 +231,64 @@ tasks.register('installPlugin') {
     }
 }
 
+tasks.register('dist-connector') {
+    subprojects.forEach { subProject ->
+        dependsOn("${subProject.path}:jar")
+    }
+    dependsOn('generateDistLicense', 'generateDistNotice')
+    doLast {
+        // Core: the connector-runtime process jar + its third-party deps (cloudevents, jackson,
+        // rocksdb, log4j binding, …). ConnectorApplication loads connectors via Class.forName, so
+        // connector jars must be on the classpath — start-connector.sh builds -cp from plugin/**/*.jar.
+        def core = findProject('eventmesh-connector-runtime')
+        logger.lifecycle('Install module: module: {}', core.name)
+        copy {
+            from core.jar.archivePath
+            into rootProject.file('dist-connector/apps')
+        }
+        copy {
+            from core.configurations.runtimeClasspath
+            into rootProject.file('dist-connector/lib')
+            exclude 'eventmesh-*'
+        }
+        copy {
+            from core.file('bin')
+            into rootProject.file('dist-connector/bin')
+        }
+        copy {
+            from core.file('conf')
+            from core.sourceSets.main.resources.srcDirs
+            into rootProject.file('dist-connector/conf')
+            duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+            exclude 'META-INF'
+        }
+        // Connector plugins (pluginType == connector) into dist-connector/plugin/connector/<name>/
+        String[] libJars = java.util.Optional.ofNullable(file('dist-connector/lib').list()).orElse(new String[0])
+        def connectorPlugins = subprojects.findAll {
+            it.file('gradle.properties').exists()
+                    && it.properties.containsKey('pluginType')
+                    && it.properties.get('pluginType') == 'connector'
+        }
+        connectorPlugins.forEach(subProject -> {
+            var pluginName = subProject.properties.get('pluginName')
+            logger.lifecycle('Install connector plugin: {}, module: {}', pluginName, subProject.name)
+            copy {
+                from subProject.jar.archivePath
+                into rootProject.file("dist-connector/plugin/connector/${pluginName}")
+            }
+            copy {
+                from subProject.configurations.runtimeClasspath
+                into rootProject.file("dist-connector/plugin/connector/${pluginName}")
+                exclude(libJars)
+            }
+        })
+        copy {
+            from 'tools/dist-license'
+            into rootProject.file('dist-connector')
+        }
+    }
+}
+
 tasks.register('tar', Tar) {
     archiveBaseName.set(project.name)
     archiveVersion.set(project.version.toString())
@@ -630,7 +638,6 @@ subprojects {
 
     repositories {
         mavenCentral()
-        maven { url "https://maven.aliyun.com/repository/public" }
     }
 
     configurations.configureEach {

docker/Dockerfile

@@ -0,0 +1,64 @@
+#
+# 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.
+#
+
+# Builder: Gradle 8.5 + JDK 21, matching the fork's local build setup. The
+# gradle wrapper (8.7) is intentionally not used: its distribution is fetched
+# from services.gradle.org, which is unreachable on this fork's network.
+# Dependencies resolve against the Maven repositories configured in settings.gradle / build.gradle.
+FROM gradle:8.5.0-jdk21 AS builder
+USER root
+WORKDIR /build
+COPY . .
+# `dist` builds every subproject jar and assembles dist/{apps,lib,conf,bin};
+# `installPlugin` lays out dist/plugin/<type>/<name>/ (storage + protocol only;
+# connectors are filtered out — they ship in the connector image). Neither runs
+# tests nor style gates (jar does not depend on check/test).
+RUN gradle clean dist --no-daemon \
+ && gradle installPlugin --no-daemon
+
+# Runtime: EventMeshApplication boots traffic HTTP + admin HTTP (+ opt-in
+# WebSocket) as one JVM. Storage/protocol plugins are discovered from ./plugin/
+# by the SPI JarExtensionClassLoader, so only conf/apps/lib need the classpath.
+# bin/start.sh assembles the classpath and maps ENV vars to -D flags.
+FROM eclipse-temurin:21-jre
+RUN apt-get update && apt-get install -y --no-install-recommends locales procps \
+ && rm -rf /var/lib/apt/lists/*
+RUN localedef -i en_US -f UTF-8 en_US.UTF-8 --quiet
+WORKDIR /data/app/eventmesh
+COPY --from=builder /build/dist ./
+RUN chmod +x bin/*.sh
+
+# 8080 = traffic HTTP (/events/* CloudEvents + legacy /eventmesh/*).
+# 8081 = independent admin port (UniAdminServer /admin/*).
+# 8082 = WebSocket push transport (opt-in via -Deventmesh.ws.port in JAVA_OPTS).
+EXPOSE 8080 8081 8082
+
+ENV DOCKER=true
+ENV EVENTMESH_HOME=/data/app/eventmesh
+ENV EVENTMESH_LOG_HOME=/data/app/eventmesh/logs
+ENV CONFPATH=/data/app/eventmesh/conf
+# Only kafka/rocketmq storage plugins ship (standalone was removed). Override
+# with -e EVENTMESH_STORAGE_TYPE=rocketmq. Storage bootstrap (namesrv) is read
+# from conf/eventmesh.properties — mount a volume over conf/ to override.
+ENV EVENTMESH_STORAGE_TYPE=kafka
+ENV EVENTMESH_HTTP_PORT=8080
+ENV EVENTMESH_ADMIN_PORT=8081
+ENV EVENTMESH_OFFSET_PATH=/data/app/eventmesh/data/offset
+# Extra -D flags: TLS keystore, ws.port, meta.type/meta.addr for clustering, …
+ENV JAVA_OPTS=""
+
+CMD ["bash", "bin/start.sh"]

docker/Dockerfile.connector

@@ -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.
+#
+
+# Connector-runtime image — a separate process that talks HTTP+CloudEvents to the
+# EventMesh runtime and runs source/sink connectors. Built from `dist-connector`
+# (connector-runtime jar + deps + every connector plugin under plugin/connector/).
+# Same builder constraints as docker/Dockerfile (system gradle 8.5 + JDK 21).
+FROM gradle:8.5.0-jdk21 AS builder
+USER root
+WORKDIR /build
+COPY . .
+RUN gradle clean dist-connector --no-daemon
+
+# Runtime: ConnectorApplication loads connectors via Class.forName, so bin/start-connector.sh
+# flattens plugin/connector/**/*.jar onto the classpath (find is required by that script).
+FROM eclipse-temurin:21-jre
+RUN apt-get update && apt-get install -y --no-install-recommends locales procps findutils \
+ && rm -rf /var/lib/apt/lists/*
+RUN localedef -i en_US -f UTF-8 en_US.UTF-8 --quiet
+WORKDIR /data/app/connector
+COPY --from=builder /build/dist-connector ./
+RUN chmod +x bin/*.sh
+
+# Connector admin port is opt-in (CONNECTOR_ADMIN_PORT=0 = off by default). Expose 8083 as the
+# conventional port for operators who enable it; the connector otherwise makes only outbound calls.
+EXPOSE 8083
+
+ENV DOCKER=true
+ENV EVENTMESH_HOME=/data/app/connector
+ENV EVENTMESH_LOG_HOME=/data/app/connector/logs
+ENV CONFPATH=/data/app/connector/conf
+ENV EVENTMESH_RUNTIME_URL=http://localhost:8080
+ENV CONNECTOR_ADMIN_PORT=0
+ENV CONNECTOR_OFFSET_MODE=remote
+ENV CONNECTOR_OFFSET_PATH=/data/app/connector/data/connector-offset
+# Connector -D flags, e.g. -Dconnector.1.class=... -Dconnector.1.mode=source -Dconnector.1.topic=t
+ENV CONNECTOR_OPTS=""
+# Extra -D flags (TLS, …)
+ENV JAVA_OPTS=""
+
+CMD ["bash", "bin/start-connector.sh"]