aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Stockhammer <martin_s@apache.org>2018-05-21 01:05:19 +0200
committerMartin Stockhammer <martin_s@apache.org>2018-05-21 01:05:19 +0200
commit6ae9703f1d162676d437f25c2f307aeb2af09937 (patch)
treecdf91af2f083128b079784fbae9694175bb13d95
parent128bd5464c5a701cc7f89390789c19fc1a4d2242 (diff)
downloadarchiva-6ae9703f1d162676d437f25c2f307aeb2af09937.tar.gz
archiva-6ae9703f1d162676d437f25c2f307aeb2af09937.zip
Modifying dependencies to fix webui test failures
There is a guava compatibility problem with the selenium test Removing the dependencies that came with the new cassandra version
-rw-r--r--archiva-modules/archiva-web/archiva-webapp-test/pom.xml14
-rw-r--r--archiva-modules/archiva-web/archiva-webapp/pom.xml2
-rw-r--r--archiva-modules/plugins/metadata-store-cassandra/pom.xml12
3 files changed, 27 insertions, 1 deletions
diff --git a/archiva-modules/archiva-web/archiva-webapp-test/pom.xml b/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
index 6c51eff1d..c826475be 100644
--- a/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
@@ -75,7 +75,6 @@
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>22.0</version>
- <scope>test</scope>
</dependency>
<!-- Selenium dependencies -->
@@ -576,6 +575,11 @@
<artifactId>mail</artifactId>
<version>${javaxMailVersion}</version>
</dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>22.0</version>
+ </dependency>
</dependencies>
<executions>
@@ -617,6 +621,14 @@
<name>org.apache.jackrabbit.core.state.validatehierarchy</name>
<value>true</value>
</systemProperty>
+ <systemProperty>
+ <name>org.apache.logging.log4j.simplelog.StatusLogger.level</name>
+ <value>TRACE</value>
+ </systemProperty>
+ <systemProperty>
+ <name>log4j.configurationFile</name>
+ <value>${project.build.directory}/test-classes/log4j2-test.xml</value>
+ </systemProperty>
</systemProperties>
</configuration>
</execution>
diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml
index 92ae8f2a0..7152a5c93 100644
--- a/archiva-modules/archiva-web/archiva-webapp/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml
@@ -673,6 +673,7 @@
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-integrations-security</artifactId>
</dependency>
+ <!--
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
@@ -682,6 +683,7 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-ext</artifactId>
</dependency>
+ -->
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
diff --git a/archiva-modules/plugins/metadata-store-cassandra/pom.xml b/archiva-modules/plugins/metadata-store-cassandra/pom.xml
index 83c6d52dd..c0c1e208b 100644
--- a/archiva-modules/plugins/metadata-store-cassandra/pom.xml
+++ b/archiva-modules/plugins/metadata-store-cassandra/pom.xml
@@ -89,6 +89,14 @@
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>log4j-over-slf4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -109,6 +117,10 @@
<groupId>com.yammer.metrics</groupId>
<artifactId>metrics-core</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>log4j-over-slf4j</artifactId>
+ </exclusion>
</exclusions>
</dependency>