Skip to content

Commit 43992e3

Browse files
LightGuardLightGuard
authored
[kie-issues#1821][CVE]-2023-0833 Updating okhttp (#3076)
1 parent b074df0 commit 43992e3

File tree

2 files changed

+96
-0
lines changed
  • kie-server-parent
    • kie-server-controller/kie-server-controller-openshift
    • kie-server-services/kie-server-services-openshift

2 files changed

+96
-0
lines changed

‎kie-server-parent/kie-server-controller/kie-server-controller-openshift/pom.xml‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717
<java.module.name>org.kie.server.controller.openshift</java.module.name>
1818
<!-- Server mock version 4.7.2 doesn't handle label selectors properly, need to use older version. -->
1919
<version.kubernetes-client.server-mock>4.6.0</version.kubernetes-client.server-mock>
20+
<!-- Add this to match other versions of okhttp3 and okio used elsewhere -->
21+
<version.com.squareup.okhttp3>4.12.0</version.com.squareup.okhttp3>
22+
<version.com.squareup.okio>3.6.0</version.com.squareup.okio>
2023
</properties>
2124

2225
<dependencyManagement>
@@ -65,6 +68,26 @@
6568
<artifactId>openshift-server-mock</artifactId>
6669
<version>${version.kubernetes-client.server-mock}</version>
6770
</dependency>
71+
<dependency>
72+
<groupId>com.squareup.okhttp3</groupId>
73+
<artifactId>okhttp</artifactId>
74+
<version>${version.com.squareup.okhttp3}</version>
75+
</dependency>
76+
<dependency>
77+
<groupId>com.squareup.okhttp3</groupId>
78+
<artifactId>logging-interceptor</artifactId>
79+
<version>${version.com.squareup.okhttp3}</version>
80+
</dependency>
81+
<dependency>
82+
<groupId>com.squareup.okio</groupId>
83+
<artifactId>okio</artifactId>
84+
<version>${version.com.squareup.okio}</version>
85+
</dependency>
86+
<dependency>
87+
<groupId>com.squareup.okhttp3</groupId>
88+
<artifactId>mockwebserver</artifactId>
89+
<version>${version.com.squareup.okhttp3}</version>
90+
</dependency>
6891
</dependencies>
6992
</dependencyManagement>
7093

@@ -137,6 +160,26 @@
137160
<artifactId>jackson-dataformat-yaml</artifactId>
138161
<scope>test</scope>
139162
</dependency>
163+
<dependency>
164+
<groupId>com.squareup.okhttp3</groupId>
165+
<artifactId>mockwebserver</artifactId>
166+
<scope>test</scope>
167+
</dependency>
168+
<dependency>
169+
<groupId>org.bouncycastle</groupId>
170+
<artifactId>bcprov-jdk15to18</artifactId>
171+
<scope>test</scope>
172+
</dependency>
173+
<dependency>
174+
<groupId>org.bouncycastle</groupId>
175+
<artifactId>bcpkix-jdk15to18</artifactId>
176+
<scope>test</scope>
177+
</dependency>
178+
<dependency>
179+
<groupId>org.bouncycastle</groupId>
180+
<artifactId>bcpg-jdk15to18</artifactId>
181+
<scope>test</scope>
182+
</dependency>
140183
</dependencies>
141184

142185
<build>

‎kie-server-parent/kie-server-services/kie-server-services-openshift/pom.xml‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@
1818
<java.module.name>org.kie.server.services.openshift</java.module.name>
1919
<!-- Server mock version 4.7.2 doesn't handle label selectors properly, need to use older version. -->
2020
<version.kubernetes-client.server-mock>4.6.0</version.kubernetes-client.server-mock>
21+
<!-- Add this to match other versions of okhttp3 and okio used elsewhere -->
22+
<version.com.squareup.okhttp3>4.12.0</version.com.squareup.okhttp3>
23+
<version.com.squareup.okio>3.6.0</version.com.squareup.okio>
2124
</properties>
2225

2326
<dependencyManagement>
@@ -32,6 +35,22 @@
3235

3336
<!-- Override fabric8 dependencies specified from parent pom with newer
3437
version -->
38+
<dependency>
39+
<groupId>com.squareup.okhttp3</groupId>
40+
<artifactId>logging-interceptor</artifactId>
41+
<version>${version.com.squareup.okhttp3}</version>
42+
</dependency>
43+
<dependency>
44+
<groupId>com.squareup.okio</groupId>
45+
<artifactId>okio</artifactId>
46+
<version>${version.com.squareup.okio}</version>
47+
</dependency>
48+
<dependency>
49+
<groupId>com.squareup.okhttp3</groupId>
50+
<artifactId>mockwebserver</artifactId>
51+
<version>${version.com.squareup.okhttp3}</version>
52+
</dependency>
53+
3554
<dependency>
3655
<groupId>io.fabric8</groupId>
3756
<artifactId>kubernetes-model</artifactId>
@@ -76,6 +95,24 @@
7695
<version>${version.org.yaml.snakeyaml}</version>
7796
<scope>test</scope>
7897
</dependency>
98+
<dependency>
99+
<groupId>org.bouncycastle</groupId>
100+
<artifactId>bcprov-jdk15to18</artifactId>
101+
<version>${version.org.bouncycastle}</version>
102+
<scope>test</scope>
103+
</dependency>
104+
<dependency>
105+
<groupId>org.bouncycastle</groupId>
106+
<artifactId>bcpkix-jdk15to18</artifactId>
107+
<version>${version.org.bouncycastle}</version>
108+
<scope>test</scope>
109+
</dependency>
110+
<dependency>
111+
<groupId>org.bouncycastle</groupId>
112+
<artifactId>bcpg-jdk15to18</artifactId>
113+
<version>${version.org.bouncycastle}</version>
114+
<scope>test</scope>
115+
</dependency>
79116
</dependencies>
80117
</dependencyManagement>
81118

@@ -137,6 +174,22 @@
137174
<artifactId>openshift-server-mock</artifactId>
138175
<scope>test</scope>
139176
</dependency>
177+
<dependency>
178+
<groupId>org.bouncycastle</groupId>
179+
<artifactId>bcprov-jdk15to18</artifactId>
180+
<scope>test</scope>
181+
</dependency>
182+
<dependency>
183+
<groupId>org.bouncycastle</groupId>
184+
<artifactId>bcpkix-jdk15to18</artifactId>
185+
<scope>test</scope>
186+
</dependency>
187+
<dependency>
188+
<groupId>org.bouncycastle</groupId>
189+
<artifactId>bcpg-jdk15to18</artifactId>
190+
<scope>test</scope>
191+
</dependency>
192+
140193
<dependency>
141194
<groupId>com.fasterxml.jackson.dataformat</groupId>
142195
<artifactId>jackson-dataformat-yaml</artifactId>

0 commit comments

Comments
 (0)