Author: centic
Date: Sun Mar 28 19:54:54 2021
New Revision: 1888138
URL: http://svn.apache.org/viewvc?rev=1888138&view=rev
Log:
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.
Modified:
poi/trunk/build.gradle
poi/trunk/build.xml
poi/trunk/examples/build.gradle
poi/trunk/excelant/build.gradle
poi/trunk/integrationtest/build.gradle
poi/trunk/jenkins/create_jobs.groovy
poi/trunk/main/build.gradle
poi/trunk/ooxml-schema/build.gradle
poi/trunk/ooxml/build.gradle
poi/trunk/scratchpad/build.gradle
Modified: poi/trunk/build.gradle
URL:
http://svn.apache.org/viewvc/poi/trunk/build.gradle?rev=1888138&r1=1888137&r2=1888138&view=diff
==============================================================================
--- poi/trunk/build.gradle (original)
+++ poi/trunk/build.gradle Sun Mar 28 19:54:54 2021
@@ -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
Modified: poi/trunk/build.xml
URL:
http://svn.apache.org/viewvc/poi/trunk/build.xml?rev=1888138&r1=1888137&r2=1888138&view=diff
==============================================================================
--- poi/trunk/build.xml (original)
+++ poi/trunk/build.xml Sun Mar 28 19:54:54 2021
@@ -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}[^<]+"
replace="version>${version.id}"/>
Modified: poi/trunk/examples/build.gradle
URL:
http://svn.apache.org/viewvc/poi/trunk/examples/build.gradle?rev=1888138&r1=1888137&r2=1888138&view=diff
==============================================================================
--- poi/trunk/examples/build.gradle (original)
+++ poi/trunk/examples/build.gradle Sun Mar 28 19:54:54 2021
@@ -21,5 +21,3 @@ dependencies {
implementation "org.apache.logging.log4j:log4j-core:${log4jVersion}"
}
-
-japicmp.enabled = false
\ No newline at end of file
Modified: poi/trunk/excelant/build.gradle
URL:
http://svn.apache.org/viewvc/poi/trunk/excelant/build.gradle?rev=1888138&r1=1888137&r2=1888138&view=diff
==============================================================================
--- poi/trunk/excelant/build.gradle (original)
+++ poi/trunk/excelant/build.gradle Sun Mar 28 19:54:54 2021
@@ -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
Modified: poi/trunk/integrationtest/build.gradle
URL:
http://svn.apache.org/viewvc/poi/trunk/integrationtest/build.gradle?rev=1888138&r1=1888137&r2=1888138&view=diff
==============================================================================
--- poi/trunk/integrationtest/build.gradle (original)
+++ poi/trunk/integrationtest/build.gradle Sun Mar 28 19:54:54 2021
@@ -35,5 +35,3 @@ test {
// exclude these from the normal test-run
exclude '**/*FileHandler.class'
}
-
-japicmp.enabled = false
\ No newline at end of file
Modified: poi/trunk/jenkins/create_jobs.groovy
URL:
http://svn.apache.org/viewvc/poi/trunk/jenkins/create_jobs.groovy?rev=1888138&r1=1888137&r2=1888138&view=diff
==============================================================================
--- poi/trunk/jenkins/create_jobs.groovy (original)
+++ poi/trunk/jenkins/create_jobs.groovy Sun Mar 28 19:54:54 2021
@@ -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:
'[email protected]', gradle: true,
// Gradle will not run any tests if the code is up-to-date,
therefore manually mark the files as updated
@@ -377,23 +378,6 @@ poijobs.each { poijob ->
if (!poijob.skipcigame) {
configure { project ->
project / publishers <<
'hudson.plugins.cigame.GamePublisher' {}
- }
- }
- 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)
Modified: poi/trunk/main/build.gradle
URL:
http://svn.apache.org/viewvc/poi/trunk/main/build.gradle?rev=1888138&r1=1888137&r2=1888138&view=diff
==============================================================================
--- poi/trunk/main/build.gradle (original)
+++ poi/trunk/main/build.gradle Sun Mar 28 19:54:54 2021
@@ -46,5 +46,3 @@ configurations {
artifacts {
tests testJar
}
-
-japicmp.baseline = "org.apache.poi:poi:${japicmpversion}@jar"
\ No newline at end of file
Modified: poi/trunk/ooxml-schema/build.gradle
URL:
http://svn.apache.org/viewvc/poi/trunk/ooxml-schema/build.gradle?rev=1888138&r1=1888137&r2=1888138&view=diff
==============================================================================
--- poi/trunk/ooxml-schema/build.gradle (original)
+++ poi/trunk/ooxml-schema/build.gradle Sun Mar 28 19:54:54 2021
@@ -66,5 +66,3 @@ jar {
attributes 'Automatic-Module-Name': 'org.apache.poi.ooxml.schemas'
}
}
-
-japicmp.baseline = "org.apache.poi:poi:${japicmpversion}@jar"
Modified: poi/trunk/ooxml/build.gradle
URL:
http://svn.apache.org/viewvc/poi/trunk/ooxml/build.gradle?rev=1888138&r1=1888137&r2=1888138&view=diff
==============================================================================
--- poi/trunk/ooxml/build.gradle (original)
+++ poi/trunk/ooxml/build.gradle Sun Mar 28 19:54:54 2021
@@ -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'
Modified: poi/trunk/scratchpad/build.gradle
URL:
http://svn.apache.org/viewvc/poi/trunk/scratchpad/build.gradle?rev=1888138&r1=1888137&r2=1888138&view=diff
==============================================================================
--- poi/trunk/scratchpad/build.gradle (original)
+++ poi/trunk/scratchpad/build.gradle Sun Mar 28 19:54:54 2021
@@ -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
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
