Skip to content
This repository was archived by the owner on May 29, 2025. It is now read-only.

Commit 15a0936

Browse files
mike-unitskyimike-unitskyi
authored
PD-179033 support C* 3.11.x (#33)
1 parent fde1636 commit 15a0936

File tree

7 files changed

+972
-447
lines changed

7 files changed

+972
-447
lines changed

‎pom.xml

Lines changed: 88 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ under the License.
2525
<parent>
2626
<groupId>com.bazaarvoice.commons</groupId>
2727
<artifactId>bv-opensource-super-pom</artifactId>
28-
<version>1.4</version>
28+
<version>1.12</version>
2929
<relativePath />
3030
</parent>
3131

@@ -110,18 +110,18 @@ under the License.
110110

111111
<properties>
112112
<mavenVersion>2.2.1</mavenVersion>
113-
<cassandraVersion>3.0.25</cassandraVersion>
114-
<slf4jVersion>1.7.25</slf4jVersion>
115-
<logback.version>1.2.0</logback.version>
116-
<cleanPluginVersion>2.5</cleanPluginVersion>
117-
<compilerPluginVersion>3.8.1</compilerPluginVersion>
118-
<deployPluginVersion>2.7</deployPluginVersion>
119-
<installPluginVersion>2.3.1</installPluginVersion>
120-
<jarPluginVersion>2.4</jarPluginVersion>
121-
<resourcesPluginVersion>2.6</resourcesPluginVersion>
122-
<surefirePluginVersion>2.18.1</surefirePluginVersion>
123-
<dependencyPluginVersion>2.8</dependencyPluginVersion>
124-
<buildHelperPluginVersion>1.9</buildHelperPluginVersion>
113+
<cassandraVersion>3.11.12</cassandraVersion>
114+
<slf4jVersion>1.7.32</slf4jVersion>
115+
<logback.version>1.2.9</logback.version>
116+
<cleanPluginVersion>3.1.0</cleanPluginVersion>
117+
<compilerPluginVersion>3.10.1</compilerPluginVersion>
118+
<deployPluginVersion>3.0.0-M2</deployPluginVersion>
119+
<installPluginVersion>3.0.0-M1</installPluginVersion>
120+
<jarPluginVersion>3.2.2</jarPluginVersion>
121+
<resourcesPluginVersion>3.2.0</resourcesPluginVersion>
122+
<surefirePluginVersion>3.0.0-M5</surefirePluginVersion>
123+
<dependencyPluginVersion>3.3.0</dependencyPluginVersion>
124+
<buildHelperPluginVersion>3.3.0</buildHelperPluginVersion>
125125
<mavenPluginPluginVersion>3.6.0</mavenPluginPluginVersion>
126126

127127
<java.version>1.8</java.version>
@@ -168,6 +168,21 @@ under the License.
168168
<artifactId>libthrift</artifactId>
169169
<version>0.12.0</version>
170170
</dependency>
171+
<dependency>
172+
<groupId>org.apache.httpcomponents</groupId>
173+
<artifactId>httpcore</artifactId>
174+
<version>4.4.10</version>
175+
</dependency>
176+
<dependency>
177+
<groupId>javax.servlet</groupId>
178+
<artifactId>servlet-api</artifactId>
179+
<version>2.5</version>
180+
</dependency>
181+
<dependency>
182+
<groupId>io.dropwizard.metrics</groupId>
183+
<artifactId>metrics-core</artifactId>
184+
<version>3.1.5</version>
185+
</dependency>
171186
<dependency>
172187
<groupId>commons-cli</groupId>
173188
<artifactId>commons-cli</artifactId>
@@ -176,7 +191,7 @@ under the License.
176191
<dependency>
177192
<groupId>commons-codec</groupId>
178193
<artifactId>commons-codec</artifactId>
179-
<version>1.6</version>
194+
<version>1.10</version>
180195
</dependency>
181196
<dependency>
182197
<groupId>org.apache.commons</groupId>
@@ -186,7 +201,12 @@ under the License.
186201
<dependency>
187202
<groupId>com.google.guava</groupId>
188203
<artifactId>guava</artifactId>
189-
<version>18.0</version>
204+
<version>20.0</version>
205+
</dependency>
206+
<dependency>
207+
<groupId>com.google.code.findbugs</groupId>
208+
<artifactId>jsr305</artifactId>
209+
<version>3.0.2</version>
190210
</dependency>
191211
<dependency>
192212
<groupId>org.slf4j</groupId>
@@ -304,6 +324,16 @@ under the License.
304324
<artifactId>commons-exec</artifactId>
305325
<version>1.1</version>
306326
</dependency>
327+
<dependency>
328+
<groupId>commons-lang</groupId>
329+
<artifactId>commons-lang</artifactId>
330+
<version>2.6</version>
331+
</dependency>
332+
<dependency>
333+
<groupId>org.antlr</groupId>
334+
<artifactId>antlr-runtime</artifactId>
335+
<version>3.5.2</version>
336+
</dependency>
307337
<dependency>
308338
<groupId>org.apache.maven.shared</groupId>
309339
<artifactId>maven-plugin-testing-harness</artifactId>
@@ -319,7 +349,7 @@ under the License.
319349
<dependency>
320350
<groupId>junit</groupId>
321351
<artifactId>junit</artifactId>
322-
<version>4.13.1</version>
352+
<version>4.13.2</version>
323353
<scope>test</scope>
324354
</dependency>
325355
<dependency>
@@ -337,11 +367,6 @@ under the License.
337367
</exclusion>
338368
</exclusions>
339369
</dependency>
340-
<dependency>
341-
<groupId>commons-lang</groupId>
342-
<artifactId>commons-lang</artifactId>
343-
<version>2.6</version>
344-
</dependency>
345370
</dependencies>
346371
</dependencyManagement>
347372

@@ -382,6 +407,34 @@ under the License.
382407
<groupId>org.apache.commons</groupId>
383408
<artifactId>commons-exec</artifactId>
384409
</dependency>
410+
<dependency>
411+
<groupId>org.codehaus.plexus</groupId>
412+
<artifactId>plexus-container-default</artifactId>
413+
</dependency>
414+
<dependency>
415+
<groupId>org.apache.thrift</groupId>
416+
<artifactId>libthrift</artifactId>
417+
</dependency>
418+
<dependency>
419+
<groupId>org.yaml</groupId>
420+
<artifactId>snakeyaml</artifactId>
421+
</dependency>
422+
<dependency>
423+
<groupId>org.apache.maven</groupId>
424+
<artifactId>maven-project</artifactId>
425+
</dependency>
426+
<dependency>
427+
<groupId>junit</groupId>
428+
<artifactId>junit</artifactId>
429+
</dependency>
430+
<dependency>
431+
<groupId>org.codehaus.plexus</groupId>
432+
<artifactId>plexus-utils</artifactId>
433+
</dependency>
434+
<dependency>
435+
<groupId>org.antlr</groupId>
436+
<artifactId>antlr-runtime</artifactId>
437+
</dependency>
385438
</dependencies>
386439

387440
<build>
@@ -438,7 +491,7 @@ under the License.
438491
<plugin>
439492
<groupId>org.sonatype.plugins</groupId>
440493
<artifactId>nexus-staging-maven-plugin</artifactId>
441-
<version>1.6.2</version>
494+
<version>1.6.12</version>
442495
<extensions>true</extensions>
443496
<configuration>
444497
<serverId>sonatype-nexus-staging</serverId>
@@ -449,35 +502,35 @@ under the License.
449502
<plugin>
450503
<groupId>org.apache.maven.plugins</groupId>
451504
<artifactId>maven-dependency-plugin</artifactId>
452-
<version>3.1.2</version>
505+
<version>${dependencyPluginVersion}</version>
453506
<executions>
454507
<execution>
455508
<id>analyze</id>
456509
<goals>
457510
<goal>analyze-only</goal>
458511
</goals>
459512
<configuration>
460-
<failOnWarning>false</failOnWarning>
513+
<failOnWarning>true</failOnWarning>
461514
</configuration>
462515
</execution>
463516
</executions>
464517
</plugin>
465518
<plugin>
466519
<groupId>org.apache.maven.plugins</groupId>
467520
<artifactId>maven-enforcer-plugin</artifactId>
468-
<version>3.0.0-M3</version>
521+
<version>3.0.0</version>
469522
<executions>
470523
<execution>
471524
<id>enforce</id>
472525
<configuration>
473526
<rules>
474527
<requireMavenVersion>
475-
<!--Any 3.6 version - See http://maven.apache.org/enforcer/enforcer-rules/versionRanges.html for an explanation of version ranges-->
476-
<version>[3.6,)</version>
477-
<message>requires maven 3.6.x</message>
528+
<!--Any See http://maven.apache.org/enforcer/enforcer-rules/versionRanges.html for an explanation of version ranges-->
529+
<version>[${maven.version},)</version>
530+
<message>requires maven ${maven.version}</message>
478531
</requireMavenVersion>
479532
<requireJavaVersion>
480-
<!--Any 1.8 version - See http://maven.apache.org/enforcer/enforcer-rules/versionRanges.html for an explanation of version ranges-->
533+
<!--Any See http://maven.apache.org/enforcer/enforcer-rules/versionRanges.html for an explanation of version ranges-->
481534
<version>[${java.version},)</version>
482535
<message>requires Java ${java.version}</message>
483536
</requireJavaVersion>
@@ -528,7 +581,7 @@ under the License.
528581
<plugin>
529582
<groupId>org.apache.maven.plugins</groupId>
530583
<artifactId>maven-site-plugin</artifactId>
531-
<version>3.3</version>
584+
<version>3.11.0</version>
532585
</plugin>
533586
<plugin>
534587
<groupId>org.codehaus.mojo</groupId>
@@ -544,7 +597,7 @@ under the License.
544597
<plugin>
545598
<groupId>org.apache.maven.plugins</groupId>
546599
<artifactId>maven-project-info-reports-plugin</artifactId>
547-
<version>2.8.1</version>
600+
<version>3.2.2</version>
548601
</plugin>
549602
</plugins>
550603
</reporting>
@@ -565,8 +618,11 @@ under the License.
565618
<plugin>
566619
<groupId>org.apache.maven.plugins</groupId>
567620
<artifactId>maven-javadoc-plugin</artifactId>
621+
<version>3.1.1</version>
568622
<configuration>
569-
<additionalparam>-Xdoclint:none</additionalparam>
623+
<additionalJOptions>
624+
<additionalJOption>-Xdoclint:none</additionalJOption>
625+
</additionalJOptions>
570626
</configuration>
571627
</plugin>
572628
</plugins>

‎src/it/smoke/pom.xml

Lines changed: 70 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,14 @@ under the License.
2222
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2323
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
2424
<modelVersion>4.0.0</modelVersion>
25+
2526
<groupId>test</groupId>
2627
<artifactId>test-maven-plugin</artifactId>
2728
<version>0.1-SNAPSHOT</version>
2829
<packaging>jar</packaging>
2930

3031
<prerequisites>
31-
<maven>2.0</maven>
32+
<maven>3.6.0</maven>
3233
</prerequisites>
3334

3435
<properties>
@@ -40,23 +41,90 @@ under the License.
4041
<groupId>org.apache.cassandra</groupId>
4142
<artifactId>cassandra-all</artifactId>
4243
<version>@cassandraVersion@</version>
44+
<scope>test</scope>
45+
<exclusions>
46+
<exclusion>
47+
<groupId>org.yaml</groupId>
48+
<artifactId>snakeyaml</artifactId>
49+
</exclusion>
50+
<exclusion>
51+
<groupId>com.google.guava</groupId>
52+
<artifactId>guava</artifactId>
53+
</exclusion>
54+
<exclusion>
55+
<groupId>org.slf4j</groupId>
56+
<artifactId>*</artifactId>
57+
</exclusion>
58+
<exclusion>
59+
<groupId>org.apache.thrift</groupId>
60+
<artifactId>libthrift</artifactId>
61+
</exclusion>
62+
<exclusion>
63+
<groupId>commons-codec</groupId>
64+
<artifactId>commons-codec</artifactId>
65+
</exclusion>
66+
</exclusions>
67+
</dependency>
68+
<dependency>
69+
<groupId>org.apache.httpcomponents</groupId>
70+
<artifactId>httpcore</artifactId>
71+
<version>4.4.10</version>
4372
</dependency>
4473
<dependency>
4574
<groupId>org.apache.cassandra</groupId>
4675
<artifactId>cassandra-thrift</artifactId>
4776
<version>@cassandraVersion@</version>
77+
<scope>test</scope>
78+
<exclusions>
79+
<exclusion>
80+
<groupId>com.google.guava</groupId>
81+
<artifactId>guava</artifactId>
82+
</exclusion>
83+
<exclusion>
84+
<groupId>org.slf4j</groupId>
85+
<artifactId>*</artifactId>
86+
</exclusion>
87+
<exclusion>
88+
<groupId>org.apache.thrift</groupId>
89+
<artifactId>libthrift</artifactId>
90+
</exclusion>
91+
</exclusions>
92+
</dependency>
93+
<dependency>
94+
<groupId>org.apache.thrift</groupId>
95+
<artifactId>libthrift</artifactId>
96+
<version>0.12.0</version>
4897
</dependency>
4998
<dependency>
5099
<groupId>junit</groupId>
51100
<artifactId>junit</artifactId>
52-
<version>4.13.1</version>
101+
<version>4.13.2</version>
53102
<scope>test</scope>
54103
</dependency>
55104
<dependency>
56105
<groupId>me.prettyprint</groupId>
57106
<artifactId>hector-core</artifactId>
58107
<version>1.0-3</version>
59108
<scope>test</scope>
109+
<exclusions>
110+
<exclusion>
111+
<groupId>org.apache.cassandra</groupId>
112+
<artifactId>cassandra-thrift</artifactId>
113+
</exclusion>
114+
<exclusion>
115+
<groupId>com.google.guava</groupId>
116+
<artifactId>guava</artifactId>
117+
</exclusion>
118+
<exclusion>
119+
<groupId>org.slf4j</groupId>
120+
<artifactId>*</artifactId>
121+
</exclusion>
122+
</exclusions>
123+
</dependency>
124+
<dependency>
125+
<groupId>org.slf4j</groupId>
126+
<artifactId>slf4j-api</artifactId>
127+
<version>@slf4jVersion@</version>
60128
</dependency>
61129
</dependencies>
62130

‎src/it/smoke/src/test/java/smoke/SmokeIT.java

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,24 +29,20 @@
2929
import java.util.AbstractMap;
3030
import java.util.Map;
3131

32-
import static org.junit.Assert.*;
33-
import static org.junit.matchers.JUnitMatchers.*;
32+
import static org.junit.Assert.assertThat;
33+
import static org.junit.matchers.JUnitMatchers.hasItem;
3434

35-
public class SmokeIT
36-
{
35+
public class SmokeIT {
3736
@Test
38-
public void connectToKeyspace() throws Exception
39-
{
40-
TTransport tr = new TFramedTransport(new TSocket("localhost", Integer.getInteger( "rpcPort", 9160 )));
37+
public void connectToKeyspace() throws Exception {
38+
TTransport tr = new TFramedTransport(new TSocket("localhost", Integer.getInteger("rpcPort", 9160)));
4139
TProtocol proto = new TBinaryProtocol(tr);
4240
Cassandra.Client client = new Cassandra.Client(proto);
4341
tr.open();
44-
try
45-
{
42+
try {
4643
assertThat(client.describe_keyspace("testkeyspace").getStrategy_options().entrySet(),
47-
hasItem((Map.Entry<String, String>)new AbstractMap.SimpleEntry<String,String>("replication_factor","1")));
48-
} finally
49-
{
44+
hasItem((Map.Entry<String, String>) new AbstractMap.SimpleEntry<>("replication_factor", "1")));
45+
} finally {
5046
tr.close();
5147
}
5248
}

0 commit comments

Comments
 (0)