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 committed Dec 11, 2023
1 parent 6dbab17 commit 9569769
Show file tree
Hide file tree
Showing 9 changed files with 62 additions and 50 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-mariadb.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:

services:
mariad:
image: mariadb:11.1
image: mariadb:11.2
ports:
- 3306:3306
env:
Expand Down
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -70,12 +70,12 @@ plugins {
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.22.0' apply false
id 'com.diffplug.spotless' version '6.23.3' 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.2.0' apply false
id 'org.springframework.boot' version '3.1.5' apply false
id 'org.springframework.boot' version '3.2.0' 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 @@ -88,7 +88,7 @@ plugins {
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.9.0' apply false
id 'com.github.spotbugs' version '5.0.14' apply false
id 'com.github.spotbugs' version '5.2.5' apply false
id 'se.thinkcode.cucumber-runner' version '0.0.11' apply false
id "com.github.davidmc24.gradle.plugin.avro-base" version "1.9.1" apply false
}
Expand Down
58 changes: 29 additions & 29 deletions buildSrc/src/main/groovy/org.apache.fineract.dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,17 @@ apply plugin: 'io.spring.dependency-management'
dependencyManagement {
imports {
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.32.0'
mavenBom 'org.jetbrains.kotlin:kotlin-bom:1.9.20'
mavenBom 'org.springframework:spring-framework-bom:6.1.1'
mavenBom 'org.springframework.boot:spring-boot-dependencies:3.2.0'
mavenBom 'io.awspring.cloud:spring-cloud-aws-dependencies:3.1.0'
mavenBom 'io.opentelemetry:opentelemetry-bom:1.33.0'
mavenBom 'org.jetbrains.kotlin:kotlin-bom:1.9.21'
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.cucumber:cucumber-bom:7.14.1'
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'
mavenBom 'org.mockito:mockito-bom:5.8.0'
mavenBom 'software.amazon.awssdk:bom:2.21.42'
}

dependencies {
Expand All @@ -46,11 +46,11 @@ dependencyManagement {
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:logback-core:1.4.14'
dependency 'ch.qos.logback:logback-classic:1.4.14'
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.10'
dependency 'org.codehaus.janino:janino:3.1.11'


dependency 'org.eclipse.persistence:org.eclipse.persistence.jpa:4.0.0'
Expand All @@ -63,15 +63,15 @@ dependencyManagement {
exclude 'com.sun.mail:javax.mail'
exclude 'javax.activation:activation'
}
dependency 'commons-io:commons-io:2.15.0'
dependency 'com.github.librepdf:openpdf:1.3.33'
dependency 'commons-io:commons-io:2.15.1'
dependency 'com.github.librepdf:openpdf:1.3.34'
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.21.28'
dependency 'software.amazon.awssdk:bom:2.21.42'
dependency 'org.ehcache:ehcache:3.10.8'
dependency 'com.github.spullara.mustache.java:compiler:0.9.11'
dependency 'com.jayway.jsonpath:json-path:2.8.0'
Expand Down Expand Up @@ -119,14 +119,14 @@ 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.3'
dependency 'org.glassfish.jersey.media:jersey-media-multipart:3.1.4'
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.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.2'
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.55'
Expand Down Expand Up @@ -168,20 +168,20 @@ dependencyManagement {
dependency 'org.bouncycastle:bcprov-jdk15on:1.70'
dependency 'org.bouncycastle:bcpg-jdk15on:1.70'

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.eclipse.jgit:org.eclipse.jgit:6.8.0.202311291450-r'
dependency 'org.eclipse.jgit:org.eclipse.jgit.ssh.apache:6.8.0.202311291450-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.2.0') {
dependency ('org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0') {
exclude 'io.swagger.core.v3:swagger-core'
}

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

dependency ('org.apache.activemq:activemq-client:6.0.0') {
dependency ('org.apache.activemq:activemq-client:6.0.1') {
exclude 'javax.annotation:javax.annotation-api'
}

Expand All @@ -199,11 +199,11 @@ dependencyManagement {
// Spring needs this version
exclude 'com.sun.activation:jakarta.activation'
}
dependency ('jakarta.xml.bind:jakarta.xml.bind-api:4.0.0') {
dependency ('jakarta.xml.bind:jakarta.xml.bind-api:4.0.1') {
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 @@ -214,22 +214,22 @@ dependencyManagement {
exclude 'pull-parser:pull-parser'
}

dependency 'org.owasp.esapi:esapi:2.5.2.0'
dependency 'org.owasp.esapi:esapi:2.5.3.1'
dependency 'org.awaitility:awaitility:4.2.0'

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

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

dependency 'org.mapstruct:mapstruct:1.5.5.Final'
dependency 'org.mapstruct:mapstruct-processor:1.5.5.Final'
Expand All @@ -238,12 +238,12 @@ dependencyManagement {

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

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

dependency 'org.postgresql:postgresql:42.7.0'
dependency 'org.postgresql:postgresql:42.7.1'

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.1
image: mariadb:11.2
volumes:
- ../../fineract-db/server_collation.cnf:/etc/mysql/conf.d/server_collation.cnf
- ../../fineract-db/docker:/docker-entrypoint-initdb.d:Z,ro
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 3 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
35 changes: 22 additions & 13 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
Expand All @@ -80,13 +80,11 @@ do
esac
done

APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

APP_NAME="Gradle"
# This is normally unused
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down Expand Up @@ -133,22 +131,29 @@ location of your Java installation."
fi
else
JAVACMD=java
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
if ! command -v java >/dev/null 2>&1
then
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
fi

# Increase the maximum file descriptors if we can.
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC2039,SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC2039,SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
Expand Down Expand Up @@ -193,11 +198,15 @@ if "$cygwin" || "$msys" ; then
done
fi

# Collect all arguments for the java command;
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
# shell script including quotes and variable substitutions, so put them in
# double quotes to make sure that they get re-expanded; and
# * put everything else in single quotes, so that it's not re-expanded.

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

# Collect all arguments for the java command:
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
# and any embedded shellness will be escaped.
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
# treated as '${Hostname}' itself on the command line.

set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
Expand Down
1 change: 1 addition & 0 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal

set DIRNAME=%~dp0
if "%DIRNAME%"=="" set DIRNAME=.
@rem This is normally unused
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%

Expand Down
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.15.1'
id 'com.gradle.common-custom-user-data-gradle-plugin' version '1.12'
id 'com.gradle.enterprise' version '3.16'
id 'com.gradle.common-custom-user-data-gradle-plugin' version '1.12.1'
}

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

0 comments on commit 9569769

Please sign in to comment.