fix(TPSVC-21171): fix dependabot (#50)

Talend · Feb 20, 2024 · e2d6078 · e2d6078
1 parent be18b7e
commit e2d6078
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 45 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,24 +1,26 @@
 buildscript {
     ext {
-        tsbiFrameworkVersion="3.2"
-        tsbiBomVersion="0.0.5"
-        springBootVersion="3.2.1"
+        tsbiFrameworkVersion = "3.2"
+        tsbiBomVersion = "0.0.11"
+        springBootVersion = "3.2.2"
 
-        securityBomVersion="4.2.0"
+        securityBomVersion = "5.2.0"
 
-        checkstyleVersion="10.3.4"
-        pmdVersion="6.55.0"
-        jacocoVersion="0.8.11"
-        spotbugsVersion="4.8.1"
-        spotbugsPluginVersion="4.7.5"
-        sonarqubePluginVersion="4.4.1.3373"
+        checkstyleVersion = "10.3.4"
+        pmdVersion = "6.55.0"
+        jacocoVersion = "0.8.11"
+        spotbugsVersion = "4.8.1"
+        spotbugsPluginVersion = "4.7.5"
+        sonarqubePluginVersion = "4.4.1.3373"
 
         // workaround for reckon issue with Java 8
-        grgitVersion="5.2.1"
+        grgitVersion = "5.2.1"
 
-        testngVersion="6.4"
-        jakartaVersion="6.0.0"
-        jakartaValidationVersion="3.0.2"
+        testngVersion = "6.4"
+        jakartaVersion = "6.0.0"
+        jakartaValidationVersion = "3.0.2"
+
+        lombokVersion = "1.18.30"
 
     }
     repositories {
@@ -52,6 +54,9 @@ configurations.all {
     resolutionStrategy {
         cacheDynamicVersionsFor 0, 'seconds'
     }
+    exclude group: "log4j", module: "log4j"
+    exclude group: "org.apache.logging.log4j"
+    exclude group: "org.slf4j", module: "slf4j-log4j12"
 }
 
 subprojects {
@@ -60,8 +65,6 @@ subprojects {
     apply from: rootProject.file('config/java.gradle')
     apply from: rootProject.file('config/publish.gradle')
 
-    apply from: rootProject.file('dependencies.gradle')
-
     repositories {
         mavenCentral()
 

diff --git a/dependencies.gradle b/dependencies.gradle
diff --git a/scim2-sdk-common/build.gradle b/scim2-sdk-common/build.gradle
@@ -8,14 +8,16 @@ test {
 }
 
 dependencies {
+    implementation(platform("org.talend.tsbi.java.springboot-bom:$tsbiFrameworkVersion:$tsbiBomVersion"))
+    implementation(platform("org.talend.pscommons:security-bom:$securityBomVersion"))
     implementation group: "com.fasterxml.jackson.core", name: "jackson-core"
     implementation group: "com.fasterxml.jackson.core", name: "jackson-annotations"
     implementation group: "com.fasterxml.jackson.core", name: "jackson-databind"
     implementation group: "com.google.guava", name: "guava"
-    implementation group: "org.projectlombok", name: "lombok"
+    implementation group: "org.projectlombok", name: "lombok", version:"$lombokVersion"
 
-    compileOnly group: "org.projectlombok", name: "lombok"
-    annotationProcessor group: "org.projectlombok", name: "lombok"
+    compileOnly group: "org.projectlombok", name: "lombok", version:"$lombokVersion"
+    annotationProcessor group: "org.projectlombok", name: "lombok", version:"$lombokVersion"
 
-    testImplementation group: "org.testng", name: "testng"
+    testImplementation group: "org.testng", name: "testng", version: "$testngVersion"
 }
diff --git a/spring-boot-starter-scim2/build.gradle b/spring-boot-starter-scim2/build.gradle
@@ -3,16 +3,18 @@ plugins {
 }
 
 dependencies {
+    implementation(platform("org.talend.tsbi.java.springboot-bom:$tsbiFrameworkVersion:$tsbiBomVersion"))
+    implementation(platform("org.talend.pscommons:security-bom:$securityBomVersion"))
     implementation project(":scim2-sdk-common")
 
     implementation "jakarta.validation:jakarta.validation-api:$jakartaValidationVersion"
     implementation "jakarta.servlet:jakarta.servlet-api:$jakartaVersion"
     implementation group: "org.springframework.boot", name: "spring-boot-starter-web"
     implementation group: "com.google.guava", name: "guava"
 
-    compileOnly group: "org.projectlombok", name: "lombok"
-    annotationProcessor group: "org.projectlombok", name: "lombok"
-    annotationProcessor group: "org.springframework.boot", name: "spring-boot-configuration-processor"
+    compileOnly group: "org.projectlombok", name: "lombok", version:"$lombokVersion"
+    annotationProcessor group: "org.projectlombok", name: "lombok", version:"$lombokVersion"
+    annotationProcessor group: "org.springframework.boot", name: "spring-boot-configuration-processor", version: "$springBootVersion"
 
     testImplementation "org.springframework.boot:spring-boot-starter-test"
     testImplementation "junit:junit"