From 162b32f393a86e298e1467e4c7d871ec2617f530 Mon Sep 17 00:00:00 2001 From: Frank Vennemeyer Date: Sun, 17 Oct 2021 13:14:24 +0200 Subject: [PATCH] Fix temporary workspace deletion on JVM shutdown (#967) --- CHANGES.md | 3 +++ .../spotless/extra/eclipse_cdt_formatter/v4.20.0.lockfile | 2 +- .../spotless/extra/eclipse_cdt_formatter/v4.21.0.lockfile | 2 +- .../spotless/extra/eclipse_jdt_formatter/v4.20.0.lockfile | 2 +- .../spotless/extra/eclipse_jdt_formatter/v4.21.0.lockfile | 2 +- .../spotless/extra/eclipse_wtp_formatters/v4.20.0.lockfile | 2 +- .../spotless/extra/eclipse_wtp_formatters/v4.21.0.lockfile | 2 +- .../spotless/extra/groovy_eclipse_formatter/v4.20.0.lockfile | 2 +- .../spotless/extra/groovy_eclipse_formatter/v4.21.0.lockfile | 2 +- plugin-gradle/CHANGES.md | 3 +++ plugin-maven/CHANGES.md | 3 +++ 11 files changed, 17 insertions(+), 8 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index d867b5cf3a..261c12d323 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -13,6 +13,9 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format ( ### Changed * Added support and bump Eclipse formatter default versions to `4.21` for `eclipse-groovy`. Change is only applied for JVM 11+. +### Fixed + * Temporary workspace deletion for Eclipse based formatters on JVM shutdown ([#967](https://github.com/diffplug/spotless/issues/967)). Change is only applied for Eclipse versions using JVM 11+, no back-port to older versions is planned. + ## [2.19.1] - 2021-10-13 ### Fixed * [module-info formatting](https://github.com/diffplug/spotless/pull/958) in `eclipse-jdt` versions `4.20` and `4.21`. Note that the problem also affects older versions. diff --git a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_cdt_formatter/v4.20.0.lockfile b/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_cdt_formatter/v4.20.0.lockfile index ee122df4e9..6cdb507d00 100644 --- a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_cdt_formatter/v4.20.0.lockfile +++ b/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_cdt_formatter/v4.20.0.lockfile @@ -1,6 +1,6 @@ # Spotless formatter based on CDT version 10.3 (see https://www.eclipse.org/cdt/) com.diffplug.spotless:spotless-eclipse-cdt:10.3.0 -com.diffplug.spotless:spotless-eclipse-base:3.5.0 +com.diffplug.spotless:spotless-eclipse-base:3.5.2 com.github.spotbugs:spotbugs-annotations:4.0.2 com.google.code.findbugs:jsr305:3.0.2 com.ibm.icu:icu4j:67.1 diff --git a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_cdt_formatter/v4.21.0.lockfile b/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_cdt_formatter/v4.21.0.lockfile index a1be4b3058..4acd5a98ca 100644 --- a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_cdt_formatter/v4.21.0.lockfile +++ b/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_cdt_formatter/v4.21.0.lockfile @@ -1,6 +1,6 @@ # Spotless formatter based on CDT version 10.4 (see https://www.eclipse.org/cdt/) com.diffplug.spotless:spotless-eclipse-cdt:10.4.0 -com.diffplug.spotless:spotless-eclipse-base:3.5.0 +com.diffplug.spotless:spotless-eclipse-base:3.5.2 com.github.spotbugs:spotbugs-annotations:4.0.2 com.google.code.findbugs:jsr305:3.0.2 com.ibm.icu:icu4j:67.1 diff --git a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.20.0.lockfile b/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.20.0.lockfile index 18a2259ac9..b06a9bc617 100644 --- a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.20.0.lockfile +++ b/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.20.0.lockfile @@ -1,7 +1,7 @@ # Spotless formatter based on JDT version 4.20.0 (see https://projects.eclipse.org/projects/eclipse.jdt) # Compare tag in M2 pom with https://git.eclipse.org/c/jdt/eclipse.jdt.core.git/log/?h=R4_20 to determine core version. com.diffplug.spotless:spotless-eclipse-jdt:4.8.1 -com.diffplug.spotless:spotless-eclipse-base:3.5.0 +com.diffplug.spotless:spotless-eclipse-base:3.5.2 com.github.spotbugs:spotbugs-annotations:4.0.2 com.google.code.findbugs:jsr305:3.0.2 net.jcip:jcip-annotations:1.0 diff --git a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.21.0.lockfile b/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.21.0.lockfile index 171b181c33..84a90489c9 100644 --- a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.21.0.lockfile +++ b/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.21.0.lockfile @@ -1,7 +1,7 @@ # Spotless formatter based on JDT version 4.21.0 (see https://projects.eclipse.org/projects/eclipse.jdt) # Compare tag in M2 pom with https://git.eclipse.org/c/jdt/eclipse.jdt.core.git/log/?h=R4_21 to determine core version. com.diffplug.spotless:spotless-eclipse-jdt:4.8.1 -com.diffplug.spotless:spotless-eclipse-base:3.5.0 +com.diffplug.spotless:spotless-eclipse-base:3.5.2 com.github.spotbugs:spotbugs-annotations:4.0.2 com.google.code.findbugs:jsr305:3.0.2 net.jcip:jcip-annotations:1.0 diff --git a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_wtp_formatters/v4.20.0.lockfile b/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_wtp_formatters/v4.20.0.lockfile index f3296ee626..f7041c2b97 100644 --- a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_wtp_formatters/v4.20.0.lockfile +++ b/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_wtp_formatters/v4.20.0.lockfile @@ -1,6 +1,6 @@ # Spotless formatter based on Eclipse-WTP version 3.22 (see https://www.eclipse.org/webtools/) com.diffplug.spotless:spotless-eclipse-wtp:3.22.0 -com.diffplug.spotless:spotless-eclipse-base:3.5.0 +com.diffplug.spotless:spotless-eclipse-base:3.5.2 com.github.spotbugs:spotbugs-annotations:4.0.2 com.google.code.findbugs:jsr305:3.0.2 com.ibm.icu:icu4j:67.1 diff --git a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_wtp_formatters/v4.21.0.lockfile b/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_wtp_formatters/v4.21.0.lockfile index b59bb0af9a..86eee98719 100644 --- a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_wtp_formatters/v4.21.0.lockfile +++ b/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_wtp_formatters/v4.21.0.lockfile @@ -1,6 +1,6 @@ # Spotless formatter based on Eclipse-WTP version 3.23 (see https://www.eclipse.org/webtools/) com.diffplug.spotless:spotless-eclipse-wtp:3.23.0 -com.diffplug.spotless:spotless-eclipse-base:3.5.0 +com.diffplug.spotless:spotless-eclipse-base:3.5.2 com.github.spotbugs:spotbugs-annotations:4.0.2 com.google.code.findbugs:jsr305:3.0.2 com.ibm.icu:icu4j:67.1 diff --git a/lib-extra/src/main/resources/com/diffplug/spotless/extra/groovy_eclipse_formatter/v4.20.0.lockfile b/lib-extra/src/main/resources/com/diffplug/spotless/extra/groovy_eclipse_formatter/v4.20.0.lockfile index dfa1dc5baa..2836c05982 100644 --- a/lib-extra/src/main/resources/com/diffplug/spotless/extra/groovy_eclipse_formatter/v4.20.0.lockfile +++ b/lib-extra/src/main/resources/com/diffplug/spotless/extra/groovy_eclipse_formatter/v4.20.0.lockfile @@ -1,6 +1,6 @@ # Spotless formatter based on Groovy-Eclipse version 4.2.0 (see https://github.com/groovy/groovy-eclipse/releases) com.diffplug.spotless:spotless-eclipse-groovy:4.2.0 -com.diffplug.spotless:spotless-eclipse-base:3.5.0 +com.diffplug.spotless:spotless-eclipse-base:3.5.2 com.github.spotbugs:spotbugs-annotations:4.0.2 com.google.code.findbugs:jsr305:3.0.2 net.jcip:jcip-annotations:1.0 diff --git a/lib-extra/src/main/resources/com/diffplug/spotless/extra/groovy_eclipse_formatter/v4.21.0.lockfile b/lib-extra/src/main/resources/com/diffplug/spotless/extra/groovy_eclipse_formatter/v4.21.0.lockfile index b177a4b8d0..38376d1b32 100644 --- a/lib-extra/src/main/resources/com/diffplug/spotless/extra/groovy_eclipse_formatter/v4.21.0.lockfile +++ b/lib-extra/src/main/resources/com/diffplug/spotless/extra/groovy_eclipse_formatter/v4.21.0.lockfile @@ -1,6 +1,6 @@ # Spotless formatter based on Groovy-Eclipse version 4.3.0 (see https://github.com/groovy/groovy-eclipse/releases) com.diffplug.spotless:spotless-eclipse-groovy:4.3.0 -com.diffplug.spotless:spotless-eclipse-base:3.5.0 +com.diffplug.spotless:spotless-eclipse-base:3.5.2 com.github.spotbugs:spotbugs-annotations:4.0.2 com.google.code.findbugs:jsr305:3.0.2 net.jcip:jcip-annotations:1.0 diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md index eb4a93e154..e26eb22ef1 100644 --- a/plugin-gradle/CHANGES.md +++ b/plugin-gradle/CHANGES.md @@ -6,6 +6,9 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format ( ### Changed * Added support and bump Eclipse formatter default versions to `4.21` for `eclipse-groovy`. Change is only applied for JVM 11+. +### Fixed + * Temporary workspace deletion for Eclipse based formatters on JVM shutdown ([#967](https://github.com/diffplug/spotless/issues/967)). Change is only applied for Eclipse versions using JVM 11+, no back-port to older versions is planned. + ## [5.17.0] - 2021-10-13 ### Added * Added support for calling local binary formatters ([#963](https://github.com/diffplug/spotless/pull/963)) diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md index 73d2a340c2..21331b7980 100644 --- a/plugin-maven/CHANGES.md +++ b/plugin-maven/CHANGES.md @@ -9,6 +9,9 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format ( * Revert change from 2.17.2 regarding [skip bug](https://github.com/diffplug/spotless/pull/969) because fixing the skip bug caused inconsistent behavior between `check.skip` and `apply.skip`. * [skip bug](https://github.com/diffplug/spotless/issues/968) if ratchetFrom is specified, the build will still fail in if no Git repository is found, even if `skip` is true (new fix). +### Fixed + * Temporary workspace deletion for Eclipse based formatters on JVM shutdown ([#967](https://github.com/diffplug/spotless/issues/967)). Change is only applied for Eclipse versions using JVM 11+, no back-port to older versions is planned. + ## [2.17.2] - 2021-10-14 ### Fixed * [skip bug](https://github.com/diffplug/spotless/issues/968) if ratchetFrom is specified, the build will still fail in if no Git repository is found, even if `skip` is true.