Skip to content

Exclude target folder from spotless to fix gradle compilation cache and add git blame ignore list #8965

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

Merged
merged 2 commits into from
Sep 18, 2024
Merged

Exclude target folder from spotless to fix gradle compilation cache and add git blame ignore list #8965

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d7d412b
Exclude generated sources from spotless
mbellade Sep 17, 2024
0846543
Create `git blame` ignore file and mention it in CONTRIBUTING.md
mbellade Sep 17, 2024
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
3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Initial commits that enabled spotless automatic formatting
59731c089e9d649a663c81d9622b54557d6aba37
4d63ffd98cdead513ab0be0fa23f9787423092d3
1 change: 1 addition & 0 deletions CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ GitHub there are a few pre-requisite steps to follow:
the linked page, this also includes:
* [set up your local git install](https://help.github.com/articles/set-up-git)
* clone your fork
* Instruct git to ignore certain commits when using `git blame`. From the directory of your local clone, run this: `git config blame.ignoreRevsFile .git-blame-ignore-revs`
* See the wiki pages for setting up your IDE, whether you use
[IntelliJ IDEA](https://hibernate.org/community/contribute/intellij-idea/)
or [Eclipse](https://hibernate.org/community/contribute/eclipse-ide/)<sup>(1)</sup>.
Expand Down
5 changes: 3 additions & 2 deletions gradle/java-module.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,9 +472,10 @@ spotless {
//Don't fail during the check: rather than enforcing guidelines, we use this plugin to fix mistakes automatically.
enforceCheck false
java {
licenseHeaderFile rootProject.file('spotless.license.java')
targetExclude( "**/target/**/*.java" )
licenseHeaderFile rootProject.file( 'spotless.license.java' )
removeUnusedImports()
indentWithTabs(4)
indentWithTabs( 4 )
trimTrailingWhitespace()
endWithNewline()
}
Expand Down
5 changes: 0 additions & 5 deletions hibernate-core/hibernate-core.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,8 +282,3 @@ tasks.sourcesJar.dependsOn ':hibernate-core:generateGraphParser'
tasks.sourcesJar.dependsOn ':hibernate-core:generateHqlParser'
tasks.sourcesJar.dependsOn ':hibernate-core:generateSqlScriptParser'
tasks.sourcesJar.dependsOn ':hibernate-core:generateOrderingParser'

tasks.spotlessJava.dependsOn ':hibernate-core:generateGraphParser'
tasks.spotlessJava.dependsOn ':hibernate-core:generateHqlParser'
tasks.spotlessJava.dependsOn ':hibernate-core:generateSqlScriptParser'
tasks.spotlessJava.dependsOn ':hibernate-core:generateOrderingParser'