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

diff --git a/build.gradle b/build.gradle
index df2d2ba6d7253f93870ace7e084264f9ca8aa7c4..b9327fcf23a305799217ad6a53e6137b89dd4f8f 100644 (file)
--- 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 8ea0ec80caabf907eff0febaf51f4e308a50ae45..4ff0352e7a8887dc5d63d21d44d0c33ef5c759f9 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -3057,7 +3057,6 @@ under the License.
         </loadresource>
 
         <replaceregexp file="build.gradle" match="( +version += +)'[^']+'" replace="\1'${version.id}'"/>
-        <replaceregexp file="build.gradle" match="(japicmpversion += +)'[^']+'" replace="\1'${rel_prev}'"/>
         <replaceregexp file="examples/src/main/groovy/build.gradle" match="( *compile 'org.apache.poi:[^0-9]+)([0-9.]+)'" replace="\1${rel_prev}'" byline="true"/>
         <replaceregexp file="examples/src/main/scala/build.sbt" match='( *org.apache.poi.* ")[0-9.]+(.+)' replace="\1${rel_prev}\2" byline="true"/>
         <replaceregexp file="osgi/pom.xml" match="version>${rel_prev}[^&lt;]+" replace="version>${version.id}"/>

diff --git a/examples/build.gradle b/examples/build.gradle
index eb7855d9900567a2070df7131eeacf7a8fd8d71d..559dd449cced10a017ad8f494ed50cc8e4686c09 100644 (file)
--- 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 fb658660615e3158720b9d4e5f2a0fe5ab6e4dff..e9889fe8533dce19d72de1e60a8f6a666d017f67 100644 (file)
--- 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 0121e7162694be549d1ea93b593c0588bd020d07..31ad8990866ea0646ea9966d851e2fb2e3e1d5cf 100644 (file)
--- 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 4a667354508acdbbc6bdd0e66bccc0bf716f5c4e..9de575eef81b14357ad2ba6fc6fe26bdead946c7 100644 (file)
--- 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 5167b32cfe2edab41bd56d618e5c19e72f95832b..f561dfb1127219564a175d0d646bbd61df65e962 100644 (file)
--- 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 68aa790fcfca4eacdb3d2c1909d865339e5c59a3..2aaa0d7eb1b5a486b85b3cab04007cded8b8ef0d 100644 (file)
--- 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 58ff2a4d1e9d28f649b9b3417bc07cac7e827956..2937e482bf9a195f57ac37b9ed85c6af3140c054 100644 (file)
--- 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 9b0717e37abfb53c92cb45e5ac072ba2ae2d07e8..83a4e09ce6458a2cd7ea9f909905719e29d5bbf7 100644 (file)
--- 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