Skip to content

Commit

Permalink
Use maven-surefire 2.8.1 for certain tests
Browse files Browse the repository at this point in the history
  • Loading branch information
lhotari committed Feb 6, 2024
1 parent 0252965 commit 94e2b8e
Show file tree
Hide file tree
Showing 2 changed files with 59 additions and 5 deletions.
28 changes: 26 additions & 2 deletions tests/integration-tests-base-groovy/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,25 @@
</properties>

<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<!-- DO NOT CHANGE VERSION
Versions newer than 2.8.1 do not respect useSystemClassLoader=false
https://issues.apache.org/jira/browse/SUREFIRE-1476 //-->
<version>2.8.1</version>
<dependencies>
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-junit4</artifactId>
<version>2.8.1</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
Expand Down Expand Up @@ -79,10 +98,15 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<version>2.8.1</version>
<configuration combine.self="override">
<argLine>-Xmx4G -Djava.net.preferIPv4Stack=true ${test.additional.args}</argLine>
<forkCount>1</forkCount>
<forkMode>once</forkMode>
<useSystemClassLoader>false</useSystemClassLoader>
<argLine>-Xmx2G -Djava.net.preferIPv4Stack=true -Dio.netty.leakDetection.level=paranoid ${test.additional.args}</argLine>
<redirectTestOutputToFile>${redirectTestOutputToFile}</redirectTestOutputToFile>
<trimStackTrace>false</trimStackTrace>
<forkedProcessTimeoutInSeconds>1800</forkedProcessTimeoutInSeconds>
<systemPropertyVariables>
<!-- only takes effect in later simpleLogger versions (1.7+) //-->
<org.slf4j.simpleLogger.logFile>System.out</org.slf4j.simpleLogger.logFile>
Expand Down
36 changes: 33 additions & 3 deletions tests/integration-tests-utils/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -78,15 +78,45 @@

</dependencies>


<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<!-- DO NOT CHANGE VERSION
Versions newer than 2.8.1 do not respect useSystemClassLoader=false
https://issues.apache.org/jira/browse/SUREFIRE-1476 //-->
<version>2.8.1</version>
<dependencies>
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-junit4</artifactId>
<version>2.8.1</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<forkCount>1</forkCount>
<reuseForks>false</reuseForks>
<version>2.8.1</version>
<configuration combine.self="override">
<argLine>-Xmx4G -Djava.net.preferIPv4Stack=true ${test.additional.args}</argLine>
<forkMode>once</forkMode>
<useSystemClassLoader>false</useSystemClassLoader>
<argLine>-Xmx2G -Djava.net.preferIPv4Stack=true -Dio.netty.leakDetection.level=paranoid ${test.additional.args}</argLine>
<redirectTestOutputToFile>${redirectTestOutputToFile}</redirectTestOutputToFile>
<trimStackTrace>false</trimStackTrace>
<forkedProcessTimeoutInSeconds>1800</forkedProcessTimeoutInSeconds>
<classpathDependencyExcludes>
<classpathDependencyExclude>org.junit.platform:*</classpathDependencyExclude>
<classpathDependencyExclude>org.junit.vintage:*</classpathDependencyExclude>
<classpathDependencyExclude>org.junit.jupiter:*</classpathDependencyExclude>
</classpathDependencyExcludes>
</configuration>
</plugin>
</plugins>
Expand Down

0 comments on commit 94e2b8e

Please sign in to comment.