Skip to content

Commit

Permalink
Merge pull request #35033 from jprinet/fix/ignore-maven-local-as-test…
Browse files Browse the repository at this point in the history 
…-input

Enable cacheability of surefire and failsafe goals
  • Loading branch information
@gsmet
gsmet authored Jul 27, 2023
2 parents 7cf4b35 + 9f3ba19 commit 340b9a8
Show file tree
Hide file tree
Showing 10 changed files with 161 additions and 46 deletions.
4 changes: 2 additions & 2 deletions .mvn/extensions.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
<extension>
<groupId>com.gradle</groupId>
<artifactId>gradle-enterprise-maven-extension</artifactId>
<version>1.17.1</version>
<version>1.18</version>
</extension>
<extension>
<groupId>com.gradle</groupId>
<artifactId>common-custom-user-data-maven-extension</artifactId>
<version>1.12</version>
</extension>
</extensions>
</extensions>
17 changes: 17 additions & 0 deletions build-parent/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -758,6 +758,23 @@
</execution>
</executions>
</plugin>

<plugin>
<groupId>com.gradle</groupId>
<artifactId>gradle-enterprise-maven-extension</artifactId>
<configuration>
<gradleEnterprise>
<normalization>
<systemProperties>
<ignoredKeys>
<ignore>maven.repo.local</ignore>
</ignoredKeys>
</systemProperties>
</normalization>
</gradleEnterprise>
</configuration>
</plugin>

</plugins>
</pluginManagement>
</build>
Expand Down
24 changes: 23 additions & 1 deletion docs/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3176,6 +3176,28 @@
</executions>
</plugin>
</plugins>

<pluginManagement>
<plugins>
<plugin>
<groupId>com.gradle</groupId>
<artifactId>gradle-enterprise-maven-extension</artifactId>
<configuration>
<gradleEnterprise>
<normalization>
<systemProperties>
<ignoredKeys combine.children="append">
<ignore>vale.dir</ignore>
<ignore>git.dir</ignore>
</ignoredKeys>
</systemProperties>
</normalization>
</gradleEnterprise>
</configuration>
</plugin>
</plugins>
</pluginManagement>

</build>

<profiles>
Expand Down Expand Up @@ -3204,7 +3226,7 @@
<phase>process-resources</phase>
<goals>
<goal>process-asciidoc</goal>
</goals>
</goals>
<configuration>
<skip>${skipDocs}</skip>
<backend>pdf</backend>
Expand Down
20 changes: 20 additions & 0 deletions independent-projects/arc/tcks/cdi-tck-runner/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,26 @@
</configuration>
</plugin>
</plugins>

<pluginManagement>
<plugins>
<plugin>
<groupId>com.gradle</groupId>
<artifactId>gradle-enterprise-maven-extension</artifactId>
<configuration>
<gradleEnterprise>
<normalization>
<systemProperties>
<ignoredKeys combine.children="append">
<ignore>org.jboss.cdi.tck.libraryDirectory</ignore>
</ignoredKeys>
</systemProperties>
</normalization>
</gradleEnterprise>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>

</project>
17 changes: 17 additions & 0 deletions independent-projects/parent/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -420,6 +420,23 @@
<artifactId>versions-maven-plugin</artifactId>
<version>${version.versions.plugin}</version>
</plugin>

<plugin>
<groupId>com.gradle</groupId>
<artifactId>gradle-enterprise-maven-extension</artifactId>
<configuration>
<gradleEnterprise>
<normalization>
<systemProperties>
<ignoredKeys>
<ignore>maven.repo.local</ignore>
</ignoredKeys>
</systemProperties>
</normalization>
</gradleEnterprise>
</configuration>
</plugin>

</plugins>
</pluginManagement>
</build>
Expand Down
20 changes: 3 additions & 17 deletions integration-tests/awt/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,23 +147,9 @@
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
<configuration>
<systemPropertyVariables>
<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>
<quarkus.http.host>localhost</quarkus.http.host>
<quarkus.http.port>8081</quarkus.http.port>
</systemPropertyVariables>
</configuration>
</execution>
</executions>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
Expand Down
20 changes: 20 additions & 0 deletions integration-tests/mongodb-rest-data-panache/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,26 @@
</configuration>
</plugin>
</plugins>

<pluginManagement>
<plugins>
<plugin>
<groupId>com.gradle</groupId>
<artifactId>gradle-enterprise-maven-extension</artifactId>
<configuration>
<gradleEnterprise>
<normalization>
<systemProperties>
<ignoredKeys combine.children="append">
<ignore>quarkus.kubernetes-service-binding.root</ignore>
</ignoredKeys>
</systemProperties>
</normalization>
</gradleEnterprise>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>

<profiles>
Expand Down
55 changes: 31 additions & 24 deletions integration-tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,29 +88,36 @@
</plugin>

<plugin>
<!-- config to avoid unbind-executions confuses gradle enterprise caching-->
<groupId>com.gradle</groupId>
<artifactId>gradle-enterprise-maven-extension</artifactId>
<configuration>
<gradleEnterprise>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<inputs>
<fileSets>
<fileSet>
<name>specs</name>
<paths>
<path>${project.basedir}/disable-unbind-executions</path>
</paths>
<normalization>RELATIVE_PATH</normalization>
</fileSet>
</fileSets>
</inputs>
</plugin>
</plugins>
</gradleEnterprise>
</configuration>
<groupId>com.gradle</groupId>
<artifactId>gradle-enterprise-maven-extension</artifactId>
<configuration>
<gradleEnterprise>
<normalization>
<systemProperties>
<ignoredKeys combine.children="append">
<ignore>native.image.path</ignore>
</ignoredKeys>
</systemProperties>
</normalization>
<!-- config to avoid unbind-executions confuses gradle enterprise caching-->
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<inputs>
<fileSets combine.children="append">
<fileSet>
<name>specs</name>
<paths>
<path>${project.basedir}/disable-unbind-executions</path>
</paths>
<normalization>RELATIVE_PATH</normalization>
</fileSet>
</fileSets>
</inputs>
</plugin>
</plugins>
</gradleEnterprise>
</configuration>
</plugin>
</plugins>
</pluginManagement>
Expand Down Expand Up @@ -505,4 +512,4 @@
</build>
</profile>
</profiles>
</project>
</project>
21 changes: 21 additions & 0 deletions integration-tests/rest-client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,27 @@
</configuration>
</plugin>
</plugins>

<pluginManagement>
<plugins>
<plugin>
<groupId>com.gradle</groupId>
<artifactId>gradle-enterprise-maven-extension</artifactId>
<configuration>
<gradleEnterprise>
<normalization>
<systemProperties>
<ignoredKeys combine.children="append">
<ignore>javax.net.ssl.trustStore</ignore>
<ignore>rest-client.trustStore</ignore>
</ignoredKeys>
</systemProperties>
</normalization>
</gradleEnterprise>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>

<profiles>
Expand Down
9 changes: 7 additions & 2 deletions integration-tests/test-extension/tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,14 @@
<artifactId>gradle-enterprise-maven-extension</artifactId>
<configuration>
<gradleEnterprise>
<normalization combine.children="append">
<normalization>
<systemProperties>
<ignoredKeys combine.children="append">
<ignore>classpathEntriesRecordingFile</ignore>
</ignoredKeys>
</systemProperties>
<runtimeClassPath>
<propertiesNormalizations>
<propertiesNormalizations combine.children="append">
<propertiesNormalization>
<path>application.properties</path>
<ignoredProperties>
Expand Down

0 comments on commit 340b9a8

Please sign in to comment.