Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build cache - Additional tweaks #37209

Merged
merged 3 commits into from
Nov 20, 2023
Merged

Build cache - Additional tweaks #37209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2712330
Build cache - Ignore more files for Spotless
gsmet Nov 20, 2023
7824826
Build cache - Avoid runtimeClasspath being overridden
gsmet Nov 20, 2023
5727c2d
Build cache - Avoid hardcoded path in generated test file
gsmet Nov 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions independent-projects/parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -562,6 +562,8 @@
<exclude>.settings/*</exclude>
<exclude>target/*</exclude>
<exclude>.cache/*</exclude>
<exclude>.factorypath</exclude>
<exclude>*.log</exclude>
</excludes>
<normalization>
<ignoreEmptyDirectories>true</ignoreEmptyDirectories>
Expand Down
3 changes: 3 additions & 0 deletions integration-tests/oidc-client-reactive/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,9 @@
<gradleEnterprise>
<normalization combine.children="append">
<runtimeClassPath>
<ignoredFiles>
<ignoredFile>META-INF/ide-deps/**</ignoredFile>
</ignoredFiles>
Comment on lines +159 to +161
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jprinet I couldn't find a combination of combine.children that would work here. Problem is that we end up with multiple elements of the same type in the resulting output.

I'm not completely sure if it's something you support?

For now I copied the rule here but interested in your feedback.

Copy link
Contributor

@jprinet jprinet Nov 21, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I applied the combine.children=append to the runtimeClassPath section instead of the normalization section here which helped me to get all the keys inherited without duplication (when looking at Intellij's effective pom).

See the effective pom result:
Screenshot 2023-11-21 at 9 27 12 AM

Is this what you were looking for @gsmet ?

<propertiesNormalizations>
<propertiesNormalization>
<path>application.properties</path>
Expand Down
3 changes: 3 additions & 0 deletions integration-tests/rest-client-reactive/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,9 @@
<gradleEnterprise>
<normalization combine.children="append">
<runtimeClassPath>
<ignoredFiles>
<ignoredFile>META-INF/ide-deps/**</ignoredFile>
</ignoredFiles>
<propertiesNormalizations>
<propertiesNormalization>
<path>application.properties</path>
Expand Down
4 changes: 2 additions & 2 deletions ...s/src/test/resources-filtered/projects/project-using-test-template-from-extension/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
Loading