Merge branch 'hotfix-1.7.2'

PavlidisLab · Feb 4, 2022 · 86fa6e7 · 86fa6e7
2 parents 4b16dc2 + 087322e
commit 86fa6e7
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 43 deletions.
diff --git a/gotrack/pom.xml b/gotrack/pom.xml
@@ -1,10 +1,16 @@
 <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.1</version>
+    <version>1.7.2</version>
     <name>gotrack</name>
     <url>https://maven.apache.org</url>
 
@@ -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>
@@ -169,11 +164,14 @@
             <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>
-            <version>${slf4j.version}</version>
-            <type>jar</type>
         </dependency>
 
         <!-- from java.util.logging to log4j -->
@@ -187,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>
@@ -265,8 +258,6 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.22</version>
-            <scope>provided</scope>
         </dependency>
 
         <dependency>
@@ -297,30 +288,12 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>2.22.2</version>
                 <configuration>
-                    <argLine>-Dlog4j.compatibility=true</argLine>
+                    <argLine>-Dlog4j1.compatibility=true</argLine>
                 </configuration>
             </plugin>
             <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>

diff --git 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