Avoid storing timestamp in Gradle.properties

(cherry picked from commit 423b4f4)

.github/dependabot.yml

@@ -184,6 +184,7 @@ updates:
  - dependency-name: biz.paluch.logging:logstash-gelf
  - dependency-name: org.bitbucket.b_c:jose4j
  - dependency-name: io.fabric8:maven-model-helper
+ - dependency-name: org.codejive:java-properties
  ignore:
  # this one cannot be upgraded due to the usage of proxies in new versions
  # the proxy implements interfaces in a random order which causes issues

extensions/amazon-lambda/maven-archetype/src/main/resources/archetype-resources/gradle.properties

@@ -1,5 +1,5 @@
-#Gradle properties
-#Tue Mar 17 10:20:48 UTC 2020
+# Gradle properties
+
 quarkusPluginVersion=${project.version}
 quarkusPlatformArtifactId=quarkus-bom
 quarkusPlatformVersion=${project.version}

independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/buildtool/gradle-kotlin-dsl/base/gradle.tpl.qute.properties

@@ -1,6 +1,7 @@
-#Gradle properties
+# Gradle properties
+
 quarkusPluginId={quarkus.gradle-plugin.id}
 quarkusPluginVersion={quarkus.gradle-plugin.version}
 quarkusPlatformGroupId={quarkus.platform.group-id}
 quarkusPlatformArtifactId={quarkus.platform.artifact-id}
-quarkusPlatformVersion={quarkus.platform.version}
+quarkusPlatformVersion={quarkus.platform.version}

independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/buildtool/gradle/base/gradle.tpl.qute.properties

@@ -1,6 +1,7 @@
-#Gradle properties
+# Gradle properties
+
 quarkusPluginId={quarkus.gradle-plugin.id}
 quarkusPluginVersion={quarkus.gradle-plugin.version}
 quarkusPlatformGroupId={quarkus.platform.group-id}
 quarkusPlatformArtifactId={quarkus.platform.artifact-id}
-quarkusPlatformVersion={quarkus.platform.version}
+quarkusPlatformVersion={quarkus.platform.version}

independent-projects/tools/devtools-common/pom.xml

@@ -106,6 +106,10 @@
  <groupId>jakarta.enterprise</groupId>
  <artifactId>jakarta.enterprise.cdi-api</artifactId>
  </dependency>
+ <dependency>
+ <groupId>org.codejive</groupId>
+ <artifactId>java-properties</artifactId>
+ </dependency>
  <dependency>
  <groupId>org.junit.jupiter</groupId>
  <artifactId>junit-jupiter</artifactId>

independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/AbstractGradleBuildFile.java

@@ -1,18 +1,19 @@
 package io.quarkus.devtools.project.buildfile;
 
 import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.io.StringWriter;
 import java.io.UncheckedIOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.Properties;
 import java.util.Scanner;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import org.codejive.properties.Properties;
+
 import io.quarkus.maven.dependency.ArtifactCoords;
 import io.quarkus.maven.dependency.ArtifactKey;
 import io.quarkus.registry.catalog.ExtensionCatalog;
@@ -47,22 +48,22 @@ public void writeToDisk() throws IOException {
  if (rootProjectPath != null) {
  Files.write(rootProjectPath.resolve(getSettingsGradlePath()), getModel().getRootSettingsContent().getBytes());
  if (hasRootProjectFile(GRADLE_PROPERTIES_PATH)) {
- try (ByteArrayOutputStream out = new ByteArrayOutputStream()) {
- getModel().getRootPropertiesContent().store(out, "Gradle properties");
- Files.write(rootProjectPath.resolve(GRADLE_PROPERTIES_PATH),
- out.toByteArray());
+ try (StringWriter sw = new StringWriter()) {
+ getModel().getRootPropertiesContent().store(sw, "Gradle properties");
+ Files.writeString(rootProjectPath.resolve(GRADLE_PROPERTIES_PATH),
+ sw.toString());
  }
  }
  } else {
  writeToProjectFile(getSettingsGradlePath(), getModel().getSettingsContent().getBytes());
  if (hasProjectFile(GRADLE_PROPERTIES_PATH)) {
- try (ByteArrayOutputStream out = new ByteArrayOutputStream()) {
- getModel().getPropertiesContent().store(out, "Gradle properties");
- writeToProjectFile(GRADLE_PROPERTIES_PATH, out.toByteArray());
+ try (StringWriter sw = new StringWriter()) {
+ getModel().getPropertiesContent().store(sw, "Gradle properties");
+ writeToProjectFile(GRADLE_PROPERTIES_PATH, sw.toString());
  }
  }
  }
- writeToProjectFile(getBuildGradlePath(), getModel().getBuildContent().getBytes());
+ writeToProjectFile(getBuildGradlePath(), getModel().getBuildContent());
  }
 
  static boolean containsProperty(ArtifactCoords coords) {

independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/AbstractGradleBuildFilesCreator.java

@@ -8,9 +8,10 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;
-import java.util.Properties;
 import java.util.concurrent.atomic.AtomicReference;
 
+import org.codejive.properties.Properties;
+
 import io.quarkus.devtools.project.QuarkusProject;
 import io.quarkus.devtools.project.buildfile.AbstractGradleBuildFile.Model;
 import io.quarkus.maven.dependency.ArtifactCoords;
@@ -122,6 +123,10 @@ protected void writeToProjectFile(final String fileName, final byte[] content) t
  Files.write(quarkusProject.getProjectDirPath().resolve(fileName), content);
  }
 
+ protected void writeToProjectFile(final String fileName, final String content) throws IOException {
+ Files.writeString(quarkusProject.getProjectDirPath().resolve(fileName), content);
+ }
+
  private void createProperties() throws IOException {
  final ExtensionCatalog platform = quarkusProject.getExtensionsCatalog();
  Properties props = getModel().getPropertiesContent();

independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/BuildFile.java

@@ -155,6 +155,10 @@ protected void writeToProjectFile(final String fileName, final byte[] content) t
  Files.write(projectDirPath.resolve(fileName), content);
  }
 
+ protected void writeToProjectFile(final String fileName, final String content) throws IOException {
+ Files.writeString(projectDirPath.resolve(fileName), content);
+ }
+
  private Set<ArtifactKey> getDependenciesKeys() throws IOException {
  return getDependencies().stream().map(ArtifactCoords::getKey).collect(Collectors.toSet());
  }

independent-projects/tools/pom.xml

@@ -60,6 +60,7 @@
  <jandex.version>3.2.0</jandex.version>
  <system-stubs-jupiter.version>2.0.2</system-stubs-jupiter.version>
  <awaitility.version>4.2.1</awaitility.version>
+ <java-properties.version>0.0.7</java-properties.version>
  </properties>
  <modules>
  <module>registry-client</module>
@@ -175,6 +176,11 @@
  <artifactId>jboss-logging</artifactId>
  <version>${jboss-logging.version}</version>
  </dependency>
+ <dependency>
+ <groupId>org.codejive</groupId>
+ <artifactId>java-properties</artifactId>
+ <version>${java-properties.version}</version>
+ </dependency>
  <dependency>
  <groupId>org.junit.jupiter</groupId>
  <artifactId>junit-jupiter</artifactId>

integration-tests/gradle/src/main/resources/compile-only-lombok/gradle.properties

@@ -1,6 +1,6 @@
-#Gradle properties
-#Tue Aug 04 17:04:55 CEST 2020
+# Gradle properties
+
 quarkusPlatformArtifactId=quarkus-bom
 quarkusPlatformGroupId=io.quarkus
 org.gradle.logging.level=INFO
-lombokVersion=1.18.12
+lombokVersion=1.18.12

integration-tests/gradle/src/main/resources/multi-module-included-build/gradle.properties

@@ -1,4 +1,4 @@
-#Gradle properties
-#Tue Aug 25 06:41:36 GMT 2020
+# Gradle properties
+
 quarkusPlatformArtifactId=quarkus-bom
 quarkusPlatformGroupId=io.quarkus

integration-tests/gradle/src/main/resources/multi-module-kotlin-project/gradle.properties

@@ -1,5 +1,5 @@
-#Gradle properties
-#Wed May 06 08:31:08 UTC 2020
+# Gradle properties
+
 quarkusPlatformArtifactId=quarkus-bom
 quarkusPlatformGroupId=io.quarkus
 

integration-tests/gradle/src/main/resources/multi-module-with-empty-module/gradle.properties

@@ -1,3 +1,4 @@
-#Gradle properties
+# Gradle properties
+
 quarkusPlatformArtifactId=quarkus-bom
-quarkusPlatformGroupId=io.quarkus
+quarkusPlatformGroupId=io.quarkus