From b52e587a84b5fd699007c1d4ba8d879bb132794a Mon Sep 17 00:00:00 2001
From: gaellafond <g.lafond@aims.gov.au>
Date: Tue, 11 Jan 2022 17:16:17 +0800
Subject: [PATCH] Uses Open-AIMS log4j library, which protect against
 CVE-2021-4104.

---
 .github/workflows/push.yml    |  2 +-
 .github/workflows/release.yml |  2 +-
 pom.xml                       |  8 ++++----
 settings.xml                  | 19 -------------------
 4 files changed, 6 insertions(+), 25 deletions(-)
 delete mode 100644 settings.xml

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index ce03a5a..73a5b24 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -26,4 +26,4 @@ jobs:
       - name: Execute tests with Maven.
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: mvn -B --settings settings.xml clean test
+        run: mvn -B --settings maven-settings.xml clean test
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index fd5a07f..b76c342 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -29,4 +29,4 @@ jobs:
       - name: Publish to GitHub Packages.
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: mvn -B -e --settings settings.xml deploy
+        run: mvn -B -e --settings maven-settings.xml deploy
diff --git a/pom.xml b/pom.xml
index 7d45718..baead85 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>au.gov.aims</groupId>
     <artifactId>netcdf-generator</artifactId>
-    <version>0.2</version>
+    <version>0.3</version>
     <packaging>jar</packaging>
     <description>This project was created to produce very small NetCDF files,
         to be used in unit tests of projects like NcAnimate,
@@ -50,9 +50,9 @@
         </dependency>
 
         <dependency>
-            <groupId>log4j</groupId>
+            <groupId>au.gov.aims</groupId>
             <artifactId>log4j</artifactId>
-            <version>1.2.17</version>
+            <version>1.2.17-aims</version>
         </dependency>
 
         <!-- Used for JUnit tests - Not included in the war -->
@@ -66,7 +66,7 @@
 
     <distributionManagement>
         <repository>
-            <id>github</id>
+            <id>github_aimsks</id>
             <name>GitHub AIMS-KS Apache Maven Packages</name>
             <url>https://maven.pkg.github.com/open-aims/netcdf-generator</url>
         </repository>
diff --git a/settings.xml b/settings.xml
deleted file mode 100644
index 0e71c41..0000000
--- a/settings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0" 
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
-                      http://maven.apache.org/xsd/settings-1.0.0.xsd">
-
-    <servers>
-        <!-- Used to deploy the package to GitHub -->
-        <server>
-            <id>github</id>
-            <username>${env.GITHUB_USERNAME}</username>
-            <password>${env.GITHUB_TOKEN}</password>
-        </server>
-        <!-- Used by GitHub server to resolve AIMS-KS dependencies when running tests or building the package -->
-        <server>
-            <id>github_aimsks</id>
-            <username>${env.GITHUB_USERNAME}</username>
-            <password>${env.GITHUB_TOKEN}</password>
-        </server>
-    </servers>
-</settings>