You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ma...@apache.org on 2017/08/20 18:54:13 UTC

[2/2] archiva git commit: Adding different guava dependency for webtests

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.


Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/6cee4606
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/6cee4606
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/6cee4606

Branch: refs/heads/master
Commit: 6cee4606ca60a6a13607b7fcb3c60deca08e67d2
Parents: 83622e8
Author: Martin Stockhammer <ma...@apache.org>
Authored: Sun Aug 20 20:52:59 2017 +0200
Committer: Martin Stockhammer <ma...@apache.org>
Committed: Sun Aug 20 20:52:59 2017 +0200

----------------------------------------------------------------------
 .../archiva-web/archiva-webapp-test/pom.xml            | 13 +++++++++++++
 1 file changed, 13 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/archiva/blob/6cee4606/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-webapp-test/pom.xml b/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
index 30fd890..6c51eff 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>