From 6dd39585d5575c35f7cdc70a1f2cbd1453d134c3 Mon Sep 17 00:00:00 2001 From: Dominik Stadler Date: Sun, 28 Mar 2021 19:54:54 +0000 Subject: [PATCH] Remove support for japicmp from Gradle build I now spent a few hours trying to make it work and the Gradle support is simply not production-ready and also not maintained, it triggers various strange errors and does not supporting the usual Gradle conventions. So I do not want to spend more time on it, feel free to revive it if you know how to make this work properly. git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1888138 13f79535-47bb-0310-9956-ffa450edef68 --- build.gradle | 15 --------------- build.xml | 1 - examples/build.gradle | 2 -- excelant/build.gradle | 2 -- integrationtest/build.gradle | 2 -- jenkins/create_jobs.groovy | 20 ++------------------ main/build.gradle | 2 -- ooxml-schema/build.gradle | 2 -- ooxml/build.gradle | 2 -- scratchpad/build.gradle | 2 -- 10 files changed, 2 insertions(+), 48 deletions(-) diff --git a/build.gradle b/build.gradle index df2d2ba6d7..b9327fcf23 100644 --- a/build.gradle +++ b/build.gradle @@ -20,8 +20,6 @@ buildscript { } dependencies { - // 2.x fails with "Could not get unknown property 'me'" - classpath 'me.champeau.gradle:japicmp-gradle-plugin:0.1.2' classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.0" } } @@ -88,16 +86,12 @@ subprojects { apply plugin: 'java-library' apply plugin: 'jacoco' - // See https://github.com/melix/japicmp-gradle-plugin - apply plugin: 'me.champeau.gradle.japicmp' - version = '5.0.1-SNAPSHOT' ext { bouncyCastleVersion = '1.68' commonsCodecVersion = '1.15' commonsCompressVersion = '1.20' commonsMathVersion = '3.6.1' - japicmpversion = '5.0.0' junitVersion = '5.7.0' log4jVersion = '2.14.0' mockitoVersion = '3.6.0' @@ -204,13 +198,4 @@ subprojects { } } } - - task(japicmp, type: me.champeau.gradle.ArtifactJapicmpTask, dependsOn: jar) { - to = jar.archivePath - onlyModified = true - onlyBinaryIncompatibleModified = true - failOnModification = false - txtOutputFile = file("$buildDir/reports/japi.txt") - htmlOutputFile = file("$buildDir/reports/japi.html") - } } \ No newline at end of file diff --git a/build.xml b/build.xml index 8ea0ec80ca..4ff0352e7a 100644 --- a/build.xml +++ b/build.xml @@ -3057,7 +3057,6 @@ under the License. - diff --git a/examples/build.gradle b/examples/build.gradle index eb7855d990..559dd449cc 100644 --- a/examples/build.gradle +++ b/examples/build.gradle @@ -21,5 +21,3 @@ dependencies { implementation "org.apache.logging.log4j:log4j-core:${log4jVersion}" } - -japicmp.enabled = false \ No newline at end of file diff --git a/excelant/build.gradle b/excelant/build.gradle index fb65866061..e9889fe853 100644 --- a/excelant/build.gradle +++ b/excelant/build.gradle @@ -28,5 +28,3 @@ jar { attributes 'Automatic-Module-Name': 'org.apache.poi.excelant' } } - -japicmp.baseline = "org.apache.poi:poi-excelant:${japicmpversion}@jar" \ No newline at end of file diff --git a/integrationtest/build.gradle b/integrationtest/build.gradle index 0121e71626..31ad899086 100644 --- a/integrationtest/build.gradle +++ b/integrationtest/build.gradle @@ -35,5 +35,3 @@ test { // exclude these from the normal test-run exclude '**/*FileHandler.class' } - -japicmp.enabled = false \ No newline at end of file diff --git a/jenkins/create_jobs.groovy b/jenkins/create_jobs.groovy index 4a66735450..9de575eef8 100644 --- a/jenkins/create_jobs.groovy +++ b/jenkins/create_jobs.groovy @@ -56,7 +56,8 @@ def poijobs = [ ], [ name: 'POI-DSL-regenerate-javadoc', trigger: triggerSundays, javadoc: true ], - [ name: 'POI-DSL-API-Check', trigger: '@daily', apicheck: true + // it was impossible to make this run stable in Gradle, thus disabling this for now + [ name: 'POI-DSL-API-Check', trigger: '@daily', apicheck: true, disabled: true ], [ name: 'POI-DSL-Gradle', trigger: triggerSundays, email: 'centic@apache.org', gradle: true, // Gradle will not run any tests if the code is up-to-date, therefore manually mark the files as updated @@ -381,23 +382,6 @@ poijobs.each { poijob -> } mailer(email, false, false) } - } else if (poijob.apicheck) { - steps { - shellEx(delegate, shellcmds, poijob) - gradle { - tasks('japicmp') - useWrapper(true) - } - } - publishers { - archiveArtifacts('build/*/build/reports/japi.html') - if (!poijob.skipcigame) { - configure { project -> - project / publishers << 'hudson.plugins.cigame.GamePublisher' {} - } - } - mailer(email, false, false) - } } else if(poijob.sonar) { steps { shellEx(delegate, shellcmds, poijob) diff --git a/main/build.gradle b/main/build.gradle index 5167b32cfe..f561dfb112 100644 --- a/main/build.gradle +++ b/main/build.gradle @@ -46,5 +46,3 @@ configurations { artifacts { tests testJar } - -japicmp.baseline = "org.apache.poi:poi:${japicmpversion}@jar" \ No newline at end of file diff --git a/ooxml-schema/build.gradle b/ooxml-schema/build.gradle index 68aa790fcf..2aaa0d7eb1 100644 --- a/ooxml-schema/build.gradle +++ b/ooxml-schema/build.gradle @@ -66,5 +66,3 @@ jar { attributes 'Automatic-Module-Name': 'org.apache.poi.ooxml.schemas' } } - -japicmp.baseline = "org.apache.poi:poi:${japicmpversion}@jar" diff --git a/ooxml/build.gradle b/ooxml/build.gradle index 58ff2a4d1e..2937e482bf 100644 --- a/ooxml/build.gradle +++ b/ooxml/build.gradle @@ -50,8 +50,6 @@ jar { } } -japicmp.baseline = "org.apache.poi:poi:${japicmpversion}@jar" - test { // for some reason catching the OOM does not work when run from Gradle exclude '**/MemoryUsage.class' diff --git a/scratchpad/build.gradle b/scratchpad/build.gradle index 9b0717e37a..83a4e09ce6 100644 --- a/scratchpad/build.gradle +++ b/scratchpad/build.gradle @@ -29,5 +29,3 @@ jar { attributes 'Automatic-Module-Name': 'org.apache.poi.scratchpad' } } - -japicmp.baseline = "org.apache.poi:poi:${japicmpversion}@jar" \ No newline at end of file