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

DATACASS-331 - Include netty as transient dependency of cassandra-driver-dse.

Browse Source 
Remove the previously added netty dependency exclusion in 237ac88 to include netty as transient dependency. Netty was excluded because of a dependency conflict between cassandra-driver-dse and cassandra-all. The conflict gets visible during build-time on CI hosts with symptoms of 100% CPU usage or network timeouts.

We now use netty 4.0.23.Final (from cassandra-all 2.1.11) during the tests. Users of spring-cql and spring-data-cassandra depend on netty 4.0.27.Final (from of cassandra-driver-dse).

Related pull request: #43.
This commit is contained in:
Mark Paluch
2016-08-22 11:07:02 +02:00
parent 65cdab7ff8
commit f83d4bf62d
4 changed files with 67 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pom.xml
View File

@@ -34,6 +34,7 @@
<failsafe.version>2.16</failsafe.version>
<jamm.version>0.3.1</jamm.version>
<cassandra.version>2.1.11</cassandra.version>
<netty.version>4.0.23.Final</netty.version>
<cassandra-driver-dse.version>2.1.7.1</cassandra-driver-dse.version>
<multithreadedtc.version>1.01</multithreadedtc.version>
</properties>
@@ -108,10 +109,6 @@
<artifactId>guava</artifactId>
<groupId>com.google.guava</groupId>
</exclusion>
<exclusion>
<artifactId>netty-handler</artifactId>
<groupId>io.netty</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>

33
spring-cql/pom.xml
View File

@@ -91,8 +91,41 @@
<artifactId>guava</artifactId>
<groupId>com.google.guava</groupId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
<version>${netty.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-buffer</artifactId>
<version>${netty.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec</artifactId>
<version>${netty.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport</artifactId>
<version>${netty.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>

2
spring-cql/src/test/resources/logback-test.xml
View File

@@ -17,4 +17,4 @@
<appender-ref ref="console" />
</root>
</configuration>
</configuration>

32
spring-data-cassandra/pom.xml
View File

@@ -99,9 +99,41 @@
<artifactId>guava</artifactId>
<groupId>com.google.guava</groupId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
<version>${netty.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-buffer</artifactId>
<version>${netty.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec</artifactId>
<version>${netty.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport</artifactId>
<version>${netty.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>