Merge remote-tracking branch 'origin/main' into trunk

Goooler · Mar 4, 2024 · 69e21c4 · 69e21c4
2 parents 49b6ec9 + e012295
commit 69e21c4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
@@ -10,7 +10,7 @@ dependencies {
     implementation 'org.apache.ant:ant:1.10.14'
     implementation 'org.codehaus.plexus:plexus-utils:4.0.0'
     implementation 'org.codehaus.plexus:plexus-xml:4.0.3'
-    implementation "org.apache.logging.log4j:log4j-core:2.22.1"
+    implementation "org.apache.logging.log4j:log4j-core:2.23.0"
     implementation('org.vafer:jdependency:2.10') {
         exclude group: 'org.ow2.asm'
     }

diff --git a/src/main/groovy/com/github/jengelman/gradle/plugins/shadow/ShadowApplicationPlugin.groovy b/src/main/groovy/com/github/jengelman/gradle/plugins/shadow/ShadowApplicationPlugin.groovy
@@ -126,7 +126,7 @@ class ShadowApplicationPlugin implements Plugin<Project> {
             }
             into("bin") {
                 from(startScripts)
-                fileMode = 493
+                filePermissions { unix(493) }
             }
         }