Take into account quarkus-*-dependencies.txt

Related to: - quarkusio/quarkus#39256 - quarkusio/quarkus#41482
gsmet · Jun 27, 2024 · be41f09 · be41f09
1 parent b966165
commit be41f09
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/src/main/java/io/quarkus/develocity/project/plugins/FailsafeConfiguredPlugin.java b/src/main/java/io/quarkus/develocity/project/plugins/FailsafeConfiguredPlugin.java
@@ -24,7 +24,10 @@ protected Map<String, GoalMetadataProvider> getGoalMetadataProviders() {
 
     private static void configureIntegrationTest(MojoMetadataProvider.Context context) {
         context.inputs(inputs -> {
-            inputs.fileSet("dependency-checksums", context.getProject().getBuild().getDirectory(), fs -> fs
+            inputs.fileSet("quarkus-dependencies", context.getProject().getBuild().getDirectory(), fs -> fs
+                    .include("quarkus-*-dependencies.txt").normalizationStrategy(NormalizationStrategy.CLASSPATH));
+            // for compatibility with older versions but this is deprecated
+            inputs.fileSet("quarkus-dependency-checksums", context.getProject().getBuild().getDirectory(), fs -> fs
                     .include("quarkus-*-dependency-checksums.txt").normalizationStrategy(NormalizationStrategy.RELATIVE_PATH));
 
             if (Matchers.directory(context, Path.of("integration-tests"))) {

diff --git a/src/main/java/io/quarkus/develocity/project/plugins/QuarkusConfiguredPlugin.java b/src/main/java/io/quarkus/develocity/project/plugins/QuarkusConfiguredPlugin.java
@@ -28,9 +28,12 @@ protected Map<String, GoalMetadataProvider> getGoalMetadataProviders() {
 
     private static void configureBuild(MojoMetadataProvider.Context context) {
         context.inputs(inputs -> {
-            inputs.fileSet("dependency-checksums", context.getProject().getBuild().getDirectory(), fs -> fs
+            inputs.fileSet("quarkus-dependencies", context.getProject().getBuild().getDirectory(), fs -> fs
+                    .include("quarkus-*-dependencies.txt").normalizationStrategy(NormalizationStrategy.CLASSPATH));
+            // for compatibility with older versions but this is deprecated
+            inputs.fileSet("quarkus-dependency-checksums", context.getProject().getBuild().getDirectory(), fs -> fs
                     .include("quarkus-*-dependency-checksums.txt").normalizationStrategy(NormalizationStrategy.RELATIVE_PATH));
-        });
+            });
     }
 
     private static void configureGenerateCode(MojoMetadataProvider.Context context) {
@@ -48,7 +51,10 @@ private static void configureCommonGeneratedCode(MojoMetadataProvider.Context co
             dependsOnJavaVersion(inputs);
 
             inputs.properties("skipSourceGeneration", "mode", "properties", "bootstrapId");
-            inputs.fileSet("dependency-checksums", context.getProject().getBuild().getDirectory(), fileSet -> fileSet
+            inputs.fileSet("quarkus-dependencies", context.getProject().getBuild().getDirectory(), fs -> fs
+                    .include("quarkus-*-dependencies.txt").normalizationStrategy(NormalizationStrategy.CLASSPATH));
+            // for compatibility with older versions but this is deprecated
+            inputs.fileSet("quarkus-dependency-checksums", context.getProject().getBuild().getDirectory(), fs -> fs
                     .include("quarkus-*-dependency-checksums.txt").normalizationStrategy(NormalizationStrategy.RELATIVE_PATH));
             inputs.fileSet("resources", context.getProject().getResources().stream().map(r -> r.getDirectory())
                     .collect(Collectors.toList()),

diff --git a/src/main/java/io/quarkus/develocity/project/plugins/SurefireConfiguredPlugin.java b/src/main/java/io/quarkus/develocity/project/plugins/SurefireConfiguredPlugin.java
@@ -24,7 +24,10 @@ protected Map<String, GoalMetadataProvider> getGoalMetadataProviders() {
 
     private static void configureTest(MojoMetadataProvider.Context context) {
         context.inputs(inputs -> {
-            inputs.fileSet("dependency-checksums", context.getProject().getBuild().getDirectory(), fs -> fs
+            inputs.fileSet("quarkus-dependencies", context.getProject().getBuild().getDirectory(), fs -> fs
+                    .include("quarkus-*-dependencies.txt").normalizationStrategy(NormalizationStrategy.CLASSPATH));
+            // for compatibility with older versions but this is deprecated
+            inputs.fileSet("quarkus-dependency-checksums", context.getProject().getBuild().getDirectory(), fs -> fs
                     .include("quarkus-*-dependency-checksums.txt").normalizationStrategy(NormalizationStrategy.RELATIVE_PATH));
         });