From 07a0eb78237773c44dac0dfd00059367f9d4fa89 Mon Sep 17 00:00:00 2001 From: Roberto Perez Alcolea Date: Fri, 25 Jul 2025 13:46:16 -0700 Subject: [PATCH] Migrate usages of deprecated classes in groovy.util package to groovy.xml ones. fixes #1379 --- .../main/groovy/com/palantir/javaformat/gradle/XmlUtils.java | 4 ++-- .../javaformat/gradle/ConfigureJavaFormatterXmlTest.groovy | 2 ++ .../javaformat/gradle/PalantirJavaFormatIdeaPluginTest.groovy | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/gradle-palantir-java-format/src/main/groovy/com/palantir/javaformat/gradle/XmlUtils.java b/gradle-palantir-java-format/src/main/groovy/com/palantir/javaformat/gradle/XmlUtils.java index 1a6035c4b..d3ba622cd 100644 --- a/gradle-palantir-java-format/src/main/groovy/com/palantir/javaformat/gradle/XmlUtils.java +++ b/gradle-palantir-java-format/src/main/groovy/com/palantir/javaformat/gradle/XmlUtils.java @@ -19,8 +19,8 @@ import com.google.common.collect.ImmutableMap; import com.google.common.io.Files; import groovy.util.Node; -import groovy.util.XmlNodePrinter; -import groovy.util.XmlParser; +import groovy.xml.XmlNodePrinter; +import groovy.xml.XmlParser; import java.io.BufferedWriter; import java.io.File; import java.io.IOException; diff --git a/gradle-palantir-java-format/src/test/groovy/com/palantir/javaformat/gradle/ConfigureJavaFormatterXmlTest.groovy b/gradle-palantir-java-format/src/test/groovy/com/palantir/javaformat/gradle/ConfigureJavaFormatterXmlTest.groovy index a6453c101..59fdd2e3b 100644 --- a/gradle-palantir-java-format/src/test/groovy/com/palantir/javaformat/gradle/ConfigureJavaFormatterXmlTest.groovy +++ b/gradle-palantir-java-format/src/test/groovy/com/palantir/javaformat/gradle/ConfigureJavaFormatterXmlTest.groovy @@ -18,6 +18,8 @@ package com.palantir.javaformat.gradle import spock.lang.Specification import spock.lang.Unroll +import groovy.xml.XmlNodePrinter +import groovy.xml.XmlParser class ConfigureJavaFormatterXmlTest extends Specification { diff --git a/gradle-palantir-java-format/src/test/groovy/com/palantir/javaformat/gradle/PalantirJavaFormatIdeaPluginTest.groovy b/gradle-palantir-java-format/src/test/groovy/com/palantir/javaformat/gradle/PalantirJavaFormatIdeaPluginTest.groovy index 4d06b4c52..26fad7f24 100644 --- a/gradle-palantir-java-format/src/test/groovy/com/palantir/javaformat/gradle/PalantirJavaFormatIdeaPluginTest.groovy +++ b/gradle-palantir-java-format/src/test/groovy/com/palantir/javaformat/gradle/PalantirJavaFormatIdeaPluginTest.groovy @@ -16,6 +16,7 @@ package com.palantir.javaformat.gradle +import groovy.xml.XmlSlurper import nebula.test.IntegrationTestKitSpec class PalantirJavaFormatIdeaPluginTest extends IntegrationTestKitSpec {