Bump io.etcd:jetcd-core from 0.3.0 to 0.8.4

.github/dependabot.yml

@@ -21,18 +21,23 @@ updates:
     directory: "/"
     open-pull-requests-limit: 15
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     ignore:
       - dependency-name: "*"
-        update-types: [ "version-update:semver-major" ]
+        update-types: [ "version-update:semver-major", "version-update:semver-patch" ]
+      - dependency-name: "software.amazon.awssdk:s3"
+        update-types: [ "version-update:semver-patch" ]
+      - dependency-name: "com.aliyun:dingtalk"
+        update-types: [ "version-update:semver-patch" ]
   - package-ecosystem: "gomod"
     directory: "eventmesh-sdks/eventmesh-sdk-go"
+    # Disabled temporarily since the Go SDK is not integrated with CI
+    open-pull-requests-limit: 0
     schedule:
       interval: "monthly"
     ignore:
       - dependency-name: "*"
-        # Disabled temporarily since the Go SDK is not integrated with CI
-        update-types: [ "version-update:semver-major", "version-update:semver-minor", "version-update:semver-patch" ]
+        update-types: [ "version-update:semver-major", "version-update:semver-patch" ]
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:

.github/workflows/auto-dependabot.yml

@@ -27,7 +27,7 @@ jobs:
   # Pull request Auto merge is not enabled for this repository
   dependabot:
     runs-on: ubuntu-latest
-    if: github.actor == 'dependabot[bot]'
+    if: github.event.pull_request.user.login == 'dependabot[bot]'
     steps:
       - name: Dependabot metadata
         id: metadata

.github/workflows/ci.yml

@@ -39,16 +39,15 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
+        with:
+          submodules: true
 
-      - if: matrix.language == 'cpp' || matrix.language == 'csharp'
-        name: Build C
-        run: |
-          git submodule init
-          git submodule update
-          make -C ./eventmesh-sdks/eventmesh-sdk-c  
+      - name: Build C SDK
+        if: matrix.language == 'cpp'
+        run: make -C ./eventmesh-sdks/eventmesh-sdk-c
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v4
 
       - name: Set up JDK 11
         uses: actions/setup-java@v4
@@ -59,7 +58,7 @@ jobs:
       - name: GenerateGrammarSource
         run: ./gradlew clean generateGrammarSource --parallel --daemon --scan
         env:
-          GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
+          DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
 
       - name: Set up JDK ${{ matrix.java }}
         uses: actions/setup-java@v4
@@ -69,14 +68,16 @@ jobs:
 
       # https://docs.gradle.org/current/userguide/performance.html
       - name: Build
-        run: ./gradlew clean build dist jacocoTestReport -x spotlessJava -x generateGrammarSource --parallel --daemon --scan
+        run: >
+          ./gradlew clean build dist jacocoTestReport --parallel --daemon --scan
+          -x spotlessJava -x generateGrammarSource -x generateDistLicense -x checkDeniedLicense
         env:
-          GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
+          DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
 
       - name: Install plugin
         run: ./gradlew installPlugin --scan
         env:
-          GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
+          DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
 
       - name: Upload coverage report to codecov.io
         run: bash <(curl -s https://codecov.io/bash) || echo 'Failed to upload coverage report!'

.github/workflows/code-scanning.yml

@@ -60,15 +60,15 @@ jobs:
 
       - name: Setup Gradle
         if: matrix.language == 'java'
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v4
         with:
           cache-disabled: true
 
       - name: Build
         if: matrix.language == 'java'
         run: ./gradlew clean assemble compileTestJava --parallel --daemon --scan
         env:
-          GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
+          DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
 
       - name: Perform CodeQL analysis
         uses: github/codeql-action/analyze@v3

.github/workflows/docker.yml

@@ -41,10 +41,10 @@ jobs:
             apache/eventmesh
 
       - name: Build and push
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           file: ./docker/Dockerfile_jdk8
-          context: ./
+          context: ./

.github/workflows/license.yml

@@ -38,7 +38,7 @@ jobs:
           java-version: 11
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v4
 
       - name: Check license compatibility
         run: ./gradlew clean checkDeniedLicense

.github/workflows/stale.yml

@@ -42,7 +42,7 @@ jobs:
             It has been 60 days since the last activity on this pull request. I am reaching out here to gently remind you that the Apache EventMesh community values every pull request, and please feel free to get in touch with the reviewers at any time. They are available to assist you in advancing the progress of your pull request and offering the latest feedback.
 
             If you encounter any challenges during development, seeking support within the community is encouraged. We sincerely appreciate your contributions to Apache EventMesh.
-          exempt-issue-labels: 'pinned,discussion,help wanted,WIP,weopen-star,GLCC,summer of code'
+          exempt-issue-labels: 'pinned,discussion,help wanted,WIP,weopen-star,GLCC,GSoC'
           exempt-pr-labels: 'help wanted,dependencies'
           exempt-all-milestones: true # Exempt all issues/PRs with milestones from stale
           operations-per-run: 300

build.gradle

@@ -42,17 +42,17 @@ buildscript {
 
     dependencies {
         classpath "com.github.spotbugs.snom:spotbugs-gradle-plugin:5.2.5"
-        classpath "io.spring.gradle:dependency-management-plugin:1.0.11.RELEASE"
+        classpath "io.spring.gradle:dependency-management-plugin:1.1.6"
         classpath "com.diffplug.spotless:spotless-plugin-gradle:6.13.0"
 
         classpath "org.apache.httpcomponents:httpclient:4.5.14"
-        classpath "commons-io:commons-io:2.11.0"
+        classpath "commons-io:commons-io:2.17.0"
     }
 }
 
 plugins {
     id 'org.cyclonedx.bom' version '1.8.2'
-    id 'com.github.jk1.dependency-license-report' version '2.7'
+    id 'com.github.jk1.dependency-license-report' version '2.9'
 }
 
 allprojects {
@@ -95,10 +95,12 @@ allprojects {
 
     checkstyleMain.exclude('**/org/apache/eventmesh/client/grpc/protos**')
             .exclude('**/org/apache/eventmesh/common/protocol/grpc/cloudevents**')
-            .exclude('**/org/apache/eventmesh/common/protocol/grpc/protos/**')
+            .exclude('**/org/apache/eventmesh/common/protocol/grpc/proto**')
+            .exclude('**/org/apache/eventmesh/common/protocol/grpc/adminserver/**')
             .exclude('**/org/apache/eventmesh/connector/openfunction/client/EventMeshGrpcService**')
             .exclude('**/org/apache/eventmesh/connector/openfunction/client/CallbackServiceGrpc**')
             .exclude('**/org/apache/eventmesh/connector/jdbc/antlr**')
+            .exclude('**/org/apache/eventmesh/meta/raft/rpc/**')
 
     dependencies {
         repositories {
@@ -107,7 +109,7 @@ allprojects {
                 url "https://maven.aliyun.com/repository/public"
             }
         }
-        testImplementation "org.junit.jupiter:junit-jupiter:5.6.0"
+        testImplementation "org.junit.jupiter:junit-jupiter:5.11.0"
     }
 
     spotless {
@@ -161,9 +163,13 @@ tasks.register('dist') {
             ["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",
@@ -204,6 +210,48 @@ 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()
@@ -402,10 +450,11 @@ tasks.register('checkDeniedLicense') {
                 "GPL-1.0", "GPL-2.0", "GPL-3.0", "AGPL-3.0", "LGPL-2.0", "LGPL-2.1", "LGPL-3.0",
                 "GPL-1.0-only", "GPL-2.0-only", "GPL-3.0-only", "AGPL-3.0-only", "LGPL-2.0-only", "LGPL-2.1-only", "LGPL-3.0-only",
                 "QPL-1.0", "Sleepycat", "SSPL-1.0", "CPOL-1.02",
-                "BSD-4-Clause", "BSD-4-Clause-UC", "NPL-1.0", "NPL-1.1", "JSON"
+                "BSD-4-Clause", "BSD-4-Clause-UC", "NPL-1.0", "NPL-1.1", "JSON",
+                "The GNU General Public License, v2 with Universal FOSS Exception, v1.0"
         ]
         // Update exemptions according to https://github.com/apache/eventmesh/issues/4842
-        def allowedArtifacts = ["amqp-client", "stax-api", "javassist", "ST4", "xsdlib"]
+        def allowedArtifacts = ["amqp-client", "stax-api", "javassist", "ST4", "xsdlib", "jsqlparser"]
 
         def licenseFile = file('tools/dist-license/LICENSE')
         def lines = licenseFile.readLines()
@@ -648,33 +697,30 @@ subprojects {
         sign publishing.publications.mavenJava
     }
 
-    def grpcVersion = '1.64.0'
-    def log4jVersion = '2.23.1'
-    def jacksonVersion = '2.17.1'
-    def dropwizardMetricsVersion = '4.2.25'
+    def grpcVersion = '1.68.0'
+    def log4jVersion = '2.24.1'
+    def jacksonVersion = '2.18.0'
+    def dropwizardMetricsVersion = '4.2.26'
     def opentelemetryVersion = '1.36.0'
-    def cloudeventsVersion = '2.5.0'
-    def curatorVersion = '5.6.0'
-    def mockitoVersion = '3.12.4'
+    def cloudeventsVersion = '3.0.0'
+    def curatorVersion = '5.7.0'
+    def mockitoVersion = '4.11.0'
 
     dependencyManagement {
         dependencies {
-            dependency "org.apache.commons:commons-lang3:3.6"
+            dependency "org.apache.commons:commons-lang3:3.17.0"
             dependency "org.apache.commons:commons-collections4:4.4"
-            dependency "org.apache.commons:commons-text:1.9"
-
-            dependency "commons-io:commons-io:2.11.0"
-
-            dependency "commons-validator:commons-validator:1.7"
-
-            dependency "com.google.guava:guava:31.1-jre"
+            dependency "org.apache.commons:commons-text:1.12.0"
+            dependency "commons-io:commons-io:2.17.0"
+            dependency "commons-validator:commons-validator:1.9.0"
+            dependency "com.google.guava:guava:33.3.0-jre"
 
             dependency "org.slf4j:slf4j-api:2.0.13"
             dependency "org.apache.logging.log4j:log4j-api:${log4jVersion}"
             dependency "org.apache.logging.log4j:log4j-core:${log4jVersion}"
             dependency "org.apache.logging.log4j:log4j-slf4j2-impl:${log4jVersion}"
 
-            dependency "com.lmax:disruptor:3.4.2"
+            dependency "com.lmax:disruptor:3.4.4"
 
             dependency "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}"
             dependency "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}"
@@ -684,10 +730,10 @@ subprojects {
 
             dependency "com.squareup.okhttp3:okhttp:3.14.9"
 
-            dependency "org.asynchttpclient:async-http-client:2.12.0"
+            dependency "org.asynchttpclient:async-http-client:2.12.3"
             dependency "org.apache.httpcomponents:httpclient:4.5.14"
 
-            dependency "io.netty:netty-all:4.1.79.Final"
+            dependency "io.netty:netty-all:4.1.112.Final"
 
             dependency "io.dropwizard.metrics:metrics-core:${dropwizardMetricsVersion}"
             dependency "io.dropwizard.metrics:metrics-healthchecks:${dropwizardMetricsVersion}"
@@ -704,16 +750,16 @@ subprojects {
 
             dependency "io.openmessaging:openmessaging-api:2.2.1-pubsub"
 
-            dependency "com.h3xstream.findsecbugs:findsecbugs-plugin:1.11.0"
-            dependency "com.mebigfatguy.fb-contrib:fb-contrib:7.6.0"
+            dependency "com.h3xstream.findsecbugs:findsecbugs-plugin:1.13.0"
+            dependency "com.mebigfatguy.fb-contrib:fb-contrib:7.6.4"
             dependency "com.jayway.jsonpath:json-path:2.9.0"
 
             dependency "org.springframework.boot:spring-boot-starter-web:2.7.18"
             dependency "io.openmessaging:registry-server:0.0.1"
 
-            dependency "org.junit.jupiter:junit-jupiter:5.6.0"
+            dependency "org.junit.jupiter:junit-jupiter:5.11.0"
             dependency "org.junit-pioneer:junit-pioneer:1.9.1"
-            dependency "org.assertj:assertj-core:2.6.0"
+            dependency "org.assertj:assertj-core:3.26.3"
 
             dependency "org.mockito:mockito-core:${mockitoVersion}"
             dependency "org.mockito:mockito-inline:${mockitoVersion}"
@@ -731,26 +777,31 @@ subprojects {
 
             dependency "javax.annotation:javax.annotation-api:1.3.2"
 
-            dependency "com.github.seancfoley:ipaddress:5.3.3"
+            dependency "com.github.seancfoley:ipaddress:5.5.0"
             dependency "com.google.code.gson:gson:2.11.0"
 
             dependency "org.javassist:javassist:3.30.2-GA"
 
-            dependency "com.alibaba.nacos:nacos-client:2.3.2"
+            dependency "com.alibaba.nacos:nacos-client:2.4.1"
 
             dependency 'org.apache.zookeeper:zookeeper:3.9.2'
             dependency "org.apache.curator:curator-client:${curatorVersion}"
             dependency "org.apache.curator:curator-framework:${curatorVersion}"
             dependency "org.apache.curator:curator-recipes:${curatorVersion}"
             dependency "org.apache.curator:curator-test:${curatorVersion}"
 
-            dependency "org.projectlombok:lombok:1.18.32"
-            dependency "com.github.seancfoley:ipaddress:5.3.3"
+            dependency "org.projectlombok:lombok:1.18.34"
             dependency "javax.annotation:javax.annotation-api:1.3.2"
-            dependency "com.alibaba.fastjson2:fastjson2:2.0.48"
+            dependency "com.alibaba.fastjson2:fastjson2:2.0.52"
 
-            dependency "software.amazon.awssdk:s3:2.25.55"
+            dependency "software.amazon.awssdk:s3:2.29.5"
             dependency "com.github.rholder:guava-retrying:2.0.0"
+
+            dependency "com.alibaba:druid-spring-boot-starter:1.2.23"
+            dependency "com.baomidou:mybatis-plus-boot-starter:3.5.7"
+            dependency "com.mysql:mysql-connector-j:8.4.0"
+            dependency "org.springframework.boot:spring-boot-starter-jetty:2.7.18"
+            dependency "org.locationtech.jts:jts-core:1.20.0"
         }
     }
 }