- Updated the sonar plugin version
- Streamlined the pom-settings even more
- Fixed a bug in the Pipeline
diff --git a/Jenkinsfile b/Jenkinsfile
index 2edcad1..0a09fd0 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -103,7 +103,7 @@
echo 'Building'
// We'll deploy to a relative directory so we can save
// that and deploy in a later step on a different node
- sh 'mvn ${MVN_TEST_FAIL_IGNORE} -Pplatform-android,platform-java7,distribution,toolchain -Djava8.home=${JAVA_HOME} -Dedgent.build.ci=true -DaltDeploymentRepository=snapshot-repo::default::file:./local-snapshots-dir clean deploy'
+ sh 'mvn ${MVN_TEST_FAIL_IGNORE} -P${JENKINS_PROFILE},platform-android,platform-java7,distribution,toolchain -Djava8.home=${JAVA_HOME} -Dedgent.build.ci=true -DaltDeploymentRepository=snapshot-repo::default::file:./local-snapshots-dir clean deploy'
}
post {
always {
@@ -142,7 +142,7 @@
}
steps {
echo 'Building Site'
- sh "${mvnHome}/bin/mvn ${mavenLocalRepo} site site:stage"
+ sh 'mvn -P${JENKINS_PROFILE} site'
}
}
diff --git a/pom.xml b/pom.xml
index 7090271..c73c5f2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,10 +58,7 @@
<!-- URL of the ASF SonarQube server -->
<sonar.host.url>https://builds.apache.org/analysis</sonar.host.url>
<!-- Exclude all generated code -->
- <sonar.exclusions>file:**/generated-sources/**</sonar.exclusions>
- <!-- Tell sonar where the coverage reports are located -->
- <sonar.jacoco.reportPath>${project.build.directory}/coverage-reports/jacoco-ut.exec</sonar.jacoco.reportPath>
- <sonar.jacoco.itReportPath>${project.build.directory}/coverage-reports/jacoco-it.exec</sonar.jacoco.itReportPath>
+ <sonar.exclusions>**/generated-sources</sonar.exclusions>
<remote-resources-maven-plugin.remote-resources.dir>src/main/remote-resources</remote-resources-maven-plugin.remote-resources.dir>
</properties>
@@ -200,7 +197,7 @@
<plugin>
<groupId>org.sonarsource.scanner.maven</groupId>
<artifactId>sonar-maven-plugin</artifactId>
- <version>3.3.0.603</version>
+ <version>3.6.0.1398</version>
</plugin>
<!--
@@ -715,11 +712,11 @@
</plugin>
<!-- Generates a report with the SonarQube analysis reports -->
- <plugin>
+ <!--plugin>
<groupId>org.codehaus.sonar-plugins</groupId>
<artifactId>maven-report</artifactId>
<version>0.1</version>
- </plugin>
+ </plugin-->
<!-- Generate the JavaDoc API documentation -->
<plugin>