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

Merge branch 'master' into OZG-4833-add-sbom-to-jar-file

parents 501cb824 83a34b80
Branches
Tags 1.7.0-administration
No related merge requests found
...@@ -62,11 +62,12 @@ pipeline { ...@@ -62,11 +62,12 @@ pipeline {
script { script {
FAILED_STAGE=env.STAGE_NAME FAILED_STAGE=env.STAGE_NAME
JAR_TAG = getPomVersion('pom.xml').replace("SNAPSHOT", "${env.BRANCH_NAME}-SNAPSHOT") JAR_TAG = getPomVersion('pom.xml').replace("SNAPSHOT", "${env.BRANCH_NAME}-SNAPSHOT")
updateDependencyVersions(JAR_TAG)
} }
configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) { configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
sh "mvn -s $MAVEN_SETTINGS versions:set -DnewVersion=${JAR_TAG} -DprocessAllModules=true" sh "mvn -s $MAVEN_SETTINGS versions:set -DnewVersion=${JAR_TAG} -DprocessAllModules=true"
script {
updateDependencyVersions(JAR_TAG)
}
} }
} }
} }
......
...@@ -208,6 +208,11 @@ ...@@ -208,6 +208,11 @@
<artifactId>grpc-inprocess</artifactId> <artifactId>grpc-inprocess</artifactId>
<version>${grpc.version}</version> <version>${grpc.version}</version>
</dependency> </dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-census</artifactId>
<version>${grpc.version}</version>
</dependency>
<!-- protobuf --> <!-- protobuf -->
<dependency> <dependency>
<groupId>com.google.protobuf</groupId> <groupId>com.google.protobuf</groupId>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment