@@ -9,6 +9,9 @@ buildscript {
99 repositories {
1010 mavenCentral()
1111 jcenter()
12+ maven {
13+ url(" https://plugins.gradle.org/m2/" )
14+ }
1215 maven {
1316 url(" https://repo.spring.io/plugins-release" )
1417 }
@@ -20,13 +23,14 @@ buildscript {
2023 classpath(libraries. asciidoctorGradlePlugin)
2124 classpath(libraries. springDependencyMangementGradlePlugin)
2225 classpath(libraries. springBootGradlePlugin)
26+ classpath(libraries. testRetryPlugin)
2327 }
2428
2529 allprojects {
2630 configurations. all {
2731 resolutionStrategy {
2832 force ' org.apache.commons:commons-collections4:4.3'
29- force ' xerces:xercesImpl:2.12.1 '
33+ force ' xerces:xercesImpl:2.12.2 '
3034 }
3135 }
3236 }
@@ -42,6 +46,7 @@ allprojects {
4246 apply(plugin : " propdeps" )
4347 apply(plugin : " propdeps-maven" )
4448 apply(plugin : " io.spring.dependency-management" )
49+ apply(plugin : " org.gradle.test-retry" )
4550
4651 dependencyManagement {
4752 imports {
@@ -119,6 +124,12 @@ subprojects {
119124 useJUnitPlatform()
120125 jvmArgs + = [" -Xmx1024m" , " -XX:+StartAttachListener" , " -XX:+HeapDumpOnOutOfMemoryError" , " -XX:HeapDumpPath=/var/log/uaa-tests.hprof" ]
121126
127+ retry {
128+ failOnPassedAfterRetry = Boolean . parseBoolean(System . getProperty(" failOnPassedAfterRetry" , " true" ));
129+ maxFailures = Integer . parseInt(System . getProperty(" maxFailures" , " 3" ))
130+ maxRetries = Integer . parseInt(System . getProperty(" maxRetries" , " 1" ))
131+ }
132+
122133 testLogging {
123134 events(" skipped" , " failed" , " passed" )
124135 exceptionFormat(" full" )
@@ -205,7 +216,7 @@ cargo {
205216
206217 jvmArgs = " "
207218 jvmArgs = String . format(" %s -DCLOUDFOUNDRY_CONFIG_PATH=%s" , jvmArgs, file(" scripts/cargo" ). getAbsolutePath())
208- jvmArgs = String . format(" %s -Dlog4j.configurationFile =%s" , jvmArgs, file(" scripts/cargo/log4j2.properties" ). getAbsolutePath())
219+ jvmArgs = String . format(" %s -Dlogging.config =%s" , jvmArgs, file(" scripts/cargo/log4j2.properties" ). getAbsolutePath())
209220 jvmArgs = String . format(" %s -Dstatsd.enabled=true" , jvmArgs)
210221 if (System . getProperty(" spring.profiles.active" , " " ). split(' ,' ). contains(" debug" )) {
211222 jvmArgs = String . format(" %s -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005" , jvmArgs)
@@ -228,6 +239,7 @@ cargo {
228239 property(" metrics.perRequestMetrics" , System . getProperty(" metrics.perRequestMetrics" , " true" ))
229240 property(" smtp.host" , " localhost" )
230241 property(" smtp.port" , 2525 )
242+ property(" java.security.egd" , " file:/dev/./urandom" )
231243 }
232244
233245 containerProperties {
0 commit comments