aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Beeker <kiwiwings@apache.org>2019-12-01 11:42:09 +0000
committerAndreas Beeker <kiwiwings@apache.org>2019-12-01 11:42:09 +0000
commit2a4ae3a1454b77bd6725827f4ece1f27e9e9e244 (patch)
tree49021983f6434f03a1c7b68cf2168462bcfb1265
parenta17a9168b112a1d7df99d3aa4bc054528c680133 (diff)
downloadpoi-2a4ae3a1454b77bd6725827f4ece1f27e9e9e244.tar.gz
poi-2a4ae3a1454b77bd6725827f4ece1f27e9e9e244.zip
Update Jacoco version and activate it again in the Sonar run
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1870671 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--build.gradle2
-rw-r--r--build.xml6
-rw-r--r--jenkins/create_jobs.groovy13
-rw-r--r--sonar/pom.xml16
4 files changed, 29 insertions, 8 deletions
diff --git a/build.gradle b/build.gradle
index d9e9619e82..162048ab72 100644
--- a/build.gradle
+++ b/build.gradle
@@ -145,7 +145,7 @@ subprojects {
}
jacoco {
- toolVersion = '0.8.3'
+ toolVersion = '0.8.5'
}
// ensure the build-dir exists
diff --git a/build.xml b/build.xml
index 1a6c761bfa..74878d4e53 100644
--- a/build.xml
+++ b/build.xml
@@ -260,8 +260,8 @@ under the License.
value="${repository.m2}/maven2/org/javassist/javassist/3.21.0-GA/javassist-3.21.0-GA.jar"/>
<!-- coverage libs -->
- <property name="jacoco.zip" location="${main.lib}/jacoco-0.8.3.zip"/>
- <property name="jacoco.url" value="${repository.m2}/maven2/org/jacoco/jacoco/0.8.3/jacoco-0.8.3.zip"/>
+ <property name="jacoco.zip" location="${main.lib}/jacoco-0.8.5.zip"/>
+ <property name="jacoco.url" value="${repository.m2}/maven2/org/jacoco/jacoco/0.8.5/jacoco-0.8.5.zip"/>
<property name="asm.jar" location="${main.lib}/asm-7.0.jar"/>
<property name="asm.url" value="${repository.m2}/maven2/org/ow2/asm/asm/7.0/asm-7.0.jar"/>
<property name="asmcommons.jar" location="${main.lib}/asm-commons-7.0.jar"/>
@@ -662,6 +662,7 @@ under the License.
<include name="jacoco-0.7*"/>
<include name="jacoco-0.8.1*"/>
<include name="jacoco-0.8.2*"/>
+ <include name="jacoco-0.8.3*"/>
<include name="jmh-core-1.15*"/>
<include name="jmh-generator-annprocess-1.15*"/>
<include name="log4j-1.2.13*"/>
@@ -669,6 +670,7 @@ under the License.
<include name="org.jacoco.*-0.7**"/>
<include name="org.jacoco.*-0.8.1*"/>
<include name="org.jacoco.*-0.8.2*"/>
+ <include name="org.jacoco.*-0.8.3*"/>
<include name="dom4j*"/>
<include name="apache-rat-0.10*"/>
<include name="xercesImpl-*.jar"/>
diff --git a/jenkins/create_jobs.groovy b/jenkins/create_jobs.groovy
index a21eae3480..5ce9bf7e1c 100644
--- a/jenkins/create_jobs.groovy
+++ b/jenkins/create_jobs.groovy
@@ -128,8 +128,6 @@ def apicheckDesc = '''
</p>
'''
-def sonarOptions = '-Dsonar.projectKey=poi-parent -Dsonar.organization=apache -Dsonar.host.url=https://sonarcloud.io '
-
def sonarDesc = '''
<p>
<b><a href="lastSuccessfulBuild/findbugsResult/" target="_blank">Findbugs report of latest build</a></b> -
@@ -295,7 +293,11 @@ poijobs.each { poijob ->
*/
maven {
if (poijob.sonar) {
- goals('compile sonar:sonar -Dsonar.login=${POI_SONAR_TOKEN} ' + sonarOptions)
+ goals('clean package sonar:sonar')
+ property('sonar.host.url', 'https://sonarcloud.io')
+ property('sonar.login', '${POI_SONAR_TOKEN}')
+ property('sonar.projectKey', 'poi-parent')
+ property('sonar.organization', 'apache')
} else {
goals('package')
}
@@ -365,7 +367,10 @@ poijobs.each { poijob ->
gradle {
switches('-PenableSonar')
- switches('-Dsonar.login=${POI_SONAR_TOKEN} ' + sonarOptions)
+ switches('-Dsonar.host.url=https://sonarcloud.io')
+ switches('-Dsonar.login=${POI_SONAR_TOKEN}')
+ switches('-Dsonar.projectKey=poi-parent')
+ switches('-Dsonar.organization=apache')
tasks('sonarqube')
useWrapper(false)
}
diff --git a/sonar/pom.xml b/sonar/pom.xml
index 91e5062ec6..df104510c9 100644
--- a/sonar/pom.xml
+++ b/sonar/pom.xml
@@ -136,7 +136,21 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
- <version>0.8.2</version>
+ <version>0.8.5</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>prepare-agent</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>report</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>report</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>