Merge branch '6.1.x'

Author: snicoll

build.gradle

@@ -3,10 +3,10 @@ plugins {
 	// kotlinVersion is managed in gradle.properties
 	id 'org.jetbrains.kotlin.plugin.serialization' version "${kotlinVersion}" apply false
 	id 'org.jetbrains.dokka' version '1.9.20'
-	id 'org.unbroken-dome.xjc' version '2.0.0' apply false
 	id 'com.github.ben-manes.versions' version '0.51.0'
-	id 'com.github.johnrengelman.shadow' version '8.1.1' apply false
+	id 'com.github.bjornvester.xjc' version '1.8.2' apply false
 	id 'de.undercouch.download' version '5.4.0'
+	id 'io.github.goooler.shadow' version '8.1.8' apply false
 	id 'me.champeau.jmh' version '0.7.2' apply false
 	id 'me.champeau.mrjar' version '0.1.1'
 	id "net.ltgt.errorprone" version "3.1.0" apply false

gradle/spring-module.gradle

@@ -3,7 +3,7 @@ apply plugin: 'org.springframework.build.conventions'
 apply plugin: 'org.springframework.build.optional-dependencies'
 // Uncomment the following for Shadow support in the jmhJar block.
 // Currently commented out due to ZipException: archive is not a ZIP archive
-// apply plugin: 'com.github.johnrengelman.shadow'
+// apply plugin: 'io.github.goooler.shadow'
 apply plugin: 'me.champeau.jmh'
 apply from: "$rootDir/gradle/publications.gradle"
 apply plugin: 'net.ltgt.errorprone'

spring-oxm/spring-oxm.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id "com.github.bjornvester.xjc" version "1.8.2"
+	id "com.github.bjornvester.xjc"
 }
 
 description = "Spring Object/XML Marshalling"