Update to log4j 2.19.0 (#2654)

* Remove log4j from grails * Updates * Try update * Remove export plugin from instructor report * Add back audit-logging * Specify Ubuntu 20 on github workflow Co-authored-by: Garrett Stevens <[email protected]>
GMOD · Jan 3, 2023 · 672a90a · 672a90a
1 parent d6751dc
commit 672a90a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/.github/workflows/python-apollo.yml b/.github/workflows/python-apollo.yml
@@ -6,7 +6,7 @@ jobs:
   test-python-apollo:
     name: test-python-apollo
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     strategy:
       matrix:
         python-version: [3.8.7]
@@ -84,5 +84,3 @@ jobs:
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
             ${{ runner.os }}-maven-
-
-
diff --git a/grails-app/conf/BuildConfig.groovy b/grails-app/conf/BuildConfig.groovy
@@ -41,9 +41,9 @@ grails.project.dependency.resolution = {
     inherits("global") {
         // specify dependency exclusions here; for example, uncomment this to disable ehcache:
         // excludes 'ehcache'
+     excludes "grails-plugin-log4j", "grails-plugin-logging", "log4j"
     }
 
-    log "error" // log level of Ivy resolver, either 'error', 'warn', 'info', 'debug' or 'verbose'
     checksums true // whether to verify checksums on resolve
     legacyResolve false
     // whether to do a secondary resolve on plugin installation, not advised and here for backwards compatibility
@@ -67,6 +67,11 @@ grails.project.dependency.resolution = {
     }
 
     dependencies {
+
+
+        runtime 'org.apache.logging.log4j:log4j-api:2.19.0'
+        runtime 'org.apache.logging.log4j:log4j-core:2.19.0'
+        runtime 'org.apache.logging.log4j:log4j-1.2-api:2.19.0'
         // specify dependencies here under either 'build', 'compile', 'runtime', 'test' or 'provided' scopes e.g.
         runtime 'mysql:mysql-connector-java:5.1.29'
         runtime 'org.postgresql:postgresql:9.4.1212'
@@ -162,7 +167,6 @@ grails.project.dependency.resolution = {
         //}
         compile ":yammer-metrics:3.0.1-2"
         compile "org.grails.plugins:quartz2:2.1.6.2"
-        compile "org.grails.plugins:export:1.6"
 
         //compile ":joda-time:1.4"
         // TODO: re-add when ready to install functional tests

diff --git a/grails-app/views/annotator/instructorReport.gsp b/grails-app/views/annotator/instructorReport.gsp
@@ -3,7 +3,6 @@
 <html>
 <head>
     <meta name="layout" content="report">
-    <export:resource />
     <title>Annotators</title>
 
     <script>
@@ -34,8 +33,6 @@
         <div class="groupHeader">
             <p>Group: ${userGroup.name}</p>
         </div>
-        <p><export:formats formats="['csv', 'excel', 'xml']" action="export" params="[userGroups: userGroup.id]"> </export:formats>
-        </p>
 
         <table class="reportTable">
         <thead>