Skip to content

Commit

Permalink
Merge pull request #1378 from vtkhir/feature/KAA-1640-master
Browse files Browse the repository at this point in the history
KAA-1640: OracleNoSqlLogAppenderTest fails on Jenkins [master]
  • Loading branch information
rasendubi committed Dec 13, 2016
2 parents 6c0b1d3 + a429747 commit 700c731
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 1 deletion.
15 changes: 15 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ Copyright 2014-2016 CyberVision, Inc.
<javax.el>2.2.4</javax.el>
<org.glassfish.web>2.2.6</org.glassfish.web>
<hibernate-validator>5.2.4.Final</hibernate-validator>
<sleepycat.je.version>7.0.6</sleepycat.je.version>
</properties>

<modules>
Expand Down Expand Up @@ -1090,6 +1091,14 @@ Copyright 2014-2016 CyberVision, Inc.
<version>${oracle-kvstore.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<!-- a test BerkleyDB Java Edition dependency for com.oracle.kv:kvstore
artifact. See http://www.oracle.com/technetwork/products/berkeleydb/downloads/index-098622.html -->
<groupId>com.sleepycat</groupId>
<artifactId>je</artifactId>
<version>${sleepycat.je.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
Expand Down Expand Up @@ -1431,6 +1440,12 @@ Copyright 2014-2016 CyberVision, Inc.
<id>twitter-twttr</id>
<url>http://maven.twttr.com/</url>
</repository>
<repository>
<id>oracleReleases</id>
<name>Oracle Released Java Packages</name>
<url>http://download.oracle.com/maven</url>
<layout>default</layout>
</repository>
<repository>
<id>repository.kaaproject</id>
<url>http://repository.kaaproject.org/repository/internal/</url>
Expand Down
6 changes: 5 additions & 1 deletion server/appenders/oracle-nosql-appender/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,11 @@
<groupId>com.oracle.kv</groupId>
<artifactId>kvstore</artifactId>
<scope>test</scope>
</dependency>
</dependency>
<dependency>
<groupId>com.sleepycat</groupId>
<artifactId>je</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Expand Down

0 comments on commit 700c731

Please sign in to comment.