diff --git a/hawkbit-dmf/pom.xml b/hawkbit-dmf/pom.xml index 17fc38b60..d888959d4 100644 --- a/hawkbit-dmf/pom.xml +++ b/hawkbit-dmf/pom.xml @@ -20,10 +20,6 @@ hawkBit :: DMF pom - - ${project.basedir}/../../target/ - - hawkbit-dmf-api hawkbit-dmf-amqp diff --git a/hawkbit-repository/pom.xml b/hawkbit-repository/pom.xml index f11d9d75f..ec8e4e216 100644 --- a/hawkbit-repository/pom.xml +++ b/hawkbit-repository/pom.xml @@ -20,10 +20,6 @@ hawkBit :: Repository pom - - ${project.basedir}/../../target/ - - hawkbit-repository-jpa hawkbit-repository-api @@ -31,5 +27,4 @@ hawkbit-repository-core - diff --git a/hawkbit-rest/pom.xml b/hawkbit-rest/pom.xml index c6c62a26d..5682dc27a 100644 --- a/hawkbit-rest/pom.xml +++ b/hawkbit-rest/pom.xml @@ -19,10 +19,6 @@ hawkbit-rest-parent hawkBit :: REST pom - - - ${project.basedir}/../../target/ - hawkbit-rest-core diff --git a/hawkbit-test-report/pom.xml b/hawkbit-test-report/pom.xml index ec42ea368..2cd98e720 100644 --- a/hawkbit-test-report/pom.xml +++ b/hawkbit-test-report/pom.xml @@ -8,7 +8,8 @@ http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 org.eclipse.hawkbit @@ -17,7 +18,138 @@ hawkbit-test-report hawkBit :: Test Report - + + + + org.eclipse.hawkbit + hawkbit-core + ${project.version} + + + org.eclipse.hawkbit + hawkbit-security-core + ${project.version} + + + org.eclipse.hawkbit + hawkbit-security-integration + ${project.version} + + + org.eclipse.hawkbit + hawkbit-http-security + ${project.version} + + + org.eclipse.hawkbit + hawkbit-repository-api + ${project.version} + + + org.eclipse.hawkbit + hawkbit-repository-core + ${project.version} + + + org.eclipse.hawkbit + hawkbit-repository-jpa + ${project.version} + + + org.eclipse.hawkbit + hawkbit-repository-test + ${project.version} + + + org.eclipse.hawkbit + hawkbit-artifact-repository-filesystem + ${project.version} + + + org.eclipse.hawkbit + hawkbit-autoconfigure + ${project.version} + + + org.eclipse.hawkbit + hawkbit-ui + ${project.version} + + + org.eclipse.hawkbit + hawkbit-ddi-api + ${project.version} + + + org.eclipse.hawkbit + hawkbit-ddi-resource + ${project.version} + + + org.eclipse.hawkbit + hawkbit-mgmt-api + ${project.version} + + + org.eclipse.hawkbit + hawkbit-mgmt-resource + ${project.version} + + + org.eclipse.hawkbit + hawkbit-rest-core + ${project.version} + + + org.eclipse.hawkbit + hawkbit-rest-docs + ${project.version} + + + org.eclipse.hawkbit + hawkbit-dmf-amqp + ${project.version} + + + org.eclipse.hawkbit + hawkbit-dmf-api + ${project.version} + + + org.eclipse.hawkbit + hawkbit-dmf-rabbitmq-test + ${project.version} + + + org.eclipse.hawkbit + hawkbit-update-server + ${project.version} + + + + + + + + org.jacoco + jacoco-maven-plugin + + + aggregate-reports + verify + + report-aggregate + + + ${jacoco.outputDir}/jacoco-aggregate + + + + + + + + generateTestReport @@ -77,4 +209,5 @@ - \ No newline at end of file + + diff --git a/pom.xml b/pom.xml index 09699122e..fe79ba4d5 100644 --- a/pom.xml +++ b/pom.xml @@ -9,8 +9,8 @@ --> + 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"> 4.0.0 @@ -187,13 +187,19 @@ eclipse/hawkbit https://www.eclipse.org/hawkbit https://circleci.com/gh/eclipse/hawkbit - **/target/generated-sources/apt/**,**/src/test/**,**/src/main/java/org/eclipse/hawkbit/repository/test/** - **/src/main/java/org/eclipse/hawkbit/ui/**,**/target/generated-sources/apt/**,**/src/main/java/org/eclipse/hawkbit/repository/test/**,**/examples/** - 0.8.2 - ${project.basedir}/../target/ - ${jacoco.outputDir}/jacoco-ut.exec - ${jacoco.outputDir}/jacoco-it.exec - ${jacoco.reportPath},${jacoco.itReportPath} + + **/target/generated-sources/apt/**,**/src/test/**,**/src/main/java/org/eclipse/hawkbit/repository/test/** + + + **/src/main/java/org/eclipse/hawkbit/ui/**,**/target/generated-sources/apt/**,**/src/main/java/org/eclipse/hawkbit/repository/test/**,**/examples/** + + 0.8.4 + ${project.build.directory} + + ${project.basedir}/../hawkbit-test-report/target/jacoco-aggregate/jacoco.xml, + ${project.basedir}/../../hawkbit-test-report/target/jacoco-aggregate/jacoco.xml + + @@ -260,6 +266,7 @@ org.jacoco jacoco-maven-plugin + ${jacoco.version} prepare-ut-agent @@ -268,21 +275,17 @@ prepare-agent - ${jacoco.reportPath} jacoco.agent.ut.arg - true prepare-it-agent pre-integration-test - prepare-agent + prepare-agent-integration - ${jacoco.itReportPath} jacoco.agent.it.arg - true @@ -384,7 +387,7 @@ - +