From ceba5408ec81de8c1e8ae03676dcfafe36ad27c9 Mon Sep 17 00:00:00 2001
From: Dhawal Kapil <dhawalkapil@gmail.com>
Date: Fri, 27 Sep 2019 20:16:06 +0530
Subject: [PATCH] BAEL-17945 Fix the integrations tests in libraries (#7880)

-Fixing serenity tests failing due to mismatching libraries
---
 libraries-testing/pom.xml                            | 12 +++++++++---
 .../src/test/java/com/baeldung/hamcrest/Animal.java  |  2 +-
 .../src/test/java/com/baeldung/hamcrest/Cat.java     |  2 +-
 .../baeldung/hamcrest/HamcrestMatcherUnitTest.java   |  4 ++--
 .../com/baeldung/hamcrest/IsPositiveInteger.java     |  2 +-
 .../src/test/java/com/baeldung/hamcrest/Person.java  |  2 +-
 6 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/libraries-testing/pom.xml b/libraries-testing/pom.xml
index 7cc5a8f775..a2fbed31b2 100644
--- a/libraries-testing/pom.xml
+++ b/libraries-testing/pom.xml
@@ -43,6 +43,12 @@
 			<artifactId>serenity-rest-assured</artifactId>
 			<version>${serenity.version}</version>
 			<scope>test</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>io.rest-assured</groupId>
+					<artifactId>rest-assured</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>net.serenity-bdd</groupId>
@@ -162,15 +168,15 @@
 	</build>
 
 	<properties>
-		<serenity.version>1.9.26</serenity.version>
-		<serenity.jbehave.version>1.41.0</serenity.jbehave.version>
+		<serenity.version>1.9.9</serenity.version>
+		<serenity.jbehave.version>1.9.0</serenity.jbehave.version>
 		<serenity.jira.version>1.9.0</serenity.jira.version>
 		<serenity.plugin.version>1.9.27</serenity.plugin.version>
 		<jsonassert.version>1.5.0</jsonassert.version>
 		<awaitility.version>3.0.0</awaitility.version>
 		<hoverfly-java.version>0.8.1</hoverfly-java.version>
 		<spring.version>4.3.8.RELEASE</spring.version>
-		<spring-mock-mvc.version>3.0.3</spring-mock-mvc.version>
+		<spring-mock-mvc.version>4.1.1</spring-mock-mvc.version>
 		<assertj.version>3.6.2</assertj.version>
 		<java-hamcrest.version>2.0.0.0</java-hamcrest.version>
 
diff --git a/libraries-testing/src/test/java/com/baeldung/hamcrest/Animal.java b/libraries-testing/src/test/java/com/baeldung/hamcrest/Animal.java
index 1a0266f5a3..1d37eef59b 100644
--- a/libraries-testing/src/test/java/com/baeldung/hamcrest/Animal.java
+++ b/libraries-testing/src/test/java/com/baeldung/hamcrest/Animal.java
@@ -1,4 +1,4 @@
-package org.baeldung.hamcrest;
+package com.baeldung.hamcrest;
 
 public class Animal {
 	String name;
diff --git a/libraries-testing/src/test/java/com/baeldung/hamcrest/Cat.java b/libraries-testing/src/test/java/com/baeldung/hamcrest/Cat.java
index 892e5b6e30..b15a3628da 100644
--- a/libraries-testing/src/test/java/com/baeldung/hamcrest/Cat.java
+++ b/libraries-testing/src/test/java/com/baeldung/hamcrest/Cat.java
@@ -1,4 +1,4 @@
-package org.baeldung.hamcrest;
+package com.baeldung.hamcrest;
 
 public class Cat extends Animal {
 
diff --git a/libraries-testing/src/test/java/com/baeldung/hamcrest/HamcrestMatcherUnitTest.java b/libraries-testing/src/test/java/com/baeldung/hamcrest/HamcrestMatcherUnitTest.java
index cf9fde7114..f5887ba79b 100644
--- a/libraries-testing/src/test/java/com/baeldung/hamcrest/HamcrestMatcherUnitTest.java
+++ b/libraries-testing/src/test/java/com/baeldung/hamcrest/HamcrestMatcherUnitTest.java
@@ -1,10 +1,10 @@
-package org.baeldung.hamcrest;
+package com.baeldung.hamcrest;
 
 import org.junit.Test;
 
 import java.util.*;
 
-import static org.baeldung.hamcrest.IsPositiveInteger.isAPositiveInteger;
+import static com.baeldung.hamcrest.IsPositiveInteger.isAPositiveInteger;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
 import static org.hamcrest.beans.HasProperty.hasProperty;
diff --git a/libraries-testing/src/test/java/com/baeldung/hamcrest/IsPositiveInteger.java b/libraries-testing/src/test/java/com/baeldung/hamcrest/IsPositiveInteger.java
index 0d8d262538..4d2ef8a8e5 100644
--- a/libraries-testing/src/test/java/com/baeldung/hamcrest/IsPositiveInteger.java
+++ b/libraries-testing/src/test/java/com/baeldung/hamcrest/IsPositiveInteger.java
@@ -1,4 +1,4 @@
-package org.baeldung.hamcrest;
+package com.baeldung.hamcrest;
 
 import org.hamcrest.Description;
 import org.hamcrest.Factory;
diff --git a/libraries-testing/src/test/java/com/baeldung/hamcrest/Person.java b/libraries-testing/src/test/java/com/baeldung/hamcrest/Person.java
index 0053c98043..417daa866e 100644
--- a/libraries-testing/src/test/java/com/baeldung/hamcrest/Person.java
+++ b/libraries-testing/src/test/java/com/baeldung/hamcrest/Person.java
@@ -1,4 +1,4 @@
-package org.baeldung.hamcrest;
+package com.baeldung.hamcrest;
 
 public class Person {
 	String name;