Skip to content

Commit c795820

Browse files
olim7tolim7t
committed
JAVA-2187: Update dependency versions
1 parent c6d3e0a commit c795820

5 files changed

Lines changed: 21 additions & 18 deletions

File tree

‎core/revapi.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
"exclude": [
1010
"com\\.datastax\\.oss\\.protocol\\.internal(\\..+)?",
1111
"com\\.datastax\\.oss\\.driver\\.internal(\\..+)?",
12-
"com\\.datastax\\.oss\\.driver\\.shaded(\\..+)?"
12+
"com\\.datastax\\.oss\\.driver\\.shaded(\\..+)?",
13+
"org\\.assertj(\\..+)?"
1314
]
1415
}
1516
}

‎core/src/test/java/com/datastax/oss/driver/internal/core/util/collection/QueryPlanTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,10 @@ public void should_return_iterator() {
6868
queryPlan.poll();
6969
Iterator<Node> iterator00 = queryPlan.iterator();
7070

71-
assertThat(iterator3).containsExactly(node1, node2, node3);
72-
assertThat(iterator2).containsExactly(node2, node3);
73-
assertThat(iterator1).containsExactly(node3);
74-
assertThat(iterator0).isEmpty();
75-
assertThat(iterator00).isEmpty();
71+
assertThat(iterator3).toIterable().containsExactly(node1, node2, node3);
72+
assertThat(iterator2).toIterable().containsExactly(node2, node3);
73+
assertThat(iterator1).toIterable().containsExactly(node3);
74+
assertThat(iterator0).toIterable().isEmpty();
75+
assertThat(iterator00).toIterable().isEmpty();
7676
}
7777
}

‎pom.xml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -46,16 +46,16 @@
4646
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
4747
<config.version>1.3.3</config.version>
4848
<guava.version>25.1-jre</guava.version>
49-
<hdrhistogram.version>2.1.10</hdrhistogram.version>
50-
<metrics.version>4.0.2</metrics.version>
49+
<hdrhistogram.version>2.1.11</hdrhistogram.version>
50+
<metrics.version>4.0.5</metrics.version>
5151
<native-protocol.version>1.4.4</native-protocol.version>
52-
<netty.version>4.1.27.Final</netty.version>
53-
<slf4j.version>1.7.25</slf4j.version>
52+
<netty.version>4.1.34.Final</netty.version>
53+
<slf4j.version>1.7.26</slf4j.version>
5454
<!-- optional dependencies -->
5555
<snappy.version>1.1.7.2</snappy.version>
56-
<lz4.version>1.4.1</lz4.version>
56+
<lz4.version>1.5.1</lz4.version>
5757
<!-- test dependencies -->
58-
<assertj.version>3.10.0</assertj.version>
58+
<assertj.version>3.12.1</assertj.version>
5959
<commons-exec.version>1.3</commons-exec.version>
6060
<jackson.version>2.9.5</jackson.version>
6161
<junit.version>4.12</junit.version>
@@ -105,7 +105,7 @@
105105
<dependency>
106106
<groupId>com.github.jnr</groupId>
107107
<artifactId>jnr-ffi</artifactId>
108-
<version>2.1.8</version>
108+
<version>2.1.9</version>
109109
</dependency>
110110
<dependency>
111111
<groupId>org.xerial.snappy</groupId>
@@ -120,7 +120,7 @@
120120
<dependency>
121121
<groupId>com.github.jnr</groupId>
122122
<artifactId>jnr-posix</artifactId>
123-
<version>3.0.46</version>
123+
<version>3.0.49</version>
124124
</dependency>
125125
<dependency>
126126
<groupId>io.dropwizard.metrics</groupId>
@@ -140,7 +140,7 @@
140140
<dependency>
141141
<groupId>com.github.spotbugs</groupId>
142142
<artifactId>spotbugs-annotations</artifactId>
143-
<version>3.1.5</version>
143+
<version>3.1.12</version>
144144
</dependency>
145145
<dependency>
146146
<groupId>junit</groupId>
@@ -160,7 +160,7 @@
160160
<dependency>
161161
<groupId>org.mockito</groupId>
162162
<artifactId>mockito-core</artifactId>
163-
<version>2.19.0</version>
163+
<version>2.25.0</version>
164164
</dependency>
165165
<dependency>
166166
<groupId>com.datastax.oss.simulacron</groupId>
@@ -291,12 +291,12 @@
291291
<plugin>
292292
<groupId>org.revapi</groupId>
293293
<artifactId>revapi-maven-plugin</artifactId>
294-
<version>0.10.4</version>
294+
<version>0.10.5</version>
295295
<dependencies>
296296
<dependency>
297297
<groupId>org.revapi</groupId>
298298
<artifactId>revapi-java</artifactId>
299-
<version>0.18.0</version>
299+
<version>0.18.2</version>
300300
</dependency>
301301
</dependencies>
302302
</plugin>

‎query-builder/revapi.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
"com\\.datastax\\.oss\\.protocol\\.internal(\\..+)?",
1111
"com\\.datastax\\.oss\\.driver\\.internal(\\..+)?",
1212
"com\\.datastax\\.oss\\.driver\\.shaded(\\..+)?",
13+
"org\\.assertj(\\..+)?",
1314
// Don't re-check sibling modules that this module depends on
1415
"com\\.datastax\\.oss\\.driver\\.api\\.core(\\..+)?"
1516
]

‎test-infra/revapi.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
"com\\.datastax\\.oss\\.driver\\.internal(\\..+)?",
1212
"com\\.datastax\\.oss\\.driver\\.shaded(\\..+)?",
1313
"com\\.datastax\\.oss\\.simulacron(\\..+)?",
14+
"org\\.assertj(\\..+)?",
1415
// Don't re-check sibling modules that this module depends on
1516
"com\\.datastax\\.oss\\.driver\\.api\\.core(\\..+)?"
1617
]

0 commit comments

Comments
 (0)