From 589f17f48bf49f1f61cb8e7f83ddb88bef49e3ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Wed, 24 Jul 2024 11:11:12 +0200 Subject: [PATCH 1/2] Polish "Upgrade XJC processing to com.github.bjornvester.xjc" See gh-33264 --- build.gradle | 2 +- spring-oxm/spring-oxm.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 44a440bed8d..51c9b978d28 100644 --- a/build.gradle +++ b/build.gradle @@ -3,8 +3,8 @@ plugins { // kotlinVersion is managed in gradle.properties id 'org.jetbrains.kotlin.plugin.serialization' version "${kotlinVersion}" apply false id 'org.jetbrains.dokka' version '1.8.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.bjornvester.xjc' version '1.8.2' apply false id 'com.github.johnrengelman.shadow' version '8.1.1' apply false id 'de.undercouch.download' version '5.4.0' id 'me.champeau.jmh' version '0.7.2' apply false diff --git a/spring-oxm/spring-oxm.gradle b/spring-oxm/spring-oxm.gradle index a00763b65e8..b23759e4b93 100644 --- a/spring-oxm/spring-oxm.gradle +++ b/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" From bcdc991838ad7161a64fdb0c75f55b8374b7a28d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Wed, 24 Jul 2024 11:22:36 +0200 Subject: [PATCH 2/2] Switch to Shadow plugin fork This commit fixes to a fork of the shadow plugin that fixes support with recent Gradle releases. See https://github.com/johnrengelman/shadow/pull/876 --- build.gradle | 2 +- gradle/spring-module.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 51c9b978d28..2891f6ac777 100644 --- a/build.gradle +++ b/build.gradle @@ -5,8 +5,8 @@ plugins { id 'org.jetbrains.dokka' version '1.8.20' id 'com.github.ben-manes.versions' version '0.51.0' id 'com.github.bjornvester.xjc' version '1.8.2' apply false - id 'com.github.johnrengelman.shadow' version '8.1.1' 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' } diff --git a/gradle/spring-module.gradle b/gradle/spring-module.gradle index 42ff9f94c21..b327b0f2f25 100644 --- a/gradle/spring-module.gradle +++ b/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"