Revert "TSK-369: Cleanup sonarcloud configuration"
This reverts commit af7dee4773.
This commit is contained in:
Mustapha Zorgati
Holger Hagen
parent
ca411ca896
commit
c54c64a85c
|
|
@ -44,7 +44,6 @@ node_modules/
|
|||
# misc
|
||||
/.sass-cache
|
||||
/connect.lock
|
||||
/coverage
|
||||
/libpeerconnection.log
|
||||
npm-debug.log
|
||||
testem.log
|
||||
|
|
|
|||
|
|
@ -8,10 +8,9 @@ jdk:
|
|||
|
||||
addons:
|
||||
sonarcloud:
|
||||
organization: $SONAR_ORGANIZATION
|
||||
organization: "benjamineckstein" # the key of the org you chose at step #3
|
||||
|
||||
git:
|
||||
#depth false needed by sonarcloud for deep comparison
|
||||
depth: false
|
||||
|
||||
services:
|
||||
|
|
|
|||
10
ci/test.sh
10
ci/test.sh
|
|
@ -17,8 +17,6 @@ set -e # fail fast
|
|||
#H - POSTGRES_10_4
|
||||
#H module:
|
||||
#H - HISTORY
|
||||
#H Optional:
|
||||
#H SONAR_PROJECT_KEY - configured in travis env
|
||||
# Arguments:
|
||||
# $1: exit code
|
||||
function helpAndExit() {
|
||||
|
|
@ -34,12 +32,8 @@ function main() {
|
|||
set -x
|
||||
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
|
||||
#-Pcoverage to activate jacoco and test coverage reports
|
||||
# #send test coverage and build information to sonarcloud
|
||||
(cd $REL/.. \
|
||||
&& mvn -q install -B -T 4C -am -Pcoverage -Dmaven.javadoc.skip -Dcheckstyle.skip \
|
||||
&& mvn sonar:sonar -Pcoverage -Dsonar.projectKey="$SONAR_PROJECT_KEY"
|
||||
)
|
||||
(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
|
||||
|
|
|
|||
|
|
@ -0,0 +1,124 @@
|
|||
<?xml version="1.0"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
|
||||
<parent>
|
||||
<groupId>pro.taskana</groupId>
|
||||
<artifactId>taskana-parent</artifactId>
|
||||
<version>1.2.1-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<artifactId>taskana-coverage</artifactId>
|
||||
|
||||
<name>${project.groupId}:${project.artifactId}</name>
|
||||
<url>http://maven.apache.org</url>
|
||||
|
||||
<dependencies>
|
||||
<!--
|
||||
<dependency>
|
||||
<groupId>pro.taskana</groupId>
|
||||
<artifactId>taskana-simplehistory-provider</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>pro.taskana</groupId>
|
||||
<artifactId>taskana-simplehistory-rest-spring</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>pro.taskana</groupId>
|
||||
<artifactId>taskana-simplehistory-rest-spring-example</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>pro.taskana</groupId>
|
||||
<artifactId>taskana-simplehistory-spring-test</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
-->
|
||||
<dependency>
|
||||
<groupId>pro.taskana</groupId>
|
||||
<artifactId>taskana-cdi</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<!--
|
||||
<dependency>
|
||||
<groupId>pro.taskana</groupId>
|
||||
<artifactId>taskana-cdi-example</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
-->
|
||||
<dependency>
|
||||
<groupId>pro.taskana</groupId>
|
||||
<artifactId>taskana-core</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>pro.taskana</groupId>
|
||||
<artifactId>taskana-data</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>pro.taskana</groupId>
|
||||
<artifactId>taskana-spring</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>pro.taskana</groupId>
|
||||
<artifactId>taskana-spring-example</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>pro.taskana</groupId>
|
||||
<artifactId>taskana-rest-spring</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>pro.taskana</groupId>
|
||||
<artifactId>taskana-rest-spring-example-boot</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>pro.taskana</groupId>
|
||||
<artifactId>taskana-rest-spring-example-common</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<!--
|
||||
<dependency>
|
||||
<groupId>pro.taskana</groupId>
|
||||
<artifactId>taskana-rest-spring-example-wildfly</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
-->
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.jacoco</groupId>
|
||||
<artifactId>jacoco-maven-plugin</artifactId>
|
||||
<version>${version.jacoco}</version>
|
||||
<executions>
|
||||
<!--aggregated unit test coverage report -->
|
||||
<execution>
|
||||
<id>aggregate-reports-ut</id>
|
||||
<phase>install</phase>
|
||||
<goals>
|
||||
<goal>report-aggregate</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<title>Maven Multimodule Coverage Demo: Coverage of Unit Tests</title>
|
||||
<dataFileIncludes>**/jacoco.exec</dataFileIncludes>
|
||||
<outputDirectory>${project.reporting.outputDirectory}/jacoco-aggregate</outputDirectory>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
|
||||
</plugins>
|
||||
</build>
|
||||
|
||||
</project>
|
||||
36
pom.xml
36
pom.xml
|
|
@ -15,6 +15,7 @@
|
|||
<module>rest</module>
|
||||
<!-- History is an optional module. -->
|
||||
<module>history</module>
|
||||
<module>coverage</module>
|
||||
</modules>
|
||||
|
||||
<properties>
|
||||
|
|
@ -81,8 +82,6 @@
|
|||
<version.h2>1.4.197</version.h2>
|
||||
<version.db2>11.1.1.1</version.db2>
|
||||
<version.postgres>42.2.9</version.postgres>
|
||||
<!-- used by jacoco to collect coverage -->
|
||||
<argLine></argLine>
|
||||
</properties>
|
||||
|
||||
<developers>
|
||||
|
|
@ -217,26 +216,6 @@
|
|||
</pluginManagement>
|
||||
</build>
|
||||
</profile>
|
||||
<profile>
|
||||
<id>coverage</id>
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.jacoco</groupId>
|
||||
<artifactId>jacoco-maven-plugin</artifactId>
|
||||
<version>${version.jacoco}</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<goals>
|
||||
<goal>prepare-agent</goal>
|
||||
<goal>report</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</profile>
|
||||
</profiles>
|
||||
|
||||
<build>
|
||||
|
|
@ -257,6 +236,19 @@
|
|||
</archive>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.jacoco</groupId>
|
||||
<artifactId>jacoco-maven-plugin</artifactId>
|
||||
<version>${version.jacoco}</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<goals>
|
||||
<goal>prepare-agent</goal>
|
||||
<goal>report</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
|
|
|
|||
|
|
@ -3,12 +3,15 @@ package pro.taskana.rest;
|
|||
import org.junit.jupiter.api.Assertions;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
/** Placeholder test class until we have real tests. */
|
||||
/**
|
||||
* Placeholder test class until we have real tests.
|
||||
*/
|
||||
class ExampleRestApplicationTest {
|
||||
|
||||
/** TODO add real tests */
|
||||
@Test
|
||||
void sampleTest() {
|
||||
Assertions.assertTrue(true);
|
||||
|
||||
}
|
||||
}
|
||||
|
|
@ -1,4 +1,5 @@
|
|||
|
||||
sonar.projectKey=benjamineckstein_taskana
|
||||
sonar.java.coveragePlugin=jacoco
|
||||
sonar.jacoco.reportPath=**/jacoco.*
|
||||
sonar.dynamicAnalysis=reuseReports
|
||||
Loading…
Reference in New Issue