From 2e98b854fa52db52ab372bf143a6786e2a00d219 Mon Sep 17 00:00:00 2001 From: Tanish <73871477+Taz03@users.noreply.github.com> Date: Fri, 3 Mar 2023 02:54:45 +0530 Subject: [PATCH 1/4] Added new lockfile --- .../eclipse_jdt_formatter/v4.22.0.lockfile | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.22.0.lockfile diff --git a/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.22.0.lockfile b/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.22.0.lockfile new file mode 100644 index 0000000000..412ecd6f27 --- /dev/null +++ b/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter/v4.22.0.lockfile @@ -0,0 +1,21 @@ +# Spotless formatter based on JDT version 4.26.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.2 +com.github.spotbugs:spotbugs-annotations:4.0.2 +com.google.code.findbugs:jsr305:3.0.2 +net.jcip:jcip-annotations:1.0 +org.eclipse.jdt:org.eclipse.jdt.core:3.32.0 +org.eclipse.platform:org.eclipse.core.commands:3.10.100 +org.eclipse.platform:org.eclipse.core.contenttype:3.8.200 +org.eclipse.platform:org.eclipse.core.filesystem:1.9.500 +org.eclipse.platform:org.eclipse.core.jobs:3.13.200 +org.eclipse.platform:org.eclipse.core.resources:3.15.100 +org.eclipse.platform:org.eclipse.core.runtime:3.23.0 +org.eclipse.platform:org.eclipse.equinox.app:1.6.0 +org.eclipse.platform:org.eclipse.equinox.common:3.15.0 +org.eclipse.platform:org.eclipse.equinox.preferences:3.9.0 +org.eclipse.platform:org.eclipse.equinox.registry:3.11.0 +org.eclipse.platform:org.eclipse.osgi:3.17.0 +org.eclipse.platform:org.eclipse.text:3.12.0 +org.osgi:org.osgi.service.prefs:1.1.2 From 45dd1a519b13022d1afd31b642a21e6bbeefd982 Mon Sep 17 00:00:00 2001 From: Tanish <73871477+Taz03@users.noreply.github.com> Date: Fri, 3 Mar 2023 02:56:39 +0530 Subject: [PATCH 2/4] Use latest lockfile --- .../diffplug/spotless/extra/java/EclipseJdtFormatterStep.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStep.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStep.java index d0d42f2814..033ce0e85c 100644 --- a/lib-extra/src/main/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStep.java +++ b/lib-extra/src/main/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStep.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2021 DiffPlug + * Copyright 2016-2023 DiffPlug * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -35,7 +35,7 @@ private EclipseJdtFormatterStep() {} private static final String FORMATTER_CLASS = "com.diffplug.spotless.extra.eclipse.java.EclipseJdtFormatterStepImpl"; private static final String MAVEN_GROUP_ARTIFACT = "com.diffplug.spotless:spotless-eclipse-jdt"; private static final String FORMATTER_METHOD = "format"; - private static final Jvm.Support JVM_SUPPORT = Jvm. support(NAME).add(8, "4.19.0").add(11, "4.21.0"); + private static final Jvm.Support JVM_SUPPORT = Jvm. support(NAME).add(8, "4.19.0").add(11, "4.22.0"); public static String defaultVersion() { return JVM_SUPPORT.getRecommendedFormatterVersion(); From 77f6d2f8c67c80239d8c4bf19fc82f82c971b7ee Mon Sep 17 00:00:00 2001 From: Tanish <73871477+Taz03@users.noreply.github.com> Date: Fri, 3 Mar 2023 03:01:40 +0530 Subject: [PATCH 3/4] Update CHANGES.md --- CHANGES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.md b/CHANGES.md index 8540a44851..2087a5b745 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -12,6 +12,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format ( ## [Unreleased] ### Changes * We are now opting in to Gradle's new stable configuration cache. ([#1591](https://github.com/diffplug/spotless/pull/1591)) +* Bump default `eclipse-jdt` version from `4.21` -> `4.22` ([#1579](https://github.com/diffplug/spotless/pull/1579)) ## [2.36.0] - 2023-02-27 ### Added From e57b187060fe68fce4d58b85335ad6144c3b78c9 Mon Sep 17 00:00:00 2001 From: Tanish <73871477+Taz03@users.noreply.github.com> Date: Sat, 4 Mar 2023 18:09:18 +0530 Subject: [PATCH 4/4] fixed pr id --- CHANGES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 2087a5b745..ae0453c245 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -12,7 +12,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format ( ## [Unreleased] ### Changes * We are now opting in to Gradle's new stable configuration cache. ([#1591](https://github.com/diffplug/spotless/pull/1591)) -* Bump default `eclipse-jdt` version from `4.21` -> `4.22` ([#1579](https://github.com/diffplug/spotless/pull/1579)) +* Bump default `eclipse-jdt` version from `4.21` -> `4.22` ([#1603](https://github.com/diffplug/spotless/pull/1603)) ## [2.36.0] - 2023-02-27 ### Added