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

Merge pull request 'OZG-6710 Update common-lib' (#25) from OZG-6710-Update-common-lib into master

parents 84873b85 e55a75b8
No related branches found
No related tags found
No related merge requests found
...@@ -62,6 +62,7 @@ pipeline { ...@@ -62,6 +62,7 @@ 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"
...@@ -134,6 +135,19 @@ pipeline { ...@@ -134,6 +135,19 @@ pipeline {
} }
} }
void updateDependencyVersions(String snapshotVersion) {
def pom = readMavenPom file: 'pom.xml'
if ( pom.properties['ozgcloud-common.version'] ==~ SNAPSHOT_REGEX ) {
pom.properties['ozgcloud-common.version'] = snapshotVersion
writeMavenPom model: pom, file: 'pom.xml'
}
pom = readMavenPom file: 'ozgcloud-common-parent/pom.xml'
if ( pom.properties['ozgcloud-common.version'] ==~ SNAPSHOT_REGEX ) {
pom.properties['ozgcloud-common.version'] = snapshotVersion
writeMavenPom model: pom, file: 'ozgcloud-common-parent/pom.xml'
}
}
Void sendFailureMessage() { Void sendFailureMessage() {
def room = '' def room = ''
def data = """{"msgtype":"m.text", \ def data = """{"msgtype":"m.text", \
......
...@@ -40,32 +40,31 @@ ...@@ -40,32 +40,31 @@
<description>Dependenencies management for ozgcloud projects</description> <description>Dependenencies management for ozgcloud projects</description>
<properties> <properties>
<vorgang-manager.version>2.9.0</vorgang-manager.version> <vorgang-manager.version>2.15.0-SNAPSHOT</vorgang-manager.version>
<license.version>1.3.0</license.version> <license.version>1.3.0</license.version>
<maven.compiler.source>${java.version}</maven.compiler.source> <maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target> <maven.compiler.target>${java.version}</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring-boot.version>3.3.3</spring-boot.version> <spring-boot.version>3.3.4</spring-boot.version>
<spring.version>6.1.12</spring.version> <spring.version>6.1.13</spring.version>
<grpc.spring-boot-starter.version>5.0.0</grpc.spring-boot-starter.version> <grpc.spring-boot-starter.version>5.1.5</grpc.spring-boot-starter.version>
<net.devh.grpc.spring-boot-server-starter.version>3.1.0.RELEASE</net.devh.grpc.spring-boot-server-starter.version> <net.devh.grpc.spring-boot-server-starter.version>3.1.0.RELEASE</net.devh.grpc.spring-boot-server-starter.version>
<net.devh.grpc.spring-boot-client-starter.version>3.1.0.RELEASE</net.devh.grpc.spring-boot-client-starter.version> <net.devh.grpc.spring-boot-client-starter.version>3.1.0.RELEASE</net.devh.grpc.spring-boot-client-starter.version>
<grpc.version>1.66.0</grpc.version> <grpc.version>1.68.0</grpc.version>
<protoc-jar-plugin.version>3.11.4</protoc-jar-plugin.version> <protoc-jar-plugin.version>3.11.4</protoc-jar-plugin.version>
<protobuf.version>4.27.3</protobuf.version> <protobuf.version>3.25.5</protobuf.version>
<protoc-gen.version>1.66.0</protoc-gen.version> <protoc-gen.version>1.68.0</protoc-gen.version>
<mapstruct.version>1.6.0</mapstruct.version> <mapstruct.version>1.6.0</mapstruct.version>
<commons-io.version>2.16.1</commons-io.version> <commons-io.version>2.16.1</commons-io.version>
<commons-beanutils.version>1.9.4</commons-beanutils.version> <commons-beanutils.version>1.9.4</commons-beanutils.version>
<commons-lang3.version>3.16.0</commons-lang3.version> <commons-lang3.version>3.17.0</commons-lang3.version>
<commons-collections.version>4.4</commons-collections.version> <commons-collections.version>4.4</commons-collections.version>
<java-jwt.version>4.4.0</java-jwt.version> <java-jwt.version>4.4.0</java-jwt.version>
...@@ -73,7 +72,7 @@ ...@@ -73,7 +72,7 @@
<jakarta.version>2.1.0</jakarta.version> <jakarta.version>2.1.0</jakarta.version>
<quarkus.platform.version>3.13.3</quarkus.platform.version> <quarkus.platform.version>3.15.1</quarkus.platform.version>
<keycloak-adapter.version>24.0.5</keycloak-adapter.version> <keycloak-adapter.version>24.0.5</keycloak-adapter.version>
<keycloak-spring-boot-starter.version>24.0.5</keycloak-spring-boot-starter.version> <keycloak-spring-boot-starter.version>24.0.5</keycloak-spring-boot-starter.version>
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>3.2.9</version> <version>3.3.4</version>
<relativePath /> <relativePath />
</parent> </parent>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment