From 89d492a3c9087de6fe7d6b425c4b5d366d6c49c4 Mon Sep 17 00:00:00 2001 From: Greg Schueler Date: Wed, 24 Jul 2024 13:20:17 -0700 Subject: [PATCH 1/2] update log4j to 2.17.2 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 1987d8696f7..752db2a7579 100644 --- a/gradle.properties +++ b/gradle.properties @@ -44,7 +44,7 @@ spockVersion=2.0-groovy-3.0 testContainersVersion=1.19.3 jetty.version=9.4.53.v20231009 spring-security.version=5.8.11 -log4j2.version=2.17.1 +log4j2.version=2.17.2 assetPluginVersion=3.4.3 dbMigrationPluginVersion=4.2.1 liquibaseVersion=4.19.0 From a4d833bd567c3d5ab4f643cda4a1c4e6f1831903 Mon Sep 17 00:00:00 2001 From: Greg Schueler Date: Thu, 25 Jul 2024 13:53:39 -0700 Subject: [PATCH 2/2] testbuild uses some gradle.properties versions --- testbuild.groovy | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/testbuild.groovy b/testbuild.groovy index c1bd2823f35..66d5c8fff7e 100644 --- a/testbuild.groovy +++ b/testbuild.groovy @@ -44,11 +44,14 @@ if(options.buildType == 'development'){ def debug=Boolean.getBoolean('debug')?:("-debug" in args) +def gprops=new Properties() +new File('gradle.properties').withReader(gprops.&load) + //versions of dependency we want to verify def versions=[ - jetty:'9.4.53.v20231009', + jetty: gprops['jetty.version'], servlet:'api-3.1.0', - log4j:'2.17.1' + log4j: gprops['log4j2.version'] ] def warFile= "rundeckapp/${target}/rundeck-${version}.war"