This is an automated email from the ASF dual-hosted git repository. chesnay pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/master by this push: new c41f169 [FLINK-27024][build] Cleanup surefire configuration c41f169 is described below commit c41f169765646bf9dd1ac8264127e1fc9e399898 Author: Chesnay Schepler <ches...@apache.org> AuthorDate: Fri Apr 1 12:28:21 2022 +0200 [FLINK-27024][build] Cleanup surefire configuration --- flink-connectors/flink-connector-cassandra/pom.xml | 1 - flink-connectors/flink-connector-kafka/pom.xml | 1 - flink-connectors/flink-connector-pulsar/pom.xml | 3 --- flink-python/pom.xml | 8 +++++--- pom.xml | 9 +++++++-- 5 files changed, 12 insertions(+), 10 deletions(-) diff --git a/flink-connectors/flink-connector-cassandra/pom.xml b/flink-connectors/flink-connector-cassandra/pom.xml index d9abb66..e03ba74 100644 --- a/flink-connectors/flink-connector-cassandra/pom.xml +++ b/flink-connectors/flink-connector-cassandra/pom.xml @@ -50,7 +50,6 @@ under the License. <configuration> <reuseForks>true</reuseForks> <forkCount>1</forkCount> - <argLine>-Xms256m -Xmx2800m -Dmvn.forkNumber=${surefire.forkNumber} -XX:-UseGCOverheadLimit -Duser.country=US -Duser.language=en</argLine> </configuration> </plugin> <plugin> diff --git a/flink-connectors/flink-connector-kafka/pom.xml b/flink-connectors/flink-connector-kafka/pom.xml index ce8fd7b..8a78cf6 100644 --- a/flink-connectors/flink-connector-kafka/pom.xml +++ b/flink-connectors/flink-connector-kafka/pom.xml @@ -285,7 +285,6 @@ under the License. <configuration> <!-- Enforce single fork execution due to heavy mini cluster use in the tests --> <forkCount>1</forkCount> - <argLine>-Xms256m -Xmx2048m -Dmvn.forkNumber=${surefire.forkNumber} -XX:-UseGCOverheadLimit -Duser.country=US -Duser.language=en</argLine> </configuration> </plugin> </plugins> diff --git a/flink-connectors/flink-connector-pulsar/pom.xml b/flink-connectors/flink-connector-pulsar/pom.xml index 2677cd3..0f1cc0e 100644 --- a/flink-connectors/flink-connector-pulsar/pom.xml +++ b/flink-connectors/flink-connector-pulsar/pom.xml @@ -254,9 +254,6 @@ under the License. <configuration> <!-- Enforce single fork execution due to heavy mini cluster use in the tests --> <forkCount>1</forkCount> - <argLine>-Xms256m -Xmx2048m -Dmvn.forkNumber=${surefire.forkNumber} - -XX:-UseGCOverheadLimit -Duser.country=US -Duser.language=en - </argLine> </configuration> </plugin> <plugin> diff --git a/flink-python/pom.xml b/flink-python/pom.xml index 5257786..b2ec81d 100644 --- a/flink-python/pom.xml +++ b/flink-python/pom.xml @@ -447,9 +447,11 @@ under the License. <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <!-- Arrow requires the property io.netty.tryReflectionSetAccessible to - be set to true for JDK >= 9. Please refer to ARROW-5412 for more details. --> - <argLine>-Xms256m -Xmx2048m -Dmvn.forkNumber=${surefire.forkNumber} -Dio.netty.tryReflectionSetAccessible=true -XX:+UseG1GC -Duser.country=US -Duser.language=en</argLine> + <systemPropertyVariables> + <!-- Arrow requires the property io.netty.tryReflectionSetAccessible to + be set to true for JDK >= 9. Please refer to ARROW-5412 for more details. --> + <io.netty.tryReflectionSetAccessible>true</io.netty.tryReflectionSetAccessible> + </systemPropertyVariables> </configuration> </plugin> <plugin> diff --git a/pom.xml b/pom.xml index a34d9ae..6ff8770 100644 --- a/pom.xml +++ b/pom.xml @@ -1573,11 +1573,16 @@ under the License. <forkCount>${flink.forkCount}</forkCount> <reuseForks>${flink.reuseForks}</reuseForks> <trimStackTrace>false</trimStackTrace> - <systemPropertyVariables> + <systemPropertyVariables combine.children="append"> <forkNumber>0${surefire.forkNumber}</forkNumber> + <!-- $$ ensures that surefire resolves this to the current forkNumber, + instead of maven during initialization --> + <mvn.forkNumber>$${surefire.forkNumber}</mvn.forkNumber> <hadoop.version>${hadoop.version}</hadoop.version> <checkpointing.randomization>true</checkpointing.randomization> <buffer-debloat.randomization>true</buffer-debloat.randomization> + <user.country>US</user.country> + <user.language>en</user.language> <!-- force the use of the Changelog State Backend in tests on mini-cluster on: enable CheckpointingOptions.ENABLE_STATE_CHANGE_LOG on cluster level random: enable it randomly, unless explicitly set @@ -1589,7 +1594,7 @@ under the License. <test.randomization.seed>${test.randomization.seed}</test.randomization.seed> <junit.jupiter.extensions.autodetection.enabled>true</junit.jupiter.extensions.autodetection.enabled> </systemPropertyVariables> - <argLine>-Xms256m -Xmx2048m -Dmvn.forkNumber=${surefire.forkNumber} -XX:+UseG1GC -Duser.country=US -Duser.language=en</argLine> + <argLine>-Xms256m -Xmx2048m -XX:+UseG1GC</argLine> </configuration> <executions> <!--execute all the unit tests-->