Spring/spring-data-cassandra
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into DATACASS-14

Browse Source
This commit is contained in:
Matthew Adams
2013-12-09 16:43:48 -06:00
parent f46a7ef991 fd46046255
commit 9bf80488c1
11 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
pom.xml
View File

@@ -27,11 +27,14 @@
</modules>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<project.type>multi</project.type>
<dist.id>spring-data-cassandra</dist.id>
<springdata.commons>1.6.2.RELEASE</springdata.commons>
<cassandra-unit.version>1.2.0.1</cassandra-unit.version>
<cassandra-driver-core.version>1.0.4-dse</cassandra-driver-core.version>
<failsafe.version>2.16</failsafe.version>
</properties>
<developers>
@@ -123,10 +126,19 @@
<version>${spring}</version>
</dependency>
<!-- Logging Dependencies -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.4</version>
<artifactId>log4j-over-slf4j</artifactId>
<version>${slf4j}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jul-to-slf4j</artifactId>
<version>${slf4j}</version>
<scope>test</scope>
</dependency>
<!-- CDI -->
@@ -246,6 +258,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>${failsafe.version}</version>
<configuration>
<forkMode>always</forkMode>
<argLine>-Xmx2048m -XX:MaxPermSize=512m</argLine>