diff --git a/.github/workflows/auto-dependabot.yml b/.github/workflows/auto-dependabot.yml index 512a43f6ec..347bd3782c 100644 --- a/.github/workflows/auto-dependabot.yml +++ b/.github/workflows/auto-dependabot.yml @@ -39,4 +39,4 @@ jobs: run: gh pr review --approve "$PR_URL" env: PR_URL: ${{ github.event.pull_request.html_url }} - GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7c792b7d3e..d961cb20ae 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,7 +38,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: submodules: true @@ -47,10 +47,10 @@ jobs: run: make -C ./eventmesh-sdks/eventmesh-sdk-c - name: Setup Gradle - uses: gradle/actions/setup-gradle@v4 + uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e #v6.1.0 - name: Set up JDK 11 - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: 'zulu' java-version: 11 @@ -61,7 +61,7 @@ jobs: DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: 'zulu' java-version: ${{ matrix.java }} @@ -80,4 +80,4 @@ jobs: DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} - name: Upload coverage report to codecov.io - run: bash <(curl -s https://codecov.io/bash) || echo 'Failed to upload coverage report!' + run: bash <(curl -s https://codecov.io/bash) || echo 'Failed to upload coverage report!' \ No newline at end of file diff --git a/.github/workflows/code-scanning.yml b/.github/workflows/code-scanning.yml index dbda7eab6b..efc28fd485 100644 --- a/.github/workflows/code-scanning.yml +++ b/.github/workflows/code-scanning.yml @@ -40,7 +40,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Initialize CodeQL uses: github/codeql-action/init@v3 @@ -53,14 +53,14 @@ jobs: - name: Set up JDK 11 if: matrix.language == 'java' - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: 'zulu' java-version: 11 - name: Setup Gradle if: matrix.language == 'java' - uses: gradle/actions/setup-gradle@v4 + uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e #v6.1.0 with: cache-disabled: true @@ -71,4 +71,4 @@ jobs: DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} - name: Perform CodeQL analysis - uses: github/codeql-action/analyze@v3 + uses: github/codeql-action/analyze@v3 \ No newline at end of file diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 171c787369..ff8179b011 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -25,7 +25,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Login to DockerHub uses: docker/login-action@v3 diff --git a/.github/workflows/license.yml b/.github/workflows/license.yml index 9172e85414..f9c1507d96 100644 --- a/.github/workflows/license.yml +++ b/.github/workflows/license.yml @@ -26,19 +26,19 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Repository - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Check license header uses: apache/skywalking-eyes@main - name: Set up JDK 11 - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: 'zulu' java-version: 11 - name: Setup Gradle - uses: gradle/actions/setup-gradle@v4 + uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e #v6.1.0 - name: Check license compatibility - run: ./gradlew clean checkDeniedLicense + run: ./gradlew clean checkDeniedLicense \ No newline at end of file diff --git a/eventmesh-storage-plugin/eventmesh-storage-standalone/src/main/java/org/apache/eventmesh/storage/standalone/broker/StandaloneBroker.java b/eventmesh-storage-plugin/eventmesh-storage-standalone/src/main/java/org/apache/eventmesh/storage/standalone/broker/StandaloneBroker.java index 0cda576332..99cc30fff9 100644 --- a/eventmesh-storage-plugin/eventmesh-storage-standalone/src/main/java/org/apache/eventmesh/storage/standalone/broker/StandaloneBroker.java +++ b/eventmesh-storage-plugin/eventmesh-storage-standalone/src/main/java/org/apache/eventmesh/storage/standalone/broker/StandaloneBroker.java @@ -130,6 +130,7 @@ public void deleteTopicIfExist(String topicName) { Channel channel = createTopicIfAbsent(topicName); channel.shutdown(); messageContainer.remove(topicMetadata); + subscribeContainer.remove(topicMetadata); } public void subscribed(String topicName, Subscribe subscribe) { diff --git a/tools/dist-license/licenses/java/AL 2.0-downloaded-LICENSE-2.0.html b/tools/dist-license/licenses/java/AL 2.0-downloaded-LICENSE-2.0.html index 7ec517ea7f..fd2be6350e 100644 --- a/tools/dist-license/licenses/java/AL 2.0-downloaded-LICENSE-2.0.html +++ b/tools/dist-license/licenses/java/AL 2.0-downloaded-LICENSE-2.0.html @@ -4,7 +4,7 @@ - + @@ -20,18 +20,19 @@ - + -