Skip to content

Commit 815f27b

Browse files
zombee0wanpengfei-git
authored andcommitted
[Enhancement] upgrade jmockit & jcoco to support jdk11 or later (#23445)
there is conflicting with jdk11 + jmockit + jcoco0.85, and more details in jmockit/jmockit1#665 jmockit/jmockit1#615 Signed-off-by: zombee0 <[email protected]> (cherry picked from commit 2f3ed5a)
1 parent ad11817 commit 815f27b

File tree

3 files changed

+11
-8
lines changed

3 files changed

+11
-8
lines changed

fe/fe-core/pom.xml

+5-4
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ under the License.
3737
<properties>
3838
<starrocks.home>${basedir}/../../</starrocks.home>
3939
<fe_ut_parallel>${env.FE_UT_PARALLEL}</fe_ut_parallel>
40-
<jacoco.version>0.8.5</jacoco.version>
40+
<jacoco.version>0.8.7</jacoco.version>
4141
<iceberg.version>1.1.0</iceberg.version>
4242
<awsv2.version>2.17.257</awsv2.version>
4343
<python>python</python>
@@ -179,8 +179,9 @@ under the License.
179179
</dependency>
180180

181181
<!-- https://mvnrepository.com/artifact/org.jmockit/jmockit -->
182+
<!-- https://mvnrepository.com/artifact/com.github.hazendaz.jmockit/jmockit -->
182183
<dependency>
183-
<groupId>org.jmockit</groupId>
184+
<groupId>com.github.hazendaz.jmockit</groupId>
184185
<artifactId>jmockit</artifactId>
185186
<scope>test</scope>
186187
</dependency>
@@ -779,7 +780,7 @@ under the License.
779780
<plugin>
780781
<groupId>org.jacoco</groupId>
781782
<artifactId>jacoco-maven-plugin</artifactId>
782-
<version>0.8.5</version>
783+
<version>0.8.7</version>
783784
<executions>
784785
<execution>
785786
<id>default-prepare-agent</id>
@@ -879,7 +880,7 @@ under the License.
879880
<!-->not reuse forked jvm, so that each unit test will run in separate jvm. to avoid singleton confict<-->
880881
<reuseForks>false</reuseForks>
881882
<argLine>
882-
-javaagent:${settings.localRepository}/org/jmockit/jmockit/1.48/jmockit-1.48.jar -Xmx2048m
883+
-javaagent:${settings.localRepository}/com/github/hazendaz/jmockit/jmockit/1.49.4/jmockit-1.49.4.jar -Xmx2048m
883884
-Duser.timezone=Asia/Shanghai @{jacocoArgLine}
884885
</argLine>
885886
<!-- Set maven to use independent class loading to avoid unit test failure due to the early shutdown of the JVM -->

fe/pom.xml

+3-2
Original file line numberDiff line numberDiff line change
@@ -296,10 +296,11 @@ under the License.
296296
</dependency>
297297

298298
<!-- https://mvnrepository.com/artifact/org.jmockit/jmockit -->
299+
<!-- https://mvnrepository.com/artifact/com.github.hazendaz.jmockit/jmockit -->
299300
<dependency>
300-
<groupId>org.jmockit</groupId>
301+
<groupId>com.github.hazendaz.jmockit</groupId>
301302
<artifactId>jmockit</artifactId>
302-
<version>1.48</version>
303+
<version>1.49.4</version>
303304
<scope>test</scope>
304305
</dependency>
305306

fe/spark-dpp/pom.xml

+3-2
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,9 @@ under the License.
6666
</dependency>
6767

6868
<!-- https://mvnrepository.com/artifact/org.jmockit/jmockit -->
69+
<!-- https://mvnrepository.com/artifact/com.github.hazendaz.jmockit/jmockit -->
6970
<dependency>
70-
<groupId>org.jmockit</groupId>
71+
<groupId>com.github.hazendaz.jmockit</groupId>
7172
<artifactId>jmockit</artifactId>
7273
<scope>test</scope>
7374
</dependency>
@@ -172,7 +173,7 @@ under the License.
172173
<!-->not reuse forked jvm, so that each unit test will run in separate jvm. to avoid singleton confict<-->
173174
<reuseForks>false</reuseForks>
174175
<argLine>
175-
-javaagent:${settings.localRepository}/org/jmockit/jmockit/1.48/jmockit-1.48.jar
176+
-javaagent:${settings.localRepository}/com/github/hazendaz/jmockit/jmockit/1.49.4/jmockit-1.49.4.jar
176177
</argLine>
177178
</configuration>
178179
</plugin>

0 commit comments

Comments
 (0)