diff --git a/Jenkinsfile b/Jenkinsfile index 3cfa42b643eb19e9f9d4c18bbf3146a387140f02..91db517b87f4041d18adcc7d40b767536f504cf4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -62,6 +62,7 @@ pipeline { script { FAILED_STAGE=env.STAGE_NAME JAR_TAG = getPomVersion('pom.xml').replace("SNAPSHOT", "${env.BRANCH_NAME}-SNAPSHOT") + updateDependencyVersions(JAR_TAG) } configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) { sh "mvn -s $MAVEN_SETTINGS versions:set -DnewVersion=${JAR_TAG} -DprocessAllModules=true" @@ -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() { def room = '' def data = """{"msgtype":"m.text", \ diff --git a/ozgcloud-common-dependencies/pom.xml b/ozgcloud-common-dependencies/pom.xml index e80c7b9b9a3b1c58d8c9b969ad1b721be878655e..79a46f9f0fd75e71079dc0a3b2011a7c6d862a55 100644 --- a/ozgcloud-common-dependencies/pom.xml +++ b/ozgcloud-common-dependencies/pom.xml @@ -40,32 +40,31 @@ <description>Dependenencies management for ozgcloud projects</description> <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> <maven.compiler.source>${java.version}</maven.compiler.source> <maven.compiler.target>${java.version}</maven.compiler.target> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <spring-boot.version>3.3.3</spring-boot.version> - <spring.version>6.1.12</spring.version> + <spring-boot.version>3.3.4</spring-boot.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-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> - <protobuf.version>4.27.3</protobuf.version> - <protoc-gen.version>1.66.0</protoc-gen.version> + <protobuf.version>3.25.5</protobuf.version> + <protoc-gen.version>1.68.0</protoc-gen.version> <mapstruct.version>1.6.0</mapstruct.version> <commons-io.version>2.16.1</commons-io.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> <java-jwt.version>4.4.0</java-jwt.version> @@ -73,7 +72,7 @@ <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-spring-boot-starter.version>24.0.5</keycloak-spring-boot-starter.version> diff --git a/ozgcloud-common-parent/pom.xml b/ozgcloud-common-parent/pom.xml index 7fa526ada47b58f86b9d460b01301fca9fc862d4..6ddde5b2272be091de38ab32d20c86b8c40d42b5 100644 --- a/ozgcloud-common-parent/pom.xml +++ b/ozgcloud-common-parent/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-parent</artifactId> - <version>3.2.9</version> + <version>3.3.4</version> <relativePath /> </parent>