Skip to content

Commit b1bbe69

Browse files
rjeberhardrjeberhard
committed
Update dependency versions
1 parent 673800b commit b1bbe69

File tree

17 files changed

+102
-97
lines changed

17 files changed

+102
-97
lines changed

‎integration-tests/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
<dependency>
7575
<groupId>javax.jms</groupId>
7676
<artifactId>javax.jms-api</artifactId>
77-
<version>2.0</version>
77+
<version>2.0.1</version>
7878
</dependency>
7979
</dependencies>
8080

@@ -149,7 +149,7 @@
149149
<plugin>
150150
<groupId>org.apache.maven.plugins</groupId>
151151
<artifactId>maven-failsafe-plugin</artifactId>
152-
<version>2.20.1</version>
152+
<version>2.22.1</version>
153153
<configuration> <!-- run tests in parallel -->
154154
<encoding>UTF-8</encoding>
155155
<argLine>${failsafeArgLine}</argLine>

‎integration-tests/src/test/java/oracle/kubernetes/operator/utils/K8sTestUtils.java

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,10 @@ public void verifyPods(String namespace, String labelSelectors, int expected) th
8989
V1PodList v1PodList =
9090
coreV1Api.listNamespacedPod(
9191
namespace,
92+
Boolean.FALSE,
9293
Boolean.FALSE.toString(),
9394
null,
9495
null,
95-
Boolean.FALSE,
9696
labelSelectors,
9797
null,
9898
null,
@@ -202,9 +202,7 @@ public void verifyIngresses(
202202
// TODO verify {domainUID}-cluster-1
203203
assertEquals(
204204
"Number of labeled ingress", labeledIngressList.getItems().size(), expectedLabeled);
205-
labeledIngressList
206-
.getItems()
207-
.stream()
205+
labeledIngressList.getItems().stream()
208206
.forEach(li -> li.getMetadata().getNamespace().equals(domainNs));
209207
V1beta1IngressList traefikIngressList =
210208
extensionsV1beta1Api.listIngressForAllNamespaces(
@@ -218,9 +216,7 @@ public void verifyIngresses(
218216
null,
219217
Boolean.FALSE);
220218
assertEquals("Number of Traefik ingress", traefikIngressList.getItems().size(), 1);
221-
traefikIngressList
222-
.getItems()
223-
.stream()
219+
traefikIngressList.getItems().stream()
224220
.forEach(ti -> ti.getMetadata().getNamespace().equals(domainNs));
225221
}
226222

@@ -303,10 +299,10 @@ public void verifySecrets(String secretName, int expected) throws Exception {
303299
public void verifyPvs(String labelSelectors, int expected) throws Exception {
304300
V1PersistentVolumeList v1PersistentVolumeList =
305301
coreV1Api.listPersistentVolume(
302+
Boolean.TRUE,
306303
Boolean.FALSE.toString(),
307304
null,
308305
null,
309-
Boolean.TRUE,
310306
labelSelectors,
311307
null,
312308
null,
@@ -318,10 +314,10 @@ public void verifyPvs(String labelSelectors, int expected) throws Exception {
318314
public void verifyNoClusterRoles(String domain1Ls) throws Exception {
319315
V1ClusterRoleList v1ClusterRoleList =
320316
rbacAuthorizationV1Api.listClusterRole(
317+
Boolean.TRUE,
321318
Boolean.FALSE.toString(),
322319
null,
323320
null,
324-
Boolean.TRUE,
325321
domain1Ls,
326322
null,
327323
null,
@@ -333,10 +329,10 @@ public void verifyNoClusterRoles(String domain1Ls) throws Exception {
333329
public void verifyNoClusterRoleBindings(String labelSelectors) throws Exception {
334330
V1ClusterRoleBindingList v1ClusterRoleBindingList =
335331
rbacAuthorizationV1Api.listClusterRoleBinding(
332+
Boolean.TRUE,
336333
Boolean.FALSE.toString(),
337334
null,
338335
null,
339-
Boolean.TRUE,
340336
labelSelectors,
341337
null,
342338
null,

‎json-schema-maven-plugin/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<dependency>
2222
<groupId>org.apache.maven</groupId>
2323
<artifactId>maven-plugin-api</artifactId>
24-
<version>2.0</version>
24+
<version>3.6.0</version>
2525
</dependency>
2626
<dependency>
2727
<groupId>org.apache.maven.plugin-tools</groupId>
@@ -41,7 +41,7 @@
4141
<dependency>
4242
<groupId>org.ow2.asm</groupId>
4343
<artifactId>asm-all</artifactId>
44-
<version>5.0.3</version>
44+
<version>5.2</version>
4545
<scope>test</scope>
4646
</dependency>
4747
</dependencies>

‎json-schema-maven-plugin/src/main/java/oracle/kubernetes/json/mojo/JsonSchemaMojo.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,9 @@
2020
import org.apache.maven.plugins.annotations.ResolutionScope;
2121

2222
@Mojo(
23-
name = "generate",
24-
defaultPhase = LifecyclePhase.PROCESS_CLASSES,
25-
requiresDependencyResolution = ResolutionScope.COMPILE
26-
)
23+
name = "generate",
24+
defaultPhase = LifecyclePhase.PROCESS_CLASSES,
25+
requiresDependencyResolution = ResolutionScope.COMPILE)
2726
public class JsonSchemaMojo extends AbstractMojo {
2827

2928
private static final String DOT = "\\.";

‎kubernetes/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<plugin>
3232
<groupId>com.coveo</groupId>
3333
<artifactId>fmt-maven-plugin</artifactId>
34-
<version>2.4.0</version>
34+
<version>2.8</version>
3535
<executions>
3636
<execution>
3737
<phase>test</phase>
@@ -113,7 +113,7 @@
113113
<plugin>
114114
<groupId>org.apache.maven.plugins</groupId>
115115
<artifactId>maven-failsafe-plugin</artifactId>
116-
<version>2.22.0</version>
116+
<version>2.22.1</version>
117117
<executions>
118118
<execution>
119119
<goals>

‎model/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
<plugin>
6666
<groupId>com.coveo</groupId>
6767
<artifactId>fmt-maven-plugin</artifactId>
68-
<version>2.4.0</version>
68+
<version>2.8</version>
6969
<executions>
7070
<execution>
7171
<phase>test</phase>
@@ -178,7 +178,7 @@
178178
<dependency>
179179
<groupId>com.kjetland</groupId>
180180
<artifactId>mbknor-jackson-jsonschema_2.12</artifactId>
181-
<version>1.0.31</version>
181+
<version>1.0.33</version>
182182
</dependency>
183183
</dependencies>
184184

‎operator/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@
148148
<plugin>
149149
<groupId>com.coveo</groupId>
150150
<artifactId>fmt-maven-plugin</artifactId>
151-
<version>2.4.0</version>
151+
<version>2.8</version>
152152
<executions>
153153
<execution>
154154
<phase>test</phase>
@@ -225,7 +225,7 @@
225225
<dependency>
226226
<groupId>org.glassfish</groupId>
227227
<artifactId>javax.json</artifactId>
228-
<version>1.1.2</version>
228+
<version>1.1.4</version>
229229
</dependency>
230230
<dependency>
231231
<groupId>joda-time</groupId>
@@ -235,7 +235,7 @@
235235
<dependency>
236236
<groupId>org.apache.commons</groupId>
237237
<artifactId>commons-lang3</artifactId>
238-
<version>3.7</version>
238+
<version>3.8.1</version>
239239
</dependency>
240240

241241
<!-- Grizzly & jersey server side code -->
@@ -291,7 +291,7 @@
291291
<dependency>
292292
<groupId>javax.xml.bind</groupId>
293293
<artifactId>jaxb-api</artifactId>
294-
<version>2.3.0</version>
294+
<version>2.3.1</version>
295295
</dependency>
296296

297297
<!-- for mvn exec:java -->

‎operator/src/main/java/oracle/kubernetes/operator/DomainStatusUpdater.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -203,8 +203,7 @@ private boolean isPodFailed(ServerKubernetesObjects sko) {
203203
}
204204

205205
Map<String, ServerStatus> getServerStatuses() {
206-
return getServerNames()
207-
.stream()
206+
return getServerNames().stream()
208207
.collect(Collectors.toMap(Function.identity(), this::createServerStatus));
209208
}
210209

@@ -231,8 +230,7 @@ Integer getReplicaSetting() {
231230
}
232231

233232
private Map<String, Long> getClusterCounts() {
234-
return getServerNames()
235-
.stream()
233+
return getServerNames().stream()
236234
.map(this::getClusterNameFromPod)
237235
.filter(Objects::nonNull)
238236
.collect(Collectors.groupingBy(Function.identity(), Collectors.counting()));

‎operator/src/main/java/oracle/kubernetes/operator/builders/WatchBuilder.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,10 @@ public Call apply(ApiClient client, CallParams callParams) {
9898
return new CoreV1Api(client)
9999
.listNamespacedServiceCall(
100100
namespace,
101+
callParams.getIncludeUninitialized(),
101102
callParams.getPretty(),
102103
START_LIST,
103104
callParams.getFieldSelector(),
104-
callParams.getIncludeUninitialized(),
105105
callParams.getLabelSelector(),
106106
callParams.getLimit(),
107107
callParams.getResourceVersion(),
@@ -143,10 +143,10 @@ public Call apply(ApiClient client, CallParams callParams) {
143143
return new CoreV1Api(client)
144144
.listNamespacedPodCall(
145145
namespace,
146+
callParams.getIncludeUninitialized(),
146147
callParams.getPretty(),
147148
START_LIST,
148149
callParams.getFieldSelector(),
149-
callParams.getIncludeUninitialized(),
150150
callParams.getLabelSelector(),
151151
callParams.getLimit(),
152152
callParams.getResourceVersion(),
@@ -188,10 +188,10 @@ public Call apply(ApiClient client, CallParams callParams) {
188188
return new BatchV1Api(client)
189189
.listNamespacedJobCall(
190190
namespace,
191+
callParams.getIncludeUninitialized(),
191192
callParams.getPretty(),
192193
START_LIST,
193194
callParams.getFieldSelector(),
194-
callParams.getIncludeUninitialized(),
195195
callParams.getLabelSelector(),
196196
callParams.getLimit(),
197197
callParams.getResourceVersion(),
@@ -233,10 +233,10 @@ public Call apply(ApiClient client, CallParams callParams) {
233233
return new CoreV1Api(client)
234234
.listNamespacedEventCall(
235235
namespace,
236+
callParams.getIncludeUninitialized(),
236237
callParams.getPretty(),
237238
START_LIST,
238239
callParams.getFieldSelector(),
239-
callParams.getIncludeUninitialized(),
240240
callParams.getLabelSelector(),
241241
callParams.getLimit(),
242242
callParams.getResourceVersion(),
@@ -326,10 +326,10 @@ public Call apply(ApiClient client, CallParams callParams) {
326326
return new CoreV1Api(client)
327327
.listNamespacedConfigMapCall(
328328
namespace,
329+
callParams.getIncludeUninitialized(),
329330
callParams.getPretty(),
330331
START_LIST,
331332
callParams.getFieldSelector(),
332-
callParams.getIncludeUninitialized(),
333333
callParams.getLabelSelector(),
334334
callParams.getLimit(),
335335
callParams.getResourceVersion(),

0 commit comments

Comments
 (0)