Skip to content

Commit 137de9b

Browse files
vinokurigvinokurig
committed
Update the io.fabric8.kubernetes-client dependency from 6.10.0 to the latest 7.1.0
1 parent 27505d6 commit 137de9b

File tree

29 files changed

+419
-13
lines changed

29 files changed

+419
-13
lines changed

‎core/che-core-api-core/pom.xml

+15
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,21 @@
131131
<artifactId>che-core-commons-test</artifactId>
132132
<scope>test</scope>
133133
</dependency>
134+
<dependency>
135+
<groupId>org.eclipse.jetty</groupId>
136+
<artifactId>jetty-security</artifactId>
137+
<scope>test</scope>
138+
</dependency>
139+
<dependency>
140+
<groupId>org.eclipse.jetty</groupId>
141+
<artifactId>jetty-servlet</artifactId>
142+
<scope>test</scope>
143+
</dependency>
144+
<dependency>
145+
<groupId>org.eclipse.jetty</groupId>
146+
<artifactId>jetty-util</artifactId>
147+
<scope>test</scope>
148+
</dependency>
134149
<dependency>
135150
<groupId>org.everrest</groupId>
136151
<artifactId>everrest-assured</artifactId>

‎core/che-core-metrics-core/pom.xml

+15
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,21 @@
100100
<artifactId>jakarta.ws.rs-api</artifactId>
101101
<scope>test</scope>
102102
</dependency>
103+
<dependency>
104+
<groupId>org.eclipse.jetty</groupId>
105+
<artifactId>jetty-security</artifactId>
106+
<scope>test</scope>
107+
</dependency>
108+
<dependency>
109+
<groupId>org.eclipse.jetty</groupId>
110+
<artifactId>jetty-servlet</artifactId>
111+
<scope>test</scope>
112+
</dependency>
113+
<dependency>
114+
<groupId>org.eclipse.jetty</groupId>
115+
<artifactId>jetty-util</artifactId>
116+
<scope>test</scope>
117+
</dependency>
103118
<dependency>
104119
<groupId>org.everrest</groupId>
105120
<artifactId>everrest-assured</artifactId>

‎infrastructures/kubernetes/pom.xml

+31
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,12 @@
6868
<dependency>
6969
<groupId>io.fabric8</groupId>
7070
<artifactId>kubernetes-model-apps</artifactId>
71+
<exclusions>
72+
<exclusion>
73+
<artifactId>javax.annotation</artifactId>
74+
<groupId>javax.annotation-api</groupId>
75+
</exclusion>
76+
</exclusions>
7177
</dependency>
7278
<dependency>
7379
<groupId>io.fabric8</groupId>
@@ -209,6 +215,11 @@
209215
<artifactId>mockwebserver</artifactId>
210216
<scope>test</scope>
211217
</dependency>
218+
<dependency>
219+
<groupId>io.fabric8</groupId>
220+
<artifactId>kubernetes-client</artifactId>
221+
<scope>test</scope>
222+
</dependency>
212223
<dependency>
213224
<groupId>io.fabric8</groupId>
214225
<artifactId>kubernetes-server-mock</artifactId>
@@ -220,6 +231,11 @@
220231
</exclusion>
221232
</exclusions>
222233
</dependency>
234+
<dependency>
235+
<groupId>io.fabric8</groupId>
236+
<artifactId>mockwebserver</artifactId>
237+
<scope>test</scope>
238+
</dependency>
223239
<dependency>
224240
<groupId>io.rest-assured</groupId>
225241
<artifactId>rest-assured</artifactId>
@@ -235,6 +251,21 @@
235251
<artifactId>che-core-sql-schema</artifactId>
236252
<scope>test</scope>
237253
</dependency>
254+
<dependency>
255+
<groupId>org.eclipse.jetty</groupId>
256+
<artifactId>jetty-security</artifactId>
257+
<scope>test</scope>
258+
</dependency>
259+
<dependency>
260+
<groupId>org.eclipse.jetty</groupId>
261+
<artifactId>jetty-servlet</artifactId>
262+
<scope>test</scope>
263+
</dependency>
264+
<dependency>
265+
<groupId>org.eclipse.jetty</groupId>
266+
<artifactId>jetty-util</artifactId>
267+
<scope>test</scope>
268+
</dependency>
238269
<dependency>
239270
<groupId>org.eclipse.persistence</groupId>
240271
<artifactId>org.eclipse.persistence.core</artifactId>

‎infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/devfile/ContainerSearch.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2012-2021 Red Hat, Inc.
2+
* Copyright (c) 2012-2025 Red Hat, Inc.
33
* This program and the accompanying materials are made
44
* available under the terms of the Eclipse Public License 2.0
55
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -102,7 +102,8 @@ private Stream<Container> findContainers(HasMetadata o) {
102102
} else if (o instanceof DeploymentConfig) {
103103
return ((DeploymentConfig) o).getSpec().getTemplate().getSpec().getContainers().stream();
104104
} else if (o instanceof Template) {
105-
return ((Template) o).getObjects().stream().flatMap(this::findContainers);
105+
return ((Template) o)
106+
.getObjects().stream().flatMap((Object t) -> findContainers(((HasMetadata) t)));
106107
} else {
107108
return Stream.empty();
108109
}

‎infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/server/secure/jwtproxy/AbstractJwtProxyProvisioner.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2012-2023 Red Hat, Inc.
2+
* Copyright (c) 2012-2025 Red Hat, Inc.
33
* This program and the accompanying materials are made
44
* available under the terms of the Eclipse Public License 2.0
55
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -312,6 +312,7 @@ private Pod createJwtProxyPod() {
312312
"che-jwtproxy-config-volume",
313313
false,
314314
null,
315+
null,
315316
null))
316317
.withArgs("-config", JWT_PROXY_CONFIG_FOLDER + "/" + JWT_PROXY_CONFIG_FILE)
317318
.addNewEnv()

‎infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/wsplugins/brokerphases/BrokerEnvironmentFactory.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2012-2021 Red Hat, Inc.
2+
* Copyright (c) 2012-2025 Red Hat, Inc.
33
* This program and the accompanying materials are made
44
* available under the terms of the Eclipse Public License 2.0
55
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -203,7 +203,7 @@ private Container newContainer(
203203
.withEnv(envVars);
204204
if (brokerVolumeName != null) {
205205
cb.withVolumeMounts(
206-
new VolumeMount(CONF_FOLDER + "/", null, brokerVolumeName, true, null, null));
206+
new VolumeMount(CONF_FOLDER + "/", null, brokerVolumeName, true, null, null, null));
207207
cb.addToArgs("--metas", CONF_FOLDER + "/" + CONFIG_FILE);
208208
}
209209
Container container = cb.build();

‎infrastructures/openshift/pom.xml

+5
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,11 @@
168168
</exclusion>
169169
</exclusions>
170170
</dependency>
171+
<dependency>
172+
<groupId>io.fabric8</groupId>
173+
<artifactId>mockwebserver</artifactId>
174+
<scope>test</scope>
175+
</dependency>
171176
<dependency>
172177
<groupId>io.fabric8</groupId>
173178
<artifactId>openshift-server-mock</artifactId>

‎multiuser/api/che-multiuser-api-organization/pom.xml

+15
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,21 @@
161161
<artifactId>che-multiuser-sql-schema</artifactId>
162162
<scope>test</scope>
163163
</dependency>
164+
<dependency>
165+
<groupId>org.eclipse.jetty</groupId>
166+
<artifactId>jetty-security</artifactId>
167+
<scope>test</scope>
168+
</dependency>
169+
<dependency>
170+
<groupId>org.eclipse.jetty</groupId>
171+
<artifactId>jetty-servlet</artifactId>
172+
<scope>test</scope>
173+
</dependency>
174+
<dependency>
175+
<groupId>org.eclipse.jetty</groupId>
176+
<artifactId>jetty-util</artifactId>
177+
<scope>test</scope>
178+
</dependency>
164179
<dependency>
165180
<groupId>org.eclipse.persistence</groupId>
166181
<artifactId>org.eclipse.persistence.core</artifactId>

‎multiuser/api/che-multiuser-api-permission/pom.xml

+15
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,21 @@
127127
<artifactId>che-multiuser-sql-schema</artifactId>
128128
<scope>test</scope>
129129
</dependency>
130+
<dependency>
131+
<groupId>org.eclipse.jetty</groupId>
132+
<artifactId>jetty-security</artifactId>
133+
<scope>test</scope>
134+
</dependency>
135+
<dependency>
136+
<groupId>org.eclipse.jetty</groupId>
137+
<artifactId>jetty-servlet</artifactId>
138+
<scope>test</scope>
139+
</dependency>
140+
<dependency>
141+
<groupId>org.eclipse.jetty</groupId>
142+
<artifactId>jetty-util</artifactId>
143+
<scope>test</scope>
144+
</dependency>
130145
<dependency>
131146
<groupId>org.eclipse.persistence</groupId>
132147
<artifactId>org.eclipse.persistence.core</artifactId>

‎multiuser/keycloak/che-multiuser-keycloak-server/pom.xml

+15
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,21 @@
169169
<artifactId>che-multiuser-machine-authentication</artifactId>
170170
<scope>test</scope>
171171
</dependency>
172+
<dependency>
173+
<groupId>org.eclipse.jetty</groupId>
174+
<artifactId>jetty-security</artifactId>
175+
<scope>test</scope>
176+
</dependency>
177+
<dependency>
178+
<groupId>org.eclipse.jetty</groupId>
179+
<artifactId>jetty-servlet</artifactId>
180+
<scope>test</scope>
181+
</dependency>
182+
<dependency>
183+
<groupId>org.eclipse.jetty</groupId>
184+
<artifactId>jetty-util</artifactId>
185+
<scope>test</scope>
186+
</dependency>
172187
<dependency>
173188
<groupId>org.everrest</groupId>
174189
<artifactId>everrest-assured</artifactId>

‎multiuser/machine-auth/che-multiuser-machine-authentication/pom.xml

+15
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,21 @@
168168
<artifactId>che-core-sql-schema</artifactId>
169169
<scope>test</scope>
170170
</dependency>
171+
<dependency>
172+
<groupId>org.eclipse.jetty</groupId>
173+
<artifactId>jetty-security</artifactId>
174+
<scope>test</scope>
175+
</dependency>
176+
<dependency>
177+
<groupId>org.eclipse.jetty</groupId>
178+
<artifactId>jetty-servlet</artifactId>
179+
<scope>test</scope>
180+
</dependency>
181+
<dependency>
182+
<groupId>org.eclipse.jetty</groupId>
183+
<artifactId>jetty-util</artifactId>
184+
<scope>test</scope>
185+
</dependency>
171186
<dependency>
172187
<groupId>org.eclipse.persistence</groupId>
173188
<artifactId>org.eclipse.persistence.jpa</artifactId>

‎multiuser/permission/che-multiuser-permission-devfile/pom.xml

+15
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,21 @@
132132
<artifactId>che-multiuser-sql-schema</artifactId>
133133
<scope>test</scope>
134134
</dependency>
135+
<dependency>
136+
<groupId>org.eclipse.jetty</groupId>
137+
<artifactId>jetty-security</artifactId>
138+
<scope>test</scope>
139+
</dependency>
140+
<dependency>
141+
<groupId>org.eclipse.jetty</groupId>
142+
<artifactId>jetty-servlet</artifactId>
143+
<scope>test</scope>
144+
</dependency>
145+
<dependency>
146+
<groupId>org.eclipse.jetty</groupId>
147+
<artifactId>jetty-util</artifactId>
148+
<scope>test</scope>
149+
</dependency>
135150
<dependency>
136151
<groupId>org.eclipse.persistence</groupId>
137152
<artifactId>org.eclipse.persistence.core</artifactId>

‎multiuser/permission/che-multiuser-permission-factory/pom.xml

+15
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,21 @@
8686
<artifactId>che-core-api-factory-shared</artifactId>
8787
<scope>test</scope>
8888
</dependency>
89+
<dependency>
90+
<groupId>org.eclipse.jetty</groupId>
91+
<artifactId>jetty-security</artifactId>
92+
<scope>test</scope>
93+
</dependency>
94+
<dependency>
95+
<groupId>org.eclipse.jetty</groupId>
96+
<artifactId>jetty-servlet</artifactId>
97+
<scope>test</scope>
98+
</dependency>
99+
<dependency>
100+
<groupId>org.eclipse.jetty</groupId>
101+
<artifactId>jetty-util</artifactId>
102+
<scope>test</scope>
103+
</dependency>
89104
<dependency>
90105
<groupId>org.everrest</groupId>
91106
<artifactId>everrest-assured</artifactId>

‎multiuser/permission/che-multiuser-permission-logger/pom.xml

+15
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,21 @@
8080
<artifactId>che-core-commons-json</artifactId>
8181
<scope>test</scope>
8282
</dependency>
83+
<dependency>
84+
<groupId>org.eclipse.jetty</groupId>
85+
<artifactId>jetty-security</artifactId>
86+
<scope>test</scope>
87+
</dependency>
88+
<dependency>
89+
<groupId>org.eclipse.jetty</groupId>
90+
<artifactId>jetty-servlet</artifactId>
91+
<scope>test</scope>
92+
</dependency>
93+
<dependency>
94+
<groupId>org.eclipse.jetty</groupId>
95+
<artifactId>jetty-util</artifactId>
96+
<scope>test</scope>
97+
</dependency>
8398
<dependency>
8499
<groupId>org.everrest</groupId>
85100
<artifactId>everrest-assured</artifactId>

‎multiuser/permission/che-multiuser-permission-resource/pom.xml

+15
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,21 @@
8383
<artifactId>che-multiuser-api-resource-shared</artifactId>
8484
<scope>test</scope>
8585
</dependency>
86+
<dependency>
87+
<groupId>org.eclipse.jetty</groupId>
88+
<artifactId>jetty-security</artifactId>
89+
<scope>test</scope>
90+
</dependency>
91+
<dependency>
92+
<groupId>org.eclipse.jetty</groupId>
93+
<artifactId>jetty-servlet</artifactId>
94+
<scope>test</scope>
95+
</dependency>
96+
<dependency>
97+
<groupId>org.eclipse.jetty</groupId>
98+
<artifactId>jetty-util</artifactId>
99+
<scope>test</scope>
100+
</dependency>
86101
<dependency>
87102
<groupId>org.everrest</groupId>
88103
<artifactId>everrest-assured</artifactId>

‎multiuser/permission/che-multiuser-permission-system/pom.xml

+15
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,21 @@
7373
<artifactId>rest-assured</artifactId>
7474
<scope>test</scope>
7575
</dependency>
76+
<dependency>
77+
<groupId>org.eclipse.jetty</groupId>
78+
<artifactId>jetty-security</artifactId>
79+
<scope>test</scope>
80+
</dependency>
81+
<dependency>
82+
<groupId>org.eclipse.jetty</groupId>
83+
<artifactId>jetty-servlet</artifactId>
84+
<scope>test</scope>
85+
</dependency>
86+
<dependency>
87+
<groupId>org.eclipse.jetty</groupId>
88+
<artifactId>jetty-util</artifactId>
89+
<scope>test</scope>
90+
</dependency>
7691
<dependency>
7792
<groupId>org.everrest</groupId>
7893
<artifactId>everrest-assured</artifactId>

‎multiuser/permission/che-multiuser-permission-user/pom.xml

+15
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,21 @@
103103
<artifactId>che-core-sql-schema</artifactId>
104104
<scope>test</scope>
105105
</dependency>
106+
<dependency>
107+
<groupId>org.eclipse.jetty</groupId>
108+
<artifactId>jetty-security</artifactId>
109+
<scope>test</scope>
110+
</dependency>
111+
<dependency>
112+
<groupId>org.eclipse.jetty</groupId>
113+
<artifactId>jetty-servlet</artifactId>
114+
<scope>test</scope>
115+
</dependency>
116+
<dependency>
117+
<groupId>org.eclipse.jetty</groupId>
118+
<artifactId>jetty-util</artifactId>
119+
<scope>test</scope>
120+
</dependency>
106121
<dependency>
107122
<groupId>org.eclipse.persistence</groupId>
108123
<artifactId>org.eclipse.persistence.core</artifactId>

0 commit comments

Comments
 (0)