From 672a90aed0910fbbd3d395c321fcdc8e0a2f2ef3 Mon Sep 17 00:00:00 2001 From: Colin Diesh Date: Tue, 3 Jan 2023 14:07:50 -0700 Subject: [PATCH] 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 --- .github/workflows/python-apollo.yml | 4 +--- grails-app/conf/BuildConfig.groovy | 8 ++++++-- grails-app/views/annotator/instructorReport.gsp | 3 --- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/python-apollo.yml b/.github/workflows/python-apollo.yml index a9b7dafdc5..69acaab251 100644 --- 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 index af78482f5f..cfedd4d83e 100644 --- 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 index c30db4fd04..216c3ea362 100644 --- a/grails-app/views/annotator/instructorReport.gsp +++ b/grails-app/views/annotator/instructorReport.gsp @@ -3,7 +3,6 @@ - Annotators