restore auditlog top level

gradle.properties

@@ -12,7 +12,7 @@ org.gradle.parallel=true
 # (this could be memory-intensive)
 org.gradle.workers.max=3
 # Default to using 2GB of memory for the JVM.
-org.gradle.jvmargs=-Xmx2048m -XX:+UseParallelGC
+org.gradle.jvmargs=-Xmx2048m -XX:+UseParallelGC -Dfile.encoding=UTF-8
 # Uncomment to restrict the number of concurrent npm build tasks. Useful for systems with limited resources.
 #npmRunLimit=2
 
@@ -44,7 +44,7 @@ buildFromSource=true
 
 # The default version for LabKey artifacts that are built or that we depend on.
 # override in an individual module's gradle.properties file as necessary 
-labkeyVersion=25.7-SNAPSHOT
+labkeyVersion=25.8-SNAPSHOT
 labkeyClientApiVersion=6.3.0
 
 # Version numbers for the various binary artifacts that are included when

gradle/settings/all.gradle

@@ -24,7 +24,7 @@ buildscript {
         {
             mavenLocal()
             maven {
-                url "${artifactory_contextUrl}/plugins-snapshot-local"
+                url = "${artifactory_contextUrl}/plugins-snapshot-local"
                 mavenContent {
                     snapshotsOnly()
                 }

server/build.gradle

@@ -191,6 +191,7 @@ project.tasks.register("reportVersionToTeamCity", DefaultTask) {
             println "##teamcity[setParameter name='labkey.version' value='${labkeyVersion}']"
         })
 }
+
 if (project.hasProperty("teamcity"))
 {
     project.tasks.named('stageApp').configure { dependsOn(project.tasks.named('reportVersionToTeamCity')) }
@@ -210,14 +211,11 @@ else
             task.description = "Copy dependencies required for JSP dynamic compiling"
             task.into project.rootProject.layout.buildDirectory.dir("jspRecompiling")
             task.from project.configurations.recompilingJsp
-            task.mustRunAfter(cleanJspRecompileSetup)
+            task.dependsOn(cleanJspRecompileSetup)
             if (project.hasProperty('apacheTomcatVersion'))
                 task.inputs.property 'apacheTomcatVersion', project.property('apacheTomcatVersion')
             else
                 task.outputs.cacheIf { false } // Just don't cache if we can't be sure of the Jasper version
-            task.doFirst {
-                project.delete project.rootProject.layout.buildDirectory.dir("jspRecompiling")
-            }
     }
 
     project.tasks.named('deployApp').configure {

server/embedded/src/main/resources/log4j2.xml

@@ -300,9 +300,9 @@
             <AppenderRef ref="QUERY_STATS"/>
         </Logger>
 
-        <!-- <Logger name="org.labkey.audit.event" level="INFO">
+        <Logger name="org.labkey.audit.event" level="INFO">
             <AppenderRef ref="LABKEY_AUDIT"/>
-        </Logger> -->
+        </Logger>
 
         <!--
           Other audit event types include, but are not limited to: