From 123934d096740c6446f94d93e89383f0728d6019 Mon Sep 17 00:00:00 2001 From: SSUday Date: Wed, 3 Sep 2025 14:10:20 -0400 Subject: [PATCH 1/2] Fix #30501: use file:/dev/urandom (remove ./) to speed up test startup on Windows --- .../jib/templates/src/main/docker/jib/entrypoint.sh.ejs | 2 +- generators/spring-boot/templates/build.gradle.ejs | 2 +- generators/spring-boot/templates/gradle/profile_dev.gradle.ejs | 2 +- generators/spring-boot/templates/gradle/profile_prod.gradle.ejs | 2 +- generators/spring-boot/templates/pom.xml.ejs | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/generators/java/generators/jib/templates/src/main/docker/jib/entrypoint.sh.ejs b/generators/java/generators/jib/templates/src/main/docker/jib/entrypoint.sh.ejs index 92545c3ff241..e95cc2fbb4e5 100644 --- a/generators/java/generators/jib/templates/src/main/docker/jib/entrypoint.sh.ejs +++ b/generators/java/generators/jib/templates/src/main/docker/jib/entrypoint.sh.ejs @@ -38,4 +38,4 @@ file_env 'SPRING_LIQUIBASE_PASSWORD' <%_ } _%> file_env 'JHIPSTER_REGISTRY_PASSWORD' -exec java ${JAVA_OPTS} -noverify -XX:+AlwaysPreTouch -Djava.security.egd=file:/dev/./urandom -cp /app/resources/:/app/classes/:/app/libs/* "<%= packageName %>.<%= mainClass %>" "$@" +exec java ${JAVA_OPTS} -noverify -XX:+AlwaysPreTouch -Djava.security.egd=file:/dev/urandom -cp /app/resources:/app/classes:/app/libs/* ... diff --git a/generators/spring-boot/templates/build.gradle.ejs b/generators/spring-boot/templates/build.gradle.ejs index ee5be98ba862..34de6f90ad27 100644 --- a/generators/spring-boot/templates/build.gradle.ejs +++ b/generators/spring-boot/templates/build.gradle.ejs @@ -113,7 +113,7 @@ test { testLogging { events 'FAILED', 'SKIPPED' } - jvmArgs += '-Djava.security.egd=file:/dev/./urandom -Xmx512m' + jvmArgs += '-Djava.security.egd=file:/dev/urandom -Xmx512m' // uncomment if the tests reports are not generated // see https://github.com/jhipster/generator-jhipster/pull/2771 and https://github.com/jhipster/generator-jhipster/pull/4484 // ignoreFailures true diff --git a/generators/spring-boot/templates/gradle/profile_dev.gradle.ejs b/generators/spring-boot/templates/gradle/profile_dev.gradle.ejs index 070b35e934dc..a74cf78c3f56 100644 --- a/generators/spring-boot/templates/gradle/profile_dev.gradle.ejs +++ b/generators/spring-boot/templates/gradle/profile_dev.gradle.ejs @@ -109,7 +109,7 @@ task integrationTest(type: Test) { exceptionFormat "full" } systemProperty('spring.profiles.active', 'test,testdev') - systemProperty('java.security.egd', 'file:/dev/./urandom') + systemProperty('java.security.egd', 'file:/dev/urandom') // uncomment if the tests reports are not generated // see https://github.com/jhipster/generator-jhipster/pull/2771 and https://github.com/jhipster/generator-jhipster/pull/4484 // ignoreFailures true diff --git a/generators/spring-boot/templates/gradle/profile_prod.gradle.ejs b/generators/spring-boot/templates/gradle/profile_prod.gradle.ejs index 609e8c80d69f..51fdba75539c 100644 --- a/generators/spring-boot/templates/gradle/profile_prod.gradle.ejs +++ b/generators/spring-boot/templates/gradle/profile_prod.gradle.ejs @@ -83,7 +83,7 @@ task integrationTest(type: Test) { exceptionFormat "full" } systemProperty('spring.profiles.active', 'test,testprod') - systemProperty('java.security.egd', 'file:/dev/./urandom') + systemProperty('java.security.egd', 'file:/dev/urandom') // uncomment if the tests reports are not generated // see https://github.com/jhipster/generator-jhipster/pull/2771 and https://github.com/jhipster/generator-jhipster/pull/4484 // ignoreFailures true diff --git a/generators/spring-boot/templates/pom.xml.ejs b/generators/spring-boot/templates/pom.xml.ejs index 0c09ae4906a9..6b4d8d69dad1 100644 --- a/generators/spring-boot/templates/pom.xml.ejs +++ b/generators/spring-boot/templates/pom.xml.ejs @@ -52,7 +52,7 @@ ${java.version} ${java.version} <%= packageName %>.<%= mainClass %> - -Djava.security.egd=file:/dev/./urandom -Xmx1G + -Djava.security.egd=file:/dev/urandom -Xmx1G jdt_apt false From 04f35416cd27fce78878084a0e4223799a9601ce Mon Sep 17 00:00:00 2001 From: Siva Sai Date: Thu, 4 Sep 2025 13:18:54 -0400 Subject: [PATCH 2/2] Update generators/java/generators/jib/templates/src/main/docker/jib/entrypoint.sh.ejs Co-authored-by: Daniel Franco --- .../jib/templates/src/main/docker/jib/entrypoint.sh.ejs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/java/generators/jib/templates/src/main/docker/jib/entrypoint.sh.ejs b/generators/java/generators/jib/templates/src/main/docker/jib/entrypoint.sh.ejs index e95cc2fbb4e5..8c32c92c368d 100644 --- a/generators/java/generators/jib/templates/src/main/docker/jib/entrypoint.sh.ejs +++ b/generators/java/generators/jib/templates/src/main/docker/jib/entrypoint.sh.ejs @@ -38,4 +38,4 @@ file_env 'SPRING_LIQUIBASE_PASSWORD' <%_ } _%> file_env 'JHIPSTER_REGISTRY_PASSWORD' -exec java ${JAVA_OPTS} -noverify -XX:+AlwaysPreTouch -Djava.security.egd=file:/dev/urandom -cp /app/resources:/app/classes:/app/libs/* ... +exec java ${JAVA_OPTS} -noverify -XX:+AlwaysPreTouch -Djava.security.egd=file:/dev/urandom -cp /app/resources:/app/classes:/app/libs/* "<%= packageName %>.<%= mainClass %>" "$@"