From 991d4f8091d914937e66c00bf7cbdde8beffcbea Mon Sep 17 00:00:00 2001 From: rrenkor Date: Tue, 11 Feb 2025 14:23:58 -0600 Subject: [PATCH 1/8] Update dependencies --- build.gradle | 40 ++++++++++++------------ gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/build.gradle b/build.gradle index 07576cd..07f2e10 100644 --- a/build.gradle +++ b/build.gradle @@ -3,12 +3,12 @@ plugins { id 'maven-publish' id 'idea' id 'application' - id 'org.springframework.boot' version '3.4.1' - id 'io.spring.dependency-management' version '1.0.9.RELEASE' - id 'de.undercouch.download' version '4.1.1' + id 'org.springframework.boot' version '3.4.2' + id 'io.spring.dependency-management' version '1.1.7' + id 'de.undercouch.download' version '5.0.4' id 'jacoco' - id 'org.barfuin.gradle.jacocolog' version '1.0.1' - id "com.github.johnrengelman.shadow" version "6.0.0" + id 'org.barfuin.gradle.jacocolog' version '2.0.0' + id "com.github.johnrengelman.shadow" version "8.1.1" } application { @@ -25,17 +25,17 @@ repositories { } dependencies { - implementation "org.springframework.boot:spring-boot-starter-web:3.4.1" - implementation "org.springframework.boot:spring-boot-starter-actuator:3.4.1" - implementation "org.springframework.boot:spring-boot-starter-validation:3.4.1" - implementation "org.springframework.boot:spring-boot-loader:3.4.1" - implementation "org.springframework:spring-webmvc:6.2.1" - implementation "org.springframework:spring-web:6.2.1" + implementation "org.springframework.boot:spring-boot-starter-web:3.4.2" + implementation "org.springframework.boot:spring-boot-starter-actuator:3.4.2" + implementation "org.springframework.boot:spring-boot-starter-validation:3.4.2" + implementation "org.springframework.boot:spring-boot-loader:3.4.2" + implementation "org.springframework:spring-webmvc:6.2.2" + implementation "org.springframework:spring-web:6.2.2" implementation "org.junit.platform:junit-platform-launcher:1.11.4" - implementation "io.micrometer:micrometer-registry-influx:1.9.0" - implementation "org.javapos:javapos-config-loader:2.2.0" - implementation "org.javapos:javapos:1.14.3" - implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:2.7.0" + implementation "io.micrometer:micrometer-registry-influx:1.14.3" + implementation "org.javapos:javapos-config-loader:4.0.0" + implementation "org.javapos:javapos:1.15.2" + implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.4" implementation "com.fasterxml.jackson.core:jackson-annotations:2.14.0" implementation "com.fasterxml.jackson.core:jackson-core:2.14.0" implementation "com.fasterxml.jackson.core:jackson-databind:2.14.0" @@ -47,12 +47,12 @@ dependencies { implementation "jakarta.validation:jakarta.validation-api:3.0.2" implementation "jakarta.annotation:jakarta.annotation-api:2.1.1" - implementation "net.logstash.logback:logstash-logback-encoder:6.4" - implementation "org.yaml:snakeyaml:2.0" + implementation "net.logstash.logback:logstash-logback-encoder:8.0" + implementation "org.yaml:snakeyaml:2.3" implementation "org.springframework.boot:spring-boot-starter-cache:3.1.11" - implementation "com.github.ben-manes.caffeine:caffeine:2.9.3" - implementation "io.github.classgraph:classgraph:4.8.147" + implementation "com.github.ben-manes.caffeine:caffeine:3.2.0" + implementation "io.github.classgraph:classgraph:4.8.179" testImplementation "org.springframework.boot:spring-boot-starter-test:3.1.11" } @@ -70,7 +70,7 @@ test { } jacoco { - toolVersion = "0.8.7" + toolVersion = "1.2.4" reportsDirectory = layout.buildDirectory.dir('customJacocoReportDir') } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c743a02..0352a51 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-all.zip \ No newline at end of file +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-all.zip \ No newline at end of file From 402ba8272e2e380f0b6f2f362103fe698989a189 Mon Sep 17 00:00:00 2001 From: rrenkor Date: Tue, 11 Feb 2025 14:43:56 -0600 Subject: [PATCH 2/8] Jacoco tool version --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 6f65579..750ef5f 100644 --- a/build.gradle +++ b/build.gradle @@ -70,7 +70,7 @@ test { } jacoco { - toolVersion = "1.2.4" + toolVersion = "0.8.12" reportsDirectory = layout.buildDirectory.dir('customJacocoReportDir') } From ee5f20e21521e494761ab4f00c9c873641451e0b Mon Sep 17 00:00:00 2001 From: rrenkor Date: Tue, 11 Feb 2025 15:08:39 -0600 Subject: [PATCH 3/8] Update jacocolog --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 750ef5f..f8594ed 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ plugins { id 'io.spring.dependency-management' version '1.1.7' id 'de.undercouch.download' version '5.0.4' id 'jacoco' - id 'org.barfuin.gradle.jacocolog' version '2.0.0' + id 'org.barfuin.gradle.jacocolog' version '3.1.0' id "com.github.johnrengelman.shadow" version "8.1.1" } From eca030f8d967583bb1b9e9e92ae5f4adb6684737 Mon Sep 17 00:00:00 2001 From: rrenkor Date: Tue, 11 Feb 2025 15:09:51 -0600 Subject: [PATCH 4/8] Newline at EOF --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0352a51..67f1133 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-all.zip \ No newline at end of file +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-all.zip From d20fd7421ae0a189e42228c657a6ec452ae5e294 Mon Sep 17 00:00:00 2001 From: rrenkor Date: Tue, 11 Feb 2025 15:17:28 -0600 Subject: [PATCH 5/8] Springframework updates --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index f8594ed..eed4ae7 100644 --- a/build.gradle +++ b/build.gradle @@ -50,10 +50,10 @@ dependencies { implementation "net.logstash.logback:logstash-logback-encoder:8.0" implementation "org.yaml:snakeyaml:2.3" - implementation "org.springframework.boot:spring-boot-starter-cache:3.1.11" + implementation "org.springframework.boot:spring-boot-starter-cache:3.4.2" implementation "com.github.ben-manes.caffeine:caffeine:3.2.0" implementation "io.github.classgraph:classgraph:4.8.179" - testImplementation "org.springframework.boot:spring-boot-starter-test:3.1.11" + testImplementation "org.springframework.boot:spring-boot-starter-test:3.4.2" } tasks.withType(JavaExec){ From 18b270a28019378c44fcfab24c69b4059ec3647e Mon Sep 17 00:00:00 2001 From: rrenkor Date: Wed, 12 Feb 2025 13:57:48 -0600 Subject: [PATCH 6/8] More dependency updates --- build.gradle | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index eed4ae7..f3f2b3b 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ plugins { id 'application' id 'org.springframework.boot' version '3.4.2' id 'io.spring.dependency-management' version '1.1.7' - id 'de.undercouch.download' version '5.0.4' + id 'de.undercouch.download' version '5.6.0' id 'jacoco' id 'org.barfuin.gradle.jacocolog' version '3.1.0' id "com.github.johnrengelman.shadow" version "8.1.1" @@ -32,7 +32,7 @@ dependencies { implementation "org.springframework:spring-webmvc:6.2.2" implementation "org.springframework:spring-web:6.2.2" implementation "org.junit.platform:junit-platform-launcher:1.11.4" - implementation "io.micrometer:micrometer-registry-influx:1.14.3" + implementation "io.micrometer:micrometer-registry-influx:1.14.4" implementation "org.javapos:javapos-config-loader:4.0.0" implementation "org.javapos:javapos:1.15.2" implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.4" @@ -43,9 +43,9 @@ dependencies { implementation "com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.18.2" implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.18.2" implementation "com.fasterxml.jackson.module:jackson-module-parameter-names:2.18.2" - implementation "jakarta.servlet:jakarta.servlet-api:6.0.0" - implementation "jakarta.validation:jakarta.validation-api:3.0.2" - implementation "jakarta.annotation:jakarta.annotation-api:2.1.1" + implementation "jakarta.servlet:jakarta.servlet-api:6.1.0" + implementation "jakarta.validation:jakarta.validation-api:3.1.1" + implementation "jakarta.annotation:jakarta.annotation-api:3.0.0" implementation "net.logstash.logback:logstash-logback-encoder:8.0" implementation "org.yaml:snakeyaml:2.3" From dc9187cb56451630c4be09bc19fd947a98741ffb Mon Sep 17 00:00:00 2001 From: rrenkor Date: Tue, 25 Mar 2025 10:10:48 -0500 Subject: [PATCH 7/8] More dependency updates --- build.gradle | 46 ++++++++++++------------ gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 25 insertions(+), 23 deletions(-) diff --git a/build.gradle b/build.gradle index f3f2b3b..4df23a4 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ plugins { id 'maven-publish' id 'idea' id 'application' - id 'org.springframework.boot' version '3.4.2' + id 'org.springframework.boot' version '3.4.3' id 'io.spring.dependency-management' version '1.1.7' id 'de.undercouch.download' version '5.6.0' id 'jacoco' @@ -25,35 +25,37 @@ repositories { } dependencies { - implementation "org.springframework.boot:spring-boot-starter-web:3.4.2" - implementation "org.springframework.boot:spring-boot-starter-actuator:3.4.2" - implementation "org.springframework.boot:spring-boot-starter-validation:3.4.2" - implementation "org.springframework.boot:spring-boot-loader:3.4.2" - implementation "org.springframework:spring-webmvc:6.2.2" - implementation "org.springframework:spring-web:6.2.2" - implementation "org.junit.platform:junit-platform-launcher:1.11.4" + implementation "org.springframework.boot:spring-boot-starter-web:3.4.3" + implementation "org.springframework.boot:spring-boot-starter-actuator:3.4.3" + implementation "org.springframework.boot:spring-boot-starter-validation:3.4.3" + implementation "org.springframework.boot:spring-boot-loader:3.4.3" + implementation "org.springframework:spring-webmvc:6.2.3" + implementation "org.springframework:spring-web:6.2.3" + implementation "org.junit.platform:junit-platform-launcher:1.12.0" + implementation "org.junit.platform:junit-platform-commons:1.12.0" + implementation "org.junit.platform:junit-platform-engine:1.12.0" implementation "io.micrometer:micrometer-registry-influx:1.14.4" - implementation "org.javapos:javapos-config-loader:4.0.0" - implementation "org.javapos:javapos:1.15.2" - implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.4" - implementation "com.fasterxml.jackson.core:jackson-annotations:2.18.2" - implementation "com.fasterxml.jackson.core:jackson-core:2.18.2" - implementation "com.fasterxml.jackson.core:jackson-databind:2.18.2" - implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.18.2" - implementation "com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.18.2" - implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.18.2" - implementation "com.fasterxml.jackson.module:jackson-module-parameter-names:2.18.2" + implementation "org.javapos:javapos-config-loader:4.0.1" + implementation "org.javapos:javapos:1.15.5" + implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.5" + implementation "com.fasterxml.jackson.core:jackson-annotations:2.18.3" + implementation "com.fasterxml.jackson.core:jackson-core:2.18.3" + implementation "com.fasterxml.jackson.core:jackson-databind:2.18.3" + implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.18.3" + implementation "com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.18.3" + implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.18.3" + implementation "com.fasterxml.jackson.module:jackson-module-parameter-names:2.18.3" implementation "jakarta.servlet:jakarta.servlet-api:6.1.0" implementation "jakarta.validation:jakarta.validation-api:3.1.1" implementation "jakarta.annotation:jakarta.annotation-api:3.0.0" implementation "net.logstash.logback:logstash-logback-encoder:8.0" - implementation "org.yaml:snakeyaml:2.3" + implementation "org.yaml:snakeyaml:2.4" - implementation "org.springframework.boot:spring-boot-starter-cache:3.4.2" + implementation "org.springframework.boot:spring-boot-starter-cache:3.4.3" implementation "com.github.ben-manes.caffeine:caffeine:3.2.0" implementation "io.github.classgraph:classgraph:4.8.179" - testImplementation "org.springframework.boot:spring-boot-starter-test:3.4.2" + testImplementation "org.springframework.boot:spring-boot-starter-test:3.4.3" } tasks.withType(JavaExec){ @@ -90,7 +92,7 @@ task copyRuntimeJars(type: Copy) { into "$buildDir/libs" } -ext['log4j2.version'] = '2.17.1' +ext['log4j2.version'] = '2.24.3' shadowJar{ archiveClassifier.set("") diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 67f1133..02767eb 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip From e8f965c4fb493eec9b3af110f7166e365cafc77a Mon Sep 17 00:00:00 2001 From: rrenkor Date: Tue, 25 Mar 2025 10:23:18 -0500 Subject: [PATCH 8/8] More dependency updates --- build.gradle | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/build.gradle b/build.gradle index fdbc738..0507c88 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ plugins { id 'maven-publish' id 'idea' id 'application' - id 'org.springframework.boot' version '3.4.3' + id 'org.springframework.boot' version '3.4.4' id 'io.spring.dependency-management' version '1.1.7' id 'de.undercouch.download' version '5.6.0' id 'jacoco' @@ -25,19 +25,19 @@ repositories { } dependencies { - implementation "org.springframework.boot:spring-boot-starter-web:3.4.3" - implementation "org.springframework.boot:spring-boot-starter-actuator:3.4.3" - implementation "org.springframework.boot:spring-boot-starter-validation:3.4.3" - implementation "org.springframework.boot:spring-boot-loader:3.4.3" - implementation "org.springframework:spring-webmvc:6.2.3" - implementation "org.springframework:spring-web:6.2.3" - implementation "org.junit.platform:junit-platform-launcher:1.12.0" - implementation "org.junit.platform:junit-platform-commons:1.12.0" - implementation "org.junit.platform:junit-platform-engine:1.12.0" - implementation "io.micrometer:micrometer-registry-influx:1.14.4" + implementation "org.springframework.boot:spring-boot-starter-web:3.4.4" + implementation "org.springframework.boot:spring-boot-starter-actuator:3.4.4" + implementation "org.springframework.boot:spring-boot-starter-validation:3.4.4" + implementation "org.springframework.boot:spring-boot-loader:3.4.4" + implementation "org.springframework:spring-webmvc:6.2.5" + implementation "org.springframework:spring-web:6.2.5" + implementation "org.junit.platform:junit-platform-launcher:1.12.1" + implementation "org.junit.platform:junit-platform-commons:1.12.1" + implementation "org.junit.platform:junit-platform-engine:1.12.1" + implementation "io.micrometer:micrometer-registry-influx:1.14.5" implementation "org.javapos:javapos-config-loader:4.0.1" implementation "org.javapos:javapos:1.15.5" - implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.5" + implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.6" implementation "com.fasterxml.jackson.core:jackson-annotations:2.18.3" implementation "com.fasterxml.jackson.core:jackson-core:2.18.3" implementation "com.fasterxml.jackson.core:jackson-databind:2.18.3" @@ -52,10 +52,10 @@ dependencies { implementation "net.logstash.logback:logstash-logback-encoder:8.0" implementation "org.yaml:snakeyaml:2.4" - implementation "org.springframework.boot:spring-boot-starter-cache:3.4.3" + implementation "org.springframework.boot:spring-boot-starter-cache:3.4.4" implementation "com.github.ben-manes.caffeine:caffeine:3.2.0" implementation "io.github.classgraph:classgraph:4.8.179" - testImplementation "org.springframework.boot:spring-boot-starter-test:3.4.3" + testImplementation "org.springframework.boot:spring-boot-starter-test:3.4.4" } tasks.withType(JavaExec){