diff --git a/bin/configs/java-jersey2-8.yaml b/bin/configs/java-jersey2-8.yaml
index f968aac6230..ca0452d33e3 100644
--- a/bin/configs/java-jersey2-8.yaml
+++ b/bin/configs/java-jersey2-8.yaml
@@ -10,3 +10,4 @@ additionalProperties:
   dateLibrary: java8
   useOneOfDiscriminatorLookup: true
   disallowAdditionalPropertiesIfNotPresent: false
+  gradleProperties: "\n# JVM arguments\norg.gradle.jvmargs=-Xmx2024m -XX:MaxPermSize=512m\n# set timeout\norg.gradle.daemon.idletimeout=3600000\n# show all warnings\norg.gradle.warning.mode=all"
diff --git a/docs/generators/java.md b/docs/generators/java.md
index 21e2817ae3d..5543c075639 100644
--- a/docs/generators/java.md
+++ b/docs/generators/java.md
@@ -30,6 +30,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |dynamicOperations|Generate operations dynamically at runtime from an OAS| |false|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |fullJavaUtil|whether to use fully qualified name for classes under java.util. This option only works for Java API client| |false|
+|gradleProperties|Append additional Gradle proeprties to the gradle.properties file| |null|
 |groupId|groupId in generated pom.xml| |org.openapitools|
 |hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |false|
 |ignoreAnyOfInEnum|Ignore anyOf keyword in enum| |false|
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java
index aa43075765d..4b048849a15 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java
@@ -63,6 +63,7 @@ public class JavaClientCodegen extends AbstractJavaCodegen
     public static final String MICROPROFILE_FRAMEWORK = "microprofileFramework";
     public static final String USE_ABSTRACTION_FOR_FILES = "useAbstractionForFiles";
     public static final String DYNAMIC_OPERATIONS = "dynamicOperations";
+    public static final String GRADLE_PROPERTIES= "gradleProperties";
 
     public static final String PLAY_24 = "play24";
     public static final String PLAY_25 = "play25";
@@ -111,6 +112,7 @@ public class JavaClientCodegen extends AbstractJavaCodegen
     protected boolean caseInsensitiveResponseHeaders = false;
     protected boolean useAbstractionForFiles = false;
     protected boolean dynamicOperations = false;
+    protected String gradleProperties;
     protected String authFolder;
     protected String serializationLibrary = null;
 
@@ -154,6 +156,7 @@ public class JavaClientCodegen extends AbstractJavaCodegen
         cliOptions.add(CliOption.newString(MICROPROFILE_FRAMEWORK, "Framework for microprofile. Possible values \"kumuluzee\""));
         cliOptions.add(CliOption.newBoolean(USE_ABSTRACTION_FOR_FILES, "Use alternative types instead of java.io.File to allow passing bytes without a file on disk. Available on " + RESTTEMPLATE + " library"));
         cliOptions.add(CliOption.newBoolean(DYNAMIC_OPERATIONS, "Generate operations dynamically at runtime from an OAS", this.dynamicOperations));
+        cliOptions.add(CliOption.newString(GRADLE_PROPERTIES, "Append additional Gradle proeprties to the gradle.properties file"));
 
         supportedLibraries.put(JERSEY1, "HTTP client: Jersey client 1.19.x. JSON processing: Jackson 2.9.x. Enable gzip request encoding using '-DuseGzipFeature=true'. IMPORTANT NOTE: jersey 1.x is no longer actively maintained so please upgrade to 'jersey2' or other HTTP libraries instead.");
         supportedLibraries.put(JERSEY2, "HTTP client: Jersey client 2.25.1. JSON processing: Jackson 2.9.x");
@@ -318,6 +321,11 @@ public class JavaClientCodegen extends AbstractJavaCodegen
         }
         additionalProperties.put(DYNAMIC_OPERATIONS, dynamicOperations);
 
+        if (additionalProperties.containsKey(GRADLE_PROPERTIES)) {
+            this.setGradleProperties(additionalProperties.get(GRADLE_PROPERTIES).toString());
+        }
+        additionalProperties.put(GRADLE_PROPERTIES, gradleProperties);
+
         final String invokerFolder = (sourceFolder + '/' + invokerPackage).replace(".", "/");
         final String apiFolder = (sourceFolder + '/' + apiPackage).replace(".", "/");
         authFolder = (sourceFolder + '/' + invokerPackage + ".auth").replace(".", "/");
@@ -980,6 +988,10 @@ public class JavaClientCodegen extends AbstractJavaCodegen
         this.dynamicOperations = dynamicOperations;
     }
 
+    public void setGradleProperties(final String gradleProperties) {
+        this.gradleProperties= gradleProperties;
+    }
+
     /**
      * Serialization library.
      *
diff --git a/modules/openapi-generator/src/main/resources/Java/gradle.properties.mustache b/modules/openapi-generator/src/main/resources/Java/gradle.properties.mustache
index 05644f0754a..095ab31d11e 100644
--- a/modules/openapi-generator/src/main/resources/Java/gradle.properties.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/gradle.properties.mustache
@@ -1,2 +1,9 @@
-# Uncomment to build for Android
-#target = android
\ No newline at end of file
+# This file is automatically generated by OpenAPI Generator (https://github.com/openAPITools/openapi-generator).
+# To include other gradle properties as part of the code generation process, please use the `gradleProperties` option.
+#
+# Gradle properties reference: https://docs.gradle.org/current/userguide/build_environment.html#sec:gradle_configuration_properties
+# For example, uncomment below to build for Android
+#target = android
+{{#gradleProperties}}
+{{{.}}}
+{{/gradleProperties}}
diff --git a/samples/client/petstore/java/apache-httpclient/gradle.properties b/samples/client/petstore/java/apache-httpclient/gradle.properties
index 05644f0754a..a3408578278 100644
--- a/samples/client/petstore/java/apache-httpclient/gradle.properties
+++ b/samples/client/petstore/java/apache-httpclient/gradle.properties
@@ -1,2 +1,6 @@
-# Uncomment to build for Android
-#target = android
\ No newline at end of file
+# This file is automatically generated by OpenAPI Generator (https://github.com/openAPITools/openapi-generator).
+# To include other gradle properties as part of the code generation process, please use the `gradleProperties` option.
+#
+# Gradle properties reference: https://docs.gradle.org/current/userguide/build_environment.html#sec:gradle_configuration_properties
+# For example, uncomment below to build for Android
+#target = android
diff --git a/samples/client/petstore/java/feign-no-nullable/gradle.properties b/samples/client/petstore/java/feign-no-nullable/gradle.properties
index 05644f0754a..a3408578278 100644
--- a/samples/client/petstore/java/feign-no-nullable/gradle.properties
+++ b/samples/client/petstore/java/feign-no-nullable/gradle.properties
@@ -1,2 +1,6 @@
-# Uncomment to build for Android
-#target = android
\ No newline at end of file
+# This file is automatically generated by OpenAPI Generator (https://github.com/openAPITools/openapi-generator).
+# To include other gradle properties as part of the code generation process, please use the `gradleProperties` option.
+#
+# Gradle properties reference: https://docs.gradle.org/current/userguide/build_environment.html#sec:gradle_configuration_properties
+# For example, uncomment below to build for Android
+#target = android
diff --git a/samples/client/petstore/java/feign/gradle.properties b/samples/client/petstore/java/feign/gradle.properties
index 05644f0754a..a3408578278 100644
--- a/samples/client/petstore/java/feign/gradle.properties
+++ b/samples/client/petstore/java/feign/gradle.properties
@@ -1,2 +1,6 @@
-# Uncomment to build for Android
-#target = android
\ No newline at end of file
+# This file is automatically generated by OpenAPI Generator (https://github.com/openAPITools/openapi-generator).
+# To include other gradle properties as part of the code generation process, please use the `gradleProperties` option.
+#
+# Gradle properties reference: https://docs.gradle.org/current/userguide/build_environment.html#sec:gradle_configuration_properties
+# For example, uncomment below to build for Android
+#target = android
diff --git a/samples/client/petstore/java/google-api-client/gradle.properties b/samples/client/petstore/java/google-api-client/gradle.properties
index 05644f0754a..a3408578278 100644
--- a/samples/client/petstore/java/google-api-client/gradle.properties
+++ b/samples/client/petstore/java/google-api-client/gradle.properties
@@ -1,2 +1,6 @@
-# Uncomment to build for Android
-#target = android
\ No newline at end of file
+# This file is automatically generated by OpenAPI Generator (https://github.com/openAPITools/openapi-generator).
+# To include other gradle properties as part of the code generation process, please use the `gradleProperties` option.
+#
+# Gradle properties reference: https://docs.gradle.org/current/userguide/build_environment.html#sec:gradle_configuration_properties
+# For example, uncomment below to build for Android
+#target = android
diff --git a/samples/client/petstore/java/jersey1/gradle.properties b/samples/client/petstore/java/jersey1/gradle.properties
index 05644f0754a..a3408578278 100644
--- a/samples/client/petstore/java/jersey1/gradle.properties
+++ b/samples/client/petstore/java/jersey1/gradle.properties
@@ -1,2 +1,6 @@
-# Uncomment to build for Android
-#target = android
\ No newline at end of file
+# This file is automatically generated by OpenAPI Generator (https://github.com/openAPITools/openapi-generator).
+# To include other gradle properties as part of the code generation process, please use the `gradleProperties` option.
+#
+# Gradle properties reference: https://docs.gradle.org/current/userguide/build_environment.html#sec:gradle_configuration_properties
+# For example, uncomment below to build for Android
+#target = android
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/gradle.properties b/samples/client/petstore/java/jersey2-java8-localdatetime/gradle.properties
index 05644f0754a..a3408578278 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/gradle.properties
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/gradle.properties
@@ -1,2 +1,6 @@
-# Uncomment to build for Android
-#target = android
\ No newline at end of file
+# This file is automatically generated by OpenAPI Generator (https://github.com/openAPITools/openapi-generator).
+# To include other gradle properties as part of the code generation process, please use the `gradleProperties` option.
+#
+# Gradle properties reference: https://docs.gradle.org/current/userguide/build_environment.html#sec:gradle_configuration_properties
+# For example, uncomment below to build for Android
+#target = android
diff --git a/samples/client/petstore/java/jersey2-java8/gradle.properties b/samples/client/petstore/java/jersey2-java8/gradle.properties
index 05644f0754a..a3408578278 100644
--- a/samples/client/petstore/java/jersey2-java8/gradle.properties
+++ b/samples/client/petstore/java/jersey2-java8/gradle.properties
@@ -1,2 +1,6 @@
-# Uncomment to build for Android
-#target = android
\ No newline at end of file
+# This file is automatically generated by OpenAPI Generator (https://github.com/openAPITools/openapi-generator).
+# To include other gradle properties as part of the code generation process, please use the `gradleProperties` option.
+#
+# Gradle properties reference: https://docs.gradle.org/current/userguide/build_environment.html#sec:gradle_configuration_properties
+# For example, uncomment below to build for Android
+#target = android
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/gradle.properties b/samples/client/petstore/java/okhttp-gson-dynamicOperations/gradle.properties
index 05644f0754a..a3408578278 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/gradle.properties
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/gradle.properties
@@ -1,2 +1,6 @@
-# Uncomment to build for Android
-#target = android
\ No newline at end of file
+# This file is automatically generated by OpenAPI Generator (https://github.com/openAPITools/openapi-generator).
+# To include other gradle properties as part of the code generation process, please use the `gradleProperties` option.
+#
+# Gradle properties reference: https://docs.gradle.org/current/userguide/build_environment.html#sec:gradle_configuration_properties
+# For example, uncomment below to build for Android
+#target = android
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/gradle.properties b/samples/client/petstore/java/okhttp-gson-parcelableModel/gradle.properties
index 05644f0754a..a3408578278 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/gradle.properties
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/gradle.properties
@@ -1,2 +1,6 @@
-# Uncomment to build for Android
-#target = android
\ No newline at end of file
+# This file is automatically generated by OpenAPI Generator (https://github.com/openAPITools/openapi-generator).
+# To include other gradle properties as part of the code generation process, please use the `gradleProperties` option.
+#
+# Gradle properties reference: https://docs.gradle.org/current/userguide/build_environment.html#sec:gradle_configuration_properties
+# For example, uncomment below to build for Android
+#target = android
diff --git a/samples/client/petstore/java/okhttp-gson/gradle.properties b/samples/client/petstore/java/okhttp-gson/gradle.properties
index 05644f0754a..a3408578278 100644
--- a/samples/client/petstore/java/okhttp-gson/gradle.properties
+++ b/samples/client/petstore/java/okhttp-gson/gradle.properties
@@ -1,2 +1,6 @@
-# Uncomment to build for Android
-#target = android
\ No newline at end of file
+# This file is automatically generated by OpenAPI Generator (https://github.com/openAPITools/openapi-generator).
+# To include other gradle properties as part of the code generation process, please use the `gradleProperties` option.
+#
+# Gradle properties reference: https://docs.gradle.org/current/userguide/build_environment.html#sec:gradle_configuration_properties
+# For example, uncomment below to build for Android
+#target = android
diff --git a/samples/client/petstore/java/rest-assured-jackson/gradle.properties b/samples/client/petstore/java/rest-assured-jackson/gradle.properties
index 05644f0754a..a3408578278 100644
--- a/samples/client/petstore/java/rest-assured-jackson/gradle.properties
+++ b/samples/client/petstore/java/rest-assured-jackson/gradle.properties
@@ -1,2 +1,6 @@
-# Uncomment to build for Android
-#target = android
\ No newline at end of file
+# This file is automatically generated by OpenAPI Generator (https://github.com/openAPITools/openapi-generator).
+# To include other gradle properties as part of the code generation process, please use the `gradleProperties` option.
+#
+# Gradle properties reference: https://docs.gradle.org/current/userguide/build_environment.html#sec:gradle_configuration_properties
+# For example, uncomment below to build for Android
+#target = android
diff --git a/samples/client/petstore/java/rest-assured/gradle.properties b/samples/client/petstore/java/rest-assured/gradle.properties
index 05644f0754a..a3408578278 100644
--- a/samples/client/petstore/java/rest-assured/gradle.properties
+++ b/samples/client/petstore/java/rest-assured/gradle.properties
@@ -1,2 +1,6 @@
-# Uncomment to build for Android
-#target = android
\ No newline at end of file
+# This file is automatically generated by OpenAPI Generator (https://github.com/openAPITools/openapi-generator).
+# To include other gradle properties as part of the code generation process, please use the `gradleProperties` option.
+#
+# Gradle properties reference: https://docs.gradle.org/current/userguide/build_environment.html#sec:gradle_configuration_properties
+# For example, uncomment below to build for Android
+#target = android
diff --git a/samples/client/petstore/java/resteasy/gradle.properties b/samples/client/petstore/java/resteasy/gradle.properties
index 05644f0754a..a3408578278 100644
--- a/samples/client/petstore/java/resteasy/gradle.properties
+++ b/samples/client/petstore/java/resteasy/gradle.properties
@@ -1,2 +1,6 @@
-# Uncomment to build for Android
-#target = android
\ No newline at end of file
+# This file is automatically generated by OpenAPI Generator (https://github.com/openAPITools/openapi-generator).
+# To include other gradle properties as part of the code generation process, please use the `gradleProperties` option.
+#
+# Gradle properties reference: https://docs.gradle.org/current/userguide/build_environment.html#sec:gradle_configuration_properties
+# For example, uncomment below to build for Android
+#target = android
diff --git a/samples/client/petstore/java/resttemplate-withXml/gradle.properties b/samples/client/petstore/java/resttemplate-withXml/gradle.properties
index 05644f0754a..a3408578278 100644
--- a/samples/client/petstore/java/resttemplate-withXml/gradle.properties
+++ b/samples/client/petstore/java/resttemplate-withXml/gradle.properties
@@ -1,2 +1,6 @@
-# Uncomment to build for Android
-#target = android
\ No newline at end of file
+# This file is automatically generated by OpenAPI Generator (https://github.com/openAPITools/openapi-generator).
+# To include other gradle properties as part of the code generation process, please use the `gradleProperties` option.
+#
+# Gradle properties reference: https://docs.gradle.org/current/userguide/build_environment.html#sec:gradle_configuration_properties
+# For example, uncomment below to build for Android
+#target = android
diff --git a/samples/client/petstore/java/resttemplate/gradle.properties b/samples/client/petstore/java/resttemplate/gradle.properties
index 05644f0754a..a3408578278 100644
--- a/samples/client/petstore/java/resttemplate/gradle.properties
+++ b/samples/client/petstore/java/resttemplate/gradle.properties
@@ -1,2 +1,6 @@
-# Uncomment to build for Android
-#target = android
\ No newline at end of file
+# This file is automatically generated by OpenAPI Generator (https://github.com/openAPITools/openapi-generator).
+# To include other gradle properties as part of the code generation process, please use the `gradleProperties` option.
+#
+# Gradle properties reference: https://docs.gradle.org/current/userguide/build_environment.html#sec:gradle_configuration_properties
+# For example, uncomment below to build for Android
+#target = android
diff --git a/samples/client/petstore/java/retrofit2-play26/gradle.properties b/samples/client/petstore/java/retrofit2-play26/gradle.properties
index 05644f0754a..a3408578278 100644
--- a/samples/client/petstore/java/retrofit2-play26/gradle.properties
+++ b/samples/client/petstore/java/retrofit2-play26/gradle.properties
@@ -1,2 +1,6 @@
-# Uncomment to build for Android
-#target = android
\ No newline at end of file
+# This file is automatically generated by OpenAPI Generator (https://github.com/openAPITools/openapi-generator).
+# To include other gradle properties as part of the code generation process, please use the `gradleProperties` option.
+#
+# Gradle properties reference: https://docs.gradle.org/current/userguide/build_environment.html#sec:gradle_configuration_properties
+# For example, uncomment below to build for Android
+#target = android
diff --git a/samples/client/petstore/java/retrofit2/gradle.properties b/samples/client/petstore/java/retrofit2/gradle.properties
index 05644f0754a..a3408578278 100644
--- a/samples/client/petstore/java/retrofit2/gradle.properties
+++ b/samples/client/petstore/java/retrofit2/gradle.properties
@@ -1,2 +1,6 @@
-# Uncomment to build for Android
-#target = android
\ No newline at end of file
+# This file is automatically generated by OpenAPI Generator (https://github.com/openAPITools/openapi-generator).
+# To include other gradle properties as part of the code generation process, please use the `gradleProperties` option.
+#
+# Gradle properties reference: https://docs.gradle.org/current/userguide/build_environment.html#sec:gradle_configuration_properties
+# For example, uncomment below to build for Android
+#target = android
diff --git a/samples/client/petstore/java/retrofit2rx2/gradle.properties b/samples/client/petstore/java/retrofit2rx2/gradle.properties
index 05644f0754a..a3408578278 100644
--- a/samples/client/petstore/java/retrofit2rx2/gradle.properties
+++ b/samples/client/petstore/java/retrofit2rx2/gradle.properties
@@ -1,2 +1,6 @@
-# Uncomment to build for Android
-#target = android
\ No newline at end of file
+# This file is automatically generated by OpenAPI Generator (https://github.com/openAPITools/openapi-generator).
+# To include other gradle properties as part of the code generation process, please use the `gradleProperties` option.
+#
+# Gradle properties reference: https://docs.gradle.org/current/userguide/build_environment.html#sec:gradle_configuration_properties
+# For example, uncomment below to build for Android
+#target = android
diff --git a/samples/client/petstore/java/retrofit2rx3/gradle.properties b/samples/client/petstore/java/retrofit2rx3/gradle.properties
index 05644f0754a..a3408578278 100644
--- a/samples/client/petstore/java/retrofit2rx3/gradle.properties
+++ b/samples/client/petstore/java/retrofit2rx3/gradle.properties
@@ -1,2 +1,6 @@
-# Uncomment to build for Android
-#target = android
\ No newline at end of file
+# This file is automatically generated by OpenAPI Generator (https://github.com/openAPITools/openapi-generator).
+# To include other gradle properties as part of the code generation process, please use the `gradleProperties` option.
+#
+# Gradle properties reference: https://docs.gradle.org/current/userguide/build_environment.html#sec:gradle_configuration_properties
+# For example, uncomment below to build for Android
+#target = android
diff --git a/samples/client/petstore/java/vertx-no-nullable/gradle.properties b/samples/client/petstore/java/vertx-no-nullable/gradle.properties
index 05644f0754a..a3408578278 100644
--- a/samples/client/petstore/java/vertx-no-nullable/gradle.properties
+++ b/samples/client/petstore/java/vertx-no-nullable/gradle.properties
@@ -1,2 +1,6 @@
-# Uncomment to build for Android
-#target = android
\ No newline at end of file
+# This file is automatically generated by OpenAPI Generator (https://github.com/openAPITools/openapi-generator).
+# To include other gradle properties as part of the code generation process, please use the `gradleProperties` option.
+#
+# Gradle properties reference: https://docs.gradle.org/current/userguide/build_environment.html#sec:gradle_configuration_properties
+# For example, uncomment below to build for Android
+#target = android
diff --git a/samples/client/petstore/java/vertx/gradle.properties b/samples/client/petstore/java/vertx/gradle.properties
index 05644f0754a..a3408578278 100644
--- a/samples/client/petstore/java/vertx/gradle.properties
+++ b/samples/client/petstore/java/vertx/gradle.properties
@@ -1,2 +1,6 @@
-# Uncomment to build for Android
-#target = android
\ No newline at end of file
+# This file is automatically generated by OpenAPI Generator (https://github.com/openAPITools/openapi-generator).
+# To include other gradle properties as part of the code generation process, please use the `gradleProperties` option.
+#
+# Gradle properties reference: https://docs.gradle.org/current/userguide/build_environment.html#sec:gradle_configuration_properties
+# For example, uncomment below to build for Android
+#target = android
diff --git a/samples/client/petstore/java/webclient-nulable-arrays/gradle.properties b/samples/client/petstore/java/webclient-nulable-arrays/gradle.properties
index 05644f0754a..a3408578278 100644
--- a/samples/client/petstore/java/webclient-nulable-arrays/gradle.properties
+++ b/samples/client/petstore/java/webclient-nulable-arrays/gradle.properties
@@ -1,2 +1,6 @@
-# Uncomment to build for Android
-#target = android
\ No newline at end of file
+# This file is automatically generated by OpenAPI Generator (https://github.com/openAPITools/openapi-generator).
+# To include other gradle properties as part of the code generation process, please use the `gradleProperties` option.
+#
+# Gradle properties reference: https://docs.gradle.org/current/userguide/build_environment.html#sec:gradle_configuration_properties
+# For example, uncomment below to build for Android
+#target = android
diff --git a/samples/client/petstore/java/webclient/gradle.properties b/samples/client/petstore/java/webclient/gradle.properties
index 05644f0754a..a3408578278 100644
--- a/samples/client/petstore/java/webclient/gradle.properties
+++ b/samples/client/petstore/java/webclient/gradle.properties
@@ -1,2 +1,6 @@
-# Uncomment to build for Android
-#target = android
\ No newline at end of file
+# This file is automatically generated by OpenAPI Generator (https://github.com/openAPITools/openapi-generator).
+# To include other gradle properties as part of the code generation process, please use the `gradleProperties` option.
+#
+# Gradle properties reference: https://docs.gradle.org/current/userguide/build_environment.html#sec:gradle_configuration_properties
+# For example, uncomment below to build for Android
+#target = android
diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8/gradle.properties b/samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8/gradle.properties
index 05644f0754a..a3408578278 100644
--- a/samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8/gradle.properties
+++ b/samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8/gradle.properties
@@ -1,2 +1,6 @@
-# Uncomment to build for Android
-#target = android
\ No newline at end of file
+# This file is automatically generated by OpenAPI Generator (https://github.com/openAPITools/openapi-generator).
+# To include other gradle properties as part of the code generation process, please use the `gradleProperties` option.
+#
+# Gradle properties reference: https://docs.gradle.org/current/userguide/build_environment.html#sec:gradle_configuration_properties
+# For example, uncomment below to build for Android
+#target = android
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/gradle.properties b/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/gradle.properties
index 05644f0754a..a3408578278 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/gradle.properties
+++ b/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/gradle.properties
@@ -1,2 +1,6 @@
-# Uncomment to build for Android
-#target = android
\ No newline at end of file
+# This file is automatically generated by OpenAPI Generator (https://github.com/openAPITools/openapi-generator).
+# To include other gradle properties as part of the code generation process, please use the `gradleProperties` option.
+#
+# Gradle properties reference: https://docs.gradle.org/current/userguide/build_environment.html#sec:gradle_configuration_properties
+# For example, uncomment below to build for Android
+#target = android
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/gradle.properties b/samples/openapi3/client/petstore/java/jersey2-java8/gradle.properties
index 05644f0754a..d3e8e41ba6f 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/gradle.properties
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/gradle.properties
@@ -1,2 +1,13 @@
-# Uncomment to build for Android
-#target = android
\ No newline at end of file
+# This file is automatically generated by OpenAPI Generator (https://github.com/openAPITools/openapi-generator).
+# To include other gradle properties as part of the code generation process, please use the `gradleProperties` option.
+#
+# Gradle properties reference: https://docs.gradle.org/current/userguide/build_environment.html#sec:gradle_configuration_properties
+# For example, uncomment below to build for Android
+#target = android
+
+# JVM arguments
+org.gradle.jvmargs=-Xmx2024m -XX:MaxPermSize=512m
+# set timeout
+org.gradle.daemon.idletimeout=3600000
+# show all warnings
+org.gradle.warning.mode=all