Skip to content

Commit 6eda386

Browse files
DreierFvlsi
authored andcommitted
chore: Replaced deprecated groovy.util usages with groovy.xml
groovy.util is no longer available in Gradle 9.x / Groovy 4
1 parent ede4bc0 commit 6eda386

File tree

5 files changed

+8
-10
lines changed

5 files changed

+8
-10
lines changed

plugins/license-gather-plugin/src/main/kotlin/com/github/vlsi/gradle/license/GatherLicenseTask.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import com.github.vlsi.gradle.license.api.LicenseExpressionParser
2626
import com.github.vlsi.gradle.license.api.OsgiBundleLicenseParser
2727
import com.github.vlsi.gradle.license.api.SpdxLicense
2828
import com.github.vlsi.gradle.license.api.text
29-
import groovy.util.slurpersupport.GPathResult
29+
import groovy.xml.slurpersupport.GPathResult
3030
import org.gradle.api.Action
3131
import org.gradle.api.DefaultTask
3232
import org.gradle.api.GradleException
@@ -53,8 +53,6 @@ import org.gradle.kotlin.dsl.property
5353
import org.gradle.kotlin.dsl.provideDelegate
5454
import org.gradle.kotlin.dsl.setProperty
5555
import org.gradle.kotlin.dsl.submit
56-
import org.gradle.util.GradleVersion
57-
import org.gradle.workers.IsolationMode
5856
import org.gradle.workers.WorkerExecutor
5957
import java.io.File
6058
import java.util.*

plugins/license-gather-plugin/src/main/kotlin/com/github/vlsi/gradle/license/MetadataStore.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ import com.github.vlsi.gradle.license.api.StandardLicense
3535
import com.github.vlsi.gradle.license.api.StandardLicenseException
3636
import com.github.vlsi.gradle.license.api.WithException
3737
import com.github.vlsi.gradle.license.api.orLater
38-
import groovy.util.XmlSlurper
39-
import groovy.util.slurpersupport.GPathResult
38+
import groovy.xml.XmlSlurper
39+
import groovy.xml.slurpersupport.GPathResult
4040
import groovy.xml.MarkupBuilder
4141
import org.gradle.api.GradleException
4242
import org.gradle.kotlin.dsl.withGroovyBuilder

plugins/license-gather-plugin/src/main/kotlin/com/github/vlsi/gradle/license/PomLicenseLoader.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import com.github.vlsi.gradle.license.api.License
2222
import com.github.vlsi.gradle.license.api.LicenseExpression
2323
import com.github.vlsi.gradle.license.api.LicenseExpressionNormalizer
2424
import com.github.vlsi.gradle.license.api.SimpleLicense
25-
import groovy.util.XmlSlurper
26-
import groovy.util.slurpersupport.GPathResult
25+
import groovy.xml.XmlSlurper
26+
import groovy.xml.slurpersupport.GPathResult
2727
import kotlinx.coroutines.runBlocking
2828
import org.gradle.api.GradleException
2929
import org.gradle.api.Project

plugins/license-gather-plugin/src/test/kotlin/com/github/vlsi/gradle/license/PomParsingTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
package com.github.vlsi.gradle.license
1919

20-
import groovy.util.XmlSlurper
20+
import groovy.xml.XmlSlurper
2121
import org.junit.jupiter.api.Assertions
2222
import org.junit.jupiter.api.Test
2323
import java.io.StringReader

plugins/stage-vote-release-plugin/src/main/kotlin/com/github/vlsi/gradle/release/svn/Svn.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ package com.github.vlsi.gradle.release.svn
1919
import com.github.vlsi.gradle.license.attr
2020
import com.github.vlsi.gradle.license.get
2121
import com.github.vlsi.gradle.license.getList
22-
import groovy.util.XmlSlurper
23-
import groovy.util.slurpersupport.GPathResult
22+
import groovy.xml.XmlSlurper
23+
import groovy.xml.slurpersupport.GPathResult
2424
import java.io.ByteArrayOutputStream
2525
import java.net.URI
2626
import java.time.OffsetDateTime

0 commit comments

Comments
 (0)