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
This commit is contained in:
Dominik Stadler 2021-03-28 19:54:54 +00:00
parent d2958cca7f
commit 6dd39585d5
10 changed files with 2 additions and 48 deletions

View File

@ -20,8 +20,6 @@ buildscript {
} }
dependencies { 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" classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.0"
} }
} }
@ -88,16 +86,12 @@ subprojects {
apply plugin: 'java-library' apply plugin: 'java-library'
apply plugin: 'jacoco' apply plugin: 'jacoco'
// See https://github.com/melix/japicmp-gradle-plugin
apply plugin: 'me.champeau.gradle.japicmp'
version = '5.0.1-SNAPSHOT' version = '5.0.1-SNAPSHOT'
ext { ext {
bouncyCastleVersion = '1.68' bouncyCastleVersion = '1.68'
commonsCodecVersion = '1.15' commonsCodecVersion = '1.15'
commonsCompressVersion = '1.20' commonsCompressVersion = '1.20'
commonsMathVersion = '3.6.1' commonsMathVersion = '3.6.1'
japicmpversion = '5.0.0'
junitVersion = '5.7.0' junitVersion = '5.7.0'
log4jVersion = '2.14.0' log4jVersion = '2.14.0'
mockitoVersion = '3.6.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")
}
} }

View File

@ -3057,7 +3057,6 @@ under the License.
</loadresource> </loadresource>
<replaceregexp file="build.gradle" match="( +version += +)'[^']+'" replace="\1'${version.id}'"/> <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/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="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}"/> <replaceregexp file="osgi/pom.xml" match="version>${rel_prev}[^&lt;]+" replace="version>${version.id}"/>

View File

@ -21,5 +21,3 @@ dependencies {
implementation "org.apache.logging.log4j:log4j-core:${log4jVersion}" implementation "org.apache.logging.log4j:log4j-core:${log4jVersion}"
} }
japicmp.enabled = false

View File

@ -28,5 +28,3 @@ jar {
attributes 'Automatic-Module-Name': 'org.apache.poi.excelant' attributes 'Automatic-Module-Name': 'org.apache.poi.excelant'
} }
} }
japicmp.baseline = "org.apache.poi:poi-excelant:${japicmpversion}@jar"

View File

@ -35,5 +35,3 @@ test {
// exclude these from the normal test-run // exclude these from the normal test-run
exclude '**/*FileHandler.class' exclude '**/*FileHandler.class'
} }
japicmp.enabled = false

View File

@ -56,7 +56,8 @@ def poijobs = [
], ],
[ name: 'POI-DSL-regenerate-javadoc', trigger: triggerSundays, javadoc: true [ 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, [ 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 // 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) 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) { } else if(poijob.sonar) {
steps { steps {
shellEx(delegate, shellcmds, poijob) shellEx(delegate, shellcmds, poijob)

View File

@ -46,5 +46,3 @@ configurations {
artifacts { artifacts {
tests testJar tests testJar
} }
japicmp.baseline = "org.apache.poi:poi:${japicmpversion}@jar"

View File

@ -66,5 +66,3 @@ jar {
attributes 'Automatic-Module-Name': 'org.apache.poi.ooxml.schemas' attributes 'Automatic-Module-Name': 'org.apache.poi.ooxml.schemas'
} }
} }
japicmp.baseline = "org.apache.poi:poi:${japicmpversion}@jar"

View File

@ -50,8 +50,6 @@ jar {
} }
} }
japicmp.baseline = "org.apache.poi:poi:${japicmpversion}@jar"
test { test {
// for some reason catching the OOM does not work when run from Gradle // for some reason catching the OOM does not work when run from Gradle
exclude '**/MemoryUsage.class' exclude '**/MemoryUsage.class'

View File

@ -29,5 +29,3 @@ jar {
attributes 'Automatic-Module-Name': 'org.apache.poi.scratchpad' attributes 'Automatic-Module-Name': 'org.apache.poi.scratchpad'
} }
} }
japicmp.baseline = "org.apache.poi:poi:${japicmpversion}@jar"