chore: tweak dockerfile; (#560)

use latest ocp 4.12 oc binary;
fix typo in pom.xml
bump to latest mavn 3.9.4

Change-Id: Ie9d9aea49e7e46bec4814477489450b277f926b4

Signed-off-by: Nick Boldt <[email protected]>

.ci/openshift-ci/Dockerfile

@@ -11,28 +11,30 @@
 #   Red Hat, Inc. - initial API and implementation
 
 # Dockerfile to bootstrap build and test in openshift-ci
-
 FROM registry.access.redhat.com/ubi9/nodejs-18:1
-
-SHELL ["/bin/bash", "-c"]
-
+# hadolint ignore=DL3002
 USER 0
 
 # Install yq, kubectl, chectl cli used by olm/olm.sh script.
-RUN dnf install -y psmisc nodejs-devel nodejs-libs -q --allowerasing --nobest \
+# hadolint ignore=DL3041
+RUN dnf install -y -q --allowerasing --nobest nodejs-devel nodejs-libs psmisc python3-pip jq golang httpd-tools \
     # already installed or installed as deps:
     openssl openssl-devel ca-certificates make cmake cpp gcc gcc-c++ zlib zlib-devel brotli brotli-devel python3 nodejs-packaging && \
     dnf update -y && dnf clean all && \
     npm install -g [email protected] npm@9 && \
     echo -n "node version: "; node -v; \
     echo -n "npm  version: "; npm -v; \
-    echo -n "yarn version: "; yarn -v && \
-    yum install --assumeyes -d1 python3-pip  httpd-tools && \
-    pip3 install --upgrade setuptools && \
-    pip3 install yq && \
+    echo -n "yarn version: "; yarn -v; \
+    go version; \
+    pip3 install --upgrade pip setuptools yq && \
+
+    # Install kubectl, chectl cli used by olm/olm.sh script.
     curl -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl && \
     chmod +x ./kubectl && \
     mv ./kubectl /usr/local/bin && \
     bash <(curl -sL https://www.eclipse.org/che/chectl/) --channel=next && \
-    curl https://mirror.openshift.com/pub/openshift-v4/clients/ocp/4.12.30/openshift-client-linux.tar.gz | tar xvzf - -C /usr/local/bin/ oc && \
+    curl https://mirror.openshift.com/pub/openshift-v4/clients/ocp/latest-4.12/openshift-client-linux.tar.gz | tar xvzf - -C /usr/local/bin/ oc && \
     chmod ug+x /usr/local/bin/oc
+
+SHELL ["/bin/bash", "-c"]
+

README.md

@@ -25,7 +25,7 @@ Che Server is mostly a Java web application deployed on an Apache Tomcat server
 Other modules are deprecated and will be removed in the future.
 
 # Build requirements
-- Apache Maven 3.6.3 or later
+- Apache Maven 3.9 or later
 - JDK 11
 - Podman or Docker (required for running integration tests)
 

pom.xml

@@ -137,7 +137,7 @@
         <org.apache.httpcomponents.httpcore.version>4.4.15</org.apache.httpcomponents.httpcore.version>
         <org.apache.maven.plugin-testing.maven-plugin-testing-harness.version>3.3.0</org.apache.maven.plugin-testing.maven-plugin-testing-harness.version>
         <org.apache.maven.plugin-tools.plugin-annotations.version>3.6.2</org.apache.maven.plugin-tools.plugin-annotations.version>
-        <org.apache.maven.verson>3.8.4</org.apache.maven.verson>
+        <org.apache.maven.version>3.9.4</org.apache.maven.version>
         <org.apache.tomcat.version>10.1.6</org.apache.tomcat.version>
         <org.codehaus.plexus.utils.version>3.4.1</org.codehaus.plexus.utils.version>
         <org.eclipse.persistence.eclipselink.version>2.7.10</org.eclipse.persistence.eclipselink.version>
@@ -558,27 +558,27 @@
             <dependency>
                 <groupId>org.apache.maven</groupId>
                 <artifactId>maven-artifact</artifactId>
-                <version>${org.apache.maven.verson}</version>
+                <version>${org.apache.maven.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.maven</groupId>
                 <artifactId>maven-compat</artifactId>
-                <version>${org.apache.maven.verson}</version>
+                <version>${org.apache.maven.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.maven</groupId>
                 <artifactId>maven-core</artifactId>
-                <version>${org.apache.maven.verson}</version>
+                <version>${org.apache.maven.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.maven</groupId>
                 <artifactId>maven-model</artifactId>
-                <version>${org.apache.maven.verson}</version>
+                <version>${org.apache.maven.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.maven</groupId>
                 <artifactId>maven-plugin-api</artifactId>
-                <version>${org.apache.maven.verson}</version>
+                <version>${org.apache.maven.version}</version>
                 <exclusions>
                     <exclusion>
                         <artifactId>jsr250-api</artifactId>