From 6cee4606ca60a6a13607b7fcb3c60deca08e67d2 Mon Sep 17 00:00:00 2001
From: Martin Stockhammer <martin_s@apache.org>
Date: Sun, 20 Aug 2017 20:52:59 +0200
Subject: [PATCH] Adding different guava dependency for webtests

Workaround to get the selenium tests running. Better would
be a solution that allows the new guava version for the complete
project.
---
 .../archiva-web/archiva-webapp-test/pom.xml         | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/archiva-modules/archiva-web/archiva-webapp-test/pom.xml b/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
index 30fd890b0..6c51eff1d 100644
--- a/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
@@ -65,6 +65,19 @@
       </exclusions>
     </dependency>
 
+    <!--
+      jcr-oak currently needs guava 15.0 and selenium webdriver needs 22.0
+      This is a rather poor workaround here better would be a way to use
+      the higher version for all scopes.
+      TODO: Check what's necessary to get jcr oak running with 22.0
+     -->
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <version>22.0</version>
+      <scope>test</scope>
+    </dependency>
+
     <!-- Selenium dependencies -->
     <dependency>
       <groupId>org.seleniumhq.selenium</groupId>
-- 
2.39.5