Merge remote-tracking branch 'upstream/release-0.11.1'

Dockerfile

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.6 as build_base
+FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8 as build_base
 
 # https://docs.docker.com/engine/reference/builder/#automatic-platform-args-in-the-global-scope
 # don't provide "default" values (e.g. 'ARG TARGETARCH=amd64') for non-buildx environments,

pom.xml

@@ -74,9 +74,12 @@
     <!-- Care must be taken when updating the prometheus client lib version
          since we have some custom optimized extensions to this -->
     <prometheus-version>0.9.0</prometheus-version>
-    <bouncycastle-version>1.70</bouncycastle-version>
+    <bouncycastle-version>1.74</bouncycastle-version>
     <junit-version>5.9.3</junit-version>
 
+    <zookeeper-version>3.7.2</zookeeper-version>
+    <curator-version>5.3.0</curator-version>
+
     <dockerhome>${project.build.directory}/dockerhome</dockerhome>
     <skipTests>false</skipTests>
   </properties>
@@ -450,7 +453,7 @@
        generate a self-signed server certificate -->
     <dependency>
       <groupId>org.bouncycastle</groupId>
-      <artifactId>bcpkix-jdk15on</artifactId>
+      <artifactId>bcpkix-jdk18on</artifactId>
       <version>${bouncycastle-version}</version>
     </dependency>
 
@@ -459,7 +462,7 @@
     <dependency>
       <groupId>org.apache.curator</groupId>
       <artifactId>curator-test</artifactId>
-      <version>2.13.0</version>
+      <version>${curator-version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -524,6 +527,17 @@
         <artifactId>libthrift</artifactId>
         <version>${thrift-version}</version>
       </dependency>
+      <dependency>
+        <!-- override litelinks' versions with newer to avoid CVE -->
+        <groupId>org.apache.zookeeper</groupId>
+        <artifactId>zookeeper</artifactId>
+        <version>${zookeeper-version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.curator</groupId>
+        <artifactId>curator-recipes</artifactId>
+        <version>${curator-version}</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 </project>