Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Enhancement] upgrade jmockit & jcoco to support jdk11 or later #23445

Merged
merged 1 commit into from
May 16, 2023
+11 −8
Merged

[Enhancement] upgrade jmockit & jcoco to support jdk11 or later #23445

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions fe/fe-core/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -37,7 +37,7 @@ under the License.
<properties>
<starrocks.home>${basedir}/../../</starrocks.home>
<fe_ut_parallel>${env.FE_UT_PARALLEL}</fe_ut_parallel>
<jacoco.version>0.8.5</jacoco.version>
<jacoco.version>0.8.7</jacoco.version>
<iceberg.version>1.1.0</iceberg.version>
<awsv2.version>2.17.257</awsv2.version>
<python>python</python>
@@ -179,8 +179,9 @@ under the License.
</dependency>

<!-- https://mvnrepository.com/artifact/org.jmockit/jmockit -->
<!-- https://mvnrepository.com/artifact/com.github.hazendaz.jmockit/jmockit -->
<dependency>
<groupId>org.jmockit</groupId>
<groupId>com.github.hazendaz.jmockit</groupId>
<artifactId>jmockit</artifactId>
<scope>test</scope>
</dependency>
@@ -783,7 +784,7 @@ under the License.
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.5</version>
<version>0.8.7</version>
<executions>
<execution>
<id>default-prepare-agent</id>
@@ -883,7 +884,7 @@ under the License.
<!-->not reuse forked jvm, so that each unit test will run in separate jvm. to avoid singleton confict<-->
<reuseForks>false</reuseForks>
<argLine>
-javaagent:${settings.localRepository}/org/jmockit/jmockit/1.48/jmockit-1.48.jar -Xmx2048m
-javaagent:${settings.localRepository}/com/github/hazendaz/jmockit/jmockit/1.49.4/jmockit-1.49.4.jar -Xmx2048m
-Duser.timezone=Asia/Shanghai @{jacocoArgLine}
</argLine>
<!-- Set maven to use independent class loading to avoid unit test failure due to the early shutdown of the JVM -->
5 changes: 3 additions & 2 deletions fe/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -296,10 +296,11 @@ under the License.
</dependency>

<!-- https://mvnrepository.com/artifact/org.jmockit/jmockit -->
<!-- https://mvnrepository.com/artifact/com.github.hazendaz.jmockit/jmockit -->
<dependency>
<groupId>org.jmockit</groupId>
<groupId>com.github.hazendaz.jmockit</groupId>
<artifactId>jmockit</artifactId>
<version>1.48</version>
<version>1.49.4</version>
<scope>test</scope>
</dependency>

5 changes: 3 additions & 2 deletions fe/spark-dpp/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -66,8 +66,9 @@ under the License.
</dependency>

<!-- https://mvnrepository.com/artifact/org.jmockit/jmockit -->
<!-- https://mvnrepository.com/artifact/com.github.hazendaz.jmockit/jmockit -->
<dependency>
<groupId>org.jmockit</groupId>
<groupId>com.github.hazendaz.jmockit</groupId>
<artifactId>jmockit</artifactId>
<scope>test</scope>
</dependency>
@@ -178,7 +179,7 @@ under the License.
<!-->not reuse forked jvm, so that each unit test will run in separate jvm. to avoid singleton confict<-->
<reuseForks>false</reuseForks>
<argLine>
-javaagent:${settings.localRepository}/org/jmockit/jmockit/1.48/jmockit-1.48.jar
-javaagent:${settings.localRepository}/com/github/hazendaz/jmockit/jmockit/1.49.4/jmockit-1.49.4.jar
</argLine>
</configuration>
</plugin>