File tree Expand file tree Collapse file tree 6 files changed +14
-75
lines changed
polaris-plugins/polaris-plugins-healthchecker/healthchecker-http/src/test/java/com/tencent/polaris/plugins/outlier/detector/http Expand file tree Collapse file tree 6 files changed +14
-75
lines changed Load Diff This file was deleted.
Original file line number Diff line number Diff line change 88 release :
99 runs-on : ubuntu-latest
1010 steps :
11- - uses : actions/checkout@v3
11+ - uses : actions/checkout@v4
1212 - name : Set up Maven Central Repository
13- uses : actions/setup-java@v3
13+ uses : actions/setup-java@v4
1414 with :
1515 java-version : ' 8'
1616 distribution : ' temurin'
Original file line number Diff line number Diff line change 1414 IS_SNAPSHOT : ${{ steps.set_output_1.outputs.IS_SNAPSHOT }}
1515 steps :
1616 - name : Checkout codes
17- uses : actions/checkout@v3
17+ uses : actions/checkout@v4
1818 - name : Check deploy type
1919 id : set_output_1
2020 run : |
3030 needs : check-snapshot
3131 if : ${{ needs.check-snapshot.outputs.IS_SNAPSHOT == 'true' }}
3232 steps :
33- - uses : actions/checkout@v3
33+ - uses : actions/checkout@v4
3434 - name : Set up Maven Central Repository
35- uses : actions/setup-java@v3
35+ uses : actions/setup-java@v4
3636 with :
3737 java-version : ' 8'
3838 distribution : ' temurin'
Original file line number Diff line number Diff line change @@ -16,19 +16,19 @@ jobs:
1616 build :
1717 strategy :
1818 matrix :
19- java : [ 8, 11, 17 ]
19+ java : [ 8, 11, 17, 21 ]
2020 os : [ 'windows-latest', 'ubuntu-latest' ]
2121 runs-on : ${{ matrix.os }}
2222 steps :
2323 - name : Checkout codes
24- uses : actions/checkout@v3
24+ uses : actions/checkout@v4
2525 - name : Set up JDK ${{ matrix.java }}
26- uses : actions/setup-java@v3
26+ uses : actions/setup-java@v4
2727 with :
2828 distribution : ' temurin'
2929 java-version : ${{ matrix.java }}
3030 - name : Cache local Maven repository
31- uses : actions/cache@v3
31+ uses : actions/cache@v4
3232 with :
3333 path : ~/.m2/repository
3434 key : ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
3737 - name : Test with Maven
3838 run : mvn clean test -B -U -Psonatype --file pom.xml
3939 - name : Upload coverage reports to Codecov
40- uses : codecov/codecov-action@v3
40+ uses : codecov/codecov-action@v4
Original file line number Diff line number Diff line change 4545import java .net .InetAddress ;
4646import java .net .InetSocketAddress ;
4747import java .util .Collection ;
48- import java .util .HashMap ;
49- import java .util .List ;
5048import java .util .Map ;
5149import java .util .Objects ;
5250import java .util .UUID ;
5351import java .util .concurrent .ConcurrentHashMap ;
54- import java .util .concurrent .CountDownLatch ;
5552import java .util .concurrent .TimeUnit ;
56- import java .util .concurrent .atomic .AtomicReference ;
57- import java .util .function .BiConsumer ;
5853import java .util .function .Consumer ;
5954
6055import static com .tencent .polaris .test .common .TestUtils .SERVER_ADDRESS_ENV ;
@@ -263,7 +258,9 @@ public void handle(HttpExchange exchange) throws IOException {
263258
264259 @ Override
265260 public void close () throws IOException {
266- this .thread .stop ();
261+ if (this .thread != null && this .thread .isAlive ()) {
262+ this .thread .interrupt ();
263+ }
267264 }
268265 }
269266}
Original file line number Diff line number Diff line change 6666
6767 <properties >
6868 <!-- Project revision -->
69- <revision >2.0.1.0-RC1 </revision >
69+ <revision >2.0.1.0-SNAPSHOT </revision >
7070
7171 <timestamp >${maven.build.timestamp}</timestamp >
7272 <skip .maven.deploy>false</skip .maven.deploy>
105105 <maven .gpg.plugin.version>3.0.1</maven .gpg.plugin.version>
106106 <maven .shaded.plugin.version>3.2.4</maven .shaded.plugin.version>
107107 <maven .deploy.plugin.version>3.0.0-M1</maven .deploy.plugin.version>
108- <maven .failsafe.plugin.version>3.0.0-M5</maven .failsafe.plugin.version>
109108 <maven .flatten.plugin.version>1.2.5</maven .flatten.plugin.version>
110109 <maven .clean.plugin.version>3.1.0</maven .clean.plugin.version>
111110 <okhttp .version>2.7.5</okhttp .version>
197196 </excludes >
198197 </configuration >
199198 </plugin >
200- <plugin >
201- <groupId >org.apache.maven.plugins</groupId >
202- <artifactId >maven-failsafe-plugin</artifactId >
203- <version >${maven.failsafe.plugin.version} </version >
204- <executions >
205- <execution >
206- <goals >
207- <goal >integration-test</goal >
208- <goal >verify</goal >
209- </goals >
210- </execution >
211- </executions >
212- </plugin >
213199 <plugin >
214200 <groupId >org.apache.maven.plugins</groupId >
215201 <artifactId >maven-source-plugin</artifactId >
You can’t perform that action at this time.
0 commit comments