Merge pull request #85 from DescartesResearch/development

Release v1.0.2
DescartesResearch · May 29, 2018 · 8b73260 · 8b73260
2 parents 3d32818 + adc7f5f
commit 8b73260
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
 
     <properties>
-        <teastoreversion>1.0.1</teastoreversion>
+        <teastoreversion>1.0.2</teastoreversion>
     </properties>
 
 	<prerequisites>

diff --git a/...commender/src/test/java/tools/descartes/teastore/recommender/RecommenderEndpointTest.java b/...commender/src/test/java/tools/descartes/teastore/recommender/RecommenderEndpointTest.java
@@ -236,10 +236,11 @@ public void performInterfaceTests() {
 		response = ClientBuilder.newBuilder().build().target(ISREADY_TARGET).request(MediaType.TEXT_PLAIN).delete();
 		Assert.assertEquals(org.apache.catalina.connector.Response.SC_METHOD_NOT_ALLOWED, response.getStatus());
 
+		// Wait for training to finish
 		try {
-			Thread.sleep(1000);
+			Thread.sleep(10000);
 		} catch (InterruptedException ex) {
-
+			Assert.fail();
 		}
 
 		// Assert calling train via GET is OK

diff --git a/utilities/tools.descartes.teastore.kieker.rabbitmq/pom.xml b/utilities/tools.descartes.teastore.kieker.rabbitmq/pom.xml
@@ -69,12 +69,7 @@
 		<dependency>
 			<groupId>com.rabbitmq</groupId>
 			<artifactId>amqp-client</artifactId>
-			<version>5.2.0</version>
-		</dependency>
-		<dependency>
-			<groupId>com.rabbitmq</groupId>
-			<artifactId>rabbitmq-client</artifactId>
-			<version>1.3.0</version>
+			<version>4.2.1</version>
 		</dependency>
 		<dependency>
 			<groupId>net.kieker-monitoring</groupId>