Merge branch 'dev' of lab.si.usi.ch:sa4-2020/the-sanmarinoes/backend into ci-cd

# Conflicts:
#	build.gradle

build.gradle

@@ -1,24 +1,21 @@
 plugins {
 	id 'org.springframework.boot' version '2.2.4.RELEASE'
 	id 'io.spring.dependency-management' version '1.0.9.RELEASE'
-	id "de.aaschmid.cpd" version "3.1"
 	id 'java'
 }
 
-group = 'ch.usi.inf.sa4.sanmarinoes'
+group = 'ch.usi.inf.sa4.sanmarinoes.'
 version = '0.0.1-SNAPSHOT'
-sourceCompatibility = '11'
+sourceCompatibility = "11"
 
 repositories {
 	mavenCentral()
+	jcenter()
 }
 
 dependencies {
 	compile 'org.hibernate.javax.persistence:hibernate-jpa-2.1-api:1.0.0.Final'
-	compile "org.springframework.boot:spring-boot-starter-websocket"
-
 	implementation 'org.springframework.boot:spring-boot-starter'
-
 	implementation 'com.sun.mail:javax.mail:1.6.2'
 	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
 	implementation 'org.springframework.boot:spring-boot-starter-security'
@@ -29,8 +26,7 @@ dependencies {
 	implementation 'com.google.code.gson:gson'
 	compile 'io.springfox:springfox-swagger2:2.9.2'
 	compile 'io.springfox:springfox-swagger-ui:2.9.2'
-	compile "org.springframework.boot:spring-boot-configuration-processor"
-	
+	compile 'org.springframework.boot:spring-boot-configuration-processor'
 
 	implementation('org.springframework.boot:spring-boot-starter-web') {
 		exclude group: 'org.springframework.boot', module: 'spring-boot-starter-json'
@@ -41,7 +37,7 @@ dependencies {
 	}
 	
 	testImplementation 'org.springframework.security:spring-security-test'
-	testImplementation 'com.h2database:h2:1.3.148'
+	testImplementation 'com.h2database:h2:1.4.200'
 
 	// Fixes https://stackoverflow.com/a/60455550
 	testImplementation group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.11'

src/test/resources/application.properties

@@ -25,3 +25,11 @@ spring.mail.properties.mail.smtp.timeout=5000
 spring.mail.properties.mail.smtp.writetimeout=5000
 
 server.port = 2000
+
+email.registrationSubject=Complete your SmartHut.sm registration
+email.registration=To confirm your registration, please click here:
+email.registrationPath=http://localhost:8080/register/confirm-account?token=
+
+email.resetpasswordSubject=SmartHut.sm password reset
+email.resetpassword=To reset your password, please click here:
+email.resetpasswordPath=http://localhost:3000/password-reset?token=