Apache
/
poi
mirror of https://github.com/apache/poi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Andreas Beeker 2019-12-01 11:42:09 +00:00
parent a17a9168b1
commit 2a4ae3a145
4 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -145,7 +145,7 @@ subprojects {
}
jacoco {
toolVersion = '0.8.3'
toolVersion = '0.8.5'
}
// ensure the build-dir exists

6
build.xml
View File

@ -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"/>

13
jenkins/create_jobs.groovy
View File

@ -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)
}

16
sonar/pom.xml
View File

@ -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>