From 917e9cec44ce28192a19f8dc0d94863c0b8a2684 Mon Sep 17 00:00:00 2001
From: Guillaume Poirier-Morency <guillaumepoiriermorency@gmail.com>
Date: Sat, 5 Feb 2022 11:28:50 -0800
Subject: [PATCH] Update dependencies

Update pavlab-starter-parent to 1.0.2.

Update jersey to 2.27, the latest version based on javax.*, jakarta
namespace was introduced in the 2.28.

Sync Primefaces data export dependencies to the expected versions.

Add used, but undeclared dependencies.
---
 gotrack/pom.xml | 207 ++++++++++++++++++++++++++----------------------
 1 file changed, 112 insertions(+), 95 deletions(-)

diff --git a/gotrack/pom.xml b/gotrack/pom.xml
index db5fe75..7c14d24 100644
--- a/gotrack/pom.xml
+++ b/gotrack/pom.xml
@@ -12,17 +12,19 @@
     <packaging>war</packaging>
     <version>1.8-SNAPSHOT</version>
     <name>gotrack</name>
-    <url>https://maven.apache.org</url>
+    <url>https://gotrack.msl.ubc.ca</url>
 
     <properties>
         <!-- Web -->
-        <jsf.version>2.3.3</jsf.version>
-        <weld.version>3.1.7.SP1</weld.version>
+        <jsf.version>2.4.0</jsf.version>
+        <weld.version>3.0.6.Final</weld.version>
+        <jersey.version>2.27</jersey.version>
+        <primefaces.version>6.2</primefaces.version>
     </properties>
 
     <dependencies>
 
-        <!-- Mojarra dependencies-->
+        <!-- Web -->
         <dependency>
             <groupId>org.glassfish</groupId>
             <artifactId>javax.faces</artifactId>
@@ -30,121 +32,150 @@
         </dependency>
         <dependency>
             <groupId>org.jboss.weld.servlet</groupId>
-            <artifactId>weld-servlet-shaded</artifactId>
+            <artifactId>weld-servlet-core</artifactId>
             <version>${weld.version}</version>
+            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
         </dependency>
         <dependency>
-	    <groupId>jakarta.servlet.jsp.jstl</groupId>
-	    <artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
-	    <version>1.2.7</version>
-	    <scope>runtime</scope>
-	</dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>jstl</artifactId>
+            <version>1.2</version>
+            <scope>runtime</scope>
+        </dependency>
         <dependency> <!-- Optional, only when <f:websocket> is used. -->
             <groupId>org.glassfish</groupId>
             <artifactId>javax.json</artifactId>
-            <version>1.1</version>
+            <version>1.1.4</version>
         </dependency>
 
-        <!-- End Mojarra dependencies-->
-
-        <!-- Rest dependencies-->
-
         <!-- JAX-RS RESTful Web Services -->
-
         <dependency>
             <groupId>org.glassfish.jersey.containers</groupId>
             <artifactId>jersey-container-servlet</artifactId>
-            <version>2.22.2</version>
+            <version>${jersey.version}</version>
+            <scope>runtime</scope>
         </dependency>
-
-        <!-- CDI Rest Dependency -->
-
         <dependency>
-            <groupId>org.glassfish.jersey.containers.glassfish</groupId>
-            <artifactId>jersey-gf-cdi</artifactId>
-            <version>2.14</version>
+            <groupId>org.glassfish.jersey.inject</groupId>
+            <artifactId>jersey-hk2</artifactId>
+            <version>${jersey.version}</version>
+            <scope>runtime</scope>
         </dependency>
-
         <dependency>
-            <groupId>javax.transaction</groupId>
-            <artifactId>javax.transaction-api</artifactId>
-            <version>1.2</version>
+            <groupId>org.glassfish.jersey.ext.cdi</groupId>
+            <artifactId>jersey-cdi1x-servlet</artifactId>
+            <version>${jersey.version}</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.enterprise</groupId>
+            <artifactId>cdi-api</artifactId>
+            <version>2.0.SP1</version>
         </dependency>
-
-        <!-- Jersey JSON Jackson Support -->
-
         <dependency>
             <groupId>org.glassfish.jersey.media</groupId>
             <artifactId>jersey-media-json-jackson</artifactId>
-            <version>3.0.2</version>
+            <version>${jersey.version}</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.ws.rs</groupId>
+            <artifactId>javax.ws.rs-api</artifactId>
+            <version>2.1.1</version>
         </dependency>
 
-        <!-- End Rest dependencies-->
+        <!-- Injection -->
+        <dependency>
+            <groupId>javax.inject</groupId>
+            <artifactId>javax.inject</artifactId>
+            <version>1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.hk2.external</groupId>
+            <artifactId>javax.inject</artifactId>
+            <version>2.5.0-b42</version>
+        </dependency>
 
-        <!-- Commons -->
+        <!-- Annotations -->
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>1.3.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.spec.javax.annotation</groupId>
+            <artifactId>jboss-annotations-api_1.3_spec</artifactId>
+            <version>2.0.1.Final</version>
+        </dependency>
 
+        <!-- Commons -->
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.3.2</version>
+            <version>3.12.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-math3</artifactId>
-            <version>3.4.1</version>
+            <version>3.6.1</version>
         </dependency>
 
-        <!-- Other Web dependencies -->
-
+        <!-- Database -->
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+        </dependency>
 
         <!-- Primefaces -->
-
         <dependency>
             <groupId>org.primefaces</groupId>
             <artifactId>primefaces</artifactId>
-            <version>6.2</version>
+            <version>${primefaces.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.primefaces.extensions</groupId>
+            <artifactId>primefaces-extensions</artifactId>
+            <version>${primefaces.version}</version>
+            <scope>runtime</scope>
         </dependency>
-
         <dependency>
             <groupId>org.primefaces.themes</groupId>
             <artifactId>bluesky</artifactId>
             <version>1.0.10</version>
+            <scope>runtime</scope>
         </dependency>
-
+        <!-- Primefaces DataExporter uses the following for data export, so we can't really update them unless we update Primefaces itself -->
         <dependency>
-            <groupId>org.primefaces.extensions</groupId>
-            <artifactId>primefaces-extensions</artifactId>
-            <version>6.2.10</version>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi</artifactId>
+            <version>3.17</version>
+            <scope>runtime</scope>
         </dependency>
-
-        <!-- PDF Exporting -->
         <dependency>
-            <groupId>com.itextpdf</groupId>
-            <artifactId>itextpdf</artifactId>
-            <version>5.5.13.2</version>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml</artifactId>
+            <version>3.17</version>
+            <scope>runtime</scope>
         </dependency>
-
-        <!-- XLS Exporting -->
         <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>poi</artifactId>
-            <version>5.0.0</version>
+            <groupId>com.lowagie</groupId>
+            <artifactId>itext</artifactId>
+            <version>2.1.7</version>
+            <scope>runtime</scope>
         </dependency>
 
         <!-- Omnifaces -->
-
         <dependency>
             <groupId>org.omnifaces</groupId>
             <artifactId>omnifaces</artifactId>
-            <version>3.0</version>
+            <version>3.13</version>
         </dependency>
 
         <!-- Logging -->
-
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
@@ -161,8 +192,6 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
-
-        <!-- from java.util.logging to log4j -->
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>jul-to-slf4j</artifactId>
@@ -173,47 +202,49 @@
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
         </dependency>
-
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
         </dependency>
-
         <dependency>
-            <groupId>org.json</groupId>
-            <artifactId>json</artifactId>
-            <version>20140107</version>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest</artifactId>
+            <version>2.2</version>
+            <scope>test</scope>
         </dependency>
-
         <dependency>
             <groupId>com.jayway.jsonpath</groupId>
             <artifactId>json-path-assert</artifactId>
-            <version>0.9.1</version>
+            <version>2.7.0</version>
             <scope>test</scope>
         </dependency>
 
-        <!-- Guava -->
+        <!-- JSON -->
+        <dependency>
+            <groupId>org.json</groupId>
+            <artifactId>json</artifactId>
+            <version>20211205</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.8.9</version>
+        </dependency>
 
+        <!-- Guava -->
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>30.1.1-jre</version>
+            <version>31.0.1-jre</version>
         </dependency>
 
         <!-- Trove -->
-
         <dependency>
             <groupId>net.sf.trove4j</groupId>
             <artifactId>trove4j</artifactId>
             <version>3.0.3</version>
         </dependency>
 
-
         <!-- BCrypt -->
         <dependency>
             <groupId>org.mindrot</groupId>
@@ -221,24 +252,18 @@
             <version>0.4</version>
         </dependency>
 
-        <!-- dom4j Dependency -->
+        <!-- XML and XPath -->
         <dependency>
-            <groupId>dom4j</groupId>
-            <artifactId>dom4j</artifactId>
-            <version>1.6.1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>jaxen</groupId>
-            <artifactId>jaxen</artifactId>
-            <version>1.1.6</version>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>2.3.1</version>
         </dependency>
 
         <!-- google concurrent-trees -->
         <dependency>
             <groupId>com.googlecode.concurrent-trees</groupId>
             <artifactId>concurrent-trees</artifactId>
-            <version>2.4.0</version>
+            <version>2.6.1</version>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/org.projectlombok/lombok -->
@@ -247,12 +272,6 @@
             <artifactId>lombok</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-            <version>2.3.1</version>
-        </dependency>
-
     </dependencies>
 
     <repositories>
@@ -355,10 +374,8 @@
                                     <autocommit>false</autocommit>
                                     <sqlCommand>
                                                                         <![CDATA[
-
                                         drop database if exists ${gotrack.testdb.name};
-                                                                        create database ${gotrack.testdb.name}
-
+                                        create database ${gotrack.testdb.name}
                                         ]]>
 									</sqlCommand>
                                 </configuration>