Skip to content

Commit b736f2b

Browse files
committed
Upgrade to Quarkus 3.21.1
1 parent 8560f04 commit b736f2b

File tree

7 files changed

+1452
-1448
lines changed

7 files changed

+1452
-1448
lines changed

generated-platform-project/quarkus-google-cloud-services/bom/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4217,17 +4217,17 @@
42174217
<dependency>
42184218
<groupId>com.google.guava</groupId>
42194219
<artifactId>guava-gwt</artifactId>
4220-
<version>33.4.0-jre</version>
4220+
<version>33.4.6-jre</version>
42214221
</dependency>
42224222
<dependency>
42234223
<groupId>com.google.guava</groupId>
42244224
<artifactId>guava-testlib</artifactId>
4225-
<version>33.4.0-jre</version>
4225+
<version>33.4.6-jre</version>
42264226
</dependency>
42274227
<dependency>
42284228
<groupId>com.google.guava</groupId>
42294229
<artifactId>guava</artifactId>
4230-
<version>33.4.0-jre</version>
4230+
<version>33.4.6-jre</version>
42314231
</dependency>
42324232
<dependency>
42334233
<groupId>com.google.http-client</groupId>

generated-platform-project/quarkus-maven-plugin/src/main/java/io/quarkus/maven/TrackConfigChangesMojo.java

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public class TrackConfigChangesMojo extends QuarkusBootstrapMojo {
5757
File recordedBuildConfigDirectory;
5858

5959
@Parameter(property = "quarkus.recorded-build-config.file", required = false)
60-
File recordedBuildConfigFile;
60+
String recordedBuildConfigFile;
6161

6262
/**
6363
* Whether to dump the current build configuration in case the configuration from the previous build isn't found
@@ -101,16 +101,7 @@ protected void doExecute() throws MojoExecutionException, MojoFailureException {
101101
getLog().debug("Bootstrapping Quarkus application in mode " + launchMode);
102102
}
103103

104-
Path compareFile;
105-
if (this.recordedBuildConfigFile == null) {
106-
compareFile = recordedBuildConfigDirectory.toPath()
107-
.resolve("quarkus-" + launchMode.getDefaultProfile() + "-config-dump");
108-
} else if (this.recordedBuildConfigFile.isAbsolute()) {
109-
compareFile = this.recordedBuildConfigFile.toPath();
110-
} else {
111-
compareFile = recordedBuildConfigDirectory.toPath().resolve(this.recordedBuildConfigFile.toPath());
112-
}
113-
104+
final Path compareFile = resolvePreviousBuildConfigDump(launchMode);
114105
final boolean prevConfigExists = Files.exists(compareFile);
115106
if (!prevConfigExists && !dumpCurrentWhenRecordedUnavailable && !dumpDependencies) {
116107
getLog().info("Config dump from the previous build does not exist at " + compareFile);
@@ -177,6 +168,19 @@ protected void doExecute() throws MojoExecutionException, MojoFailureException {
177168
}
178169
}
179170

171+
private Path resolvePreviousBuildConfigDump(LaunchMode launchMode) {
172+
final Path previousBuildConfigDump = this.recordedBuildConfigFile == null ? null
173+
: Path.of(this.recordedBuildConfigFile);
174+
if (previousBuildConfigDump == null) {
175+
return recordedBuildConfigDirectory.toPath()
176+
.resolve("quarkus-" + launchMode.getDefaultProfile() + "-config-dump");
177+
}
178+
if (previousBuildConfigDump.isAbsolute()) {
179+
return previousBuildConfigDump;
180+
}
181+
return recordedBuildConfigDirectory.toPath().resolve(previousBuildConfigDump);
182+
}
183+
180184
private Path getOutputFile(File outputFile, String profile, String fileNameSuffix) {
181185
if (outputFile == null) {
182186
return outputDirectory.toPath().resolve("quarkus-" + profile + fileNameSuffix);

0 commit comments

Comments
 (0)