diff --git a/.ci/openshift-ci/Dockerfile b/.ci/openshift-ci/Dockerfile index 0ceedc09d6..718fd06652 100644 --- a/.ci/openshift-ci/Dockerfile +++ b/.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 yarn@1.22 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"] + diff --git a/README.md b/README.md index a494bc5d28..9ac58077bf 100644 --- a/README.md +++ b/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) diff --git a/pom.xml b/pom.xml index ffc0d49db6..a3327d661f 100644 --- a/pom.xml +++ b/pom.xml @@ -137,7 +137,7 @@ 4.4.15 3.3.0 3.6.2 - 3.8.4 + 3.9.4 10.1.6 3.4.1 2.7.10 @@ -558,27 +558,27 @@ org.apache.maven maven-artifact - ${org.apache.maven.verson} + ${org.apache.maven.version} org.apache.maven maven-compat - ${org.apache.maven.verson} + ${org.apache.maven.version} org.apache.maven maven-core - ${org.apache.maven.verson} + ${org.apache.maven.version} org.apache.maven maven-model - ${org.apache.maven.verson} + ${org.apache.maven.version} org.apache.maven maven-plugin-api - ${org.apache.maven.verson} + ${org.apache.maven.version} jsr250-api