Upgrades dependency versions

domain/pom.xml

@@ -32,7 +32,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.hamcrest</groupId>
-			<artifactId>java-hamcrest</artifactId>
+			<artifactId>hamcrest</artifactId>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>

domain/src/test/java/es/uvigo/esei/xcs/domain/entities/OwnerTest.java

@@ -8,7 +8,7 @@ import static org.hamcrest.CoreMatchers.nullValue;
 import static org.hamcrest.collection.IsEmptyIterable.emptyIterable;
 import static org.hamcrest.collection.IsIterableContainingInAnyOrder.containsInAnyOrder;
 import static org.hamcrest.collection.IsIterableContainingInOrder.contains;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.util.Date;
 

domain/src/test/java/es/uvigo/esei/xcs/domain/entities/PetTest.java

@@ -4,7 +4,7 @@ import static org.apache.commons.lang3.StringUtils.repeat;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.util.Date;
 

domain/src/test/java/es/uvigo/esei/xcs/domain/entities/UserTest.java

@@ -3,7 +3,7 @@ package es.uvigo.esei.xcs.domain.entities;
 import static org.apache.commons.lang3.StringUtils.repeat;
 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 org.junit.Before;
 import org.junit.Test;

jsf/pom.xml

@@ -42,7 +42,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.hamcrest</groupId>
-			<artifactId>java-hamcrest</artifactId>
+			<artifactId>hamcrest</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -66,6 +66,11 @@
 			<type>pom</type>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.jboss.shrinkwrap.resolver</groupId>
+			<artifactId>shrinkwrap-resolver-impl-maven</artifactId>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 	
 	<build>
@@ -100,12 +105,12 @@
 								<id>download-geckodriver</id>
 								<phase>process-test-resources</phase>
 								<configuration>
-									<tasks>
+									<target>
 										<mkdir dir="${geckodriver.basepath}"/>
 										<get src="${geckodriver.url}" dest="${geckodriver.compressed.path}" skipexisting="true"/>
 										<untar src="${geckodriver.compressed.path}" dest="${geckodriver.basepath}" compression="gzip"/>
 										<chmod file="${geckodriver.uncompressed.path}" perm="a+x"/>
-									</tasks>
+									</target>
 								</configuration>
 								<goals>
 									<goal>run</goal>
@@ -140,12 +145,12 @@
 								<id>download-geckodriver</id>
 								<phase>process-test-resources</phase>
 								<configuration>
-									<tasks>
+									<target>
 										<mkdir dir="${geckodriver.basepath}"/>
 										<get src="${geckodriver.url}" dest="${geckodriver.compressed.path}" skipexisting="true"/>
 										<unzip src="${geckodriver.compressed.path}" dest="${geckodriver.basepath}"/>
 										<chmod file="${geckodriver.uncompressed.path}" perm="a+x"/>
-									</tasks>
+									</target>
 								</configuration>
 								<goals>
 									<goal>run</goal>
@@ -248,12 +253,12 @@
 								<id>download-geckodriver</id>
 								<phase>process-test-resources</phase>
 								<configuration>
-									<tasks>
+									<target>
 										<mkdir dir="${geckodriver.basepath}"/>
 										<get src="${geckodriver.url}" dest="${geckodriver.compressed.path}" skipexisting="true"/>
 										<untar src="${geckodriver.compressed.path}" dest="${geckodriver.basepath}" compression="gzip"/>
 										<chmod file="${geckodriver.uncompressed.path}" perm="a+x"/>
-									</tasks>
+									</target>
 								</configuration>
 								<goals>
 									<goal>run</goal>

jsf/src/main/webapp/WEB-INF/template.xhtml

@@ -5,7 +5,7 @@
 <h:head>
 	<title>Pet Store</title>
 
-	<h:outputStylesheet name="webjars/bootstrap/3.3.7-1/css/bootstrap.min.css" />
+	<h:outputStylesheet name="webjars/bootstrap/3.4.1/css/bootstrap.min.css" />
 </h:head>
 <h:body>
 	<div class="container">
@@ -42,6 +42,6 @@
 	</div>
 
 	<h:outputScript name="webjars/jquery/1.11.1/jquery.min.js" />
-	<h:outputScript name="webjars/bootstrap/3.3.7-1/js/bootstrap.min.js" />
+	<h:outputScript name="webjars/bootstrap/3.4.1/js/bootstrap.min.js" />
 </h:body>
 </html>
\ No newline at end of file

jsf/src/test/java/es/uvigo/esei/xcs/jsf/OwnerJsfTest.java

@@ -11,7 +11,7 @@ import static es.uvigo.esei.xcs.domain.entities.OwnersDataset.owners;
 import static es.uvigo.esei.xcs.domain.entities.OwnersDataset.ownersAnd;
 import static es.uvigo.esei.xcs.domain.entities.OwnersDataset.ownersWithout;
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.nio.file.Path;
 import java.nio.file.Paths;

jsf/src/test/java/es/uvigo/esei/xcs/jsf/pages/LoginPage.java

 package es.uvigo.esei.xcs.jsf.pages;
 
 import static org.hamcrest.core.StringContains.containsString;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import org.jboss.arquillian.drone.api.annotation.Drone;
 import org.jboss.arquillian.graphene.page.Location;

jsf/src/test/java/es/uvigo/esei/xcs/jsf/pages/OwnersPage.java

@@ -2,7 +2,7 @@ package es.uvigo.esei.xcs.jsf.pages;
 
 import static java.util.Arrays.stream;
 import static org.hamcrest.core.StringContains.containsString;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import org.jboss.arquillian.drone.api.annotation.Drone;
 import org.jboss.arquillian.graphene.GrapheneElement;

pom.xml

@@ -38,42 +38,42 @@
 
 		<!-- BOM versions -->
 		<javaee.api.version>7.0</javaee.api.version>
-		<arquillian.version>1.1.13.Final</arquillian.version>
+		<arquillian.version>1.7.1.Final</arquillian.version>
 		<arquillian.rest.version>1.0.0.Alpha4</arquillian.rest.version>
-		<arquillian.selenium.version>3.4.0</arquillian.selenium.version>
+		<arquillian.selenium.version>3.13.0</arquillian.selenium.version>
 		<shrinkwrap.resolver.bom.version>3.0.0-beta-2</shrinkwrap.resolver.bom.version>
 
 		<!-- Dependencies versions -->
 		<wildfly.version>10.1.0.Final</wildfly.version>
 		<commons.lang3.version>3.4</commons.lang3.version>
-		<bootstrap.version>3.3.7-1</bootstrap.version>
+		<bootstrap.version>3.4.1</bootstrap.version>
 
 		<!-- Testing dependecies versions -->
-		<arquillian.jacoco.version>1.0.0.Alpha9</arquillian.jacoco.version>
+		<arquillian.jacoco.version>1.1.0</arquillian.jacoco.version>
 		<arquillian.persistence.dbunit.version>1.0.0.Alpha7</arquillian.persistence.dbunit.version>
 		<arquillian.wildfly.embedded.version>3.0.3.Final</arquillian.wildfly.embedded.version>
 		<arquillian.wildfly.embedded.container.version>2.1.0.Final</arquillian.wildfly.embedded.container.version>
-		<easymock.version>3.4</easymock.version>
+		<easymock.version>5.2.0</easymock.version>
 		<geckodriver.version>v0.33.0</geckodriver.version>
-		<graphene.webdrive.version>2.3.1</graphene.webdrive.version>
-		<hamcrest.version>2.0.0.0</hamcrest.version>
-		<jacoco.version>0.7.9</jacoco.version>
-		<junit.version>4.12</junit.version>
-		<mysql.connector.java.version>8.0.21</mysql.connector.java.version>
-		<resteasy.version>3.0.24.Final</resteasy.version>
+		<graphene.webdrive.version>2.5.4</graphene.webdrive.version>
+		<hamcrest.version>2.2</hamcrest.version>
+		<jacoco.version>0.8.10</jacoco.version>
+		<junit.version>4.13.2</junit.version>
+		<mysql.connector.java.version>8.1.0</mysql.connector.java.version>
+		<resteasy.version>3.15.6.Final</resteasy.version>
 		<slf4j.version>1.5.10</slf4j.version>
 
 		<!-- Plugins versions -->
-		<maven.antrun.plugin.version>1.8</maven.antrun.plugin.version>
-		<maven.compiler.plugin.version>3.6.1</maven.compiler.plugin.version>
+		<maven.antrun.plugin.version>3.1.0</maven.antrun.plugin.version>
+		<maven.compiler.plugin.version>3.11.0</maven.compiler.plugin.version>
 		<maven.ear.plugin.version>2.10.1</maven.ear.plugin.version>
-		<maven.javadoc.plugin.version>2.10.4</maven.javadoc.plugin.version>
-		<maven.dependency.plugin.version>2.10</maven.dependency.plugin.version>
-		<maven.deploy.plugin.version>2.8.2</maven.deploy.plugin.version>
-		<maven.resources.plugin.version>3.0.2</maven.resources.plugin.version>
-		<maven.source.plugin.version>3.0.1</maven.source.plugin.version>
-		<maven.surefire.plugin.version>2.20</maven.surefire.plugin.version>
-		<wildfly.maven.plugin.version>1.2.0.Final</wildfly.maven.plugin.version>
+		<maven.javadoc.plugin.version>3.6.0</maven.javadoc.plugin.version>
+		<maven.dependency.plugin.version>3.6.0</maven.dependency.plugin.version>
+		<maven.deploy.plugin.version>3.1.1</maven.deploy.plugin.version>
+		<maven.resources.plugin.version>3.3.1</maven.resources.plugin.version>
+		<maven.source.plugin.version>3.3.0</maven.source.plugin.version>
+		<maven.surefire.plugin.version>3.1.2</maven.surefire.plugin.version>
+		<wildfly.maven.plugin.version>1.2.2.Final</wildfly.maven.plugin.version>
 	</properties>
 
 	<dependencyManagement>
@@ -91,6 +91,13 @@
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
+			<dependency>
+			    <groupId>org.jboss.shrinkwrap.resolver</groupId>
+			    <artifactId>shrinkwrap-resolver-bom</artifactId>
+			    <version>${shrinkwrap.resolver.bom.version}</version>
+			    <type>pom</type>
+			    <scope>import</scope>
+			</dependency>
 			<dependency>
 				<groupId>org.jboss.arquillian.selenium</groupId>
 				<artifactId>selenium-bom</artifactId>
@@ -147,7 +154,7 @@
 			</dependency>
 			<dependency>
 				<groupId>org.hamcrest</groupId>
-				<artifactId>java-hamcrest</artifactId>
+				<artifactId>hamcrest</artifactId>
 				<version>${hamcrest.version}</version>
 			</dependency>
 			<dependency>
@@ -188,8 +195,8 @@
 				<version>${jacoco.version}</version>
 			</dependency>
 			<dependency>
-				<groupId>mysql</groupId>
-				<artifactId>mysql-connector-java</artifactId>
+				<groupId>com.mysql</groupId>
+				<artifactId>mysql-connector-j</artifactId>
 				<version>${mysql.connector.java.version}</version>
 			</dependency>
 			<dependency>
@@ -589,8 +596,8 @@
 								<configuration>
 									<artifactItems>
 										<artifactItem>
-											<groupId>mysql</groupId>
-											<artifactId>mysql-connector-java</artifactId>
+											<groupId>com.mysql</groupId>
+											<artifactId>mysql-connector-j</artifactId>
 											<type>jar</type>
 											<overWrite>false</overWrite>
 											<outputDirectory>${project.build.directory}/wildfly-${wildfly.version}/standalone/deployments</outputDirectory>
@@ -607,8 +614,8 @@
 								<configuration>
 									<artifactItems>
 										<artifactItem>
-											<groupId>mysql</groupId>
-											<artifactId>mysql-connector-java</artifactId>
+											<groupId>com.mysql</groupId>
+											<artifactId>mysql-connector-j</artifactId>
 											<type>jar</type>
 											<overWrite>false</overWrite>
 											<outputDirectory>${project.build.directory}</outputDirectory>
@@ -690,8 +697,8 @@
 								<configuration>
 									<artifactItems>
 										<artifactItem>
-											<groupId>mysql</groupId>
-											<artifactId>mysql-connector-java</artifactId>
+											<groupId>com.mysql</groupId>
+											<artifactId>mysql-connector-j</artifactId>
 											<type>jar</type>
 											<overWrite>false</overWrite>
 											<outputDirectory>${project.build.directory}/wildfly-${wildfly.version}/standalone/deployments</outputDirectory>
@@ -708,8 +715,8 @@
 								<configuration>
 									<artifactItems>
 										<artifactItem>
-											<groupId>mysql</groupId>
-											<artifactId>mysql-connector-java</artifactId>
+											<groupId>com.mysql</groupId>
+											<artifactId>mysql-connector-j</artifactId>
 											<type>jar</type>
 											<overWrite>false</overWrite>
 											<outputDirectory>${project.build.directory}</outputDirectory>

rest/pom.xml

@@ -38,7 +38,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.hamcrest</groupId>
-			<artifactId>java-hamcrest</artifactId>
+			<artifactId>hamcrest</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

rest/src/test/java/es/uvigo/esei/xcs/rest/OwnerResourceRestTest.java

@@ -18,7 +18,7 @@ import static es.uvigo.esei.xcs.http.util.HasHttpStatus.hasMethodNotAllowedStatu
 import static es.uvigo.esei.xcs.http.util.HasHttpStatus.hasOkStatus;
 import static javax.ws.rs.client.Entity.json;
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.util.List;
 

rest/src/test/java/es/uvigo/esei/xcs/rest/OwnerResourceUnitTest.java

@@ -20,7 +20,7 @@ import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.collection.IsEmptyCollection.empty;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.net.URI;
 import java.util.List;

service/pom.xml

@@ -37,7 +37,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.hamcrest</groupId>
-			<artifactId>java-hamcrest</artifactId>
+			<artifactId>hamcrest</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

service/src/test/java/es/uvigo/esei/xcs/service/OwnerServiceIntegrationTest.java

@@ -20,7 +20,7 @@ import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.nullValue;
 import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
 import static org.hamcrest.collection.IsEmptyCollection.empty;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.util.Collection;
 import java.util.List;

service/src/test/java/es/uvigo/esei/xcs/service/PetServiceIntegrationTest.java

@@ -14,7 +14,7 @@ import static es.uvigo.esei.xcs.domain.entities.OwnersDataset.petWithId;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.nullValue;
 import static org.hamcrest.collection.IsEmptyCollection.empty;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.util.Date;
 import java.util.List;

service/src/test/java/es/uvigo/esei/xcs/service/UserServiceIllegalAccessIntegrationTest.java

@@ -4,7 +4,7 @@ import static es.uvigo.esei.xcs.domain.entities.IsEqualToUser.equalToUser;
 import static es.uvigo.esei.xcs.domain.entities.OwnersDataset.existentOwner;
 import static es.uvigo.esei.xcs.domain.entities.UsersDataset.existentAdmin;
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import javax.ejb.EJB;
 import javax.inject.Inject;
@@ -21,10 +21,8 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import es.uvigo.esei.xcs.domain.entities.Owner;
-import es.uvigo.esei.xcs.domain.entities.OwnersDataset;
 import es.uvigo.esei.xcs.domain.entities.Pet;
 import es.uvigo.esei.xcs.domain.entities.User;
-import es.uvigo.esei.xcs.domain.entities.UsersDataset;
 import es.uvigo.esei.xcs.service.util.security.RoleCaller;
 import es.uvigo.esei.xcs.service.util.security.TestPrincipal;
 

tests/pom.xml

@@ -30,7 +30,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.hamcrest</groupId>
-			<artifactId>java-hamcrest</artifactId>
+			<artifactId>hamcrest</artifactId>
 			<scope>compile</scope>
 		</dependency>
 	</dependencies>

tests/src/main/java/es/uvigo/esei/xcs/domain/entities/IsEqualToOwner.java

 package es.uvigo.esei.xcs.domain.entities;
 
-import org.hamcrest.Factory;
 import org.hamcrest.Matcher;
 
 public class IsEqualToOwner extends IsEqualToEntity<Owner> {
@@ -25,32 +24,26 @@ public class IsEqualToOwner extends IsEqualToEntity<Owner> {
 		}
 	}
 
-	@Factory
 	public static IsEqualToOwner equalToOwner(Owner owner) {
 		return new IsEqualToOwner(owner, true);
 	}
 	
-	@Factory
 	public static IsEqualToOwner equalToOwnerWithoutRelations(Owner owner) {
 		return new IsEqualToOwner(owner, false);
 	}
 	
-	@Factory
 	public static Matcher<Iterable<? extends Owner>> containsOwnersInAnyOrder(Owner ... owners) {
 		return containsEntityInAnyOrder(IsEqualToOwner::equalToOwner, owners);
 	}
 	
-	@Factory
 	public static Matcher<Iterable<? extends Owner>> containsOwnersWithoutRelationsInAnyOrder(Owner ... owners) {
 		return containsEntityInAnyOrder(IsEqualToOwner::equalToOwnerWithoutRelations, owners);
 	}
 	
-	@Factory
 	public static Matcher<Iterable<? extends Owner>> containsOwnersInAnyOrder(Iterable<Owner> owners) {
 		return containsEntityInAnyOrder(IsEqualToOwner::equalToOwner, owners);
 	}
 	
-	@Factory
 	public static Matcher<Iterable<? extends Owner>> containsOwnersWithoutRelationsInAnyOrder(Iterable<Owner> owners) {
 		return containsEntityInAnyOrder(IsEqualToOwner::equalToOwnerWithoutRelations, owners);
 	}

tests/src/main/java/es/uvigo/esei/xcs/domain/entities/IsEqualToPet.java

 package es.uvigo.esei.xcs.domain.entities;
 
-import org.hamcrest.Factory;
 import org.hamcrest.Matcher;
 
 public class IsEqualToPet extends IsEqualToEntity<Pet> {
@@ -26,32 +25,26 @@ public class IsEqualToPet extends IsEqualToEntity<Pet> {
 		}
 	}
 
-	@Factory
 	public static IsEqualToPet equalToPet(Pet pet) {
 		return new IsEqualToPet(pet, true);
 	}
 	
-	@Factory
 	public static IsEqualToPet equalToPetWithoutRelations(Pet pet) {
 		return new IsEqualToPet(pet, false);
 	}
 	
-	@Factory
 	public static Matcher<Iterable<? extends Pet>> containsPetsInAnyOrder(Pet ... pets) {
 		return containsEntityInAnyOrder(IsEqualToPet::equalToPet, pets);
 	}
 	
-	@Factory
 	public static Matcher<Iterable<? extends Pet>> containsPetsWithoutRelationsInAnyOrder(Pet ... pets) {
 		return containsEntityInAnyOrder(IsEqualToPet::equalToPetWithoutRelations, pets);
 	}
 	
-	@Factory
 	public static Matcher<Iterable<? extends Pet>> containsPetsInAnyOrder(Iterable<Pet> pets) {
 		return containsEntityInAnyOrder(IsEqualToPet::equalToPet, pets);
 	}
 	
-	@Factory
 	public static Matcher<Iterable<? extends Pet>> containsPetsWithoutRelationsInAnyOrder(Iterable<Pet> pets) {
 		return containsEntityInAnyOrder(IsEqualToPet::equalToPetWithoutRelations, pets);
 	}

tests/src/main/java/es/uvigo/esei/xcs/domain/entities/IsEqualToUser.java

 package es.uvigo.esei.xcs.domain.entities;
 
-import org.hamcrest.Factory;
 import org.hamcrest.Matcher;
 
 public class IsEqualToUser extends IsEqualToEntity<User> {
@@ -21,17 +20,14 @@ public class IsEqualToUser extends IsEqualToEntity<User> {
 		}
 	}
 
-	@Factory
 	public static IsEqualToUser equalToUser(User user) {
 		return new IsEqualToUser(user);
 	}
 	
-	@Factory
 	public static Matcher<Iterable<? extends User>> containsUsersInAnyOrder(User ... users) {
 		return containsEntityInAnyOrder(IsEqualToUser::equalToUser, users);
 	}
 	
-	@Factory
 	public static Matcher<Iterable<? extends User>> containsUsersInAnyOrder(Iterable<User> users) {
 		return containsEntityInAnyOrder(IsEqualToUser::equalToUser, users);
 	}

tests/src/main/java/es/uvigo/esei/xcs/http/util/HasHttpStatus.java

@@ -4,7 +4,6 @@ import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.StatusType;
 
 import org.hamcrest.Description;
-import org.hamcrest.Factory;
 import org.hamcrest.TypeSafeMatcher;
 
 import static javax.ws.rs.core.Response.Status.BAD_REQUEST;
@@ -33,32 +32,26 @@ public class HasHttpStatus extends TypeSafeMatcher<Response> {
 		return this.status.getStatusCode() == item.getStatus();
 	}
 	
-	@Factory
 	public static HasHttpStatus hasHttpStatus(int statusCode) {
 		return new HasHttpStatus(statusCode);
 	}
 	
-	@Factory
 	public static HasHttpStatus hasHttpStatus(StatusType status) {
 		return new HasHttpStatus(status);
 	}
 	
-	@Factory
 	public static HasHttpStatus hasOkStatus() {
 		return new HasHttpStatus(OK);
 	}
 	
-	@Factory
 	public static HasHttpStatus hasCreatedStatus() {
 		return new HasHttpStatus(CREATED);
 	}
 	
-	@Factory
 	public static HasHttpStatus hasMethodNotAllowedStatus() {
 		return new HasHttpStatus(METHOD_NOT_ALLOWED);
 	}
 	
-	@Factory
 	public static HasHttpStatus hasBadRequestStatus() {
 		return new HasHttpStatus(BAD_REQUEST);
 	}