Skip to content
Snippets Groups Projects
Commit 17713cb8 authored by OZGCloud's avatar OZGCloud
Browse files

Merge branch 'master' into Version-4

# Conflicts:
#	Jenkinsfile
#	ozgcloud-common-pdf/pom.xml
#	pom.xml
parents 400fae85 71398f2b
Branches
No related tags found
No related merge requests found
...@@ -57,7 +57,7 @@ pipeline { ...@@ -57,7 +57,7 @@ pipeline {
dir('ozgcloud-common-dependencies') { dir('ozgcloud-common-dependencies') {
configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) { configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
sh 'mvn --version' 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 { ...@@ -71,7 +71,7 @@ pipeline {
} }
configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) { configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
sh 'mvn --version' sh 'mvn --version'
sh 'mvn -s $MAVEN_SETTINGS clean install' sh 'mvn --no-transfer-progress -s $MAVEN_SETTINGS clean install'
script { script {
dir('ozgcloud-common-lib') { dir('ozgcloud-common-lib') {
...@@ -104,7 +104,7 @@ pipeline { ...@@ -104,7 +104,7 @@ pipeline {
FAILED_STAGE = env.STAGE_NAME FAILED_STAGE = env.STAGE_NAME
} }
configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) { configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
sh 'mvn -s $MAVEN_SETTINGS deploy' sh 'mvn --no-transfer-progress -s $MAVEN_SETTINGS deploy'
} }
} }
} }
......
...@@ -165,4 +165,19 @@ ...@@ -165,4 +165,19 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </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> </project>
\ No newline at end of file
...@@ -63,14 +63,14 @@ class GrpcUtilTest { ...@@ -63,14 +63,14 @@ class GrpcUtilTest {
void shouldReadFromHeader() { void shouldReadFromHeader() {
var value = GrpcUtil.getFromHeaders(KEY_VALUE_BIN, header); var value = GrpcUtil.getFromHeaders(KEY_VALUE_BIN, header);
assertThat(value).isEqualTo(TEST_VALUE); assertThat(value).contains(TEST_VALUE);
} }
@Test @Test
void shouldReturnNullOnUnknownKey() { void shouldReturnNullOnUnknownKey() {
var value = GrpcUtil.getFromHeaders(UNKNOWN_KEY_BIN, header); var value = GrpcUtil.getFromHeaders(UNKNOWN_KEY_BIN, header);
assertThat(value).isNull(); assertThat(value).isEmpty();
} }
} }
......
...@@ -103,4 +103,18 @@ ...@@ -103,4 +103,18 @@
</dependency> </dependency>
</dependencies> </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> </project>
\ No newline at end of file
...@@ -51,6 +51,7 @@ ...@@ -51,6 +51,7 @@
<java.version>21</java.version> <java.version>21</java.version>
<maven.compiler.target>${java.version}</maven.compiler.target> <maven.compiler.target>${java.version}</maven.compiler.target>
<maven.compiler.source>${java.version}</maven.compiler.source> <maven.compiler.source>${java.version}</maven.compiler.source>
<maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
</properties> </properties>
<distributionManagement> <distributionManagement>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment