Skip to content

Commit 114807c

Browse files
gastaldigsmet
authored andcommitted
Avoid storing timestamp in Gradle.properties
(cherry picked from commit 423b4f4)
1 parent d377d3c commit 114807c

File tree

13 files changed

+50
-26
lines changed

13 files changed

+50
-26
lines changed

.github/dependabot.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,7 @@ updates:
184184
- dependency-name: biz.paluch.logging:logstash-gelf
185185
- dependency-name: org.bitbucket.b_c:jose4j
186186
- dependency-name: io.fabric8:maven-model-helper
187+
- dependency-name: org.codejive:java-properties
187188
ignore:
188189
# this one cannot be upgraded due to the usage of proxies in new versions
189190
# the proxy implements interfaces in a random order which causes issues

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#Gradle properties
2-
#Tue Mar 17 10:20:48 UTC 2020
1+
# Gradle properties
2+
33
quarkusPluginVersion=${project.version}
44
quarkusPlatformArtifactId=quarkus-bom
55
quarkusPlatformVersion=${project.version}
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
#Gradle properties
1+
# Gradle properties
2+
23
quarkusPluginId={quarkus.gradle-plugin.id}
34
quarkusPluginVersion={quarkus.gradle-plugin.version}
45
quarkusPlatformGroupId={quarkus.platform.group-id}
56
quarkusPlatformArtifactId={quarkus.platform.artifact-id}
6-
quarkusPlatformVersion={quarkus.platform.version}
7+
quarkusPlatformVersion={quarkus.platform.version}
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
#Gradle properties
1+
# Gradle properties
2+
23
quarkusPluginId={quarkus.gradle-plugin.id}
34
quarkusPluginVersion={quarkus.gradle-plugin.version}
45
quarkusPlatformGroupId={quarkus.platform.group-id}
56
quarkusPlatformArtifactId={quarkus.platform.artifact-id}
6-
quarkusPlatformVersion={quarkus.platform.version}
7+
quarkusPlatformVersion={quarkus.platform.version}

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,10 @@
106106
<groupId>jakarta.enterprise</groupId>
107107
<artifactId>jakarta.enterprise.cdi-api</artifactId>
108108
</dependency>
109+
<dependency>
110+
<groupId>org.codejive</groupId>
111+
<artifactId>java-properties</artifactId>
112+
</dependency>
109113
<dependency>
110114
<groupId>org.junit.jupiter</groupId>
111115
<artifactId>junit-jupiter</artifactId>

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

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
package io.quarkus.devtools.project.buildfile;
22

33
import java.io.ByteArrayInputStream;
4-
import java.io.ByteArrayOutputStream;
54
import java.io.IOException;
5+
import java.io.StringWriter;
66
import java.io.UncheckedIOException;
77
import java.nio.charset.StandardCharsets;
88
import java.nio.file.Files;
99
import java.nio.file.Path;
10-
import java.util.Properties;
1110
import java.util.Scanner;
1211
import java.util.concurrent.atomic.AtomicReference;
1312
import java.util.regex.Matcher;
1413
import java.util.regex.Pattern;
1514

15+
import org.codejive.properties.Properties;
16+
1617
import io.quarkus.maven.dependency.ArtifactCoords;
1718
import io.quarkus.maven.dependency.ArtifactKey;
1819
import io.quarkus.registry.catalog.ExtensionCatalog;
@@ -47,22 +48,22 @@ public void writeToDisk() throws IOException {
4748
if (rootProjectPath != null) {
4849
Files.write(rootProjectPath.resolve(getSettingsGradlePath()), getModel().getRootSettingsContent().getBytes());
4950
if (hasRootProjectFile(GRADLE_PROPERTIES_PATH)) {
50-
try (ByteArrayOutputStream out = new ByteArrayOutputStream()) {
51-
getModel().getRootPropertiesContent().store(out, "Gradle properties");
52-
Files.write(rootProjectPath.resolve(GRADLE_PROPERTIES_PATH),
53-
out.toByteArray());
51+
try (StringWriter sw = new StringWriter()) {
52+
getModel().getRootPropertiesContent().store(sw, "Gradle properties");
53+
Files.writeString(rootProjectPath.resolve(GRADLE_PROPERTIES_PATH),
54+
sw.toString());
5455
}
5556
}
5657
} else {
5758
writeToProjectFile(getSettingsGradlePath(), getModel().getSettingsContent().getBytes());
5859
if (hasProjectFile(GRADLE_PROPERTIES_PATH)) {
59-
try (ByteArrayOutputStream out = new ByteArrayOutputStream()) {
60-
getModel().getPropertiesContent().store(out, "Gradle properties");
61-
writeToProjectFile(GRADLE_PROPERTIES_PATH, out.toByteArray());
60+
try (StringWriter sw = new StringWriter()) {
61+
getModel().getPropertiesContent().store(sw, "Gradle properties");
62+
writeToProjectFile(GRADLE_PROPERTIES_PATH, sw.toString());
6263
}
6364
}
6465
}
65-
writeToProjectFile(getBuildGradlePath(), getModel().getBuildContent().getBytes());
66+
writeToProjectFile(getBuildGradlePath(), getModel().getBuildContent());
6667
}
6768

6869
static boolean containsProperty(ArtifactCoords coords) {

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@
88
import java.nio.file.Files;
99
import java.nio.file.Path;
1010
import java.util.List;
11-
import java.util.Properties;
1211
import java.util.concurrent.atomic.AtomicReference;
1312

13+
import org.codejive.properties.Properties;
14+
1415
import io.quarkus.devtools.project.QuarkusProject;
1516
import io.quarkus.devtools.project.buildfile.AbstractGradleBuildFile.Model;
1617
import io.quarkus.maven.dependency.ArtifactCoords;
@@ -122,6 +123,10 @@ protected void writeToProjectFile(final String fileName, final byte[] content) t
122123
Files.write(quarkusProject.getProjectDirPath().resolve(fileName), content);
123124
}
124125

126+
protected void writeToProjectFile(final String fileName, final String content) throws IOException {
127+
Files.writeString(quarkusProject.getProjectDirPath().resolve(fileName), content);
128+
}
129+
125130
private void createProperties() throws IOException {
126131
final ExtensionCatalog platform = quarkusProject.getExtensionsCatalog();
127132
Properties props = getModel().getPropertiesContent();

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,10 @@ protected void writeToProjectFile(final String fileName, final byte[] content) t
155155
Files.write(projectDirPath.resolve(fileName), content);
156156
}
157157

158+
protected void writeToProjectFile(final String fileName, final String content) throws IOException {
159+
Files.writeString(projectDirPath.resolve(fileName), content);
160+
}
161+
158162
private Set<ArtifactKey> getDependenciesKeys() throws IOException {
159163
return getDependencies().stream().map(ArtifactCoords::getKey).collect(Collectors.toSet());
160164
}

independent-projects/tools/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
<jandex.version>3.2.0</jandex.version>
6161
<system-stubs-jupiter.version>2.0.2</system-stubs-jupiter.version>
6262
<awaitility.version>4.2.1</awaitility.version>
63+
<java-properties.version>0.0.7</java-properties.version>
6364
</properties>
6465
<modules>
6566
<module>registry-client</module>
@@ -175,6 +176,11 @@
175176
<artifactId>jboss-logging</artifactId>
176177
<version>${jboss-logging.version}</version>
177178
</dependency>
179+
<dependency>
180+
<groupId>org.codejive</groupId>
181+
<artifactId>java-properties</artifactId>
182+
<version>${java-properties.version}</version>
183+
</dependency>
178184
<dependency>
179185
<groupId>org.junit.jupiter</groupId>
180186
<artifactId>junit-jupiter</artifactId>
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Gradle properties
2-
#Tue Aug 04 17:04:55 CEST 2020
1+
# Gradle properties
2+
33
quarkusPlatformArtifactId=quarkus-bom
44
quarkusPlatformGroupId=io.quarkus
55
org.gradle.logging.level=INFO
6-
lombokVersion=1.18.12
6+
lombokVersion=1.18.12

0 commit comments

Comments
 (0)