Merge pull request #37209 from gsmet/additional-tweaks-build-cache

Build cache - Additional tweaks
quarkusio · Nov 20, 2023 · 63aeb93 · 63aeb93
2 parents 3326e64 + 5727c2d
commit 63aeb93
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/independent-projects/parent/pom.xml b/independent-projects/parent/pom.xml
@@ -562,6 +562,8 @@
                                                     <exclude>.settings/*</exclude>
                                                     <exclude>target/*</exclude>
                                                     <exclude>.cache/*</exclude>
+                                                    <exclude>.factorypath</exclude>
+                                                    <exclude>*.log</exclude>
                                                 </excludes>
                                                 <normalization>
                                                     <ignoreEmptyDirectories>true</ignoreEmptyDirectories>

diff --git a/integration-tests/oidc-client-reactive/pom.xml b/integration-tests/oidc-client-reactive/pom.xml
@@ -156,6 +156,9 @@
                         <gradleEnterprise>
                             <normalization combine.children="append">
                                 <runtimeClassPath>
+                                    <ignoredFiles>
+                                        <ignoredFile>META-INF/ide-deps/**</ignoredFile>
+                                    </ignoredFiles>
                                     <propertiesNormalizations>
                                         <propertiesNormalization>
                                             <path>application.properties</path>

diff --git a/integration-tests/rest-client-reactive/pom.xml b/integration-tests/rest-client-reactive/pom.xml
@@ -156,6 +156,9 @@
                         <gradleEnterprise>
                             <normalization combine.children="append">
                                 <runtimeClassPath>
+                                    <ignoredFiles>
+                                        <ignoredFile>META-INF/ide-deps/**</ignoredFile>
+                                    </ignoredFiles>
                                     <propertiesNormalizations>
                                         <propertiesNormalization>
                                             <path>application.properties</path>

diff --git a/...s/src/test/resources-filtered/projects/project-using-test-template-from-extension/pom.xml b/...s/src/test/resources-filtered/projects/project-using-test-template-from-extension/pom.xml
@@ -46,7 +46,7 @@
       <groupId>io.quarkus</groupId>
       <artifactId>integration-test-extension-that-defines-junit-test-extensions</artifactId>
       <version>${quarkus.version}</version>
-       <scope>test</scope> 
+       <scope>test</scope>
     </dependency>
 
   </dependencies>
@@ -109,7 +109,7 @@
                 </goals>
                 <configuration>
                   <systemPropertyVariables>
-                    <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
+                    <native.image.path>\${project.build.directory}/\${project.build.finalName}-runner</native.image.path>
                     <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
                     <maven.home>\${maven.home}</maven.home>
                   </systemPropertyVariables>