Merge branch 'v3.x.x' into reboot/addional-registrated-gateway-fix

zowe · Dec 13, 2024 · d9bc518 · d9bc518
2 parents f8dc2bd + 1106cb9
commit d9bc518
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 18 deletions.
diff --git a/.github/workflows/automated-release.yml b/.github/workflows/automated-release.yml
@@ -47,20 +47,16 @@ jobs:
               run: |
                   cd onboarding-enabler-nodejs
                   echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" > ~/.npmrc
-                  echo "registry=$DIST_REGISTRY" >> ~/.npmrc
                   npm version ${{ github.event.inputs.scope || env.DEFAULT_SCOPE }} --allow-same-version
                   npm publish --access public
                   git add package.json
                   git add package-lock.json
                   git commit -m "[skip ci] Update version"
-                  git push
+                  git push --no-verify
                   cd ..
               env:
-                  ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
-                  ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
                   DEFAULT_SCOPE: 'patch'
                   NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
-                  DIST_REGISTRY: https://registry.npmjs.org/
 
             - name: Release with Gradle automatic
               shell: bash

diff --git a/.github/workflows/binary-specific-release.yml b/.github/workflows/binary-specific-release.yml
@@ -44,19 +44,15 @@ jobs:
               run: |
                   cd onboarding-enabler-nodejs
                   echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" > ~/.npmrc
-                  echo "registry=$DIST_REGISTRY" >> ~/.npmrc
                   npm version ${{ github.event.inputs.release_version }} --allow-same-version
                   npm publish --access public
                   git add package.json
                   git add package-lock.json
                   git commit -m "[skip ci] Update version"
-                  git push
+                  git push --no-verify
                   cd ..
               env:
-                  ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
-                  ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
                   NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
-                  DIST_REGISTRY: https://registry.npmjs.org/
 
             - name: Release with Gradle automatic
               shell: bash
@@ -84,6 +80,6 @@ jobs:
                     caching-service/build/reports/**
                     api-catalog-services/build/reports/**
                     zaas-service/build/reports/**
-                    /home/runner/.npm/logs/**
+                    ~/.npm/_logs
 
             - uses: ./.github/actions/teardown
diff --git a/api-catalog-ui/frontend/.env b/api-catalog-ui/frontend/.env
@@ -7,4 +7,4 @@ REACT_APP_STATUS_UPDATE_MAX_RETRIES=10
 REACT_APP_STATUS_UPDATE_DEBOUNCE=300
 REACT_APP_CA_ENV=false
 REACT_APP_STATUS_UPDATE_SCALING_DURATION=1000
-REACT_APP_ZOWE_BUILD_INFO=3.0.44-SNAPSHOT
+REACT_APP_ZOWE_BUILD_INFO=3.0.49-SNAPSHOT
diff --git a/discovery-package/src/main/resources/bin/configure.sh b/discovery-package/src/main/resources/bin/configure.sh
@@ -41,7 +41,7 @@ fi
 
 if [ -e "$SOURCE_FILE" ]; then
     # _BPXK_AUTOCVT is set on some systems and resulted in twice-converted files when run through chtag and sed
-    _BPXK_AUTOCVT="OFF" sed -W filecodeset=ISO8859-1 -e "s|%ZOSMF_SCHEME%|${ZOSMF_SCHEME}|g" $SOURCE_FILE >$DEST_FILE # implicit EBCDIC out
+    _BPXK_AUTOCVT="ON" sed -W filecodeset=ISO8859-1 -e "s|%ZOSMF_SCHEME%|${ZOSMF_SCHEME}|g" $SOURCE_FILE >$DEST_FILE # implicit EBCDIC out
     iconv -f IBM-1047 -t ISO8859-1 $DEST_FILE >$SOURCE_FILE
     _BPXK_AUTOCVT="OFF" chtag -tc ISO8859-1 $SOURCE_FILE
     rm -f $DEST_FILE

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=3.0.44-SNAPSHOT
+version=3.0.49-SNAPSHOT
 
 defaultSpringBootVersion=2.0.2.RELEASE
 defaultSpringBootCloudVersion=2.0.0.RELEASE

diff --git a/onboarding-enabler-nodejs/.npmrc b/onboarding-enabler-nodejs/.npmrc
@@ -1,2 +1,2 @@
 legacy-peer-deps=true
-registry=https://zowe.jfrog.io/artifactory/api/npm/npm-org
+registry=https://registry.npmjs.org/
diff --git a/onboarding-enabler-nodejs/package-lock.json b/onboarding-enabler-nodejs/package-lock.json
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": "3.0.44",
+  "version": "3.0.48",
   "description": "NodeJS enabler for Zowe API Mediation Layer",
   "type": "module",
   "main": "src/index.js",