You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ce...@apache.org on 2018/07/05 19:55:12 UTC
svn commit: r1835185 - in /poi/trunk: build.gradle jenkins/create_jobs.groovy
Author: centic
Date: Thu Jul 5 19:55:12 2018
New Revision: 1835185
URL: http://svn.apache.org/viewvc?rev=1835185&view=rev
Log:
Gradle: Define japicmp settings only once, but still fails due to removed classes in 4.0.0
Modified:
poi/trunk/build.gradle
poi/trunk/jenkins/create_jobs.groovy
Modified: poi/trunk/build.gradle
URL: http://svn.apache.org/viewvc/poi/trunk/build.gradle?rev=1835185&r1=1835184&r2=1835185&view=diff
==============================================================================
--- poi/trunk/build.gradle (original)
+++ poi/trunk/build.gradle Thu Jul 5 19:55:12 2018
@@ -152,6 +152,17 @@ subprojects {
}
}
}
+
+ // japicmp will fail with "Could not load" because we moved some classes out of the root-package
+ // for Java 9 compatibility in 4.0.0
+ 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")
+ }
}
project('main') {
@@ -189,16 +200,7 @@ project('main') {
tests testJar
}
- // TOOD: we should not duplicate this task in each project, but I did not figure out how to inject the artifactId for each project
- task japicmp(type: me.champeau.gradle.ArtifactJapicmpTask, dependsOn: jar) {
- baseline = 'org.apache.poi:poi:' + japicmpversion + '@jar'
- to = jar.archivePath
- onlyModified = true
- onlyBinaryIncompatibleModified = true
- failOnModification = false
- txtOutputFile = file("$buildDir/reports/japi.txt")
- htmlOutputFile = file("$buildDir/reports/japi.html")
- }
+ japicmp.baseline = 'org.apache.poi:poi:' + japicmpversion + '@jar'
}
project('ooxml') {
@@ -244,16 +246,7 @@ project('ooxml') {
}
}
- // TODO: we should not duplicate this task in each project, but I did not figure out how to inject the artifactId for each project
- task japicmp(type: me.champeau.gradle.ArtifactJapicmpTask, dependsOn: jar) {
- baseline = 'org.apache.poi:poi-ooxml:' + japicmpversion + '@jar'
- to = jar.archivePath
- onlyModified = true
- onlyBinaryIncompatibleModified = true
- failOnModification = false
- txtOutputFile = file("$buildDir/reports/japi.txt")
- htmlOutputFile = file("$buildDir/reports/japi.html")
- }
+ japicmp.baseline = 'org.apache.poi:poi-ooxml:' + japicmpversion + '@jar'
}
project('examples') {
@@ -263,6 +256,8 @@ project('examples') {
compile project(':main')
compile project(':ooxml')
}
+
+ japicmp.enabled = false
}
@@ -286,16 +281,7 @@ project('excelant') {
}
}
- // TOOD: we should not duplicate this task in each project, but I did not figure out how to inject the artifactId for each project
- task japicmp(type: me.champeau.gradle.ArtifactJapicmpTask, dependsOn: jar) {
- baseline = 'org.apache.poi:poi-excelant:' + japicmpversion + '@jar'
- to = jar.archivePath
- onlyModified = true
- onlyBinaryIncompatibleModified = true
- failOnModification = false
- txtOutputFile = file("$buildDir/reports/japi.txt")
- htmlOutputFile = file("$buildDir/reports/japi.html")
- }
+ japicmp.baseline = 'org.apache.poi:poi-excelant:' + japicmpversion + '@jar'
}
project('integrationtest') {
@@ -330,6 +316,8 @@ project('integrationtest') {
exclude '**/*FileHandler.class'
exclude '**/RecordStresser.class'
}
+
+ japicmp.enabled = false
}
project('scratchpad') {
@@ -351,14 +339,5 @@ project('scratchpad') {
}
}
- // TOOD: we should not duplicate this task in each project, but I did not figure out how to inject the artifactId for each project
- task japicmp(type: me.champeau.gradle.ArtifactJapicmpTask, dependsOn: jar) {
- baseline = 'org.apache.poi:poi-scratchpad:' + japicmpversion + '@jar'
- to = jar.archivePath
- onlyModified = true
- onlyBinaryIncompatibleModified = true
- failOnModification = false
- txtOutputFile = file("$buildDir/reports/japi.txt")
- htmlOutputFile = file("$buildDir/reports/japi.html")
- }
+ japicmp.baseline = 'org.apache.poi:poi-scratchpad:' + japicmpversion + '@jar'
}
Modified: poi/trunk/jenkins/create_jobs.groovy
URL: http://svn.apache.org/viewvc/poi/trunk/jenkins/create_jobs.groovy?rev=1835185&r1=1835184&r2=1835185&view=diff
==============================================================================
--- poi/trunk/jenkins/create_jobs.groovy (original)
+++ poi/trunk/jenkins/create_jobs.groovy Thu Jul 5 19:55:12 2018
@@ -64,6 +64,7 @@ def poijobs = [
],
[ name: 'POI-DSL-regenerate-javadoc', trigger: triggerSundays, javadoc: true
],
+ // disabled for 4.0.0 because we break compatibility on-purpose in a few places, e.g. for Java 9 compatibility
[ name: 'POI-DSL-API-Check', trigger: '@daily', apicheck: true, disabled: true
],
[ name: 'POI-DSL-Gradle', trigger: triggerSundays, email: 'centic@apache.org', gradle: true,
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org