diff --git a/Jenkinsfile b/Jenkinsfile index 96a8c77b0e71435fc170313a2793e85bdf1f69b6..23fee205c342e9e7f78d969c673b0047416c0ecc 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 dd7d549665f2441fb4e5907d732b9350ff12873a..b7d40d61ea503514b135c3aafdd940c78976e949 100644 --- a/ozgcloud-common-lib/pom.xml +++ b/ozgcloud-common-lib/pom.xml @@ -165,4 +165,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 46f3f3a84a12d0d3346526092b8cc4c93a9acc51..81987664996a27427772746bd624499c7eff98be 100644 --- a/ozgcloud-common-pdf/pom.xml +++ b/ozgcloud-common-pdf/pom.xml @@ -103,4 +103,18 @@ </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 fa6c709222bc4d587cd47d3ccfb2120417fdcc3f..544232cb3833f570f3e1fd359c9ec5b30ee2d6ba 100644 --- a/pom.xml +++ b/pom.xml @@ -51,6 +51,7 @@ <java.version>21</java.version> <maven.compiler.target>${java.version}</maven.compiler.target> <maven.compiler.source>${java.version}</maven.compiler.source> + <maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version> </properties> <distributionManagement>