Skip to content

Commit 14361a6

Browse files
committed
IGNITE-27707 Update package dependencies before 2.18 release (#12676)
(cherry picked from commit 5a874bd)
1 parent 094f54c commit 14361a6

11 files changed

Lines changed: 24 additions & 20 deletions

File tree

modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/misc/GridDhtPartitionsStateValidatorBenchmark.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,14 @@
3434
import org.apache.ignite.internal.processors.cache.distributed.dht.topology.GridDhtPartitionTopology;
3535
import org.apache.ignite.internal.processors.cache.distributed.dht.topology.GridDhtPartitionsStateValidator;
3636
import org.jetbrains.annotations.Nullable;
37-
import org.mockito.Matchers;
3837
import org.mockito.Mockito;
3938
import org.openjdk.jmh.annotations.Benchmark;
4039
import org.openjdk.jmh.annotations.Scope;
4140
import org.openjdk.jmh.annotations.Setup;
4241
import org.openjdk.jmh.annotations.State;
4342

43+
import static org.mockito.ArgumentMatchers.any;
44+
import static org.mockito.ArgumentMatchers.anyInt;
4445
import static org.openjdk.jmh.annotations.Scope.Thread;
4546

4647
/** */
@@ -110,7 +111,7 @@ public void setup() {
110111
Mockito.when(cctxMock.localNodeId()).thenReturn(localNodeId);
111112

112113
topologyMock = Mockito.mock(GridDhtPartitionTopology.class);
113-
Mockito.when(topologyMock.partitionState(Matchers.any(), Matchers.anyInt())).thenReturn(GridDhtPartitionState.OWNING);
114+
Mockito.when(topologyMock.partitionState(any(), anyInt())).thenReturn(GridDhtPartitionState.OWNING);
114115
Mockito.when(topologyMock.groupId()).thenReturn(0);
115116

116117
Mockito.when(topologyMock.partitions()).thenReturn(PARTS);

modules/compatibility/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
<dependency>
8181
<groupId>com.thoughtworks.xstream</groupId>
8282
<artifactId>xstream</artifactId>
83-
<version>1.4.8</version>
83+
<version>${xstream.version}</version>
8484
<scope>test</scope>
8585
</dependency>
8686

modules/compress/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@
107107
<dependency>
108108
<groupId>com.thoughtworks.xstream</groupId>
109109
<artifactId>xstream</artifactId>
110-
<version>1.4.8</version>
110+
<version>${xstream.version}</version>
111111
<scope>test</scope>
112112
</dependency>
113113

modules/control-utility/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
<dependency>
101101
<groupId>com.thoughtworks.xstream</groupId>
102102
<artifactId>xstream</artifactId>
103-
<version>1.4.8</version>
103+
<version>${xstream.version}</version>
104104
<scope>test</scope>
105105
</dependency>
106106

modules/core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@
110110
<dependency>
111111
<groupId>com.thoughtworks.xstream</groupId>
112112
<artifactId>xstream</artifactId>
113-
<version>1.4.8</version>
113+
<version>${xstream.version}</version>
114114
<scope>test</scope>
115115
</dependency>
116116

modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionsStateValidatorSelfTest.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,11 @@
3434
import org.jetbrains.annotations.Nullable;
3535
import org.junit.Assert;
3636
import org.junit.Test;
37-
import org.mockito.Matchers;
3837
import org.mockito.Mockito;
3938

39+
import static org.mockito.ArgumentMatchers.any;
40+
import static org.mockito.ArgumentMatchers.anyInt;
41+
4042
/**
4143
* Test correct behaviour of {@link GridDhtPartitionsStateValidator} class.
4244
*/
@@ -57,7 +59,7 @@ public class GridCachePartitionsStateValidatorSelfTest extends GridCommonAbstrac
5759
Mockito.when(cctxMock.localNodeId()).thenReturn(localNodeId);
5860

5961
topologyMock = Mockito.mock(GridDhtPartitionTopology.class);
60-
Mockito.when(topologyMock.partitionState(Matchers.any(), Matchers.anyInt())).thenReturn(GridDhtPartitionState.OWNING);
62+
Mockito.when(topologyMock.partitionState(any(), anyInt())).thenReturn(GridDhtPartitionState.OWNING);
6163
Mockito.when(topologyMock.groupId()).thenReturn(0);
6264
Mockito.when(topologyMock.partitions()).thenReturn(3);
6365

modules/direct-io/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
<dependency>
105105
<groupId>com.thoughtworks.xstream</groupId>
106106
<artifactId>xstream</artifactId>
107-
<version>1.4.8</version>
107+
<version>${xstream.version}</version>
108108
<scope>test</scope>
109109
</dependency>
110110

modules/indexing/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
<dependency>
8787
<groupId>com.thoughtworks.xstream</groupId>
8888
<artifactId>xstream</artifactId>
89-
<version>1.4.8</version>
89+
<version>${xstream.version}</version>
9090
<scope>test</scope>
9191
</dependency>
9292

modules/numa-allocator/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
<dependency>
7272
<groupId>com.thoughtworks.xstream</groupId>
7373
<artifactId>xstream</artifactId>
74-
<version>1.4.8</version>
74+
<version>${xstream.version}</version>
7575
<scope>test</scope>
7676
</dependency>
7777

modules/zookeeper/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@
133133
<dependency>
134134
<groupId>com.thoughtworks.xstream</groupId>
135135
<artifactId>xstream</artifactId>
136-
<version>1.4.8</version>
136+
<version>${xstream.version}</version>
137137
<scope>test</scope>
138138
</dependency>
139139

0 commit comments

Comments
 (0)