From 18e0a088a11fc14016063bad1ef3a83f96dc1c85 Mon Sep 17 00:00:00 2001
From: Guillaume Poirier-Morency <guillaumepoiriermorency@gmail.com>
Date: Thu, 3 Feb 2022 14:26:07 -0800
Subject: [PATCH 1/7] update versions for hotfix

---
 gotrack/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gotrack/pom.xml b/gotrack/pom.xml
index 9e630de..e1e73a3 100644
--- a/gotrack/pom.xml
+++ b/gotrack/pom.xml
@@ -4,7 +4,7 @@
     <groupId>ubc.pavlab</groupId>
     <artifactId>gotrack</artifactId>
     <packaging>war</packaging>
-    <version>1.7.1</version>
+    <version>1.7.2</version>
     <name>gotrack</name>
     <url>https://maven.apache.org</url>
 

From 7c7a64808e05f6a884647b3a60f5afa13ff95a01 Mon Sep 17 00:00:00 2001
From: Guillaume Poirier-Morency <guillaumepoiriermorency@gmail.com>
Date: Thu, 3 Feb 2022 14:25:16 -0800
Subject: [PATCH 2/7] Move Tomcat logs under $CATALINA_BASE/logs

---
 gotrack/src/main/resources/log4j.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gotrack/src/main/resources/log4j.properties b/gotrack/src/main/resources/log4j.properties
index 4e976bc..f72f3c7 100644
--- a/gotrack/src/main/resources/log4j.properties
+++ b/gotrack/src/main/resources/log4j.properties
@@ -14,7 +14,7 @@ log4j.appender.console.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %t
  
 # Redirect log messages to a log file
 log4j.appender.file=org.apache.log4j.RollingFileAppender
-log4j.appender.file.File=${catalina.home}/logs/gotrack.log
+log4j.appender.file.File=${catalina.base}/logs/gotrack.log
 log4j.appender.file.Threshold=DEBUG
 log4j.appender.file.MaxFileSize=5MB
 log4j.appender.file.MaxBackupIndex=5

From fda377400792ff1374c5ec72feb19c4621b49740 Mon Sep 17 00:00:00 2001
From: Guillaume Poirier-Morency <guillaumepoiriermorency@gmail.com>
Date: Thu, 3 Feb 2022 14:50:05 -0800
Subject: [PATCH 3/7] Move log4j.properties under etc/

---
 gotrack/{src/main/resources => etc}/log4j.properties | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename gotrack/{src/main/resources => etc}/log4j.properties (100%)

diff --git a/gotrack/src/main/resources/log4j.properties b/gotrack/etc/log4j.properties
similarity index 100%
rename from gotrack/src/main/resources/log4j.properties
rename to gotrack/etc/log4j.properties

From 025c689b4dc9a7cebc6685559931e84576e7d064 Mon Sep 17 00:00:00 2001
From: Guillaume Poirier-Morency <guillaumepoiriermorency@gmail.com>
Date: Thu, 3 Feb 2022 14:51:43 -0800
Subject: [PATCH 4/7] Fix option name for log4j 1.2 compatibility mode

---
 gotrack/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gotrack/pom.xml b/gotrack/pom.xml
index e1e73a3..8abe88e 100644
--- a/gotrack/pom.xml
+++ b/gotrack/pom.xml
@@ -297,7 +297,7 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>2.22.2</version>
                 <configuration>
-                    <argLine>-Dlog4j.compatibility=true</argLine>
+                    <argLine>-Dlog4j1.compatibility=true</argLine>
                 </configuration>
             </plugin>
             <plugin>

From 29878a61c02ba932ddd41dd16f6b112b643cdf26 Mon Sep 17 00:00:00 2001
From: Guillaume Poirier-Morency <guillaumepoiriermorency@gmail.com>
Date: Fri, 4 Feb 2022 10:21:51 -0800
Subject: [PATCH 5/7] Add log4j-web dependency

---
 gotrack/pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/gotrack/pom.xml b/gotrack/pom.xml
index 8abe88e..6df9576 100644
--- a/gotrack/pom.xml
+++ b/gotrack/pom.xml
@@ -169,6 +169,11 @@
             <version>${log4j.version}</version>
             <type>jar</type>
         </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-web</artifactId>
+            <version>${log4j.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>

From c789ac80a995d63439c7e3e5732ad00f77d253d7 Mon Sep 17 00:00:00 2001
From: Guillaume Poirier-Morency <guillaumepoiriermorency@gmail.com>
Date: Fri, 4 Feb 2022 10:24:37 -0800
Subject: [PATCH 6/7] Revert "Move log4j.properties under etc/"

This reverts commit fda377400792ff1374c5ec72feb19c4621b49740.
---
 gotrack/{etc => src/main/resources}/log4j.properties | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename gotrack/{etc => src/main/resources}/log4j.properties (100%)

diff --git a/gotrack/etc/log4j.properties b/gotrack/src/main/resources/log4j.properties
similarity index 100%
rename from gotrack/etc/log4j.properties
rename to gotrack/src/main/resources/log4j.properties

From 087322e68d26c36e07f715f7e76821b0e299e74e Mon Sep 17 00:00:00 2001
From: Guillaume Poirier-Morency <guillaumepoiriermorency@gmail.com>
Date: Fri, 4 Feb 2022 10:32:04 -0800
Subject: [PATCH 7/7] Use pavlab-starter-parent to manage dependencies

---
 gotrack/pom.xml | 48 ++++++++----------------------------------------
 1 file changed, 8 insertions(+), 40 deletions(-)

diff --git a/gotrack/pom.xml b/gotrack/pom.xml
index 6df9576..d848aaf 100644
--- a/gotrack/pom.xml
+++ b/gotrack/pom.xml
@@ -1,7 +1,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>ubc.pavlab</groupId>
+
+    <parent>
+        <groupId>ubc.pavlab</groupId>
+        <artifactId>pavlab-starter-parent</artifactId>
+        <version>1.0.1</version>
+    </parent>
+
     <artifactId>gotrack</artifactId>
     <packaging>war</packaging>
     <version>1.7.2</version>
@@ -17,17 +23,8 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
         <!-- Web -->
-        <servlet.version>3.1.0</servlet.version>
         <jsf.version>2.3.3</jsf.version>
         <weld.version>3.1.7.SP1</weld.version>
-
-        <!-- logging -->
-        <log4j.version>2.17.1</log4j.version>
-        <slf4j.version>1.6.6</slf4j.version>
-
-        <!-- Test -->
-        <junit.version>4.11</junit.version>
-
     </properties>
 
     <dependencies>
@@ -46,8 +43,6 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>${servlet.version}</version>
-            <scope>provided</scope>
         </dependency>
         <dependency>
 	    <groupId>jakarta.servlet.jsp.jstl</groupId>
@@ -177,8 +172,6 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>${slf4j.version}</version>
-            <type>jar</type>
         </dependency>
 
         <!-- from java.util.logging to log4j -->
@@ -192,21 +185,16 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>${junit.version}</version>
-            <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>8.0.25</version>
-            <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
-            <version>1.10.19</version>
+            <artifactId>mockito-core</artifactId>
         </dependency>
 
         <dependency>
@@ -270,8 +258,6 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.22</version>
-            <scope>provided</scope>
         </dependency>
 
         <dependency>
@@ -308,24 +294,6 @@
             <plugin>
                 <groupId>com.amashchenko.maven.plugin</groupId>
                 <artifactId>gitflow-maven-plugin</artifactId>
-                <version>1.9.0</version>
-                <configuration>
-                    <!-- Do not push to remote -->
-                    <pushRemote>false</pushRemote>
-                    <verbose>true</verbose>
-                    <!-- Branch naming schemes -->
-                    <gitFlowConfig>
-                        <productionBranch>master</productionBranch>
-                        <developmentBranch>development</developmentBranch>
-                        <releaseBranchPrefix>release-</releaseBranchPrefix>
-                        <versionTagPrefix></versionTagPrefix>
-                        <origin>origin</origin>
-                        <!-- Unused for releasing -->
-                        <featureBranchPrefix>feature-</featureBranchPrefix>
-                        <hotfixBranchPrefix>hotfix-</hotfixBranchPrefix>
-                        <supportBranchPrefix>support-</supportBranchPrefix>
-                    </gitFlowConfig>
-                </configuration>
             </plugin>
         </plugins>
     </build>