Skip to content

Commit 1e66c64

Browse files
authored
Fix ci check error (#5251)
* [ISSUE #5185] Enhancement for http server and tcp server * update StandaloneBroker & dependencies licenses * upgrade ci version * upgrade ci setup-gradle version
1 parent c3d6548 commit 1e66c64

12 files changed

Lines changed: 901 additions & 509 deletions

.github/workflows/auto-dependabot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,4 @@ jobs:
3939
run: gh pr review --approve "$PR_URL"
4040
env:
4141
PR_URL: ${{ github.event.pull_request.html_url }}
42-
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
42+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838

3939
steps:
4040
- name: Checkout repository
41-
uses: actions/checkout@v4
41+
uses: actions/checkout@v6
4242
with:
4343
submodules: true
4444

@@ -47,10 +47,10 @@ jobs:
4747
run: make -C ./eventmesh-sdks/eventmesh-sdk-c
4848

4949
- name: Setup Gradle
50-
uses: gradle/actions/setup-gradle@v4
50+
uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e #v6.1.0
5151

5252
- name: Set up JDK 11
53-
uses: actions/setup-java@v4
53+
uses: actions/setup-java@v5
5454
with:
5555
distribution: 'zulu'
5656
java-version: 11
@@ -61,7 +61,7 @@ jobs:
6161
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
6262

6363
- name: Set up JDK ${{ matrix.java }}
64-
uses: actions/setup-java@v4
64+
uses: actions/setup-java@v5
6565
with:
6666
distribution: 'zulu'
6767
java-version: ${{ matrix.java }}
@@ -80,4 +80,4 @@ jobs:
8080
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
8181

8282
- name: Upload coverage report to codecov.io
83-
run: bash <(curl -s https://codecov.io/bash) || echo 'Failed to upload coverage report!'
83+
run: bash <(curl -s https://codecov.io/bash) || echo 'Failed to upload coverage report!'

.github/workflows/code-scanning.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040

4141
steps:
4242
- name: Checkout repository
43-
uses: actions/checkout@v4
43+
uses: actions/checkout@v6
4444

4545
- name: Initialize CodeQL
4646
uses: github/codeql-action/init@v3
@@ -53,14 +53,14 @@ jobs:
5353

5454
- name: Set up JDK 11
5555
if: matrix.language == 'java'
56-
uses: actions/setup-java@v4
56+
uses: actions/setup-java@v5
5757
with:
5858
distribution: 'zulu'
5959
java-version: 11
6060

6161
- name: Setup Gradle
6262
if: matrix.language == 'java'
63-
uses: gradle/actions/setup-gradle@v4
63+
uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e #v6.1.0
6464
with:
6565
cache-disabled: true
6666

@@ -71,4 +71,4 @@ jobs:
7171
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
7272

7373
- name: Perform CodeQL analysis
74-
uses: github/codeql-action/analyze@v3
74+
uses: github/codeql-action/analyze@v3

.github/workflows/docker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
runs-on: ubuntu-latest
2626
steps:
2727
- name: Checkout repository
28-
uses: actions/checkout@v4
28+
uses: actions/checkout@v6
2929

3030
- name: Login to DockerHub
3131
uses: docker/login-action@v3

.github/workflows/license.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,19 @@ jobs:
2626
runs-on: ubuntu-latest
2727
steps:
2828
- name: Checkout Repository
29-
uses: actions/checkout@v4
29+
uses: actions/checkout@v6
3030

3131
- name: Check license header
3232
uses: apache/skywalking-eyes@main
3333

3434
- name: Set up JDK 11
35-
uses: actions/setup-java@v4
35+
uses: actions/setup-java@v5
3636
with:
3737
distribution: 'zulu'
3838
java-version: 11
3939

4040
- name: Setup Gradle
41-
uses: gradle/actions/setup-gradle@v4
41+
uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e #v6.1.0
4242

4343
- name: Check license compatibility
44-
run: ./gradlew clean checkDeniedLicense
44+
run: ./gradlew clean checkDeniedLicense

eventmesh-storage-plugin/eventmesh-storage-standalone/src/main/java/org/apache/eventmesh/storage/standalone/broker/StandaloneBroker.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ public void deleteTopicIfExist(String topicName) {
130130
Channel channel = createTopicIfAbsent(topicName);
131131
channel.shutdown();
132132
messageContainer.remove(topicMetadata);
133+
subscribeContainer.remove(topicMetadata);
133134
}
134135

135136
public void subscribed(String topicName, Subscribe subscribe) {

tools/dist-license/licenses/java/AL 2.0-downloaded-LICENSE-2.0.html

Lines changed: 264 additions & 231 deletions
Large diffs are not rendered by default.
Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
2+
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
3+
<html xmlns="http://www.w3.org/1999/xhtml">
4+
<head>
5+
<!-- CookiePro Cookies Consent Notice start for bouncycastle.org -->
6+
<script type="text/javascript" src="https://cookie-cdn.cookiepro.com/consent/11a057b9-eefc-4308-b690-0168134844d8/OtAutoBlock.js" ></script>
7+
<script src="https://cookie-cdn.cookiepro.com/scripttemplates/otSDKStub.js" type="text/javascript" charset="UTF-8" data-domain-script="11a057b9-eefc-4308-b690-0168134844d8" ></script>
8+
<script type="text/javascript">
9+
function OptanonWrapper() { }
10+
</script>
11+
<!-- CookiePro Cookies Consent Notice end for bouncycastle.org -->
12+
<!-- Google Tag Manager -->
13+
<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
14+
new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
15+
j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
16+
'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
17+
})(window,document,'script','dataLayer','GTM-KJTS5J6');</script>
18+
<!-- End Google Tag Manager -->
19+
<title>bouncycastle.org</title>
20+
<meta http-equiv="Content-type" content="text/html; charset=iso-8859-1" />
21+
<meta http-equiv="Content-Language" content="en-aus" />
22+
<meta name="description" content="Home of the Legion of the Bouncy Castle and their Java cryptography resources and open source code" />
23+
<meta name="keywords" content="Legion of the Bouncy Castle, Cryptography, JCE, Java Cryptography Extension, Cryptography Source Code, ASN.1, X.509, Open Source" />
24+
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
25+
<link rel="stylesheet" type="text/css" href="bouncycastle.css" />
26+
</head>
27+
<body>
28+
<!-- Google Tag Manager (noscript) -->
29+
<noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-KJTS5J6"
30+
height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
31+
<!-- End Google Tag Manager (noscript) -->
32+
33+
34+
<div id="header">
35+
<div id="title">
36+
<h1>The Legion of the Bouncy Castle</h1>
37+
</div>
38+
</div>
39+
40+
41+
<div id="container">
42+
43+
<div id="content">
44+
45+
<div id="navigation">
46+
<ul>
47+
<li><a href="/" class="nav">Main Site</a></li>
48+
</ul>
49+
<div class="clearing">&nbsp;</div>
50+
</div>
51+
52+
53+
<div id="body">
54+
<script>
55+
window._6si = window._6si || [];
56+
window._6si.push(['enableEventTracking', true]);
57+
window._6si.push(['setToken', '282d572333172d4991a19a8a92e95c49']);
58+
window._6si.push(['setEndpoint', 'b.6sc.co']);
59+
60+
(function() {
61+
var gd = document.createElement('script');
62+
63+
gd.type = 'text/javascript';
64+
gd.async = true;
65+
gd.src = '//j.6sc.co/6si.min.js';
66+
var s = document.getElementsByTagName('script')[0];
67+
s.parentNode.insertBefore(gd, s);
68+
})();
69+
</script>
70+
<p>Please note the Bouncy Caste License should be read in the same way as the <a href="http://opensource.org/licenses/MIT">MIT license</a>.</p>
71+
<p>Please also note this licensing model is made possible through funding from <a href="https://www.bouncycastle.org/donate">donations</a> and the sale of <a href="https://www.keyfactor.com/open-source/bouncy-castle-support/?utm_medium=website&utm_source=bouncycastle">support contracts</a>.</p>
72+
<h2 class="spot">Bouncy Castle License</h2>
73+
<p>Copyright (c) 2000 - 2024 The Legion of the Bouncy Castle Inc. (https://www.bouncycastle.org)
74+
<p>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
75+
<p>The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
76+
<p>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
77+
78+
<h2 class="spot">Third party licenses</h2>
79+
80+
<p>The OpenPGP library and the MLS library both make use of additional open source code:
81+
<ul>
82+
<li>openpgp - includes modified BZIP2 library which is licensed under the <a href="http://www.apache.org/licenses/">Apache Software License, Version 2.0<a>.</li>
83+
<li>MLS - The MLS Client makes use of io.grpc licensed under <a href="http://www.apache.org/licenses/">Apache Software License, Version 2.0</a>, and com.google.protobuf which is licensed under the <a href="https://opensource.org/license/bsd-3-clause/">3-Clause BSD License</a>.</li>
84+
</ul>
85+
</p>
86+
</div>
87+
<div class="clearing">&nbsp;</div>
88+
89+
</div>
90+
</div>
91+
<div class="clearing">&nbsp;</div>
92+
93+
94+
<div id="footer">
95+
<ul>
96+
<li>Site hosted by <a href="https://www.tauceti.org.au/">Tau Ceti Co-operative Ltd</a>.</li>
97+
<li>Graphics provided by <a href="https://www.geoffhook.com/">Geoff Hook</a>.</li>
98+
</ul>
99+
</div>
100+
101+
</body>
102+
</html>

0 commit comments

Comments
 (0)