Index: dbLearnStar-model/pom.xml
===================================================================
--- dbLearnStar-model/pom.xml	(revision 58a5c93299c299ec3a3a024911f3357bb0ed4460)
+++ dbLearnStar-model/pom.xml	(revision 196b0a0f72a6b8d1cafa985ef8f1eca15da77d69)
@@ -6,5 +6,5 @@
 	<groupId>dblearnstar</groupId>
 	<artifactId>dblearnstar-model</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+	<version>0.0.2-SNAPSHOT</version>
 
 	<name>dbLearnStar - Model</name>
Index: dbLearnStar-model/src/main/java/dblearnstar/model/model/ComparatorTaskInTestInstance.java
===================================================================
--- dbLearnStar-model/src/main/java/dblearnstar/model/model/ComparatorTaskInTestInstance.java	(revision 196b0a0f72a6b8d1cafa985ef8f1eca15da77d69)
+++ dbLearnStar-model/src/main/java/dblearnstar/model/model/ComparatorTaskInTestInstance.java	(revision 196b0a0f72a6b8d1cafa985ef8f1eca15da77d69)
@@ -0,0 +1,43 @@
+/*******************************************************************************
+ * Copyright (C) 2021 Vangel V. Ajanovski
+ *     
+ * This file is part of the dbLearnStar system (hereinafter: dbLearn*).
+ *     
+ * dbLearn* is free software: you can redistribute it and/or modify it under the 
+ * terms of the GNU General Public License as published by the Free Software 
+ * Foundation, either version 3 of the License, or (at your option) any later 
+ * version.
+ *     
+ * dbLearn* is distributed in the hope that it will be useful, but WITHOUT ANY 
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more 
+ * details.
+ *     
+ * You should have received a copy of the GNU General Public License along 
+ * with dbLearn*.  If not, see <https://www.gnu.org/licenses/>.
+ * 
+ ******************************************************************************/
+
+package dblearnstar.model.model;
+
+import java.util.Comparator;
+
+import dblearnstar.model.entities.TaskInTestInstance;
+
+public class ComparatorTaskInTestInstance implements Comparator<TaskInTestInstance> {
+
+	@Override
+	public int compare(TaskInTestInstance o1, TaskInTestInstance o2) {
+		if (o1.getTestInstance().getTestInstanceId() == o2.getTestInstance().getTestInstanceId()) {
+			if (o1.getTask().getTitle() != null && o2.getTask().getTitle() != null) {
+				return o1.getTask().getTitle().compareTo(o2.getTask().getTitle());
+			} else {
+				return Long.compare(o1.getTaskInTestInstanceId(), o2.getTaskInTestInstanceId());
+			}
+		} else {
+			ComparatorTestInstance cti = new ComparatorTestInstance();
+			return cti.compare(o1.getTestInstance(), o2.getTestInstance());
+		}
+	}
+
+}
Index: dbLearnStar-webApp/pom.xml
===================================================================
--- dbLearnStar-webApp/pom.xml	(revision 58a5c93299c299ec3a3a024911f3357bb0ed4460)
+++ dbLearnStar-webApp/pom.xml	(revision 196b0a0f72a6b8d1cafa985ef8f1eca15da77d69)
@@ -8,5 +8,5 @@
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.5.3</version>
+		<version>2.6.1</version>
 		<relativePath />
 	</parent>
@@ -14,5 +14,5 @@
 	<groupId>dblearnstar</groupId>
 	<artifactId>dblearnstar</artifactId>
-	<version>0.8-T5.7.3</version>
+	<version>0.8.6</version>
 	<name>dbLearnStar</name>
 
@@ -37,20 +37,21 @@
 		<java.version>15</java.version>
 
-		<spring-boot-version>2.5.3</spring-boot-version>
-		<tapestry-version>5.7.3</tapestry-version>
-		<tapestry-testify-version>1.0.4</tapestry-testify-version>
-		<tapestry-xpath-version>1.0.1</tapestry-xpath-version>
-
-		<jackson-version>2.12.4</jackson-version>
-		<geb-version>2.3.1</geb-version>
-		<htmlunit-driver-version>2.33.3</htmlunit-driver-version>
-		<json-version>1.1.4</json-version>
-		<selenium-version>3.141.59</selenium-version>
-		<servlet-api-version>3.0.1</servlet-api-version>
-		<spock-version>1.3-groovy-2.5</spock-version>
-		<yasson-version>1.0.9</yasson-version>
-
-		<postgresql-version>42.2.23</postgresql-version>
-		<cas-client-version>3.6.2</cas-client-version>
+		<spring-boot.version>2.6.1</spring-boot.version>
+		<log4j.version>2.17.1</log4j.version>
+		<tapestry.version>5.7.3</tapestry.version>
+		<tapestry-testify.version>1.0.4</tapestry-testify.version>
+		<tapestry-xpath.version>1.0.1</tapestry-xpath.version>
+
+		<jackson.version>2.13.0</jackson.version>
+		<geb.version>2.3.1</geb.version>
+		<htmlunit-driver.version>2.33.3</htmlunit-driver.version>
+		<json.version>1.1.4</json.version>
+		<selenium.version>3.141.59</selenium.version>
+		<servlet-api.version>3.0.1</servlet-api.version>
+		<spock.version>1.3-groovy-2.5</spock.version>
+		<yasson.version>1.0.9</yasson.version>
+
+		<postgresql.version>42.3.1</postgresql.version>
+		<cas-client.version>3.6.2</cas-client.version>
 
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -70,5 +71,5 @@
 			<groupId>dblearnstar</groupId>
 			<artifactId>dblearnstar-model</artifactId>
-			<version>0.0.1-SNAPSHOT</version>
+			<version>0.0.2-SNAPSHOT</version>
 		</dependency>
 
@@ -83,4 +84,17 @@
 					<groupId>org.springframework.boot</groupId>
 					<artifactId>spring-boot-starter-logging</artifactId>
+				</exclusion>
+				<!-- log4j security issues -->
+				<exclusion>
+					<groupId>org.apache.logging.log4j</groupId>
+					<artifactId>log4j-core</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.apache.logging.log4j</groupId>
+					<artifactId>log4j-api</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.apache.logging.log4j</groupId>
+					<artifactId>log4j-slf4j-impl</artifactId>
 				</exclusion>
 			</exclusions>
@@ -113,10 +127,8 @@
 
 		<!-- Apache Tapestry -->
-		<!-- <dependency> <groupId>org.apache.tapestry</groupId> <artifactId>tapestry-core</artifactId> 
-			<version>${tapestry-version}</version> <scope>compile</scope> </dependency> -->
 		<dependency>
 			<groupId>org.apache.tapestry</groupId>
 			<artifactId>tapestry-hibernate</artifactId>
-			<version>${tapestry-version}</version>
+			<version>${tapestry.version}</version>
 			<scope>compile</scope>
 		</dependency>
@@ -125,18 +137,13 @@
 			<groupId>org.apache.tapestry</groupId>
 			<artifactId>tapestry-webresources</artifactId>
-			<version>${tapestry-version}</version>
-			<scope>compile</scope>
-		</dependency>
-		<!-- <dependency> <groupId>org.apache.tapestry</groupId> <artifactId>tapestry-beanvalidator</artifactId> 
-			<version>${tapestry-version}</version> <scope>compile</scope> </dependency> -->
+			<version>${tapestry.version}</version>
+			<scope>compile</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.apache.tapestry</groupId>
 			<artifactId>tapestry-upload</artifactId>
-			<version>${tapestry-version}</version>
-			<scope>compile</scope>
-		</dependency>
-
-		<!-- <dependency> <groupId>org.tynamo</groupId> <artifactId>tapestry-conversations</artifactId> 
-			<version>0.3.0</version> </dependency> -->
+			<version>${tapestry.version}</version>
+			<scope>compile</scope>
+		</dependency>
 
 		<!-- Unit Testing -->
@@ -144,5 +151,5 @@
 			<groupId>org.apache.tapestry</groupId>
 			<artifactId>tapestry-test</artifactId>
-			<version>${tapestry-version}</version>
+			<version>${tapestry.version}</version>
 			<scope>test</scope>
 			<exclusions>
@@ -156,5 +163,5 @@
 			<groupId>net.sourceforge.tapestrytestify</groupId>
 			<artifactId>tapestry-testify</artifactId>
-			<version>${tapestry-testify-version}</version>
+			<version>${tapestry-testify.version}</version>
 			<scope>test</scope>
 		</dependency>
@@ -162,5 +169,5 @@
 			<groupId>net.sourceforge.tapestryxpath</groupId>
 			<artifactId>tapestry-xpath</artifactId>
-			<version>${tapestry-xpath-version}</version>
+			<version>${tapestry-xpath.version}</version>
 			<scope>test</scope>
 		</dependency>
@@ -168,5 +175,5 @@
 			<groupId>org.spockframework</groupId>
 			<artifactId>spock-core</artifactId>
-			<version>${spock-version}</version>
+			<version>${spock.version}</version>
 			<scope>test</scope>
 		</dependency>
@@ -174,5 +181,5 @@
 			<groupId>org.spockframework</groupId>
 			<artifactId>spock-spring</artifactId>
-			<version>${spock-version}</version>
+			<version>${spock.version}</version>
 			<scope>test</scope>
 		</dependency>
@@ -193,5 +200,5 @@
 			<groupId>org.gebish</groupId>
 			<artifactId>geb-spock</artifactId>
-			<version>${geb-version}</version>
+			<version>${geb.version}</version>
 			<scope>test</scope>
 		</dependency>
@@ -215,10 +222,9 @@
 			<groupId>org.eclipse</groupId>
 			<artifactId>yasson</artifactId>
-			<version>${yasson-version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.glassfish</groupId>
 			<artifactId>javax.json</artifactId>
-			<version>${json-version}</version>
+			<version>${json.version}</version>
 		</dependency>
 		<dependency>
@@ -241,17 +247,13 @@
 			<groupId>javax.servlet</groupId>
 			<artifactId>javax.servlet-api</artifactId>
-			<version>${servlet-api-version}</version>
+			<version>${servlet-api.version}</version>
 			<scope>provided</scope>
 		</dependency>
 
-		<!-- Hibernate 5.1.17 is the last supported by tapestry 5.6.1 -->
-		<!-- <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> 
-			<version>5.1.17.Final</version> </dependency> <dependency> <groupId>org.hibernate</groupId> 
-			<artifactId>hibernate-validator</artifactId> <version>5.4.3.Final</version> 
-			</dependency> -->
 		<!-- PostgreSQL is used as the main DBMS engine for this app -->
 		<dependency>
 			<groupId>org.postgresql</groupId>
 			<artifactId>postgresql</artifactId>
+			<version>${postgresql.version}</version>
 		</dependency>
 
@@ -259,5 +261,5 @@
 			<groupId>org.jasig.cas.client</groupId>
 			<artifactId>cas-client-core</artifactId>
-			<version>${cas-client-version}</version>
+			<version>${cas-client.version}</version>
 		</dependency>
 
@@ -270,4 +272,10 @@
 		</dependency>
 
+		<dependency>
+			<groupId>commons-codec</groupId>
+			<artifactId>commons-codec</artifactId>
+			<version>1.15</version>
+		</dependency>
+
 		<!-- webjars -->
 		<dependency>
@@ -289,10 +297,10 @@
 			<groupId>org.webjars</groupId>
 			<artifactId>ckeditor</artifactId>
-			<version>4.16.1</version>
-		</dependency>
-		<dependency>
-			<groupId>org.webjars</groupId>
+			<version>4.17.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.webjars.npm</groupId>
 			<artifactId>codemirror</artifactId>
-			<version>5.62.2</version>
+			<version>5.63.3</version>
 		</dependency>
 		<dependency>
@@ -302,4 +310,25 @@
 		</dependency>
 
+		<!-- security patches -->
+		<dependency>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-core</artifactId>
+			<version>${log4j.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-slf4j-impl</artifactId>
+			<version>${log4j.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-api</artifactId>
+			<version>${log4j.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.webjars.npm</groupId>
+			<artifactId>sql-formatter</artifactId>
+			<version>2.3.3</version>
+		</dependency>
 	</dependencies>
 
@@ -364,5 +393,4 @@
 		</testResources>
 
-
 		<plugins>
 			<plugin>
@@ -375,7 +403,90 @@
 				<version>2.6</version>
 			</plugin>
+
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>unpack</id>
+						<phase>generate-test-sources</phase>
+						<goals>
+							<goal>unpack</goal>
+						</goals>
+						<configuration>
+							<artifactItems>
+								<artifactItem>
+									<groupId>org.webjars.npm</groupId>
+									<artifactId>fontsource-fira-sans</artifactId>
+									<type>jar</type>
+									<includes>META-INF/resources/webjars/**/*</includes>
+									<outputDirectory>${project.basedir}/target/classes/META-INF/assets/</outputDirectory>
+								</artifactItem>
+								<artifactItem>
+									<groupId>org.webjars.npm</groupId>
+									<artifactId>firacode</artifactId>
+									<type>jar</type>
+									<includes>META-INF/resources/webjars/**/*</includes>
+									<outputDirectory>${project.basedir}/target/classes/META-INF/assets/</outputDirectory>
+								</artifactItem>
+								<artifactItem>
+									<groupId>org.webjars.npm</groupId>
+									<artifactId>feather-icons</artifactId>
+									<type>jar</type>
+									<includes>META-INF/resources/webjars/**/*</includes>
+									<outputDirectory>${project.basedir}/target/classes/META-INF/assets/</outputDirectory>
+								</artifactItem>
+								<artifactItem>
+									<groupId>org.webjars.npm</groupId>
+									<artifactId>codemirror</artifactId>
+									<type>jar</type>
+									<includes>META-INF/resources/webjars/**/*</includes>
+									<outputDirectory>${project.basedir}/target/classes/META-INF/assets/codemirror/</outputDirectory>
+									<fileMappers>
+										<org.codehaus.plexus.components.io.filemappers.RegExpFileMapper>
+											<pattern>^\QMETA-INF/resources/webjars/codemirror/5.63.3/\E</pattern>
+											<replacement>./</replacement>
+										</org.codehaus.plexus.components.io.filemappers.RegExpFileMapper>
+									</fileMappers>
+								</artifactItem>
+								<artifactItem>
+									<groupId>org.webjars</groupId>
+									<artifactId>ckeditor</artifactId>
+									<type>jar</type>
+									<includes>META-INF/resources/webjars/**/*</includes>
+									<outputDirectory>${project.basedir}/target/classes/META-INF/assets/</outputDirectory>
+								</artifactItem>
+								<artifactItem>
+									<groupId>org.webjars.npm</groupId>
+									<artifactId>sql-formatter</artifactId>
+									<type>jar</type>
+									<includes>META-INF/resources/webjars/**/*</includes>
+									<outputDirectory>${project.basedir}/target/classes/META-INF/assets/sql-formatter/</outputDirectory>
+									<fileMappers>
+										<org.codehaus.plexus.components.io.filemappers.RegExpFileMapper>
+											<pattern>^\QMETA-INF/resources/webjars/sql-formatter/2.3.3/dist/\E</pattern>
+											<replacement>./</replacement>
+										</org.codehaus.plexus.components.io.filemappers.RegExpFileMapper>
+									</fileMappers>
+								</artifactItem>
+							</artifactItems>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
 		</plugins>
 
 	</build>
 
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.eclipse</groupId>
+				<artifactId>yasson</artifactId>
+				<version>${yasson.version}</version>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
 </project>