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

Commit 17501da

Browse files
mike-unitskyimike-unitskyi
authored
EMO-6858 upgrade C* to 3.0.25 (#21)
1 parent fd85792 commit 17501da

35 files changed

+327
-505
lines changed

‎README.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,18 @@
44

55
This is the Bazaarvoice's fork of the [cassandra-maven-plugin](http://www.mojohaus.org/cassandra-maven-plugin/).
66

7+
## Testing
8+
```bash
9+
mvn -e clean verify -Ddependency-check.skip=true -Prun-its
10+
```
11+
12+
## Running
13+
```bash
14+
mvn clean install
15+
16+
mvn com.bazaarvoice.maven.plugins:cassandra-maven-plugin:${version}:start -Dcassandra.rpcPort=19160 -Dcassandra.jmxPort=17199 -Dcassandra.storagePort=17000 -Dcassandra.stopPort=18081
17+
```
18+
719
## Releasing
820

921
* Make sure `gpg-agent` is running.

‎pom.xml

Lines changed: 35 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ under the License.
3131

3232
<groupId>com.bazaarvoice.maven.plugins</groupId>
3333
<artifactId>cassandra-maven-plugin</artifactId>
34-
<version>2.2.19-1-SNAPSHOT</version>
34+
<version>3.0.25-SNAPSHOT</version>
3535
<packaging>maven-plugin</packaging>
3636

3737
<name>BV Customized Version of Mojo's Cassandra Maven Plugin</name>
@@ -110,10 +110,9 @@ under the License.
110110

111111
<properties>
112112
<mavenVersion>2.2.1</mavenVersion>
113-
<cassandraVersion>2.2.19</cassandraVersion>
114-
<slf4jVersion>1.7.12</slf4jVersion>
115-
<log4jVersion>2.1</log4jVersion>
116-
<commonsLoggingVersion>1.1.1</commonsLoggingVersion>
113+
<cassandraVersion>3.0.25</cassandraVersion>
114+
<slf4jVersion>1.7.25</slf4jVersion>
115+
<logback.version>1.1.3</logback.version>
117116
<cleanPluginVersion>2.5</cleanPluginVersion>
118117
<compilerPluginVersion>3.8.1</compilerPluginVersion>
119118
<deployPluginVersion>2.7</deployPluginVersion>
@@ -147,20 +146,17 @@ under the License.
147146
<groupId>log4j</groupId>
148147
<artifactId>log4j</artifactId>
149148
</exclusion>
150-
<exclusion>
151-
<groupId>ch.qos.logback</groupId>
152-
<artifactId>logback-core</artifactId>
153-
</exclusion>
154-
<exclusion>
155-
<groupId>ch.qos.logback</groupId>
156-
<artifactId>logback-classic</artifactId>
157-
</exclusion>
158149
</exclusions>
159150
</dependency>
151+
<dependency>
152+
<groupId>org.apache.cassandra</groupId>
153+
<artifactId>cassandra-thrift</artifactId>
154+
<version>${cassandraVersion}</version>
155+
</dependency>
160156
<dependency>
161157
<groupId>net.java.dev.jna</groupId>
162158
<artifactId>jna</artifactId>
163-
<version>4.1.0</version>
159+
<version>4.2.2</version>
164160
</dependency>
165161
<dependency>
166162
<groupId>org.yaml</groupId>
@@ -170,7 +166,7 @@ under the License.
170166
<dependency>
171167
<groupId>org.apache.thrift</groupId>
172168
<artifactId>libthrift</artifactId>
173-
<version>0.9.2</version>
169+
<version>0.12.0</version>
174170
</dependency>
175171
<dependency>
176172
<groupId>commons-cli</groupId>
@@ -209,6 +205,11 @@ under the License.
209205
<artifactId>log4j-over-slf4j</artifactId>
210206
<version>${slf4jVersion}</version>
211207
</dependency>
208+
<dependency>
209+
<groupId>ch.qos.logback</groupId>
210+
<artifactId>logback-classic</artifactId>
211+
<version>${logback.version}</version>
212+
</dependency>
212213
<dependency>
213214
<groupId>org.apache.maven</groupId>
214215
<artifactId>maven-project</artifactId>
@@ -282,6 +283,16 @@ under the License.
282283
<groupId>org.codehaus.plexus</groupId>
283284
<artifactId>plexus-container-default</artifactId>
284285
<version>1.1.0</version>
286+
<exclusions>
287+
<exclusion>
288+
<groupId>log4j</groupId>
289+
<artifactId>log4j</artifactId>
290+
</exclusion>
291+
<exclusion>
292+
<groupId>commons-logging</groupId>
293+
<artifactId>commons-logging-api</artifactId>
294+
</exclusion>
295+
</exclusions>
285296
</dependency>
286297
<dependency>
287298
<groupId>org.apache.commons</groupId>
@@ -309,37 +320,23 @@ under the License.
309320
<dependency>
310321
<groupId>org.cassandraunit</groupId>
311322
<artifactId>cassandra-unit</artifactId>
312-
<version>2.2.2.1</version>
323+
<version>1.0.3.1</version>
313324
<exclusions>
314325
<exclusion>
315326
<groupId>org.slf4j</groupId>
316327
<artifactId>slf4j-log4j12</artifactId>
317328
</exclusion>
329+
<exclusion>
330+
<groupId>org.apache.cassandra</groupId>
331+
<artifactId>cassandra-all</artifactId>
332+
</exclusion>
318333
</exclusions>
319334
</dependency>
320335
<dependency>
321336
<groupId>commons-lang</groupId>
322337
<artifactId>commons-lang</artifactId>
323338
<version>2.6</version>
324339
</dependency>
325-
<dependency>
326-
<groupId>commons-logging</groupId>
327-
<artifactId>commons-logging</artifactId>
328-
<version>${commonsLoggingVersion}</version>
329-
<scope>test</scope>
330-
</dependency>
331-
<dependency>
332-
<groupId>org.apache.logging.log4j</groupId>
333-
<artifactId>log4j-slf4j-impl</artifactId>
334-
<version>${log4jVersion}</version>
335-
<scope>test</scope>
336-
</dependency>
337-
<dependency>
338-
<groupId>org.apache.logging.log4j</groupId>
339-
<artifactId>log4j-core</artifactId>
340-
<version>${log4jVersion}</version>
341-
<scope>test</scope>
342-
</dependency>
343340
</dependencies>
344341
</dependencyManagement>
345342

@@ -348,6 +345,10 @@ under the License.
348345
<groupId>org.apache.cassandra</groupId>
349346
<artifactId>cassandra-all</artifactId>
350347
</dependency>
348+
<dependency>
349+
<groupId>org.apache.cassandra</groupId>
350+
<artifactId>cassandra-thrift</artifactId>
351+
</dependency>
351352
<dependency>
352353
<groupId>org.cassandraunit</groupId>
353354
<artifactId>cassandra-unit</artifactId>

‎src/cassandra/cql/load.cql

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
create keyspace TestKeyspaceWithSpace with replication = {'class':'SimpleStrategy', 'replication_factor':1};
2+
3+
use TestKeyspaceWithSpace;
4+
create table Test (key uuid PRIMARY KEY);

‎src/it/smoke/pom.xml

Lines changed: 14 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -40,21 +40,22 @@ under the License.
4040
<groupId>org.apache.cassandra</groupId>
4141
<artifactId>cassandra-all</artifactId>
4242
<version>@cassandraVersion@</version>
43-
<exclusions>
44-
<exclusion>
45-
<groupId>ch.qos.logback</groupId>
46-
<artifactId>logback-core</artifactId>
47-
</exclusion>
48-
<exclusion>
49-
<groupId>ch.qos.logback</groupId>
50-
<artifactId>logback-classic</artifactId>
51-
</exclusion>
52-
</exclusions>
43+
</dependency>
44+
<dependency>
45+
<groupId>org.apache.cassandra</groupId>
46+
<artifactId>cassandra-thrift</artifactId>
47+
<version>@cassandraVersion@</version>
5348
</dependency>
5449
<dependency>
5550
<groupId>junit</groupId>
5651
<artifactId>junit</artifactId>
57-
<version>4.8.1</version>
52+
<version>4.12</version>
53+
<scope>test</scope>
54+
</dependency>
55+
<dependency>
56+
<groupId>me.prettyprint</groupId>
57+
<artifactId>hector-core</artifactId>
58+
<version>1.0-3</version>
5859
<scope>test</scope>
5960
</dependency>
6061
</dependencies>
@@ -69,8 +70,8 @@ under the License.
6970
<artifactId>maven-compiler-plugin</artifactId>
7071
<version>@compilerPluginVersion@</version>
7172
<configuration>
72-
<source>1.6</source>
73-
<target>1.6</target>
73+
<source>1.8</source>
74+
<target>1.8</target>
7475
</configuration>
7576
</plugin>
7677
<plugin>
@@ -135,16 +136,6 @@ under the License.
135136
</execution>
136137
</executions>
137138
<dependencies>
138-
<dependency>
139-
<groupId>org.apache.logging.log4j</groupId>
140-
<artifactId>log4j-slf4j-impl</artifactId>
141-
<version>@log4jVersion@</version>
142-
</dependency>
143-
<dependency>
144-
<groupId>org.apache.logging.log4j</groupId>
145-
<artifactId>log4j-core</artifactId>
146-
<version>@log4jVersion@</version>
147-
</dependency>
148139
</dependencies>
149140
<configuration>
150141
<loadAfterFirstStart>false</loadAfterFirstStart>

‎src/it/smoke/src/cassandra/cli/load.script

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎src/it/smoke/src/cassandra/cql/load.cql

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
create keyspace TestKeyspace
2-
with strategy_class = 'SimpleStrategy'
3-
and strategy_options:replication_factor = 1;
1+
create keyspace TestKeyspace with replication = {'class':'SimpleStrategy', 'replication_factor':1};
42

53
use TestKeyspace;
6-
create columnfamily Test (key uuid PRIMARY KEY) with comparator='UTF8Type';
4+
create table Test (key uuid PRIMARY KEY);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public void connectToKeyspace() throws Exception
4343
tr.open();
4444
try
4545
{
46-
assertThat(client.describe_keyspace("TestKeyspace").getStrategy_options().entrySet(),
46+
assertThat(client.describe_keyspace("testkeyspace").getStrategy_options().entrySet(),
4747
hasItem((Map.Entry<String, String>)new AbstractMap.SimpleEntry<String,String>("replication_factor","1")));
4848
} finally
4949
{

‎src/it/spaces in path/pom.xml

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -40,21 +40,22 @@ under the License.
4040
<groupId>org.apache.cassandra</groupId>
4141
<artifactId>cassandra-all</artifactId>
4242
<version>@cassandraVersion@</version>
43-
<exclusions>
44-
<exclusion>
45-
<groupId>ch.qos.logback</groupId>
46-
<artifactId>logback-core</artifactId>
47-
</exclusion>
48-
<exclusion>
49-
<groupId>ch.qos.logback</groupId>
50-
<artifactId>logback-classic</artifactId>
51-
</exclusion>
52-
</exclusions>
43+
</dependency>
44+
<dependency>
45+
<groupId>org.apache.cassandra</groupId>
46+
<artifactId>cassandra-thrift</artifactId>
47+
<version>@cassandraVersion@</version>
5348
</dependency>
5449
<dependency>
5550
<groupId>junit</groupId>
5651
<artifactId>junit</artifactId>
57-
<version>4.8.1</version>
52+
<version>4.12</version>
53+
<scope>test</scope>
54+
</dependency>
55+
<dependency>
56+
<groupId>me.prettyprint</groupId>
57+
<artifactId>hector-core</artifactId>
58+
<version>1.0-3</version>
5859
<scope>test</scope>
5960
</dependency>
6061
</dependencies>
@@ -69,8 +70,8 @@ under the License.
6970
<artifactId>maven-compiler-plugin</artifactId>
7071
<version>@compilerPluginVersion@</version>
7172
<configuration>
72-
<source>1.6</source>
73-
<target>1.6</target>
73+
<source>1.8</source>
74+
<target>1.8</target>
7475
</configuration>
7576
</plugin>
7677
<plugin>

‎src/it/spaces in path/src/cassandra/cli/load.script

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎src/it/spaces in path/src/cassandra/cql/load.cql

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
create keyspace TestKeyspaceWithSpace
2-
with strategy_class = 'SimpleStrategy'
3-
and strategy_options:replication_factor = 1;
1+
create keyspace TestKeyspaceWithSpace with replication = {'class':'SimpleStrategy', 'replication_factor':1};
42

53
use TestKeyspaceWithSpace;
6-
create columnfamily Test (key uuid PRIMARY KEY) with comparator='UTF8Type';
4+
create table Test (key uuid PRIMARY KEY);

‎src/it/spaces in path/src/test/java/smoke/SmokeIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public void connectToKeyspace() throws Exception
4343
tr.open();
4444
try
4545
{
46-
assertThat(client.describe_keyspace("TestKeyspaceWithSpace").getStrategy_options().entrySet(),
46+
assertThat(client.describe_keyspace("testkeyspacewithspace").getStrategy_options().entrySet(),
4747
hasItem((Map.Entry<String, String>)new AbstractMap.SimpleEntry<String,String>("replication_factor","1")));
4848
} finally
4949
{

0 commit comments

Comments
 (0)