Merge pull request #19 from bancolombia/feature/update-deps

Update dependencies
bancolombia · Jun 29, 2023 · 497b462 · 497b462
2 parents 3ee36aa + a0f4312
commit 497b462
Show file tree

Hide file tree

Showing 10 changed files with 44 additions and 36 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -38,9 +38,9 @@ jobs:
       - name: Push codeCoverage to Codecov
         if: endsWith(github.REF, '/master') == true
         run: bash <(curl -s https://codecov.io/bash)
-      - name: Run sonarqube
+      - name: Run sonar
         if: endsWith(github.REF, '/master') == true
-        run: ./gradlew sonarqube --stacktrace
+        run: ./gradlew sonar --stacktrace
           -Dsonar.login=${{ secrets.SONAR_TOKEN }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

diff --git a/README.md b/README.md
@@ -19,23 +19,23 @@ For local cache only
 
 ```gradle
 dependencies {
-    implementation 'com.github.bancolombia:bin-stash-local:1.1.0'
+    implementation 'com.github.bancolombia:bin-stash-local:1.2.0'
 }
 ```
 
 For a centralized (redis) cache only
 
 ```gradle
 dependencies {
-    implementation 'com.github.bancolombia:bin-stash-centralized:1.1.0'
+    implementation 'com.github.bancolombia:bin-stash-centralized:1.2.0'
 }
 ```
 
 For an hybrid (local and centralized) cache
 
 ```gradle
 dependencies {
-    implementation 'com.github.bancolombia:bin-stash-hybrid:1.1.0'
+    implementation 'com.github.bancolombia:bin-stash-hybrid:1.2.0'
 }
 ```
 

diff --git a/build.gradle b/build.gradle
@@ -1,7 +1,7 @@
 buildscript {
 
 	ext {
-		springBootVersion = '3.0.5'
+		springBootVersion = '3.1.1'
 		jacocoVersion = '0.8.7'
 	}
 
@@ -11,12 +11,12 @@ buildscript {
 
 	dependencies {
 		classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}")
-		classpath("org.owasp:dependency-check-gradle:8.2.1")
+		classpath("org.owasp:dependency-check-gradle:8.3.1")
 	}
 }
 
 plugins {
-	id 'org.sonarqube' version '3.0'
+	id 'org.sonarqube' version '4.2.1.3168'
 	id "io.github.gradle-nexus.publish-plugin" version "1.1.0"
 }
 

diff --git a/configuration/centralized-cache/build.gradle b/configuration/centralized-cache/build.gradle
@@ -5,6 +5,6 @@ dependencies {
     implementation 'org.springframework:spring-context'
     implementation 'com.fasterxml.jackson.core:jackson-databind'
     testImplementation 'org.springframework:spring-test'
-    testImplementation 'com.github.kstyrc:embedded-redis:0.6'
+    testImplementation "com.github.kstyrc:embedded-redis:${embeddedRedis}"
 }
 
diff --git a/configuration/hybrid-cache/build.gradle b/configuration/hybrid-cache/build.gradle
@@ -6,6 +6,6 @@ dependencies {
     implementation 'org.springframework:spring-context'
     implementation 'com.fasterxml.jackson.core:jackson-databind'
     testImplementation 'org.springframework:spring-test'
-    testImplementation 'com.github.kstyrc:embedded-redis:0.6'
+    testImplementation "com.github.kstyrc:embedded-redis:${embeddedRedis}"
 }
 
diff --git a/domain/usecase/build.gradle b/domain/usecase/build.gradle
@@ -2,5 +2,5 @@ dependencies {
     api project(':bin-stash-model')
     implementation 'org.apache.commons:commons-lang3'
     implementation 'com.fasterxml.jackson.core:jackson-databind'
-    testImplementation 'com.google.re2j:re2j:1.6'
+    testImplementation "com.google.re2j:re2j:${re2j}"
 }
diff --git a/gradle.properties b/gradle.properties
@@ -1,3 +1,5 @@
-version=1.1.0
+version=1.2.0
+re2j=1.7
+embeddedRedis=0.6
 toPublish=bin-stash-model,bin-stash-usecase,bin-stash-memory,bin-stash-redis,bin-stash-local,bin-stash-centralized,bin-stash-hybrid
 org.gradle.daemon=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/infrastructure/driven-adapters/redis-stash/build.gradle b/infrastructure/driven-adapters/redis-stash/build.gradle
@@ -2,5 +2,5 @@ dependencies {
     implementation project(':bin-stash-model')
     implementation 'io.lettuce:lettuce-core'
     implementation 'org.apache.commons:commons-lang3'
-    testImplementation 'com.github.kstyrc:embedded-redis:0.6'
+    testImplementation "com.github.kstyrc:embedded-redis:${embeddedRedis}"
 }
diff --git a/main.gradle b/main.gradle
@@ -58,29 +58,28 @@ subprojects {
         testImplementation(platform('org.junit:junit-bom:5.7.0'))
 
         implementation 'io.projectreactor:reactor-core'
-        compileOnly 'org.projectlombok:lombok:1.18.24'
-        annotationProcessor 'org.projectlombok:lombok:1.18.24'
-        testCompileOnly 'org.projectlombok:lombok:1.18.24'
-        testAnnotationProcessor 'org.projectlombok:lombok:1.18.24'
+        compileOnly 'org.projectlombok:lombok:1.18.28'
+        annotationProcessor 'org.projectlombok:lombok:1.18.28'
+        testCompileOnly 'org.projectlombok:lombok:1.18.28'
+        testAnnotationProcessor 'org.projectlombok:lombok:1.18.28'
         testImplementation 'io.projectreactor:reactor-test'
 
         testImplementation('org.junit.jupiter:junit-jupiter')
         testImplementation 'org.mockito:mockito-inline:3.7.7'
         testImplementation 'org.mockito:mockito-junit-jupiter:3.7.7'
     }
 
-    configurations.all {
+    configurations.configureEach {
         resolutionStrategy.eachDependency { DependencyResolveDetails details ->
             if (details.requested.group == 'org.apache.logging.log4j') {
-                details.useVersion '2.19.0'
+                details.useVersion '2.20.0'
             }
         }
     }
 
     dependencyManagement {
         imports {
             mavenBom "org.springframework.boot:spring-boot-dependencies:${springBootVersion}"
-            //mavenBom "org.springframework.cloud:spring-cloud-dependencies:${springCloudVersion}"
         }
     }
 
@@ -96,10 +95,10 @@ subprojects {
     jacocoTestReport {
         dependsOn test
         reports {
-            xml.enabled true
-            xml.destination file("${buildDir}/reports/jacoco.xml")
-            csv.enabled false
-            html.destination file("${buildDir}/reports/jacocoHtml")
+            xml.setRequired true
+            xml.setOutputLocation file("${buildDir}/reports/jacoco.xml")
+            csv.setRequired false
+            html.setOutputLocation file("${buildDir}/reports/jacocoHtml")
         }
     }
     compileJava {
@@ -121,14 +120,16 @@ subprojects {
         apply plugin: "maven-publish"
         apply plugin: "signing"
 
-        task sourcesJar(type: Jar, dependsOn: classes) {
-            classifier = 'sources'
+        tasks.register('sourcesJar', Jar) {
+            dependsOn classes
+            archiveClassifier = 'sources'
             from sourceSets.main.allSource
         }
 
         javadoc.failOnError = false
-        task javadocJar(type: Jar, dependsOn: javadoc) {
-            classifier = 'javadoc'
+        tasks.register('javadocJar', Jar) {
+            dependsOn javadoc
+            archiveClassifier = 'javadoc'
             from javadoc.destinationDir
         }
 
@@ -137,7 +138,7 @@ subprojects {
             archives javadocJar
         }
 
-        tasks.withType(GenerateModuleMetadata) {
+        tasks.withType(GenerateModuleMetadata).configureEach {
             enabled = false
         }
 
@@ -189,17 +190,22 @@ subprojects {
 
 }
 
-task generateMergedReport(type: JacocoReport) {
-    dependsOn = subprojects.test
+tasks.register('generateMergedReport', JacocoReport) {
+    dependsOn test
+    dependsOn subprojects.test
+    dependsOn subprojects.javadoc
+    dependsOn subprojects.jacocoTestReport
     additionalSourceDirs.setFrom files(subprojects.sourceSets.main.allSource.srcDirs)
     sourceDirectories.setFrom files(subprojects.sourceSets.main.allSource.srcDirs)
     classDirectories.setFrom files(subprojects.sourceSets.main.output)
     executionData.setFrom project.fileTree(dir: '.', include: '**/build/jacoco/test.exec')
     reports {
-        xml.enabled true
-        csv.enabled false
-        html.enabled true
+        xml.setRequired true
+        csv.setRequired false
+        html.setRequired true
     }
 }
 
-
+tasks.named('wrapper') {
+    gradleVersion = '8.1.1'
+}