Merge branch 'v1.x.x' into apiml/release/1_28_24

zowe · Oct 3, 2023 · ca26da6 · ca26da6
2 parents a123cbf + 087da32
commit ca26da6
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 6 deletions.
diff --git a/.github/workflows/image-publish-branch.yml b/.github/workflows/image-publish-branch.yml
@@ -42,7 +42,7 @@ jobs:
     publish-images:
         needs:
             - build-test-services
-        uses: zowe/api-layer/.github/workflows/build-conformant-images.yml@v2.x.x
+        uses: zowe/api-layer/.github/workflows/build-conformant-images.yml@v1.x.x
         with:
             service: ${{ github.event.inputs.service }}
             forceNoRelease: true

diff --git a/.github/workflows/image-snapshot-release.yml b/.github/workflows/image-snapshot-release.yml
@@ -22,7 +22,7 @@ jobs:
     publish-images:
         needs:
             - build-test-services
-        uses: zowe/api-layer/.github/workflows/build-conformant-images.yml@v2.x.x
+        uses: zowe/api-layer/.github/workflows/build-conformant-images.yml@v1.x.x
         with:
             forceNoRelease: true
         secrets:

diff --git a/.github/workflows/image-specific-release.yml b/.github/workflows/image-specific-release.yml
@@ -25,7 +25,7 @@ jobs:
     publish-images:
         needs:
             - build-test-services
-        uses: zowe/api-layer/.github/workflows/build-conformant-images.yml@v2.x.x
+        uses: zowe/api-layer/.github/workflows/build-conformant-images.yml@v1.x.x
         with:
             version: ${{ github.event.inputs.release_version }}
         secrets:

diff --git a/gateway-service/src/main/resources/ehcache.xml b/gateway-service/src/main/resources/ehcache.xml
@@ -2,7 +2,7 @@
 <config
     xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
     xmlns='http://www.ehcache.org/v3'
-    xsi:schemaLocation="http://www.ehcache.org/v3 http://www.ehcache.org/schema/ehcache-core-3.0.xsd">
+    xsi:schemaLocation="http://www.ehcache.org/v3 http://www.ehcache.org/schema/ehcache-core-3.6.xsd">
 
     <persistence directory="${ehcache.disk.store.dir}"/>
 
@@ -20,6 +20,7 @@
             <heap unit="MB">1</heap>
             <disk unit="MB" persistent="true">10</disk>
         </resources>
+        <disk-store-settings writer-concurrency="1" disk-segments="1"></disk-store-settings>
     </cache>
 
     <cache alias="validationJwtToken">

diff --git a/gradle.properties b/gradle.properties
@@ -17,7 +17,7 @@ artifactoryPublishingMavenRepo=https://zowe.jfrog.io/zowe/libs-release-local
 artifactoryPublishingMavenSnapshotRepo=https://zowe.jfrog.io/zowe/libs-snapshot-local
 
 # Artifacts version
-version=1.28.23-SNAPSHOT
+version=1.28.24-SNAPSHOT
 
 defaultSpringBootVersion=2.0.2.RELEASE
 defaultSpringBootCloudVersion=2.0.0.RELEASE

diff --git a/onboarding-enabler-nodejs/package.json b/onboarding-enabler-nodejs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@zowe/apiml-onboarding-enabler-nodejs",
-  "version": "1.28.22",
+  "version": "1.28.23",
   "description": "NodeJS enabler for Zowe API Mediation Layer",
   "main": "src/index.js",
   "scripts": {