Skip to content

Commit

Permalink
Update all non-major dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
renovate-bot authored and galovics committed Nov 25, 2023
1 parent 054903a commit 47ff783
Show file tree
Hide file tree
Showing 9 changed files with 76 additions and 76 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-mariadb.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ jobs:

services:
mariad:
image: mariadb:11.0
image: mariadb:11.1
ports:
- 3306:3306
env:
MARIADB_ROOT_PASSWORD: mysql
options: --health-cmd="healthcheck.sh --su-mysql --connect --innodb_initialized" --health-interval=5s --health-timeout=2s --health-retries=3

mock-oauth2-server:
image: ghcr.io/navikt/mock-oauth2-server:2.0.0
image: ghcr.io/navikt/mock-oauth2-server:2.0.1
ports:
- 9000:9000
env:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-mysql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ jobs:

services:
mariad:
image: mysql:8.0
image: mysql:8.2
ports:
- 3306:3306
env:
MYSQL_ROOT_PASSWORD: mysql
options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s --health-retries=3

mock-oauth2-server:
image: ghcr.io/navikt/mock-oauth2-server:2.0.0
image: ghcr.io/navikt/mock-oauth2-server:2.0.1
ports:
- 9000:9000
env:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-postgresql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:

services:
postgresql:
image: postgres:16.0
image: postgres:16.1
ports:
- 5432:5432
env:
Expand All @@ -19,7 +19,7 @@ jobs:
options: --health-cmd="pg_isready -q -d postgres -U root" --health-interval=5s --health-timeout=2s --health-retries=3

mock-oauth2-server:
image: ghcr.io/navikt/mock-oauth2-server:2.0.0
image: ghcr.io/navikt/mock-oauth2-server:2.0.1
ports:
- 9000:9000
env:
Expand Down
18 changes: 9 additions & 9 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -67,15 +67,15 @@ buildscript {
}

plugins {
id 'me.qoomon.git-versioning' version '6.4.2'
id 'me.qoomon.git-versioning' version '6.4.3'
id "org.barfuin.gradle.taskinfo" version "2.1.0"
id 'com.adarshr.test-logger' version '4.0.0'
id 'com.diffplug.spotless' version '6.19.0' apply false
id 'org.nosphere.apache.rat' version '0.8.0' apply false
id 'com.diffplug.spotless' version '6.22.0' apply false
id 'org.nosphere.apache.rat' version '0.8.1' apply false
id 'com.github.hierynomus.license' version '0.16.1' apply false
id 'com.github.jk1.dependency-license-report' version '2.5' apply false
id 'org.zeroturnaround.gradle.jrebel' version '1.1.12' apply false
id 'org.springframework.boot' version '3.1.1' apply false
id 'org.zeroturnaround.gradle.jrebel' version '1.2.0' apply false
id 'org.springframework.boot' version '3.1.5' apply false
id 'net.ltgt.errorprone' version '3.1.0' apply false
id 'io.swagger.core.v3.swagger-gradle-plugin' version '2.2.11' apply false
id 'com.gorylenko.gradle-git-properties' version '2.4.1' apply false
Expand All @@ -85,12 +85,12 @@ plugins {
id 'org.asciidoctor.jvm.revealjs' version '3.3.2' apply false
id 'org.asciidoctor.jvm.gems' version '3.3.2' apply false
id 'org.asciidoctor.kindlegen.base' version '3.2.0' apply false
id 'com.google.cloud.tools.jib' version '3.3.2' apply false
id 'com.google.cloud.tools.jib' version '3.4.0' apply false
id 'org.sonarqube' version '4.4.1.3373'
id 'com.github.andygoossens.modernizer' version '1.8.0' apply false
id 'com.github.spotbugs' version '5.0.14' apply false
id 'com.github.andygoossens.modernizer' version '1.9.0' apply false
id 'com.github.spotbugs' version '5.2.3' apply false
id 'se.thinkcode.cucumber-runner' version '0.0.11' apply false
id "com.github.davidmc24.gradle.plugin.avro-base" version "1.7.1" apply false
id "com.github.davidmc24.gradle.plugin.avro-base" version "1.9.1" apply false
}

apply from: "${rootDir}/buildSrc/src/main/groovy/org.apache.fineract.release.gradle"
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import static org.slf4j.LoggerFactory.*

plugins {
id 'io.spring.dependency-management' version '1.1.0'
id 'io.spring.dependency-management' version '1.1.4'
id 'groovy'
id 'java-gradle-plugin'
id 'groovy-gradle-plugin'
Expand Down
112 changes: 56 additions & 56 deletions buildSrc/src/main/groovy/org.apache.fineract.dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,61 +22,61 @@ apply plugin: 'io.spring.dependency-management'
// https://github.com/spring-gradle-plugins/dependency-management-plugin
dependencyManagement {
imports {
mavenBom 'io.micrometer:micrometer-bom:1.11.5'
mavenBom 'org.springframework:spring-framework-bom:6.0.10'
mavenBom 'org.springframework.boot:spring-boot-dependencies:3.1.1'
mavenBom 'io.micrometer:micrometer-bom:1.12.0'
mavenBom 'org.springframework:spring-framework-bom:6.1.0'
mavenBom 'org.springframework.boot:spring-boot-dependencies:3.1.5'
mavenBom 'io.awspring.cloud:spring-cloud-aws-dependencies:3.0.3'
mavenBom 'io.opentelemetry:opentelemetry-bom:1.31.0'
mavenBom 'org.jetbrains.kotlin:kotlin-bom:1.8.22'
mavenBom 'org.junit:junit-bom:5.9.3'
mavenBom 'com.fasterxml.jackson:jackson-bom:2.15.2'
mavenBom 'io.cucumber:cucumber-bom:7.12.1'
mavenBom 'io.netty:netty-bom:4.1.94.Final'
mavenBom 'org.mockito:mockito-bom:5.4.0'
mavenBom 'software.amazon.awssdk:bom:2.20.97'
mavenBom 'io.opentelemetry:opentelemetry-bom:1.32.0'
mavenBom 'org.jetbrains.kotlin:kotlin-bom:1.9.20'
mavenBom 'org.junit:junit-bom:5.10.1'
mavenBom 'com.fasterxml.jackson:jackson-bom:2.16.0'
mavenBom 'io.cucumber:cucumber-bom:7.14.0'
mavenBom 'io.netty:netty-bom:4.1.101.Final'
mavenBom 'org.mockito:mockito-bom:5.7.0'
mavenBom 'software.amazon.awssdk:bom:2.21.28'
}

dependencies {
// We use fixed versions, instead of inheriting them from the Spring BOM, to be able to be on more recent ones.
// We do not use :+ to get the latest available version available on Maven Central, as that could suddenly break things.
// We use the Renovate Bot to automatically propose Pull Requests (PRs) when upgrades for all of these versions are available.

dependency 'org.slf4j:slf4j-api:2.0.7'
dependency 'org.slf4j:slf4j-simple:2.0.7'
dependency 'org.slf4j:jcl-over-slf4j:2.0.7'
dependency 'org.slf4j:jul-to-slf4j:2.0.7'
dependency 'org.slf4j:log4j-over-slf4j:2.0.7'
dependency 'ch.qos.logback:logback-core:1.4.8'
dependency 'ch.qos.logback:logback-classic:1.4.8'
dependency 'org.slf4j:slf4j-api:2.0.9'
dependency 'org.slf4j:slf4j-simple:2.0.9'
dependency 'org.slf4j:jcl-over-slf4j:2.0.9'
dependency 'org.slf4j:jul-to-slf4j:2.0.9'
dependency 'org.slf4j:log4j-over-slf4j:2.0.9'
dependency 'ch.qos.logback:logback-core:1.4.11'
dependency 'ch.qos.logback:logback-classic:1.4.11'
dependency 'ch.qos.logback.contrib:logback-json-classic:0.1.5'
dependency 'ch.qos.logback.contrib:logback-jackson:0.1.5'
dependency 'org.codehaus.janino:janino:3.1.9'
dependency 'org.codehaus.janino:janino:3.1.10'


dependency 'org.eclipse.persistence:org.eclipse.persistence.jpa:4.0.0'
dependency 'com.google.guava:guava:32.0.0-jre'
dependency 'com.google.code.gson:gson:2.10.1'
dependency 'com.google.truth:truth:1.1.5'
dependency 'com.google.truth.extensions:truth-java8-extension:1.1.5'
dependency 'com.google.googlejavaformat:google-java-format:1.17.0'
dependency 'com.google.googlejavaformat:google-java-format:1.18.1'
dependency ('org.apache.commons:commons-email:1.5') {
exclude 'com.sun.mail:javax.mail'
exclude 'javax.activation:activation'
}
dependency 'commons-io:commons-io:2.13.0'
dependency 'com.github.librepdf:openpdf:1.3.30'
dependency ('org.mnode.ical4j:ical4j:3.2.11') {
dependency 'commons-io:commons-io:2.15.0'
dependency 'com.github.librepdf:openpdf:1.3.33'
dependency ('org.mnode.ical4j:ical4j:3.2.14') {
exclude 'com.sun.mail:javax.mail'
exclude 'org.codehaus.groovy:groovy'
}
dependency 'org.apache.commons:commons-csv:1.10.0'
dependency 'org.quartz-scheduler:quartz:2.3.2'
dependency 'software.amazon.awssdk:bom:2.20.97'
dependency 'software.amazon.awssdk:bom:2.21.28'
dependency 'org.ehcache:ehcache:3.10.8'
dependency 'com.github.spullara.mustache.java:compiler:0.9.10'
dependency 'com.github.spullara.mustache.java:compiler:0.9.11'
dependency 'com.jayway.jsonpath:json-path:2.8.0'
dependency 'org.apache.tika:tika-core:2.8.0'
dependency ('org.apache.tika:tika-parser-microsoft-module:2.8.0') {
dependency 'org.apache.tika:tika-core:2.9.1'
dependency ('org.apache.tika:tika-parser-microsoft-module:2.9.1') {
exclude 'org.bouncycastle:bcprov-jdk15on'
exclude 'org.bouncycastle:bcmail-jdk15on'
exclude 'org.bouncycastle:bcprov-jdk18on'
Expand All @@ -95,7 +95,7 @@ dependencyManagement {
exclude 'org.apache.commons:commons-compress'
exclude 'xml-apis:xml-apis'
}
dependency ('org.apache.tika:tika-parser-miscoffice-module:2.8.0') {
dependency ('org.apache.tika:tika-parser-miscoffice-module:2.9.1') {
exclude 'org.bouncycastle:bcprov-jdk15on'
exclude 'org.bouncycastle:bcmail-jdk15on'
exclude 'org.bouncycastle:bcprov-jdk18on'
Expand All @@ -119,19 +119,19 @@ dependencyManagement {
dependency 'jakarta.management.j2ee:jakarta.management.j2ee-api:1.1.4'
dependency 'jakarta.jms:jakarta.jms-api:3.1.0'
dependency 'jakarta.ws.rs:jakarta.ws.rs-api:3.1.0'
dependency 'org.glassfish.jersey.media:jersey-media-multipart:3.1.2'
dependency 'org.glassfish.jersey.media:jersey-media-multipart:3.1.3'
dependency 'org.glassfish.jaxb:jaxb-runtime:2.3.6' // Swagger needs exactly this version
dependency 'org.apache.bval:org.apache.bval.bundle:3.0.0'
dependency 'joda-time:joda-time:2.12.5'

dependency 'io.github.classgraph:classgraph:4.8.160'
dependency 'io.github.classgraph:classgraph:4.8.165'
dependency 'org.awaitility:awaitility:4.2.0'
dependency 'com.github.spotbugs:spotbugs-annotations:4.7.3'
dependency 'com.github.spotbugs:spotbugs-annotations:4.8.1'
dependency 'javax.cache:cache-api:1.1.1'
dependency 'org.mock-server:mockserver-junit-jupiter:5.15.0'
dependency 'org.webjars:webjars-locator-core:0.53'
dependency 'com.icegreen:greenmail-junit5:2.0.0'
dependency 'com.intuit.karate:karate-junit5:1.4.0'
dependency 'org.webjars:webjars-locator-core:0.55'
dependency 'com.icegreen:greenmail-junit5:2.0.1'
dependency 'com.intuit.karate:karate-junit5:1.4.1'

// fineract client dependencies
dependency "com.squareup.retrofit2:retrofit:2.9.0"
Expand All @@ -151,35 +151,35 @@ dependencyManagement {
dependency "org.apache.oltu.oauth2:org.apache.oltu.oauth2.common:1.0.1"
dependency "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:1.0.1"
dependency "org.apache.oltu.oauth2:org.apache.oltu.oauth2.httpclient4:1.0.1"
dependency "com.squareup.okhttp3:okhttp:4.11.0"
dependency "com.squareup.okhttp3:okcurl:4.11.0"
dependency "com.squareup.okhttp3:logging-interceptor:4.11.0"
dependency "com.squareup.okhttp3:okhttp:4.12.0"
dependency "com.squareup.okhttp3:okcurl:4.12.0"
dependency "com.squareup.okhttp3:logging-interceptor:4.12.0"
dependency "com.squareup.okhttp3:okhttp-apache:4.9.3"
dependency "com.squareup.okhttp3:okhttp-android-support:4.9.3"
dependency "com.squareup.okhttp3:okhttp-urlconnection:4.11.0"
dependency "com.squareup.okhttp3:okhttp-sse:4.11.0"
dependency "io.gsonfire:gson-fire:1.8.5"
dependency "com.squareup.okhttp3:okhttp-urlconnection:4.12.0"
dependency "com.squareup.okhttp3:okhttp-sse:4.12.0"
dependency "io.gsonfire:gson-fire:1.9.0"
dependency "com.google.code.findbugs:jsr305:3.0.2"
dependency "commons-codec:commons-codec:1.16.0"
dependency "org.projectlombok:lombok:1.18.28"
dependency "org.projectlombok:lombok:1.18.30"

dependency 'org.bouncycastle:bcpkix-jdk15to18:1.75'
dependency 'org.bouncycastle:bcprov-jdk15to18:1.75'
dependency 'org.bouncycastle:bcpkix-jdk15to18:1.77'
dependency 'org.bouncycastle:bcprov-jdk15to18:1.77'
dependency 'org.bouncycastle:bcprov-jdk15on:1.70'
dependency 'org.bouncycastle:bcpg-jdk15on:1.70'

dependency 'org.eclipse.jgit:org.eclipse.jgit:6.6.0.202305301015-r'
dependency 'org.eclipse.jgit:org.eclipse.jgit.ssh.apache:6.6.0.202305301015-r'
dependency 'org.eclipse.jgit:org.eclipse.jgit:6.7.0.202309050840-r'
dependency 'org.eclipse.jgit:org.eclipse.jgit.ssh.apache:6.7.0.202309050840-r'

dependency 'org.tmatesoft.svnkit:svnkit:1.10.11'
dependency 'com.vdurmont:semver4j:3.1.0'
dependency 'org.beryx:text-io:3.4.1'

dependency ('org.springdoc:springdoc-openapi-starter-webmvc-ui:2.1.0') {
dependency ('org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0') {
exclude 'io.swagger.core.v3:swagger-core'
}

dependency 'com.google.cloud.sql:mysql-socket-factory-connector-j-8:1.12.0'
dependency 'com.google.cloud.sql:mysql-socket-factory-connector-j-8:1.15.0'

dependency ('org.apache.activemq:activemq-client:6.0.0') {
exclude 'javax.annotation:javax.annotation-api'
Expand All @@ -203,7 +203,7 @@ dependencyManagement {
exclude 'jakarta.activation:jakarta.activation-api'
}

dependency ('org.liquibase:liquibase-core:4.23.0') {
dependency ('org.liquibase:liquibase-core:4.25.0') {
exclude 'javax.xml.bind:jaxb-api'
}

Expand All @@ -217,33 +217,33 @@ dependencyManagement {
dependency 'org.owasp.esapi:esapi:2.5.2.0'
dependency 'org.awaitility:awaitility:4.2.0'

dependencySet(group: 'org.apache.poi', version: '5.2.3') {
dependencySet(group: 'org.apache.poi', version: '5.2.4') {
entry 'poi'
entry 'poi-ooxml'
entry 'poi-ooxml-schemas'
}

dependencySet(group: 'io.rest-assured', version: '5.3.1') {
dependencySet(group: 'io.rest-assured', version: '5.3.2') {
entry 'rest-assured'
entry 'json-path'
entry 'xml-path'
}
dependency 'org.apache.groovy:groovy-xml:4.0.13'
dependency 'org.apache.groovy:groovy-json:4.0.13'
dependency 'org.apache.groovy:groovy-xml:4.0.14'
dependency 'org.apache.groovy:groovy-json:4.0.15'

dependency 'org.mapstruct:mapstruct:1.5.5.Final'
dependency 'org.mapstruct:mapstruct-processor:1.5.5.Final'

dependency "org.apache.avro:avro:1.11.1"
dependency "org.apache.avro:avro:1.11.3"

dependency "io.github.resilience4j:resilience4j-spring-boot2:2.0.2"
dependency "io.github.resilience4j:resilience4j-spring-boot2:2.1.0"

dependency ('org.mariadb.jdbc:mariadb-java-client:3.1.4') {
dependency ('org.mariadb.jdbc:mariadb-java-client:3.3.0') {
exclude 'org.slf4j:jcl-over-slf4j'
exclude 'org.slf4j:slf4j-api'
}

dependency 'org.postgresql:postgresql:42.6.0'
dependency 'org.postgresql:postgresql:42.7.0'

dependency 'org.assertj:assertj-core:3.24.2'

Expand Down
2 changes: 1 addition & 1 deletion custom/docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ version: '3.7'
services:
# Backend service
fineractmysql:
image: mariadb:11.0
image: mariadb:11.1
volumes:
- ../../fineract-db/server_collation.cnf:/etc/mysql/conf.d/server_collation.cnf
- ../../fineract-db/docker:/docker-entrypoint-initdb.d:Z,ro
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
4 changes: 2 additions & 2 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
*/

plugins {
id 'com.gradle.enterprise' version '3.13.4'
id 'com.gradle.common-custom-user-data-gradle-plugin' version '1.11'
id 'com.gradle.enterprise' version '3.15.1'
id 'com.gradle.common-custom-user-data-gradle-plugin' version '1.12'
}

def isCI = System.getenv('JENKINS_URL') != null
Expand Down

0 comments on commit 47ff783

Please sign in to comment.