diff --git a/.gitignore b/.gitignore
index 88063ce4122606dc88f27eefba9fe88f58cd8ddf..3c74e2ca5a5a6e2286f6fc6c425b11db1b698b24 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,6 @@ WebContent
# Testing
/servers
C:\\nppdf32Log\\debuglog.txt
+
+# Angular
+src/main/angular
diff --git a/README.md b/README.md
index db1ae4dd128558090e4c69a5c0e2080e17fe798f..ff8f8cd9a356087f4e4a5876be8dbb9bcc73bce0 100644
--- a/README.md
+++ b/README.md
@@ -5,6 +5,16 @@ Aplicación y arquitectura de ejemplo para la asignatura Desarrollo Ágil de
Aplicaciones del Grado en Ingeniería Informática de la Escuela Superior de
Ingeniería Informática de la Universidad de Vigo.
+## Dependencias
+Este proyecto está diseñado para ser desarrollado en un entorno con:
+
+* Maven 3
+* Java 8
+* MySQL 5.7.6+ o 8+
+
+Además, se recomienda emplear la última versión de Eclipse IDE for Enterprise
+Java Developers.
+
## Ejecución con Maven
La configuración de Maven ha sido preparada para permitir varios tipos de
ejecución.
diff --git a/db/mysql-with-inserts.sql b/db/mysql-with-inserts.sql
index f678c3e9084aa903194ad5b620cc736e62a4be91..d7daea4bea4625b9b8785f6a0b9f9310cb870861 100644
--- a/db/mysql-with-inserts.sql
+++ b/db/mysql-with-inserts.sql
@@ -1,3 +1,4 @@
+DROP DATABASE IF EXISTS `daaexample`;
CREATE DATABASE `daaexample`;
CREATE TABLE `daaexample`.`people` (
@@ -14,7 +15,7 @@ CREATE TABLE `daaexample`.`users` (
PRIMARY KEY (`login`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-CREATE USER 'daa'@'localhost' IDENTIFIED WITH mysql_native_password BY 'daa';
+CREATE USER IF NOT EXISTS 'daa'@'localhost' IDENTIFIED WITH mysql_native_password BY 'daa';
GRANT ALL ON `daaexample`.* TO 'daa'@'localhost';
INSERT INTO `daaexample`.`people` (`id`,`name`,`surname`) VALUES (0,'Antón','Pérez');
diff --git a/db/mysql.sql b/db/mysql.sql
index 8fc20dbfffb1eef02e1d252c05f853e64f6d620d..116ae71b7273739848fe932b99815091eb683b79 100644
--- a/db/mysql.sql
+++ b/db/mysql.sql
@@ -1,3 +1,4 @@
+DROP DATABASE IF EXISTS `daaexample`;
CREATE DATABASE `daaexample`;
CREATE TABLE `daaexample`.`people` (
@@ -14,5 +15,5 @@ CREATE TABLE `daaexample`.`users` (
PRIMARY KEY (`login`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-CREATE USER 'daa'@'localhost' IDENTIFIED WITH mysql_native_password BY 'daa';
+CREATE USER IF NOT EXISTS 'daa'@'localhost' IDENTIFIED WITH mysql_native_password BY 'daa';
GRANT ALL ON `daaexample`.* TO 'daa'@'localhost';
diff --git a/pom.xml b/pom.xml
index 6b70115b784d851acc83f60da9c530d0934e84d8..76c19487b6d890323fe4695454b3735d9a0fe910 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
es.uvigo.esei.daa
example
war
- 0.1.18
+ 0.1.19
DAA Example
@@ -35,7 +35,7 @@
1.7.21
- 4.12
+ 4.13.2
2.0.0.0
3.5.1
3.141.59
@@ -48,6 +48,7 @@
2.20.1
+ 3.0.0
2.20.1
2.20.1
3.2.0
@@ -183,6 +184,16 @@
+
+
+
+ org.apache.maven.plugins
+ maven-jxr-plugin
+ ${maven-jxr-plugin.version}
+
+
+
+
DAAExample
@@ -394,7 +405,7 @@
cargo.datasource.jndi=jdbc/daaexample|
cargo.datasource.driver=com.mysql.jdbc.Driver|
- cargo.datasource.url=jdbc:mysql://localhost/daaexample|
+ cargo.datasource.url=jdbc:mysql://localhost/daaexample?useSSL=false|
cargo.datasource.username=daa|
cargo.datasource.password=daa|
cargo.datasource.maxActive=8|
diff --git a/src/test/java/es/uvigo/esei/daa/entities/PersonUnitTest.java b/src/test/java/es/uvigo/esei/daa/entities/PersonUnitTest.java
index a648f5ddbaa0f9221a2ccfbed9e2a7d295c51a4d..4b40545da0a5efabac07496a64071f0e62bf39ff 100644
--- a/src/test/java/es/uvigo/esei/daa/entities/PersonUnitTest.java
+++ b/src/test/java/es/uvigo/esei/daa/entities/PersonUnitTest.java
@@ -2,7 +2,7 @@ package es.uvigo.esei.daa.entities;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
diff --git a/src/test/java/es/uvigo/esei/daa/rest/PeopleResourceTest.java b/src/test/java/es/uvigo/esei/daa/rest/PeopleResourceTest.java
index 4cbc8be87daee45673830bfebfed6171a9135df9..1e0263898211837ad5cc6058fc9b4d6856c1a8a5 100644
--- a/src/test/java/es/uvigo/esei/daa/rest/PeopleResourceTest.java
+++ b/src/test/java/es/uvigo/esei/daa/rest/PeopleResourceTest.java
@@ -18,7 +18,7 @@ import static es.uvigo.esei.daa.matchers.IsEqualToPerson.equalsToPerson;
import static javax.ws.rs.client.Entity.entity;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
import java.io.IOException;
import java.util.List;
diff --git a/src/test/java/es/uvigo/esei/daa/rest/UsersResourceTest.java b/src/test/java/es/uvigo/esei/daa/rest/UsersResourceTest.java
index 0c74ad1d3e3531d283512c301ec3d54ac72cb28a..253ab07eed32f6fc94b5029b72472f80dc15db53 100644
--- a/src/test/java/es/uvigo/esei/daa/rest/UsersResourceTest.java
+++ b/src/test/java/es/uvigo/esei/daa/rest/UsersResourceTest.java
@@ -8,7 +8,7 @@ import static es.uvigo.esei.daa.matchers.HasHttpStatus.hasOkStatus;
import static es.uvigo.esei.daa.matchers.HasHttpStatus.hasUnauthorized;
import static es.uvigo.esei.daa.matchers.IsEqualToUser.equalsToUser;
import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
import java.io.IOException;
diff --git a/tomcat/server.mysql.xml b/tomcat/server.mysql.xml
index 9e09ce4266820ed8cf391b69e57a4c89996527d8..e9b8849d9241961ced5189d47667cc5abc481871 100644
--- a/tomcat/server.mysql.xml
+++ b/tomcat/server.mysql.xml
@@ -138,7 +138,7 @@