Merge branch 'master' of github.com:apereo/cas-initializr

# Conflicts: # gradle.properties
apereo · Nov 22, 2024 · 55b41f6 · 55b41f6
2 parents 924c5c9 + 93ef362
commit 55b41f6
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -45,7 +45,7 @@ springBoot {
 dependencies {
     implementation "org.jooq:jool:0.9.15"
     implementation "org.eclipse.jgit:org.eclipse.jgit:7.0.0.202409031743-r"
-    implementation "commons-io:commons-io:2.17.0"
+    implementation "commons-io:commons-io:2.18.0"
     implementation "com.github.vladimir-bukhtoyarov:bucket4j-core:8.0.1"
     implementation "com.github.spullara.mustache.java:compiler:0.9.14"
 

diff --git a/app/src/main/resources/common/gradle/gradle.properties.mustache b/app/src/main/resources/common/gradle/gradle.properties.mustache
@@ -131,3 +131,5 @@ org.gradle.parallel=true
 org.gradle.jvmargs=-Xms1024m -Xmx4048m -XX:TieredStopAtLevel=1
 org.gradle.unsafe.configuration-cache=false
 org.gradle.unsafe.configuration-cache-problems=warn
+systemProp.org.gradle.internal.http.connectionTimeout=60000 
+systemProp.org.gradle.internal.http.requestTimeout=120000
diff --git a/app/src/main/resources/overlay/puppeteer/package.json b/app/src/main/resources/overlay/puppeteer/package.json
@@ -2,6 +2,6 @@
   "dependencies": {
     "pino-pretty": "13.0.0",
     "pino": "9.5.0",
-    "puppeteer": "23.8.0"
+    "puppeteer": "23.9.0"
   }
 }
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-8.11-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/ui/yarn.lock b/ui/yarn.lock
@@ -3745,9 +3745,9 @@ cosmiconfig@^7.0.0:
     yaml "^1.10.0"
 
 cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
-  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
+  version "7.0.5"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.5.tgz#910aac880ff5243da96b728bc6521a5f6c2f2f82"
+  integrity sha512-ZVJrKKYunU38/76t0RMOulHOnUcbU9GbpWKAOZ0mhjr7CX6FVrH+4FrAapSOekrgFQ3f/8gwMEuIft0aKq6Hug==
   dependencies:
     path-key "^3.1.0"
     shebang-command "^2.0.0"