diff --git a/Jenkinsfile b/Jenkinsfile index c6f57dbe2d5cbd6dc56d35e0b2fe7aa6b0cb7761..16021e3652d4fa32918913a96e74743f0b276832 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -57,7 +57,7 @@ pipeline { dir('ozgcloud-common-dependencies') { configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) { sh 'mvn --version' - sh 'mvn -s $MAVEN_SETTINGS clean install' + sh 'mvn --no-transfer-progress -s $MAVEN_SETTINGS clean install' } } } @@ -71,7 +71,7 @@ pipeline { } configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) { sh 'mvn --version' - sh 'mvn -s $MAVEN_SETTINGS clean install' + sh 'mvn --no-transfer-progress -s $MAVEN_SETTINGS clean install' script { dir('ozgcloud-common-lib') { @@ -104,7 +104,7 @@ pipeline { FAILED_STAGE = env.STAGE_NAME } configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) { - sh 'mvn -s $MAVEN_SETTINGS deploy' + sh 'mvn --no-transfer-progress -s $MAVEN_SETTINGS deploy' } } } diff --git a/ozgcloud-common-lib/pom.xml b/ozgcloud-common-lib/pom.xml index e06e4421ba5617dda1acda9826686f6c7a80201f..a131d88965cf264fc5ef4d3452139ff6724db14e 100644 --- a/ozgcloud-common-lib/pom.xml +++ b/ozgcloud-common-lib/pom.xml @@ -164,4 +164,19 @@ <scope>test</scope> </dependency> </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>${maven-surefire-plugin.version}</version> + <configuration> + <argLine> + ${surefire.jacoco.args} + </argLine> + </configuration> + </plugin> + </plugins> + </build> </project> \ No newline at end of file diff --git a/ozgcloud-common-lib/src/test/java/de/ozgcloud/common/grpc/GrpcUtilTest.java b/ozgcloud-common-lib/src/test/java/de/ozgcloud/common/grpc/GrpcUtilTest.java index 0107dfc4b1f46d030b8d86e9fc95f1c2efd079a9..340d732eefaa5a19cdabea383d9140da0032a261 100644 --- a/ozgcloud-common-lib/src/test/java/de/ozgcloud/common/grpc/GrpcUtilTest.java +++ b/ozgcloud-common-lib/src/test/java/de/ozgcloud/common/grpc/GrpcUtilTest.java @@ -63,14 +63,14 @@ class GrpcUtilTest { void shouldReadFromHeader() { var value = GrpcUtil.getFromHeaders(KEY_VALUE_BIN, header); - assertThat(value).isEqualTo(TEST_VALUE); + assertThat(value).contains(TEST_VALUE); } @Test void shouldReturnNullOnUnknownKey() { var value = GrpcUtil.getFromHeaders(UNKNOWN_KEY_BIN, header); - assertThat(value).isNull(); + assertThat(value).isEmpty(); } } diff --git a/ozgcloud-common-pdf/pom.xml b/ozgcloud-common-pdf/pom.xml index 19e18bc429b82e5f6f2f136b94fe8cdf9171d7d3..9675ee26bbaaa73baa6018bb32739c497fa406bf 100644 --- a/ozgcloud-common-pdf/pom.xml +++ b/ozgcloud-common-pdf/pom.xml @@ -114,5 +114,19 @@ <artifactId>ozgcloud-common-test</artifactId> </dependency> </dependencies> - + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>${maven-surefire-plugin.version}</version> + <configuration> + <argLine> + ${surefire.jacoco.args} + </argLine> + </configuration> + </plugin> + </plugins> + </build> </project> \ No newline at end of file diff --git a/pom.xml b/pom.xml index 2ac8c6ca278dd2c9a8d67256446b21226da22362..9a5f24939375e0f912d6994072b3706b0fdb4a75 100644 --- a/pom.xml +++ b/pom.xml @@ -51,6 +51,7 @@ <java.version>17</java.version> <maven.compiler.target>17</maven.compiler.target> <maven.compiler.source>17</maven.compiler.source> + <maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version> </properties> <distributionManagement>