From c92f4a42ed1b92f850e3bca2fda5a6a291e23098 Mon Sep 17 00:00:00 2001 From: Benjamin Eckstein <13351939+benjamineckstein@users.noreply.github.com> Date: Wed, 4 Dec 2019 13:08:05 +0100 Subject: [PATCH] TSK-369: Add sonarcloud to travis --- .gitignore | 1 - .sonarcloud.properties | 0 .travis.yml | 7 +- ci/test.sh | 1 + coverage/pom.xml | 124 ++++++++++++++++++ .../taskana-simplehistory-spring-test/pom.xml | 18 --- lib/taskana-cdi-example/pom.xml | 18 +++ .../java/pro/taskana/ExampleBootstrap.java | 14 ++ pom.xml | 29 +--- rest/taskana-rest-spring-example-boot/pom.xml | 19 ++- .../rest/ExampleRestApplicationTest.java | 17 +++ rest/taskana-rest-spring/pom.xml | 18 --- sonar-project.properties | 5 + 13 files changed, 204 insertions(+), 67 deletions(-) delete mode 100644 .sonarcloud.properties create mode 100644 coverage/pom.xml create mode 100644 lib/taskana-cdi-example/src/test/java/pro/taskana/ExampleBootstrap.java create mode 100644 rest/taskana-rest-spring-example-boot/src/test/pro/taskana/rest/ExampleRestApplicationTest.java create mode 100644 sonar-project.properties diff --git a/.gitignore b/.gitignore index d7af20fb1..d6a777165 100644 --- a/.gitignore +++ b/.gitignore @@ -44,7 +44,6 @@ node_modules/ # misc /.sass-cache /connect.lock -/coverage /libpeerconnection.log npm-debug.log testem.log diff --git a/.sonarcloud.properties b/.sonarcloud.properties deleted file mode 100644 index e69de29bb..000000000 diff --git a/.travis.yml b/.travis.yml index 662292618..660839502 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,8 +6,12 @@ language: java jdk: - openjdk8 +addons: + sonarcloud: + organization: "benjamineckstein" # the key of the org you chose at step #3 + git: - depth: 3 + depth: false services: - docker @@ -39,6 +43,7 @@ env: install: skip script: ci/test.sh $DB + before_cache: rm -rf $HOME/.m2/repository/pro/taskana jobs: diff --git a/ci/test.sh b/ci/test.sh index b2c19e494..1dab3cf13 100755 --- a/ci/test.sh +++ b/ci/test.sh @@ -33,6 +33,7 @@ function main() { eval "$REL/prepare_db.sh '$1'" # We can not use the fance '-f' maven option due to a bug in arquillian. See https://issues.jboss.org/browse/THORN-2049 (cd $REL/.. && mvn -q install -B -T 4C -am -Dmaven.javadoc.skip -Dcheckstyle.skip) + mvn sonar:sonar -Dsonar.projectKey=benjamineckstein_taskana ;; DB2_10_5 | DB2_11_1) set -x diff --git a/coverage/pom.xml b/coverage/pom.xml new file mode 100644 index 000000000..5a5bc249a --- /dev/null +++ b/coverage/pom.xml @@ -0,0 +1,124 @@ + + + + + pro.taskana + taskana-parent + 1.2.1-SNAPSHOT + ../pom.xml + + 4.0.0 + + taskana-coverage + + ${project.groupId}:${project.artifactId} + http://maven.apache.org + + + + + pro.taskana + taskana-cdi + ${project.version} + + + + pro.taskana + taskana-core + ${project.version} + + + pro.taskana + taskana-data + ${project.version} + + + pro.taskana + taskana-spring + ${project.version} + + + pro.taskana + taskana-spring-example + ${project.version} + + + pro.taskana + taskana-rest-spring + ${project.version} + + + pro.taskana + taskana-rest-spring-example-boot + ${project.version} + + + pro.taskana + taskana-rest-spring-example-common + ${project.version} + + + + + + + + org.jacoco + jacoco-maven-plugin + ${version.jacoco} + + + + aggregate-reports-ut + install + + report-aggregate + + + Maven Multimodule Coverage Demo: Coverage of Unit Tests + **/jacoco.exec + ${project.reporting.outputDirectory}/jacoco-aggregate + + + + + + + + + \ No newline at end of file diff --git a/history/taskana-simplehistory-spring-test/pom.xml b/history/taskana-simplehistory-spring-test/pom.xml index e3826c059..45023f293 100644 --- a/history/taskana-simplehistory-spring-test/pom.xml +++ b/history/taskana-simplehistory-spring-test/pom.xml @@ -92,24 +92,6 @@ - - - org.apache.maven.plugins - maven-surefire-plugin - ${version.maven.surefire} - - - - **/*Plugin*Test.java - - - **/*Test.java - **/*Documentation.java - - - -Xms1024m -Xmx2048m - - org.asciidoctor asciidoctor-maven-plugin diff --git a/lib/taskana-cdi-example/pom.xml b/lib/taskana-cdi-example/pom.xml index cd438f6a7..fcef197ff 100644 --- a/lib/taskana-cdi-example/pom.xml +++ b/lib/taskana-cdi-example/pom.xml @@ -26,5 +26,23 @@ taskana-cdi ${project.version} + + org.junit.jupiter + junit-jupiter-api + ${version.junit.jupiter} + test + + + org.junit.jupiter + junit-jupiter-engine + ${version.junit.jupiter} + test + + + org.junit.vintage + junit-vintage-engine + ${version.junit.jupiter} + test + diff --git a/lib/taskana-cdi-example/src/test/java/pro/taskana/ExampleBootstrap.java b/lib/taskana-cdi-example/src/test/java/pro/taskana/ExampleBootstrap.java new file mode 100644 index 000000000..9785b25ba --- /dev/null +++ b/lib/taskana-cdi-example/src/test/java/pro/taskana/ExampleBootstrap.java @@ -0,0 +1,14 @@ +package pro.taskana; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +/** Placeholder test class until we have real tests. */ +class ExampleBootstrap { + + /** TODO add real tests. */ + @Test + void sampleTest() { + Assertions.assertTrue(true); + } +} diff --git a/pom.xml b/pom.xml index 74f90978c..72bc169cd 100644 --- a/pom.xml +++ b/pom.xml @@ -15,6 +15,7 @@ rest history + coverage @@ -76,7 +77,6 @@ 3.1.11 0.8.13 0.8.3 - ${project.basedir}/../../target/jacoco.exec 1.4.197 @@ -244,36 +244,9 @@ prepare-agent - - - true - ${jacoco.reportPath} - - - - report - prepare-package - report - - jacoco-check - - check - - - - - - - 0.0 - - - - - - diff --git a/rest/taskana-rest-spring-example-boot/pom.xml b/rest/taskana-rest-spring-example-boot/pom.xml index d325a0788..8e1326cc1 100644 --- a/rest/taskana-rest-spring-example-boot/pom.xml +++ b/rest/taskana-rest-spring-example-boot/pom.xml @@ -95,8 +95,25 @@ + + org.junit.jupiter + junit-jupiter-api + ${version.junit.jupiter} + test + + + org.junit.jupiter + junit-jupiter-engine + ${version.junit.jupiter} + test + + + org.junit.vintage + junit-vintage-engine + ${version.junit.jupiter} + test + - history.plugin diff --git a/rest/taskana-rest-spring-example-boot/src/test/pro/taskana/rest/ExampleRestApplicationTest.java b/rest/taskana-rest-spring-example-boot/src/test/pro/taskana/rest/ExampleRestApplicationTest.java new file mode 100644 index 000000000..268bc0ee9 --- /dev/null +++ b/rest/taskana-rest-spring-example-boot/src/test/pro/taskana/rest/ExampleRestApplicationTest.java @@ -0,0 +1,17 @@ +package pro.taskana.rest; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +/** + * Placeholder test class until we have real tests. + */ +class ExampleRestApplicationTest { + + /** TODO add real tests */ + @Test + void sampleTest() { + Assertions.assertTrue(true); + + } +} \ No newline at end of file diff --git a/rest/taskana-rest-spring/pom.xml b/rest/taskana-rest-spring/pom.xml index d52d59a29..a9a492ebe 100644 --- a/rest/taskana-rest-spring/pom.xml +++ b/rest/taskana-rest-spring/pom.xml @@ -161,24 +161,6 @@ - - - org.apache.maven.plugins - maven-surefire-plugin - ${version.maven.surefire} - - - - **/*Plugin*Test.java - - - **/*Test.java - **/*Documentation.java - - - -Xms1024m -Xmx2048m - - org.asciidoctor asciidoctor-maven-plugin diff --git a/sonar-project.properties b/sonar-project.properties new file mode 100644 index 000000000..e47ca560e --- /dev/null +++ b/sonar-project.properties @@ -0,0 +1,5 @@ + +sonar.projectKey=benjamineckstein_taskana +sonar.java.coveragePlugin=jacoco +sonar.jacoco.reportPath=**/jacoco.* +sonar.dynamicAnalysis=reuseReports \ No newline at end of file