Merge pull request #47 from WASdev/version-23.0.0.7

Update Websphere Liberty to 23.0.0.7
WASdev · Aug 28, 2023 · 67e3db3 · 67e3db3
2 parents 2d913f7 + efcd8f8
commit 67e3db3
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
@@ -5,8 +5,8 @@ on:
   workflow_dispatch:
 env:
   LANG: en_US.UTF-8
-  S2I_URI: https://api.github.com/repos/openshift/source-to-image/releases/tags/v1.3.1
-  CEKIT_VERSION: 3.2.1
+  S2I_URI: https://api.github.com/repos/openshift/source-to-image/releases/tags/v1.3.8
+  CEKIT_VERSION: 4.8.0
   DOCKER_USERID: ${{ secrets.DOCKER_USERID }}
   LIBERTY_VERSION: ${{ github.event.release.tag_name }}
 jobs:

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -7,8 +7,8 @@ on:
   workflow_dispatch:
 env:
   LANG: en_US.UTF-8
-  S2I_URI: https://api.github.com/repos/openshift/source-to-image/releases/tags/v1.3.1
-  CEKIT_VERSION: 3.2.1
+  S2I_URI: https://api.github.com/repos/openshift/source-to-image/releases/tags/v1.3.8
+  CEKIT_VERSION: 4.8.0
 jobs:
   wasci:
     name: WebSphere Liberty S2I Build and Test 
@@ -51,7 +51,7 @@ jobs:
           mkdir ~/cekit${{ env.CEKIT_VERSION }}
           python3 -m venv ~/cekit${{ env.CEKIT_VERSION }}
           . ~/cekit${{ env.CEKIT_VERSION }}/bin/activate
-          pip install cekit==${{ env.CEKIT_VERSION }} docker==5.0.3 docker-squash odcs behave lxml urllib3==1.26.15
+          pip install cekit==${{ env.CEKIT_VERSION }} docker==5.0.3 docker-squash odcs behave lxml urllib3==1.26.15 packaging==21.3
       - name: install s2i binary
         run: |
           echo ===== Installing s2i from ${{ env.S2I_URL }} =====

diff --git a/.one-pipeline.yaml b/.one-pipeline.yaml
@@ -7,7 +7,7 @@ setup:
 
     set_env S2I_URI "https://api.github.com/repos/openshift/source-to-image/releases/tags/v1.3.1"
     set_env CEKIT_VERSION "3.2.1"   
-    set_env LIBERTY_VERSION "23.0.0.6"
+    set_env LIBERTY_VERSION "23.0.0.7"
 
 test:
   abort_on_failure: false

diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-LIBERTY_VERSION=23.0.0.6
+LIBERTY_VERSION=23.0.0.7
 JAVA8_IMAGE_VERSION=$(LIBERTY_VERSION)-java8
 JAVA8_RUNTIME_IMAGE_VERSION=$(LIBERTY_VERSION)-runtime-java8
 JAVA11_IMAGE_VERSION=$(LIBERTY_VERSION)-java11

diff --git a/modules/maven/install.sh b/modules/maven/install.sh
@@ -3,7 +3,7 @@
 set -e
 
     tar -C /usr/local -zxf /tmp/artifacts/maven.tar.gz \
-      && ln -sf /usr/local/apache-maven-3.9.3/bin/mvn /usr/local/bin/mvn 
+      && ln -sf /usr/local/apache-maven-3.8.8/bin/mvn /usr/local/bin/mvn 
 
 SCRIPT_DIR=$(dirname $0)
 ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts

diff --git a/modules/maven/module.yaml b/modules/maven/module.yaml
@@ -7,8 +7,8 @@ description: "Module used to install Maven 3.9.3"
 # Defined artifacts that are used to build the image
 artifacts:
   - name: maven.tar.gz
-    url: https://www.apache.org/dist/maven/maven-3/3.9.3/binaries/apache-maven-3.9.3-bin.tar.gz 
-    sha512: 400fc5b6d000c158d5ee7937543faa06b6bda8408caa2444a9c947c21472fde0f0b64ac452b8cec8855d528c0335522ed5b6c8f77085811c7e29e1bedbb5daa2
+    url: https://www.apache.org/dist/maven/maven-3/3.8.8/binaries/apache-maven-3.8.8-bin.tar.gz 
+    sha512: 332088670d14fa9ff346e6858ca0acca304666596fec86eea89253bd496d3c90deae2be5091be199f48e09d46cec817c6419d5161fb4ee37871503f472765d00
 
 execute:
   - script: install.sh